diff --git a/.github/workflows/native-update.yml b/.github/workflows/native-update.yml
index e4aa5a0a..35610852 100644
--- a/.github/workflows/native-update.yml
+++ b/.github/workflows/native-update.yml
@@ -9,6 +9,9 @@ jobs:
       run:
         working-directory: ./front
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
       - name: Check for EXPO_TOKEN
         run: |
           if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then
@@ -16,9 +19,6 @@ jobs:
             exit 1
           fi
 
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
       - name: Setup Node
         uses: actions/setup-node@v2
         with:
diff --git a/front/.gitignore b/front/.gitignore
index deb3e06c..2abf30a0 100755
--- a/front/.gitignore
+++ b/front/.gitignore
@@ -43,3 +43,5 @@ yarn-error.log*
 
 .expo
 
+
+apps/web/next-env.d.ts
diff --git a/front/apps/web/next-env.d.ts b/front/apps/web/next-env.d.ts
deleted file mode 100755
index 4f11a03d..00000000
--- a/front/apps/web/next-env.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/front/packages/ui/src/i18n.d.ts b/front/apps/web/src/i18n-d.ts
similarity index 95%
rename from front/packages/ui/src/i18n.d.ts
rename to front/apps/web/src/i18n-d.ts
index 9a5489c8..eeee0be0 100644
--- a/front/packages/ui/src/i18n.d.ts
+++ b/front/apps/web/src/i18n-d.ts
@@ -18,7 +18,7 @@
  * along with Kyoo. If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { resources, defaultNS } from "./i18n";
+import "i18next";
 import en from "../../../translations/en.json";
 
 declare module "i18next" {
diff --git a/front/package.json b/front/package.json
index b6a9f514..9008d35a 100644
--- a/front/package.json
+++ b/front/package.json
@@ -11,6 +11,7 @@
 		"update": "yarn workspace mobile update",
 		"lint": "eslint ."
 	},
+	"eslintIgnore": ["next-env.d.ts"],
 	"workspaces": [
 		"apps/*",
 		"packages/*"
diff --git a/front/packages/ui/src/details/episode.tsx b/front/packages/ui/src/details/episode.tsx
index 5fa49b11..1bea0fb9 100644
--- a/front/packages/ui/src/details/episode.tsx
+++ b/front/packages/ui/src/details/episode.tsx
@@ -103,7 +103,9 @@ export const EpisodeLine = ({
 				{...css({ flexShrink: 0, m: ts(1) })}
 			/>
 			<View {...css({ flexGrow: 1, flexShrink: 1, m: ts(1) })}>
-				<Skeleton>{isLoading || <H6 as="p">{name ?? t("show.episodeNoMetadata")}</H6>}</Skeleton>
+				<Skeleton>
+					{isLoading || <H6 aria-level={undefined}>{name ?? t("show.episodeNoMetadata")}</H6>}
+				</Skeleton>
 				<Skeleton>{isLoading || <P numberOfLines={3}>{overview}</P>}</Skeleton>
 			</View>
 		</Link>
diff --git a/front/packages/ui/src/details/season.tsx b/front/packages/ui/src/details/season.tsx
index b1d760e7..6ae3df88 100644
--- a/front/packages/ui/src/details/season.tsx
+++ b/front/packages/ui/src/details/season.tsx
@@ -36,25 +36,26 @@ export const EpisodeList = ({
 	season: string | number;
 	Header: ComponentType<{ children: JSX.Element }>;
 }) => {
-	const { t } = useTranslation();
+	return null;
+	// const { t } = useTranslation();
 
-	return (
-		<InfiniteFetch
-			query={EpisodeList.query(slug, season)}
-			placeholderCount={15}
-			layout={EpisodeLine.layout}
-			empty={t("show.episode-none")}
-			divider
-			Header={Header}
-		>
-			{(item) => (
-				<EpisodeLine
-					{...item}
-					displayNumber={item.isLoading ? undefined : episodeDisplayNumber(item)}
-				/>
-			)}
-		</InfiniteFetch>
-	);
+	// return (
+	// 	<InfiniteFetch
+	// 		query={EpisodeList.query(slug, season)}
+	// 		placeholderCount={15}
+	// 		layout={EpisodeLine.layout}
+	// 		empty={t("show.episode-none")}
+	// 		divider
+	// 		Header={Header}
+	// 	>
+	// 		{(item) => (
+	// 			<EpisodeLine
+	// 				{...item}
+	// 				displayNumber={item.isLoading ? undefined : episodeDisplayNumber(item)}
+	// 			/>
+	// 		)}
+	// 	</InfiniteFetch>
+	// );
 };
 
 EpisodeList.query = (slug: string, season: string | number): QueryIdentifier<Episode> => ({
diff --git a/front/packages/ui/src/i18n-d.ts b/front/packages/ui/src/i18n-d.ts
new file mode 100644
index 00000000..eeee0be0
--- /dev/null
+++ b/front/packages/ui/src/i18n-d.ts
@@ -0,0 +1,29 @@
+/*
+ * Kyoo - A portable and vast media library solution.
+ * Copyright (c) Kyoo.
+ *
+ * See AUTHORS.md and LICENSE file in the project root for full license information.
+ *
+ * Kyoo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * Kyoo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Kyoo. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import "i18next";
+import en from "../../../translations/en.json";
+
+declare module "i18next" {
+	interface CustomTypeOptions {
+		returnNull: false;
+		resources: { translations: typeof en };
+	}
+}
diff --git a/front/packages/ui/src/player/keyboard.tsx b/front/packages/ui/src/player/keyboard.tsx
index 1bde4252..a2440a80 100644
--- a/front/packages/ui/src/player/keyboard.tsx
+++ b/front/packages/ui/src/player/keyboard.tsx
@@ -73,12 +73,7 @@ export const reducerAtom = atom<null, Action>(null, (get, set, action) => {
 			const index = subtitle ? action.subtitles.findIndex((x) => x.id === subtitle.id) : -1;
 			set(
 				subtitleAtom,
-				index === -1
-					? null
-					: {
-							track: action.subtitles[(index + 1) % action.subtitles.length],
-							fonts: action.fonts,
-					  },
+				index === -1 ? null : action.subtitles[(index + 1) % action.subtitles.length],
 			);
 			break;
 	}
diff --git a/front/packages/ui/src/player/state.tsx b/front/packages/ui/src/player/state.tsx
index 34cf3d32..c36078e4 100644
--- a/front/packages/ui/src/player/state.tsx
+++ b/front/packages/ui/src/player/state.tsx
@@ -18,7 +18,7 @@
  * along with Kyoo. If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { Track, WatchItem } from "@kyoo/models";
+import { Track, WatchItem, Font } from "@kyoo/models";
 import { atom, useAtom, useAtomValue, useSetAtom } from "jotai";
 import { memo, useEffect, useLayoutEffect, useRef } from "react";
 import NativeVideo, { VideoProperties as VideoProps } from "./video";
@@ -73,6 +73,7 @@ export const Video = memo(function _Video({
 }: {
 	links?: WatchItem["link"];
 	setError: (error: string | undefined) => void;
+	fonts?: Font[];
 } & Partial<VideoProps>) {
 	const ref = useRef<NativeVideo | null>(null);
 	const [isPlaying, setPlay] = useAtom(playAtom);