diff --git a/package-lock.json b/package-lock.json
index 66c3148..82b848c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
 				"hls.js": "^1.4.14",
 				"openapi-fetch": "^0.8.2",
 				"openapi-typescript": "^6.7.3",
-				"postcss": "^8.4.32",
+				"postcss": "^8.4.35",
 				"prettier": "^2.8.0",
 				"prettier-plugin-svelte": "^2.10.1",
 				"radix-icons-svelte": "^1.2.1",
@@ -5084,9 +5084,9 @@
 			}
 		},
 		"node_modules/postcss": {
-			"version": "8.4.32",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz",
-			"integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
+			"version": "8.4.35",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
+			"integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
 			"dev": true,
 			"funding": [
 				{
diff --git a/package.json b/package.json
index 7e59fe1..917b7cf 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
 		"build": "vite build",
 		"build:tizen": "vite build --outDir tizen/dist",
 		"preview": "vite preview",
+		"preview:tizen": "vite build --outDir tizen/dist && vite preview --outDir tizen/dist",
 		"deploy": "PORT=9494 NODE_ENV=production node build/",
 		"deploy:electron": "vite build && electron-builder -mw --x64 --config build.config.json; electron-builder -m --arm64 --config build.config.json",
 		"test": "playwright test",
@@ -21,10 +22,8 @@
 		"format": "prettier --plugin-search-dir . --write ."
 	},
 	"devDependencies": {
-		"@playwright/test": "^1.28.1",
-		"vitest": "^0.25.3",
-		"reflect-metadata": "^0.1.13",
 		"@jellyfin/sdk": "^0.8.2",
+		"@playwright/test": "^1.28.1",
 		"@sveltejs/vite-plugin-svelte": "^2.4.2",
 		"@tsconfig/svelte": "^5.0.2",
 		"@types/axios": "^0.14.0",
@@ -40,10 +39,11 @@
 		"hls.js": "^1.4.14",
 		"openapi-fetch": "^0.8.2",
 		"openapi-typescript": "^6.7.3",
-		"postcss": "^8.4.32",
+		"postcss": "^8.4.35",
 		"prettier": "^2.8.0",
 		"prettier-plugin-svelte": "^2.10.1",
 		"radix-icons-svelte": "^1.2.1",
+		"reflect-metadata": "^0.1.13",
 		"svelte": "^3.59.1",
 		"svelte-check": "^3.6.2",
 		"svelte-i18n": "^4.0.0",
@@ -54,7 +54,8 @@
 		"tslib": "^2.6.2",
 		"typescript": "^5.2.2",
 		"vite": "^4.5.1",
-		"vite-plugin-singlefile": "^0.13.5"
+		"vite-plugin-singlefile": "^0.13.5",
+		"vitest": "^0.25.3"
 	},
 	"browserslist": {
 		"production": [
diff --git a/postcss.config.js b/postcss.config.js
old mode 100644
new mode 100755
index 2e7af2b..0e55863
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,6 +1,7 @@
 export default {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-}
+	plugins: {
+		tailwindcss: {},
+		autoprefixer: {}
+		// 'flex-gap-polyfill': {}
+	}
+};
diff --git a/src/App.svelte b/src/App.svelte
index f95e3d5..fe6574a 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -4,7 +4,7 @@
 	import { handleKeyboardNavigation, Selectable } from './lib/selectable';
 	import { onMount } from 'svelte';
 	import Container from './Container.svelte';
-	import NavbarItem from './lib/components-new/NavbarItem.svelte';
+	import NavbarItem from './lib/components/NavbarItem.svelte';
 	import { Bookmark, CardStack, Gear, Laptop, MagnifyingGlass } from 'radix-icons-svelte';
 	import classNames from 'classnames';
 	import type { Readable } from 'svelte/store';
diff --git a/src/lib/components/Button.svelte b/src/lib/components-old/Button.svelte
similarity index 100%
rename from src/lib/components/Button.svelte
rename to src/lib/components-old/Button.svelte
diff --git a/src/lib/components/Card/Card.svelte b/src/lib/components-old/Card/Card.svelte
similarity index 100%
rename from src/lib/components/Card/Card.svelte
rename to src/lib/components-old/Card/Card.svelte
diff --git a/src/lib/components/Card/CardGrid.svelte b/src/lib/components-old/Card/CardGrid.svelte
similarity index 100%
rename from src/lib/components/Card/CardGrid.svelte
rename to src/lib/components-old/Card/CardGrid.svelte
diff --git a/src/lib/components-new/Card/CardPlaceholder.svelte b/src/lib/components-old/Card/CardPlaceholder.svelte
similarity index 100%
rename from src/lib/components-new/Card/CardPlaceholder.svelte
rename to src/lib/components-old/Card/CardPlaceholder.svelte
diff --git a/src/lib/components/Card/PosterTag.svelte b/src/lib/components-old/Card/PosterTag.svelte
similarity index 100%
rename from src/lib/components/Card/PosterTag.svelte
rename to src/lib/components-old/Card/PosterTag.svelte
diff --git a/src/lib/components/Card/card.ts b/src/lib/components-old/Card/card.ts
similarity index 100%
rename from src/lib/components/Card/card.ts
rename to src/lib/components-old/Card/card.ts
diff --git a/src/lib/components-new/Carousel/Carousel.svelte b/src/lib/components-old/Carousel/Carousel.svelte
similarity index 81%
rename from src/lib/components-new/Carousel/Carousel.svelte
rename to src/lib/components-old/Carousel/Carousel.svelte
index f5a5927..0e54de0 100644
--- a/src/lib/components-new/Carousel/Carousel.svelte
+++ b/src/lib/components-old/Carousel/Carousel.svelte
@@ -3,7 +3,7 @@
 	import IconButton from '../IconButton.svelte';
 	import { ChevronLeft, ChevronRight } from 'radix-icons-svelte';
 	import classNames from 'classnames';
-	import Container from '../../../Container.svelte';
+	import type { Registerer } from '../../selectable';
 
 	export let gradientFromColor = 'from-stone-950';
 	export let heading = '';
@@ -44,19 +44,17 @@
 	</div>
 
 	<div class="relative">
-		<Container horizontal>
-			<div
-				class={classNames(
-					'flex overflow-x-scroll items-center overflow-y-visible gap-4 relative scrollbar-hide p-1',
-					scrollClass
-				)}
-				bind:this={carousel}
-				tabindex="-1"
-				on:scroll={() => (scrollX = carousel?.scrollLeft || scrollX)}
-			>
-				<slot />
-			</div>
-		</Container>
+		<div
+			class={classNames(
+				'flex overflow-x-scroll items-center overflow-y-visible gap-4 relative scrollbar-hide p-1',
+				scrollClass
+			)}
+			bind:this={carousel}
+			tabindex="-1"
+			on:scroll={() => (scrollX = carousel?.scrollLeft || scrollX)}
+		>
+			<slot />
+		</div>
 		{#if scrollX > 50}
 			<div
 				transition:fade={{ duration: 200 }}
diff --git a/src/lib/components-new/Carousel/CarouselPlaceholderItems.svelte b/src/lib/components-old/Carousel/CarouselPlaceholderItems.svelte
similarity index 100%
rename from src/lib/components-new/Carousel/CarouselPlaceholderItems.svelte
rename to src/lib/components-old/Carousel/CarouselPlaceholderItems.svelte
diff --git a/src/lib/components/Carousel/UICarousel.svelte b/src/lib/components-old/Carousel/UICarousel.svelte
similarity index 100%
rename from src/lib/components/Carousel/UICarousel.svelte
rename to src/lib/components-old/Carousel/UICarousel.svelte
diff --git a/src/lib/components/ContextMenu/ContextMenu.svelte b/src/lib/components-old/ContextMenu/ContextMenu.svelte
similarity index 100%
rename from src/lib/components/ContextMenu/ContextMenu.svelte
rename to src/lib/components-old/ContextMenu/ContextMenu.svelte
diff --git a/src/lib/components/ContextMenu/ContextMenu.ts b/src/lib/components-old/ContextMenu/ContextMenu.ts
similarity index 100%
rename from src/lib/components/ContextMenu/ContextMenu.ts
rename to src/lib/components-old/ContextMenu/ContextMenu.ts
diff --git a/src/lib/components/ContextMenu/ContextMenuButton.svelte b/src/lib/components-old/ContextMenu/ContextMenuButton.svelte
similarity index 100%
rename from src/lib/components/ContextMenu/ContextMenuButton.svelte
rename to src/lib/components-old/ContextMenu/ContextMenuButton.svelte
diff --git a/src/lib/components/ContextMenu/ContextMenuDivider.svelte b/src/lib/components-old/ContextMenu/ContextMenuDivider.svelte
similarity index 100%
rename from src/lib/components/ContextMenu/ContextMenuDivider.svelte
rename to src/lib/components-old/ContextMenu/ContextMenuDivider.svelte
diff --git a/src/lib/components/ContextMenu/ContextMenuItem.svelte b/src/lib/components-old/ContextMenu/ContextMenuItem.svelte
similarity index 100%
rename from src/lib/components/ContextMenu/ContextMenuItem.svelte
rename to src/lib/components-old/ContextMenu/ContextMenuItem.svelte
diff --git a/src/lib/components/ContextMenu/LibraryItemContextItems.svelte b/src/lib/components-old/ContextMenu/LibraryItemContextItems.svelte
similarity index 100%
rename from src/lib/components/ContextMenu/LibraryItemContextItems.svelte
rename to src/lib/components-old/ContextMenu/LibraryItemContextItems.svelte
diff --git a/src/lib/components/ContextMenu/SelectableContextMenuItem.svelte b/src/lib/components-old/ContextMenu/SelectableContextMenuItem.svelte
similarity index 100%
rename from src/lib/components/ContextMenu/SelectableContextMenuItem.svelte
rename to src/lib/components-old/ContextMenu/SelectableContextMenuItem.svelte
diff --git a/src/lib/components/EpisodeCard/EpisodeCard.svelte b/src/lib/components-old/EpisodeCard/EpisodeCard.svelte
similarity index 100%
rename from src/lib/components/EpisodeCard/EpisodeCard.svelte
rename to src/lib/components-old/EpisodeCard/EpisodeCard.svelte
diff --git a/src/lib/components/GenreCard.svelte b/src/lib/components-old/GenreCard.svelte
similarity index 100%
rename from src/lib/components/GenreCard.svelte
rename to src/lib/components-old/GenreCard.svelte
diff --git a/src/lib/components/GridPage/GridPage.svelte b/src/lib/components-old/GridPage/GridPage.svelte
similarity index 100%
rename from src/lib/components/GridPage/GridPage.svelte
rename to src/lib/components-old/GridPage/GridPage.svelte
diff --git a/src/lib/components/HeightHider.svelte b/src/lib/components-old/HeightHider.svelte
similarity index 100%
rename from src/lib/components/HeightHider.svelte
rename to src/lib/components-old/HeightHider.svelte
diff --git a/src/lib/components-new/IconButton.svelte b/src/lib/components-old/IconButton.svelte
similarity index 100%
rename from src/lib/components-new/IconButton.svelte
rename to src/lib/components-old/IconButton.svelte
diff --git a/src/lib/components-old/Lang/I18n.svelte b/src/lib/components-old/Lang/I18n.svelte
new file mode 100644
index 0000000..340772e
--- /dev/null
+++ b/src/lib/components-old/Lang/I18n.svelte
@@ -0,0 +1,29 @@
+<script lang="ts">
+	import { addMessages, init, locale } from 'svelte-i18n';
+
+	import de from '../../lang/de.json';
+	import en from '../../lang/en.json';
+	import es from '../../lang/es.json';
+	import fr from '../../lang/fr.json';
+	import it from '../../lang/it.json';
+	import { settings } from '../../stores/settings.store';
+
+	addMessages('de', de);
+	addMessages('en', en);
+	addMessages('es', es);
+	addMessages('fr', fr);
+	addMessages('it', it);
+
+	settings.subscribe((value) => {
+		if (value.language) {
+			locale.set(value.language);
+		} else {
+			locale.set('en');
+		}
+	});
+
+	init({
+		initialLocale: $settings.language,
+		fallbackLocale: 'en'
+	});
+</script>
diff --git a/src/lib/components-new/LazyImg.svelte b/src/lib/components-old/LazyImg.svelte
similarity index 100%
rename from src/lib/components-new/LazyImg.svelte
rename to src/lib/components-old/LazyImg.svelte
diff --git a/src/lib/components/LibraryItems.svelte b/src/lib/components-old/LibraryItems.svelte
similarity index 100%
rename from src/lib/components/LibraryItems.svelte
rename to src/lib/components-old/LibraryItems.svelte
diff --git a/src/lib/components/Modal/DynamicModal.svelte b/src/lib/components-old/Modal/DynamicModal.svelte
similarity index 100%
rename from src/lib/components/Modal/DynamicModal.svelte
rename to src/lib/components-old/Modal/DynamicModal.svelte
diff --git a/src/lib/components/Modal/ModalContainer.svelte b/src/lib/components-old/Modal/ModalContainer.svelte
similarity index 100%
rename from src/lib/components/Modal/ModalContainer.svelte
rename to src/lib/components-old/Modal/ModalContainer.svelte
diff --git a/src/lib/components/Modal/ModalContent.svelte b/src/lib/components-old/Modal/ModalContent.svelte
similarity index 100%
rename from src/lib/components/Modal/ModalContent.svelte
rename to src/lib/components-old/Modal/ModalContent.svelte
diff --git a/src/lib/components/Modal/ModalHeader.svelte b/src/lib/components-old/Modal/ModalHeader.svelte
similarity index 100%
rename from src/lib/components/Modal/ModalHeader.svelte
rename to src/lib/components-old/Modal/ModalHeader.svelte
diff --git a/src/lib/components/MoviePage.svelte b/src/lib/components-old/MoviePage.svelte
similarity index 100%
rename from src/lib/components/MoviePage.svelte
rename to src/lib/components-old/MoviePage.svelte
diff --git a/src/lib/components/Navbar/Navbar.svelte b/src/lib/components-old/Navbar/Navbar.svelte
similarity index 100%
rename from src/lib/components/Navbar/Navbar.svelte
rename to src/lib/components-old/Navbar/Navbar.svelte
diff --git a/src/lib/components/Navbar/TitleSearchModal.svelte b/src/lib/components-old/Navbar/TitleSearchModal.svelte
similarity index 100%
rename from src/lib/components/Navbar/TitleSearchModal.svelte
rename to src/lib/components-old/Navbar/TitleSearchModal.svelte
diff --git a/src/lib/components/NetworkCard.svelte b/src/lib/components-old/NetworkCard.svelte
similarity index 100%
rename from src/lib/components/NetworkCard.svelte
rename to src/lib/components-old/NetworkCard.svelte
diff --git a/src/lib/components/Notification/Notification.svelte b/src/lib/components-old/Notification/Notification.svelte
similarity index 100%
rename from src/lib/components/Notification/Notification.svelte
rename to src/lib/components-old/Notification/Notification.svelte
diff --git a/src/lib/components/Notification/Notifications.svelte b/src/lib/components-old/Notification/Notifications.svelte
similarity index 100%
rename from src/lib/components/Notification/Notifications.svelte
rename to src/lib/components-old/Notification/Notifications.svelte
diff --git a/src/lib/components/PageDots.svelte b/src/lib/components-old/PageDots.svelte
similarity index 100%
rename from src/lib/components/PageDots.svelte
rename to src/lib/components-old/PageDots.svelte
diff --git a/src/lib/components/PersonCard/PersonCard.svelte b/src/lib/components-old/PersonCard/PersonCard.svelte
similarity index 100%
rename from src/lib/components/PersonCard/PersonCard.svelte
rename to src/lib/components-old/PersonCard/PersonCard.svelte
diff --git a/src/lib/components/PersonPage.svelte b/src/lib/components-old/PersonPage.svelte
similarity index 100%
rename from src/lib/components/PersonPage.svelte
rename to src/lib/components-old/PersonPage.svelte
diff --git a/src/lib/components-new/PlayButton.svelte b/src/lib/components-old/PlayButton.svelte
similarity index 89%
rename from src/lib/components-new/PlayButton.svelte
rename to src/lib/components-old/PlayButton.svelte
index a69f181..fa592aa 100644
--- a/src/lib/components-new/PlayButton.svelte
+++ b/src/lib/components-old/PlayButton.svelte
@@ -1,5 +1,6 @@
 <script>
 	import { TriangleRight } from 'radix-icons-svelte';
+	import IconButton from './IconButton.svelte';
 	import classNames from 'classnames';
 </script>
 
diff --git a/src/lib/components/Poster/Poster.svelte b/src/lib/components-old/Poster/Poster.svelte
similarity index 100%
rename from src/lib/components/Poster/Poster.svelte
rename to src/lib/components-old/Poster/Poster.svelte
diff --git a/src/lib/components-new/ProgressBar.svelte b/src/lib/components-old/ProgressBar.svelte
similarity index 100%
rename from src/lib/components-new/ProgressBar.svelte
rename to src/lib/components-old/ProgressBar.svelte
diff --git a/src/lib/components/RequestModal/EpisodeSelectModal.svelte b/src/lib/components-old/RequestModal/EpisodeSelectModal.svelte
similarity index 100%
rename from src/lib/components/RequestModal/EpisodeSelectModal.svelte
rename to src/lib/components-old/RequestModal/EpisodeSelectModal.svelte
diff --git a/src/lib/components/RequestModal/RequestModal.svelte b/src/lib/components-old/RequestModal/RequestModal.svelte
similarity index 100%
rename from src/lib/components/RequestModal/RequestModal.svelte
rename to src/lib/components-old/RequestModal/RequestModal.svelte
diff --git a/src/lib/components/RequestModal/SeriesRequestModal.svelte b/src/lib/components-old/RequestModal/SeriesRequestModal.svelte
similarity index 100%
rename from src/lib/components/RequestModal/SeriesRequestModal.svelte
rename to src/lib/components-old/RequestModal/SeriesRequestModal.svelte
diff --git a/src/lib/components/RoundedButton.svelte b/src/lib/components-old/RoundedButton.svelte
similarity index 100%
rename from src/lib/components/RoundedButton.svelte
rename to src/lib/components-old/RoundedButton.svelte
diff --git a/src/lib/components/Selectable.svelte b/src/lib/components-old/Selectable.svelte
similarity index 100%
rename from src/lib/components/Selectable.svelte
rename to src/lib/components-old/Selectable.svelte
diff --git a/src/lib/components/SeriesPage.svelte b/src/lib/components-old/SeriesPage.svelte
similarity index 100%
rename from src/lib/components/SeriesPage.svelte
rename to src/lib/components-old/SeriesPage.svelte
diff --git a/src/lib/components/SetupRequired/SetupRequired.svelte b/src/lib/components-old/SetupRequired/SetupRequired.svelte
similarity index 100%
rename from src/lib/components/SetupRequired/SetupRequired.svelte
rename to src/lib/components-old/SetupRequired/SetupRequired.svelte
diff --git a/src/lib/components/SourceStats/RadarrStats.svelte b/src/lib/components-old/SourceStats/RadarrStats.svelte
similarity index 100%
rename from src/lib/components/SourceStats/RadarrStats.svelte
rename to src/lib/components-old/SourceStats/RadarrStats.svelte
diff --git a/src/lib/components/SourceStats/SonarrStats.svelte b/src/lib/components-old/SourceStats/SonarrStats.svelte
similarity index 100%
rename from src/lib/components/SourceStats/SonarrStats.svelte
rename to src/lib/components-old/SourceStats/SonarrStats.svelte
diff --git a/src/lib/components/SourceStats/StatsContainer.svelte b/src/lib/components-old/SourceStats/StatsContainer.svelte
similarity index 100%
rename from src/lib/components/SourceStats/StatsContainer.svelte
rename to src/lib/components-old/SourceStats/StatsContainer.svelte
diff --git a/src/lib/components/SourceStats/StatsPlaceholder.svelte b/src/lib/components-old/SourceStats/StatsPlaceholder.svelte
similarity index 100%
rename from src/lib/components/SourceStats/StatsPlaceholder.svelte
rename to src/lib/components-old/SourceStats/StatsPlaceholder.svelte
diff --git a/src/lib/components/TitlePageLayout/OpenInButton.svelte b/src/lib/components-old/TitlePageLayout/OpenInButton.svelte
similarity index 100%
rename from src/lib/components/TitlePageLayout/OpenInButton.svelte
rename to src/lib/components-old/TitlePageLayout/OpenInButton.svelte
diff --git a/src/lib/components/TitlePageLayout/TitlePageLayout.svelte b/src/lib/components-old/TitlePageLayout/TitlePageLayout.svelte
similarity index 100%
rename from src/lib/components/TitlePageLayout/TitlePageLayout.svelte
rename to src/lib/components-old/TitlePageLayout/TitlePageLayout.svelte
diff --git a/src/lib/components/TitlePageLayout/TitlePageModal.svelte b/src/lib/components-old/TitlePageLayout/TitlePageModal.svelte
similarity index 100%
rename from src/lib/components/TitlePageLayout/TitlePageModal.svelte
rename to src/lib/components-old/TitlePageLayout/TitlePageModal.svelte
diff --git a/src/lib/components/TitlePageLayout/TitlePageModal.ts b/src/lib/components-old/TitlePageLayout/TitlePageModal.ts
similarity index 100%
rename from src/lib/components/TitlePageLayout/TitlePageModal.ts
rename to src/lib/components-old/TitlePageLayout/TitlePageModal.ts
diff --git a/src/lib/components/TitlePageLayout/TitlePagePlaceholder.svelte b/src/lib/components-old/TitlePageLayout/TitlePagePlaceholder.svelte
similarity index 100%
rename from src/lib/components/TitlePageLayout/TitlePagePlaceholder.svelte
rename to src/lib/components-old/TitlePageLayout/TitlePagePlaceholder.svelte
diff --git a/src/lib/components/TitleShowcase/TitleShowcaseBackground.svelte b/src/lib/components-old/TitleShowcase/TitleShowcaseBackground.svelte
similarity index 100%
rename from src/lib/components/TitleShowcase/TitleShowcaseBackground.svelte
rename to src/lib/components-old/TitleShowcase/TitleShowcaseBackground.svelte
diff --git a/src/lib/components/TitleShowcase/TitleShowcaseVisuals.svelte b/src/lib/components-old/TitleShowcase/TitleShowcaseVisuals.svelte
similarity index 100%
rename from src/lib/components/TitleShowcase/TitleShowcaseVisuals.svelte
rename to src/lib/components-old/TitleShowcase/TitleShowcaseVisuals.svelte
diff --git a/src/lib/components/TitleShowcase/TitleShowcasesContainer.svelte b/src/lib/components-old/TitleShowcase/TitleShowcasesContainer.svelte
similarity index 100%
rename from src/lib/components/TitleShowcase/TitleShowcasesContainer.svelte
rename to src/lib/components-old/TitleShowcase/TitleShowcasesContainer.svelte
diff --git a/src/lib/components/TruncatedText.svelte b/src/lib/components-old/TruncatedText.svelte
similarity index 100%
rename from src/lib/components/TruncatedText.svelte
rename to src/lib/components-old/TruncatedText.svelte
diff --git a/src/lib/components/UpdateChecker.svelte b/src/lib/components-old/UpdateChecker.svelte
similarity index 100%
rename from src/lib/components/UpdateChecker.svelte
rename to src/lib/components-old/UpdateChecker.svelte
diff --git a/src/lib/components/VideoPlayer/Slider.svelte b/src/lib/components-old/VideoPlayer/Slider.svelte
similarity index 100%
rename from src/lib/components/VideoPlayer/Slider.svelte
rename to src/lib/components-old/VideoPlayer/Slider.svelte
diff --git a/src/lib/components/VideoPlayer/VideoPlayer.svelte b/src/lib/components-old/VideoPlayer/VideoPlayer.svelte
similarity index 100%
rename from src/lib/components/VideoPlayer/VideoPlayer.svelte
rename to src/lib/components-old/VideoPlayer/VideoPlayer.svelte
diff --git a/src/lib/components/VideoPlayer/VideoPlayer.ts b/src/lib/components-old/VideoPlayer/VideoPlayer.ts
similarity index 100%
rename from src/lib/components/VideoPlayer/VideoPlayer.ts
rename to src/lib/components-old/VideoPlayer/VideoPlayer.ts
diff --git a/src/lib/components/YoutubePlayer.svelte b/src/lib/components-old/YoutubePlayer.svelte
similarity index 100%
rename from src/lib/components/YoutubePlayer.svelte
rename to src/lib/components-old/YoutubePlayer.svelte
diff --git a/src/lib/components/forms/FormButton.svelte b/src/lib/components-old/forms/FormButton.svelte
similarity index 100%
rename from src/lib/components/forms/FormButton.svelte
rename to src/lib/components-old/forms/FormButton.svelte
diff --git a/src/lib/components/forms/Input.svelte b/src/lib/components-old/forms/Input.svelte
similarity index 100%
rename from src/lib/components/forms/Input.svelte
rename to src/lib/components-old/forms/Input.svelte
diff --git a/src/lib/components/forms/Select.svelte b/src/lib/components-old/forms/Select.svelte
similarity index 100%
rename from src/lib/components/forms/Select.svelte
rename to src/lib/components-old/forms/Select.svelte
diff --git a/src/lib/components/forms/Toggle.svelte b/src/lib/components-old/forms/Toggle.svelte
similarity index 100%
rename from src/lib/components/forms/Toggle.svelte
rename to src/lib/components-old/forms/Toggle.svelte
diff --git a/src/lib/components/settings/GeneralSettingsPage.svelte b/src/lib/components-old/settings/GeneralSettingsPage.svelte
similarity index 100%
rename from src/lib/components/settings/GeneralSettingsPage.svelte
rename to src/lib/components-old/settings/GeneralSettingsPage.svelte
diff --git a/src/lib/components/settings/IntegrationCard.svelte b/src/lib/components-old/settings/IntegrationCard.svelte
similarity index 100%
rename from src/lib/components/settings/IntegrationCard.svelte
rename to src/lib/components-old/settings/IntegrationCard.svelte
diff --git a/src/lib/components/settings/IntegrationSettingsPage.svelte b/src/lib/components-old/settings/IntegrationSettingsPage.svelte
similarity index 100%
rename from src/lib/components/settings/IntegrationSettingsPage.svelte
rename to src/lib/components-old/settings/IntegrationSettingsPage.svelte
diff --git a/src/lib/components/settings/TestConnectionButton.svelte b/src/lib/components-old/settings/TestConnectionButton.svelte
similarity index 100%
rename from src/lib/components/settings/TestConnectionButton.svelte
rename to src/lib/components-old/settings/TestConnectionButton.svelte
diff --git a/src/lib/components/svgs/FacebookIcon.svelte b/src/lib/components-old/svgs/FacebookIcon.svelte
similarity index 100%
rename from src/lib/components/svgs/FacebookIcon.svelte
rename to src/lib/components-old/svgs/FacebookIcon.svelte
diff --git a/src/lib/components/svgs/ImdbIcon.svelte b/src/lib/components-old/svgs/ImdbIcon.svelte
similarity index 100%
rename from src/lib/components/svgs/ImdbIcon.svelte
rename to src/lib/components-old/svgs/ImdbIcon.svelte
diff --git a/src/lib/components/svgs/RadarrIcon.svelte b/src/lib/components-old/svgs/RadarrIcon.svelte
similarity index 100%
rename from src/lib/components/svgs/RadarrIcon.svelte
rename to src/lib/components-old/svgs/RadarrIcon.svelte
diff --git a/src/lib/components/svgs/SonarrIcon.svelte b/src/lib/components-old/svgs/SonarrIcon.svelte
similarity index 100%
rename from src/lib/components/svgs/SonarrIcon.svelte
rename to src/lib/components-old/svgs/SonarrIcon.svelte
diff --git a/src/lib/components/svgs/TiktokIcon.svelte b/src/lib/components-old/svgs/TiktokIcon.svelte
similarity index 100%
rename from src/lib/components/svgs/TiktokIcon.svelte
rename to src/lib/components-old/svgs/TiktokIcon.svelte
diff --git a/src/lib/components/svgs/TmdbIcon.svelte b/src/lib/components-old/svgs/TmdbIcon.svelte
similarity index 100%
rename from src/lib/components/svgs/TmdbIcon.svelte
rename to src/lib/components-old/svgs/TmdbIcon.svelte
diff --git a/src/lib/components/svgs/TwitterIcon.svelte b/src/lib/components-old/svgs/TwitterIcon.svelte
similarity index 100%
rename from src/lib/components/svgs/TwitterIcon.svelte
rename to src/lib/components-old/svgs/TwitterIcon.svelte
diff --git a/src/lib/components/svgs/YoutubeIcon.svelte b/src/lib/components-old/svgs/YoutubeIcon.svelte
similarity index 100%
rename from src/lib/components/svgs/YoutubeIcon.svelte
rename to src/lib/components-old/svgs/YoutubeIcon.svelte
diff --git a/src/lib/components/utils/WidthLimited.svelte b/src/lib/components-old/utils/WidthLimited.svelte
similarity index 100%
rename from src/lib/components/utils/WidthLimited.svelte
rename to src/lib/components-old/utils/WidthLimited.svelte
diff --git a/src/lib/components/Card/CardPlaceholder.svelte b/src/lib/components/Card/CardPlaceholder.svelte
index 4adf1dd..130af4f 100644
--- a/src/lib/components/Card/CardPlaceholder.svelte
+++ b/src/lib/components/Card/CardPlaceholder.svelte
@@ -1,23 +1,23 @@
-<script lang="ts">
-	import classNames from 'classnames';
-	import { fade } from 'svelte/transition';
-
-	export let index = 0;
-	export let size: 'dynamic' | 'md' | 'lg' = 'md';
-	export let orientation: 'portrait' | 'landscape' = 'landscape';
-</script>
-
-<div
-	class={classNames('rounded-xl overflow-hidden shadow-lg placeholder shrink-0', {
-		'aspect-video': orientation === 'landscape',
-		'aspect-[2/3]': orientation === 'portrait',
-		'w-44': size === 'md' && orientation === 'portrait',
-		'h-44': size === 'md' && orientation === 'landscape',
-		'w-60': size === 'lg' && orientation === 'portrait',
-		'h-60': size === 'lg' && orientation === 'landscape',
-		'w-full': size === 'dynamic'
-	})}
-	style={'animation-delay: ' + ((index * 100) % 2000) + 'ms;'}
-	transition:fade|global
-	tabindex="0"
-/>
+<script lang="ts">
+	import classNames from 'classnames';
+	import { fade } from 'svelte/transition';
+
+	export let index = 0;
+	export let size: 'dynamic' | 'md' | 'lg' = 'md';
+	export let orientation: 'portrait' | 'landscape' = 'landscape';
+</script>
+
+<div
+	class={classNames('rounded-xl overflow-hidden shadow-lg placeholder shrink-0', {
+		'aspect-video': orientation === 'landscape',
+		'aspect-[2/3]': orientation === 'portrait',
+		'w-44': size === 'md' && orientation === 'portrait',
+		'h-44': size === 'md' && orientation === 'landscape',
+		'w-60': size === 'lg' && orientation === 'portrait',
+		'h-60': size === 'lg' && orientation === 'landscape',
+		'w-full': size === 'dynamic'
+	})}
+	style={'animation-delay: ' + ((index * 100) % 2000) + 'ms;'}
+	transition:fade|global
+	tabindex="0"
+/>
diff --git a/src/lib/components/Carousel/Carousel.svelte b/src/lib/components/Carousel/Carousel.svelte
index 0e54de0..f5a5927 100644
--- a/src/lib/components/Carousel/Carousel.svelte
+++ b/src/lib/components/Carousel/Carousel.svelte
@@ -3,7 +3,7 @@
 	import IconButton from '../IconButton.svelte';
 	import { ChevronLeft, ChevronRight } from 'radix-icons-svelte';
 	import classNames from 'classnames';
-	import type { Registerer } from '../../selectable';
+	import Container from '../../../Container.svelte';
 
 	export let gradientFromColor = 'from-stone-950';
 	export let heading = '';
@@ -44,17 +44,19 @@
 	</div>
 
 	<div class="relative">
-		<div
-			class={classNames(
-				'flex overflow-x-scroll items-center overflow-y-visible gap-4 relative scrollbar-hide p-1',
-				scrollClass
-			)}
-			bind:this={carousel}
-			tabindex="-1"
-			on:scroll={() => (scrollX = carousel?.scrollLeft || scrollX)}
-		>
-			<slot />
-		</div>
+		<Container horizontal>
+			<div
+				class={classNames(
+					'flex overflow-x-scroll items-center overflow-y-visible gap-4 relative scrollbar-hide p-1',
+					scrollClass
+				)}
+				bind:this={carousel}
+				tabindex="-1"
+				on:scroll={() => (scrollX = carousel?.scrollLeft || scrollX)}
+			>
+				<slot />
+			</div>
+		</Container>
 		{#if scrollX > 50}
 			<div
 				transition:fade={{ duration: 200 }}
diff --git a/src/lib/components-new/NavbarItem.svelte b/src/lib/components/NavbarItem.svelte
similarity index 95%
rename from src/lib/components-new/NavbarItem.svelte
rename to src/lib/components/NavbarItem.svelte
index 08dceab..ff95fed 100644
--- a/src/lib/components-new/NavbarItem.svelte
+++ b/src/lib/components/NavbarItem.svelte
@@ -1,26 +1,26 @@
-<script lang="ts">
-	import classNames from 'classnames';
-	import { useNavigate } from 'svelte-navigator';
-	import { type Readable } from 'svelte/store';
-	import Container from '../../Container.svelte';
-
-	export let to: string;
-	let hasFocus: Readable<boolean>;
-
-	const navigate = useNavigate();
-
-	function handleClick() {
-		navigate(to);
-	}
-</script>
-
-<Container tag="button" on:click={handleClick} bind:hasFocus>
-	<div
-		class={classNames('flex items-center my-2', {
-			'text-amber-200': $hasFocus
-		})}
-	>
-		<slot name="icon" />
-		<slot name="text" />
-	</div>
-</Container>
+<script lang="ts">
+	import classNames from 'classnames';
+	import { useNavigate } from 'svelte-navigator';
+	import { type Readable } from 'svelte/store';
+	import Container from '../../Container.svelte';
+
+	export let to: string;
+	let hasFocus: Readable<boolean>;
+
+	const navigate = useNavigate();
+
+	function handleClick() {
+		navigate(to);
+	}
+</script>
+
+<Container tag="button" on:click={handleClick} bind:hasFocus>
+	<div
+		class={classNames('flex items-center my-2', {
+			'text-amber-200': $hasFocus
+		})}
+	>
+		<slot name="icon" />
+		<slot name="text" />
+	</div>
+</Container>
diff --git a/src/lib/components/PlayButton.svelte b/src/lib/components/PlayButton.svelte
index fa592aa..a69f181 100644
--- a/src/lib/components/PlayButton.svelte
+++ b/src/lib/components/PlayButton.svelte
@@ -1,6 +1,5 @@
 <script>
 	import { TriangleRight } from 'radix-icons-svelte';
-	import IconButton from './IconButton.svelte';
 	import classNames from 'classnames';
 </script>
 
diff --git a/src/lib/components-new/Poster.svelte b/src/lib/components/Poster.svelte
similarity index 100%
rename from src/lib/components-new/Poster.svelte
rename to src/lib/components/Poster.svelte
diff --git a/src/lib/pages/LibraryPage.svelte b/src/lib/pages/LibraryPage.svelte
index 698b71c..2538cd4 100644
--- a/src/lib/pages/LibraryPage.svelte
+++ b/src/lib/pages/LibraryPage.svelte
@@ -4,7 +4,6 @@
 	import Carousel from '../components/Carousel/Carousel.svelte';
 	import CarouselPlaceholderItems from '../components/Carousel/CarouselPlaceholderItems.svelte';
 	import Container from '../../Container.svelte';
-	import type { Readable } from 'svelte/store';
 
 	settings.update((prev) => ({
 		...prev,
@@ -20,15 +19,11 @@
 	jellyfinItemsStore.subscribe((items) => {
 		console.warn('GOT ITEMS', items.data);
 	});
-
-	let focusIndex: Readable<number>;
 </script>
 
 <Container focusOnMount>
 	<div>LibraryPage</div>
-	<Container horizontal bind:focusIndex>
-		<Carousel>
-			<CarouselPlaceholderItems {focusIndex} />
-		</Carousel>
-	</Container>
+	<Carousel>
+		<CarouselPlaceholderItems />
+	</Carousel>
 </Container>
diff --git a/src/lib/pages/SeriesPage.svelte b/src/lib/pages/SeriesPage.svelte
index b7f5cfd..bd9cf41 100644
--- a/src/lib/pages/SeriesPage.svelte
+++ b/src/lib/pages/SeriesPage.svelte
@@ -5,12 +5,12 @@
 	import { settings } from '../stores/settings.store';
 	import type { TitleType } from '../types';
 	import type { ComponentProps } from 'svelte';
-	import Poster from '../components-new/Poster.svelte';
+	import Poster from '../components/Poster.svelte';
 	import type { JellyfinItem } from '../apis/jellyfin/jellyfinApi';
 	import { jellyfinItemsStore } from '../stores/data.store';
-	import Carousel from '../components-new/Carousel/Carousel.svelte';
+	import Carousel from '../components/Carousel/Carousel.svelte';
 	import { _ } from 'svelte-i18n';
-	import CarouselPlaceholderItems from '../components-new/Carousel/CarouselPlaceholderItems.svelte';
+	import CarouselPlaceholderItems from '../components/Carousel/CarouselPlaceholderItems.svelte';
 
 	const jellyfinItemsPromise = new Promise<JellyfinItem[]>((resolve) => {
 		jellyfinItemsStore.subscribe((data) => {
diff --git a/svelte.config.js b/svelte.config.js
old mode 100644
new mode 100755