diff --git a/src/lib/components/chat/Settings/General.svelte b/src/lib/components/chat/Settings/General.svelte
index d339e371..0a9c88e3 100644
--- a/src/lib/components/chat/Settings/General.svelte
+++ b/src/lib/components/chat/Settings/General.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { toast } from 'svelte-sonner';
 	import { createEventDispatcher, onMount, getContext } from 'svelte';
+	import { languages } from '$lib/i18n';
 	const dispatch = createEventDispatcher();
 
 	import { models, user } from '$lib/stores';
@@ -16,7 +17,6 @@
 	let themes = ['dark', 'light', 'rose-pine dark', 'rose-pine-dawn light'];
 	let theme = 'dark';
 	// TODO: Get these dynamically from the i18n module
-	let languages = ['en', 'fa', 'fr', 'de', 'ua'];
 	let lang = $i18n.language;
 	let notificationEnabled = false;
 	let system = '';
@@ -134,12 +134,11 @@
 						bind:value={lang}
 						placeholder="Select a language"
 						on:change={(e) => {
-							console.log($i18n);
 							$i18n.changeLanguage(lang);
 						}}
 					>
-						{#each languages as value}
-							<option {value}>{value}</option>
+						{#each languages as language}
+							<option value={language['code']}>{language['title']}</option>
 						{/each}
 					</select>
 				</div>
diff --git a/src/lib/i18n/index.ts b/src/lib/i18n/index.ts
index d3811dea..14a11a22 100644
--- a/src/lib/i18n/index.ts
+++ b/src/lib/i18n/index.ts
@@ -50,13 +50,16 @@ i18next
 			lookupQuerystring: 'lang',
 			lookupLocalStorage: 'locale'
 		},
-		fallbackLng: 'en',
-		ns: 'common',
+		fallbackLng: {
+			default: ['en-US']
+		},
+		ns: 'translation',
 		interpolation: {
 			escapeValue: false // not needed for svelte as it escapes by default
 		}
 	});
 
+export const languages = (await import(`./locales/languages.json`)).default;
 const i18n = createI18nStore(i18next);
 const isLoadingStore = createIsLoadingStore(i18next);
 export default i18n;
diff --git a/src/lib/i18n/locales/de/common.json b/src/lib/i18n/locales/de/translation.json
similarity index 100%
rename from src/lib/i18n/locales/de/common.json
rename to src/lib/i18n/locales/de/translation.json
diff --git a/src/lib/i18n/locales/en/common.json b/src/lib/i18n/locales/en-US/translation.json
similarity index 100%
rename from src/lib/i18n/locales/en/common.json
rename to src/lib/i18n/locales/en-US/translation.json
diff --git a/src/lib/i18n/locales/fa/common.json b/src/lib/i18n/locales/fa/translation.json
similarity index 100%
rename from src/lib/i18n/locales/fa/common.json
rename to src/lib/i18n/locales/fa/translation.json
diff --git a/src/lib/i18n/locales/fr/common.json b/src/lib/i18n/locales/fr/translation.json
similarity index 100%
rename from src/lib/i18n/locales/fr/common.json
rename to src/lib/i18n/locales/fr/translation.json
diff --git a/src/lib/i18n/locales/languages.json b/src/lib/i18n/locales/languages.json
new file mode 100644
index 00000000..bcfca80e
--- /dev/null
+++ b/src/lib/i18n/locales/languages.json
@@ -0,0 +1,22 @@
+[
+	{
+		"title": "English",
+		"code": "en-US"
+	},
+	{
+		"title": "فارسی",
+		"code": "fa"
+	},
+	{
+		"title": "Deutsch",
+		"code": "de"
+	},
+	{
+		"title": "French",
+		"code": "fr"
+	},
+	{
+		"title": "Ukrainian",
+		"code": "uk"
+	}
+]
diff --git a/src/lib/i18n/locales/ua/common.json b/src/lib/i18n/locales/uk/translation.json
similarity index 100%
rename from src/lib/i18n/locales/ua/common.json
rename to src/lib/i18n/locales/uk/translation.json