diff --git a/materialious/src/lib/Player.svelte b/materialious/src/lib/Player.svelte
index 3c53c262..22a883be 100644
--- a/materialious/src/lib/Player.svelte
+++ b/materialious/src/lib/Player.svelte
@@ -29,6 +29,7 @@
 	export let audioMode = false;
 	export let player: MediaPlayerElement;
 	export let isSyncing: boolean = false;
+	export let isEmbed: boolean = false;
 
 	let src: PlayerSrc = [];
 	let categoryBeingSkipped = '';
@@ -279,9 +280,11 @@
 	{/if}
 </media-player>
 
-<div class="snackbar" id="sponsorblock-alert">
-	<span
-		>{$_('skipping')}
-		<span class="bold" style="text-transform: capitalize;">{categoryBeingSkipped}</span></span
-	>
-</div>
+{#if !isEmbed}
+	<div class="snackbar" id="sponsorblock-alert">
+		<span
+			>{$_('skipping')}
+			<span class="bold" style="text-transform: capitalize;">{categoryBeingSkipped}</span></span
+		>
+	</div>
+{/if}
diff --git a/materialious/src/routes/+error.svelte b/materialious/src/routes/(app)/+error.svelte
similarity index 100%
rename from materialious/src/routes/+error.svelte
rename to materialious/src/routes/(app)/+error.svelte
diff --git a/materialious/src/routes/+layout.svelte b/materialious/src/routes/(app)/+layout.svelte
similarity index 100%
rename from materialious/src/routes/+layout.svelte
rename to materialious/src/routes/(app)/+layout.svelte
diff --git a/materialious/src/routes/+page.svelte b/materialious/src/routes/(app)/+page.svelte
similarity index 100%
rename from materialious/src/routes/+page.svelte
rename to materialious/src/routes/(app)/+page.svelte
diff --git a/materialious/src/routes/+page.ts b/materialious/src/routes/(app)/+page.ts
similarity index 100%
rename from materialious/src/routes/+page.ts
rename to materialious/src/routes/(app)/+page.ts
diff --git a/materialious/src/routes/auth/+page.svelte b/materialious/src/routes/(app)/auth/+page.svelte
similarity index 92%
rename from materialious/src/routes/auth/+page.svelte
rename to materialious/src/routes/(app)/auth/+page.svelte
index dc33d769..2b704073 100644
--- a/materialious/src/routes/auth/+page.svelte
+++ b/materialious/src/routes/(app)/auth/+page.svelte
@@ -2,8 +2,8 @@
 	import { goto } from '$app/navigation';
 	import { page } from '$app/stores';
 	import PageLoading from '$lib/PageLoading.svelte';
+	import { authStore } from '$lib/store';
 	import { onMount } from 'svelte';
-	import { authStore } from '../../store';
 
 	// Auth response handling for Desktop
 	onMount(() => {
diff --git a/materialious/src/routes/auth/+page.ts b/materialious/src/routes/(app)/auth/+page.ts
similarity index 100%
rename from materialious/src/routes/auth/+page.ts
rename to materialious/src/routes/(app)/auth/+page.ts
diff --git a/materialious/src/routes/channel/[slug]/+page.svelte b/materialious/src/routes/(app)/channel/[slug]/+page.svelte
similarity index 98%
rename from materialious/src/routes/channel/[slug]/+page.svelte
rename to materialious/src/routes/(app)/channel/[slug]/+page.svelte
index e2eb86d1..2bdcde2b 100644
--- a/materialious/src/routes/channel/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/channel/[slug]/+page.svelte
@@ -5,12 +5,12 @@
 	import PlaylistThumbnail from '$lib/PlaylistThumbnail.svelte';
 	import Thumbnail from '$lib/Thumbnail.svelte';
 	import { cleanNumber, getBestThumbnail } from '$lib/misc';
+	import { activePageStore, authStore } from '$lib/store';
 	import { Capacitor } from '@capacitor/core';
 	import { onMount } from 'svelte';
 	import { _ } from 'svelte-i18n';
 	import InfiniteLoading, { type InfiniteEvent } from 'svelte-infinite-loading';
 	import { get } from 'svelte/store';
-	import { activePageStore, authStore } from '../../../store';
 
 	export let data;
 
diff --git a/materialious/src/routes/channel/[slug]/+page.ts b/materialious/src/routes/(app)/channel/[slug]/+page.ts
similarity index 100%
rename from materialious/src/routes/channel/[slug]/+page.ts
rename to materialious/src/routes/(app)/channel/[slug]/+page.ts
diff --git a/materialious/src/routes/history/+page.svelte b/materialious/src/routes/(app)/history/+page.svelte
similarity index 96%
rename from materialious/src/routes/history/+page.svelte
rename to materialious/src/routes/(app)/history/+page.svelte
index eaa5b567..0ebbf88d 100644
--- a/materialious/src/routes/history/+page.svelte
+++ b/materialious/src/routes/(app)/history/+page.svelte
@@ -3,12 +3,12 @@
 	import type { VideoPlay } from '$lib/Api/model';
 	import PageLoading from '$lib/PageLoading.svelte';
 	import VideoList from '$lib/VideoList.svelte';
+	import { activePageStore, synciousStore } from '$lib/store';
 	import { error } from '@sveltejs/kit';
 	import { onMount } from 'svelte';
 	import { _ } from 'svelte-i18n';
 	import InfiniteLoading, { type InfiniteEvent } from 'svelte-infinite-loading';
 	import { get } from 'svelte/store';
-	import { activePageStore, synciousStore } from '../../store';
 
 	activePageStore.set('history');
 
diff --git a/materialious/src/routes/playlist/+page.ts b/materialious/src/routes/(app)/playlist/+page.ts
similarity index 100%
rename from materialious/src/routes/playlist/+page.ts
rename to materialious/src/routes/(app)/playlist/+page.ts
diff --git a/materialious/src/routes/playlist/[slug]/+page.svelte b/materialious/src/routes/(app)/playlist/[slug]/+page.svelte
similarity index 97%
rename from materialious/src/routes/playlist/[slug]/+page.svelte
rename to materialious/src/routes/(app)/playlist/[slug]/+page.svelte
index 578af97f..979fb915 100644
--- a/materialious/src/routes/playlist/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/playlist/[slug]/+page.svelte
@@ -3,10 +3,10 @@
 	import type { PlaylistPageVideo } from '$lib/Api/model.js';
 	import VideoList from '$lib/VideoList.svelte';
 	import { cleanNumber, unsafeRandomItem } from '$lib/misc.js';
+	import { activePageStore, playlistSettingsStore } from '$lib/store';
 	import { Capacitor } from '@capacitor/core';
 	import { onMount } from 'svelte';
 	import { _ } from 'svelte-i18n';
-	import { activePageStore, playlistSettingsStore } from '../../../store';
 
 	export let data;
 
diff --git a/materialious/src/routes/playlist/[slug]/+page.ts b/materialious/src/routes/(app)/playlist/[slug]/+page.ts
similarity index 100%
rename from materialious/src/routes/playlist/[slug]/+page.ts
rename to materialious/src/routes/(app)/playlist/[slug]/+page.ts
diff --git a/materialious/src/routes/playlists/+page.svelte b/materialious/src/routes/(app)/playlists/+page.svelte
similarity index 98%
rename from materialious/src/routes/playlists/+page.svelte
rename to materialious/src/routes/(app)/playlists/+page.svelte
index df146453..d3e9b811 100644
--- a/materialious/src/routes/playlists/+page.svelte
+++ b/materialious/src/routes/(app)/playlists/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import { deletePersonalPlaylist, getPersonalPlaylists, postPersonalPlaylist } from '$lib/Api';
 	import PlaylistThumbnail from '$lib/PlaylistThumbnail.svelte';
+	import { activePageStore } from '$lib/store';
 	import { _ } from 'svelte-i18n';
-	import { activePageStore } from '../../store';
 
 	export let data;
 
diff --git a/materialious/src/routes/playlists/+page.ts b/materialious/src/routes/(app)/playlists/+page.ts
similarity index 100%
rename from materialious/src/routes/playlists/+page.ts
rename to materialious/src/routes/(app)/playlists/+page.ts
diff --git a/materialious/src/routes/search/[slug]/+page.svelte b/materialious/src/routes/(app)/search/[slug]/+page.svelte
similarity index 98%
rename from materialious/src/routes/search/[slug]/+page.svelte
rename to materialious/src/routes/(app)/search/[slug]/+page.svelte
index 8a1a4454..accc3f51 100644
--- a/materialious/src/routes/search/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/search/[slug]/+page.svelte
@@ -4,9 +4,9 @@
 	import PageLoading from '$lib/PageLoading.svelte';
 	import PlaylistThumbnail from '$lib/PlaylistThumbnail.svelte';
 	import Thumbnail from '$lib/Thumbnail.svelte';
+	import { activePageStore } from '$lib/store';
 	import { _ } from 'svelte-i18n';
 	import InfiniteLoading, { type InfiniteEvent } from 'svelte-infinite-loading';
-	import { activePageStore } from '../../../store';
 
 	export let data;
 
diff --git a/materialious/src/routes/search/[slug]/+page.ts b/materialious/src/routes/(app)/search/[slug]/+page.ts
similarity index 100%
rename from materialious/src/routes/search/[slug]/+page.ts
rename to materialious/src/routes/(app)/search/[slug]/+page.ts
diff --git a/materialious/src/routes/subscriptions/+page.svelte b/materialious/src/routes/(app)/subscriptions/+page.svelte
similarity index 95%
rename from materialious/src/routes/subscriptions/+page.svelte
rename to materialious/src/routes/(app)/subscriptions/+page.svelte
index 826fa186..000ad99c 100644
--- a/materialious/src/routes/subscriptions/+page.svelte
+++ b/materialious/src/routes/(app)/subscriptions/+page.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 	import { getFeed } from '$lib/Api/index.js';
 	import VideoList from '$lib/VideoList.svelte';
+	import { activePageStore } from '$lib/store';
 	import { _ } from 'svelte-i18n';
 	import InfiniteLoading, { type InfiniteEvent } from 'svelte-infinite-loading';
-	import { activePageStore } from '../../store';
 
 	export let data;
 
diff --git a/materialious/src/routes/subscriptions/+page.ts b/materialious/src/routes/(app)/subscriptions/+page.ts
similarity index 100%
rename from materialious/src/routes/subscriptions/+page.ts
rename to materialious/src/routes/(app)/subscriptions/+page.ts
diff --git a/materialious/src/routes/subscriptions/manage/+page.svelte b/materialious/src/routes/(app)/subscriptions/manage/+page.svelte
similarity index 100%
rename from materialious/src/routes/subscriptions/manage/+page.svelte
rename to materialious/src/routes/(app)/subscriptions/manage/+page.svelte
diff --git a/materialious/src/routes/subscriptions/manage/+page.ts b/materialious/src/routes/(app)/subscriptions/manage/+page.ts
similarity index 100%
rename from materialious/src/routes/subscriptions/manage/+page.ts
rename to materialious/src/routes/(app)/subscriptions/manage/+page.ts
diff --git a/materialious/src/routes/trending/+page.svelte b/materialious/src/routes/(app)/trending/+page.svelte
similarity index 77%
rename from materialious/src/routes/trending/+page.svelte
rename to materialious/src/routes/(app)/trending/+page.svelte
index 4a0630e0..e2fd59f2 100644
--- a/materialious/src/routes/trending/+page.svelte
+++ b/materialious/src/routes/(app)/trending/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import VideoList from '$lib/VideoList.svelte';
-	import { activePageStore } from '../../store';
+	import { activePageStore } from '$lib/store';
 
 	export let data;
 
diff --git a/materialious/src/routes/trending/+page.ts b/materialious/src/routes/(app)/trending/+page.ts
similarity index 100%
rename from materialious/src/routes/trending/+page.ts
rename to materialious/src/routes/(app)/trending/+page.ts
diff --git a/materialious/src/routes/watch/+page.ts b/materialious/src/routes/(app)/watch/+page.ts
similarity index 100%
rename from materialious/src/routes/watch/+page.ts
rename to materialious/src/routes/(app)/watch/+page.ts
diff --git a/materialious/src/routes/watch/[slug]/+page.svelte b/materialious/src/routes/(app)/watch/[slug]/+page.svelte
similarity index 99%
rename from materialious/src/routes/watch/[slug]/+page.svelte
rename to materialious/src/routes/(app)/watch/[slug]/+page.svelte
index 407d9d9f..83beea1e 100644
--- a/materialious/src/routes/watch/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/watch/[slug]/+page.svelte
@@ -16,11 +16,6 @@
 	import Thumbnail from '$lib/Thumbnail.svelte';
 	import { cleanNumber, getBestThumbnail, numberWithCommas, unsafeRandomItem } from '$lib/misc';
 	import type { PlayerEvents } from '$lib/player';
-	import type { DataConnection } from 'peerjs';
-	import { onDestroy, onMount } from 'svelte';
-	import { _ } from 'svelte-i18n';
-	import { get } from 'svelte/store';
-	import type { MediaPlayerElement } from 'vidstack/elements';
 	import {
 		activePageStore,
 		authStore,
@@ -32,7 +27,12 @@
 		playlistSettingsStore,
 		syncPartyConnectionsStore,
 		syncPartyPeerStore
-	} from '../../../store';
+	} from '$lib/store';
+	import type { DataConnection } from 'peerjs';
+	import { onDestroy, onMount } from 'svelte';
+	import { _ } from 'svelte-i18n';
+	import { get } from 'svelte/store';
+	import type { MediaPlayerElement } from 'vidstack/elements';
 
 	export let data;
 
diff --git a/materialious/src/routes/watch/[slug]/+page.ts b/materialious/src/routes/(app)/watch/[slug]/+page.ts
similarity index 100%
rename from materialious/src/routes/watch/[slug]/+page.ts
rename to materialious/src/routes/(app)/watch/[slug]/+page.ts
diff --git a/materialious/src/routes/(no-layout)/embed/[slug]/+page@.svelte b/materialious/src/routes/(no-layout)/embed/[slug]/+page@.svelte
index b131bcb2..9803214a 100644
--- a/materialious/src/routes/(no-layout)/embed/[slug]/+page@.svelte
+++ b/materialious/src/routes/(no-layout)/embed/[slug]/+page@.svelte
@@ -8,4 +8,4 @@
 	let player: MediaPlayerElement;
 </script>
 
-<Player bind:player {data} />
+<Player bind:player isEmbed={true} {data} />