diff --git a/package-lock.json b/package-lock.json
index 5737b84..f6c2364 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,6 @@
 				"@fontsource/fira-mono": "^4.5.10",
 				"@neoconfetti/svelte": "^1.0.0",
 				"@playwright/test": "^1.28.1",
-				"@rollup/plugin-json": "^6.0.0",
 				"@sveltejs/adapter-auto": "^2.0.0",
 				"@sveltejs/adapter-node": "^1.3.1",
 				"@sveltejs/kit": "^1.5.0",
diff --git a/package.json b/package.json
index f72314e..8efd31a 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,6 @@
 		"@fontsource/fira-mono": "^4.5.10",
 		"@neoconfetti/svelte": "^1.0.0",
 		"@playwright/test": "^1.28.1",
-		"@rollup/plugin-json": "^6.0.0",
 		"@sveltejs/adapter-auto": "^2.0.0",
 		"@sveltejs/adapter-node": "^1.3.1",
 		"@sveltejs/kit": "^1.5.0",
@@ -54,9 +53,9 @@
 		"hls.js": "^1.4.6",
 		"openapi-fetch": "^0.2.1",
 		"radix-icons-svelte": "^1.2.1",
-		"svelte-i18n": "^3.7.0",
 		"reflect-metadata": "^0.1.13",
 		"sqlite3": "^5.1.6",
+		"svelte-i18n": "^3.7.0",
 		"tailwind-scrollbar-hide": "^1.1.7",
 		"typeorm": "^0.3.17"
 	}
diff --git a/rollup.config.js b/rollup.config.js
deleted file mode 100644
index 4c0caa2..0000000
--- a/rollup.config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import json from '@rollup/plugin-json';
-import svelte from 'rollup-plugin-svelte';
-
-export default {
-	plugins: [json(), svelte({})]
-};
diff --git a/src/lib/components/Lang/I18n.svelte b/src/lib/components/Lang/I18n.svelte
index f16dab6..4cd640d 100644
--- a/src/lib/components/Lang/I18n.svelte
+++ b/src/lib/components/Lang/I18n.svelte
@@ -1,24 +1,22 @@
 <script lang="ts">
-	import { addMessages, init, locale } from 'svelte-i18n';
+	import { addMessages, init, locale, dictionary } from 'svelte-i18n';
 	import { settings } from '$lib/stores/settings.store';
-	import { SUPPORTED_LANGUAGES } from '$lib/utils/supported-languages';
 	import en from '../../lang/en.json';
 	import es from '../../lang/es.json';
 
 	addMessages('en', en);
 	addMessages('es', es);
 
-	$: {
-		if ($settings.language) {
-			const selectedLocale = SUPPORTED_LANGUAGES[parseInt($settings.language)];
-			locale.set(selectedLocale);
+	settings.subscribe((value) => {
+		if (value.language) {
+			locale.set(value.language);
 		} else {
 			locale.set('en');
 		}
-	}
+	});
 
 	init({
-		initialLocale: SUPPORTED_LANGUAGES[parseInt($settings.language)],
+		initialLocale: $settings.language,
 		fallbackLocale: 'en'
 	});
 </script>
diff --git a/src/lib/discover.ts b/src/lib/discover.ts
index b40c7b4..cc1e083 100644
--- a/src/lib/discover.ts
+++ b/src/lib/discover.ts
@@ -55,61 +55,62 @@ export const genres: Record<string, Genre> = {
 	crime: {
 		name: 'crime',
 		tmdbGenreId: 80
-	},
-	documentary: {
-		name: 'documentary',
-		tmdbGenreId: 99
-	},
-	drama: {
-		name: 'drama',
-		tmdbGenreId: 18
-	},
-	family: {
-		name: 'family',
-		tmdbGenreId: 10751
-	},
-	fantasy: {
-		name: 'fantasy',
-		tmdbGenreId: 14
-	},
-	history: {
-		name: 'history',
-		tmdbGenreId: 36
-	},
-	horror: {
-		name: 'horror',
-		tmdbGenreId: 27
-	},
-	music: {
-		name: 'music',
-		tmdbGenreId: 10402
-	},
-	mystery: {
-		name: 'mystery',
-		tmdbGenreId: 9648
-	},
-	romance: {
-		name: 'romance',
-		tmdbGenreId: 10749
-	},
-	scienceFiction: {
-		name: 'scienceFiction',
-		tmdbGenreId: 878
-	},
-	tvMovie: {
-		name: 'tvMovie',
-		tmdbGenreId: 10770
-	},
-	thriller: {
-		name: 'thriller',
-		tmdbGenreId: 53
-	},
-	war: {
-		name: 'war',
-		tmdbGenreId: 10752
-	},
-	western: {
-		name: 'western',
-		tmdbGenreId: 37
 	}
+	// Remove until pictures added
+	// documentary: {
+	// 	name: 'documentary',
+	// 	tmdbGenreId: 99
+	// },
+	// drama: {
+	// 	name: 'drama',
+	// 	tmdbGenreId: 18
+	// },
+	// family: {
+	// 	name: 'family',
+	// 	tmdbGenreId: 10751
+	// },
+	// fantasy: {
+	// 	name: 'fantasy',
+	// 	tmdbGenreId: 14
+	// },
+	// history: {
+	// 	name: 'history',
+	// 	tmdbGenreId: 36
+	// },
+	// horror: {
+	// 	name: 'horror',
+	// 	tmdbGenreId: 27
+	// },
+	// music: {
+	// 	name: 'music',
+	// 	tmdbGenreId: 10402
+	// },
+	// mystery: {
+	// 	name: 'mystery',
+	// 	tmdbGenreId: 9648
+	// },
+	// romance: {
+	// 	name: 'romance',
+	// 	tmdbGenreId: 10749
+	// },
+	// scienceFiction: {
+	// 	name: 'scienceFiction',
+	// 	tmdbGenreId: 878
+	// },
+	// tvMovie: {
+	// 	name: 'tvMovie',
+	// 	tmdbGenreId: 10770
+	// },
+	// thriller: {
+	// 	name: 'thriller',
+	// 	tmdbGenreId: 53
+	// },
+	// war: {
+	// 	name: 'war',
+	// 	tmdbGenreId: 10752
+	// },
+	// western: {
+	// 	name: 'western',
+	// 	tmdbGenreId: 37
+	// }
 };
diff --git a/src/lib/lang/en.json b/src/lib/lang/en.json
index 07f60c4..c8f919a 100644
--- a/src/lib/lang/en.json
+++ b/src/lib/lang/en.json
@@ -25,7 +25,7 @@
 		"TVNetworks": "TV Networks"
 	},
 	"library": {
-		"missingConfiguration": "Configure Radarr, Sonarr y Jellyfin to watch and manage your library",
+		"missingConfiguration": "Configure Radarr, Sonarr and Jellyfin to watch and manage your library",
 		"available": "Available",
 		"watched": "Watched",
 		"unavailable": "Unavailable",
diff --git a/src/lib/utils/supported-languages.ts b/src/lib/utils/supported-languages.ts
deleted file mode 100644
index 77d02e3..0000000
--- a/src/lib/utils/supported-languages.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const SUPPORTED_LANGUAGES = ['en', 'es'];
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index 0ff278c..c214f67 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -199,6 +199,7 @@
 			on:click={() => history.back()}
 		>
 			<ChevronLeft size={22} />
+			{$_('settings.navbar.settings')}
 		</button>
 		<Select bind:value={openTab}>
 			<option value="general"> {$_('settings.navbar.general')} </option>
diff --git a/src/routes/settings/GeneralSettingsPage.svelte b/src/routes/settings/GeneralSettingsPage.svelte
index be538f0..6d7c97d 100644
--- a/src/routes/settings/GeneralSettingsPage.svelte
+++ b/src/routes/settings/GeneralSettingsPage.svelte
@@ -5,20 +5,9 @@
 	import type { SettingsValues } from '$lib/stores/settings.store';
 	import { ISO_LANGUAGES } from '$lib/utils/iso-languages';
 	import { ISO_REGIONS } from '$lib/utils/iso-regions';
-	import { SUPPORTED_LANGUAGES } from '$lib/utils/supported-languages';
-	import { _, locale } from 'svelte-i18n';
+	import { _, dictionary } from 'svelte-i18n';
 
 	export let values: SettingsValues;
-
-	// We should only return the supported languages
-	const filteredLanguages = Object.entries(ISO_LANGUAGES)
-		.map(([code, name]) => {
-			if (SUPPORTED_LANGUAGES.includes(code)) {
-				return { code, name };
-			}
-			return null;
-		})
-		.filter((language) => language !== null);
 </script>
 
 <div
@@ -31,8 +20,8 @@
 	</h1>
 	<h2>{$_('settings.general.userInterface.language')}</h2>
 	<Select bind:value={values.language}>
-		{#each Object.entries(filteredLanguages) as [code, lang]}
-			<option value={code}>{`${lang?.name.name} - ${lang?.name.nativeName}`}</option>
+		{#each Object.entries(ISO_LANGUAGES).filter( ([c, l]) => Object.keys($dictionary).includes(c) ) as [code, lang]}
+			<option value={code}>{`${lang?.name} - ${lang?.nativeName}`}</option>
 		{/each}
 	</Select>
 	<h2>