diff --git a/locales/en.yml b/locales/en.yml
index 385e019b..4b4873a8 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -1,4 +1,27 @@
 home:
+  commandPalette:
+    search: Search...
+    placeholder: Type to search a tool or a command...
+  commandPaletteStore:
+    actions: Actions
+    external: External
+    tools: Tools
   categories:
     newestTools: Newest tools
 
+    title: IT Tools - Handy online tools for developers
+    allTools: All the tools
+    favoriteTools: Your favorite tools
+    thanks: '! Thank you'
+    giveUsAStarOn: Give us a star on
+    orFollowUsOn: or follow us on
+    youLikeItTools: You like it-tools?
+tools:
+  xmlFormat:
+    description: Prettify your XML string to a human friendly readable format.
+    indentSize: 'Indent size:'
+    collapseContent: 'Collapse content:'
+    providedXmlIsNotValid: Provided XML is not valid.
+    inputLabel: Your XML
+    outputLabel: Formatted XML from your XML
+    placeHolder: Paste your XML here...
diff --git a/src/layouts/base.layout.vue b/src/layouts/base.layout.vue
index 2b697cfc..b586daed 100644
--- a/src/layouts/base.layout.vue
+++ b/src/layouts/base.layout.vue
@@ -7,6 +7,7 @@ import { Heart, Home2, Menu2 } from '@vicons/tabler';
 import HeroGradient from '../assets/hero-gradient.svg?component';
 import MenuLayout from '../components/MenuLayout.vue';
 import NavbarButtons from '../components/NavbarButtons.vue';
+import { availableLocales, loadLanguageAsync } from '../plugins/i18n.plugin';
 import { toolsByCategory } from '@/tools';
 import { useStyleStore } from '@/stores/style.store';
 import { config } from '@/config';
@@ -24,10 +25,19 @@ const { tracker } = useTracker();
 
 const toolStore = useToolStore();
 
+const currentLang = useStorage('application:selected-language', 'en');
+
+loadLanguageAsync(currentLang.value);
+
 const tools = computed<ToolCategory[]>(() => [
   ...(toolStore.favoriteTools.length > 0 ? [{ name: 'Your favorite tools', components: toolStore.favoriteTools }] : []),
   ...toolsByCategory,
 ]);
+
+function onChange(event: any) {
+  currentLang.value = event;
+  loadLanguageAsync(event);
+}
 </script>
 
 <template>
@@ -107,11 +117,24 @@ const tools = computed<ToolCategory[]>(() => [
           <icon-mdi:brush-variant text-20px />
         </c-button>
 
+<<<<<<< HEAD
         <command-palette />
 
         <div>
           <NavbarButtons v-if="!styleStore.isSmallScreen" />
         </div>
+=======
+        <n-select
+          class="i18n"
+          :model:value="currentLang"
+          :options="availableLocales.map(lang => ({ value: lang, label: lang }))"
+          placeholder="Select language"
+          :on-update-value="onChange"
+          :default-value="currentLang"
+        />
+
+        <NavbarButtons v-if="!styleStore.isSmallScreen" />
+>>>>>>> fcf79cc248ccefbca855c19a038bc71d59f8a2b8
 
         <n-tooltip trigger="hover">
           <template #trigger>
@@ -211,4 +234,27 @@ const tools = computed<ToolCategory[]>(() => [
     }
   }
 }
+<<<<<<< HEAD
+=======
+
+// ::v-deep(.n-menu-item-content-header) {
+//   overflow: visible !important;
+//   // overflow-x: hidden !important;
+// }
+
+.navigation {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: row;
+
+  .search-bar {
+    // width: 100%;
+    flex-grow: 1;
+  }
+}
+.i18n{
+  width: 75px;
+}
+>>>>>>> fcf79cc248ccefbca855c19a038bc71d59f8a2b8
 </style>
diff --git a/src/layouts/tool.layout.vue b/src/layouts/tool.layout.vue
index aa808f1c..c016cc21 100644
--- a/src/layouts/tool.layout.vue
+++ b/src/layouts/tool.layout.vue
@@ -9,6 +9,7 @@ import type { Tool } from '@/tools/tools.types';
 
 const route = useRoute();
 
+const { t } = useI18n();
 const head = computed<HeadObject>(() => ({
   title: `${route.meta.name} - IT Tools`,
   meta: [
@@ -47,7 +48,11 @@ const toolDescription = computed<string>(() => t(`tools.${i18nKey.value}.descrip
         <div class="separator" />
 
         <div class="description">
+<<<<<<< HEAD
           {{ toolDescription }}
+=======
+          {{ t(route.meta.description) }}
+>>>>>>> fcf79cc248ccefbca855c19a038bc71d59f8a2b8
         </div>
       </div>
     </div>