diff --git a/src/managers/ThemeManager.js b/src/managers/ThemeManager.js
index c68c57a..be51ba5 100644
--- a/src/managers/ThemeManager.js
+++ b/src/managers/ThemeManager.js
@@ -1,14 +1,14 @@
 // @flow
 
 import AsyncStorageManager from "./AsyncStorageManager";
-import {DarkTheme, DefaultTheme, Theme} from 'react-native-paper';
+import {DarkTheme, DefaultTheme} from 'react-native-paper';
 import AprilFoolsManager from "./AprilFoolsManager";
 import {Appearance} from 'react-native-appearance';
 
 const colorScheme = Appearance.getColorScheme();
 
 export type CustomTheme = {
-    ...Theme,
+    ...DefaultTheme,
     colors: {
         primary: string,
         accent: string,
diff --git a/src/navigation/MainNavigator.js b/src/navigation/MainNavigator.js
index 16c1e4b..9afbf5e 100644
--- a/src/navigation/MainNavigator.js
+++ b/src/navigation/MainNavigator.js
@@ -8,7 +8,7 @@ import DebugScreen from '../screens/About/DebugScreen';
 import {createStackNavigator, TransitionPresets} from "@react-navigation/stack";
 import i18n from "i18n-js";
 import TabNavigator from "./TabNavigator";
-import TetrisScreen from "../screens/Tetris/TetrisScreen";
+import GameScreen from "../screens/Game/GameScreen";
 import VoteScreen from "../screens/Amicale/VoteScreen";
 import LoginScreen from "../screens/Amicale/LoginScreen";
 import {Platform} from "react-native";
@@ -93,7 +93,7 @@ function MainStackComponent(props: { createTabNavigator: () => React.Node }) {
             />
             <MainStack.Screen
                 name="tetris"
-                component={TetrisScreen}
+                component={GameScreen}
                 options={{
                     title: i18n.t("screens.game.title"),
                 }}
diff --git a/src/screens/Tetris/GameLogic.js b/src/screens/Game/GameLogic.js
similarity index 100%
rename from src/screens/Tetris/GameLogic.js
rename to src/screens/Game/GameLogic.js
diff --git a/src/screens/Tetris/TetrisScreen.js b/src/screens/Game/GameScreen.js
similarity index 98%
rename from src/screens/Tetris/TetrisScreen.js
rename to src/screens/Game/GameScreen.js
index 0326cb2..f30806a 100644
--- a/src/screens/Tetris/TetrisScreen.js
+++ b/src/screens/Game/GameScreen.js
@@ -22,7 +22,7 @@ type State = {
     gameLevel: number,
 }
 
-class TetrisScreen extends React.Component<Props, State> {
+class GameScreen extends React.Component<Props, State> {
 
     colors: Object;
 
@@ -296,4 +296,4 @@ class TetrisScreen extends React.Component<Props, State> {
 
 }
 
-export default withTheme(TetrisScreen);
+export default withTheme(GameScreen);
diff --git a/src/screens/Tetris/GridManager.js b/src/screens/Game/GridManager.js
similarity index 100%
rename from src/screens/Tetris/GridManager.js
rename to src/screens/Game/GridManager.js
diff --git a/src/screens/Tetris/Piece.js b/src/screens/Game/Piece.js
similarity index 100%
rename from src/screens/Tetris/Piece.js
rename to src/screens/Game/Piece.js
diff --git a/src/screens/Tetris/ScoreManager.js b/src/screens/Game/ScoreManager.js
similarity index 100%
rename from src/screens/Tetris/ScoreManager.js
rename to src/screens/Game/ScoreManager.js
diff --git a/src/screens/Tetris/Shapes/BaseShape.js b/src/screens/Game/Shapes/BaseShape.js
similarity index 100%
rename from src/screens/Tetris/Shapes/BaseShape.js
rename to src/screens/Game/Shapes/BaseShape.js
diff --git a/src/screens/Tetris/Shapes/ShapeI.js b/src/screens/Game/Shapes/ShapeI.js
similarity index 100%
rename from src/screens/Tetris/Shapes/ShapeI.js
rename to src/screens/Game/Shapes/ShapeI.js
diff --git a/src/screens/Tetris/Shapes/ShapeJ.js b/src/screens/Game/Shapes/ShapeJ.js
similarity index 100%
rename from src/screens/Tetris/Shapes/ShapeJ.js
rename to src/screens/Game/Shapes/ShapeJ.js
diff --git a/src/screens/Tetris/Shapes/ShapeL.js b/src/screens/Game/Shapes/ShapeL.js
similarity index 100%
rename from src/screens/Tetris/Shapes/ShapeL.js
rename to src/screens/Game/Shapes/ShapeL.js
diff --git a/src/screens/Tetris/Shapes/ShapeO.js b/src/screens/Game/Shapes/ShapeO.js
similarity index 100%
rename from src/screens/Tetris/Shapes/ShapeO.js
rename to src/screens/Game/Shapes/ShapeO.js
diff --git a/src/screens/Tetris/Shapes/ShapeS.js b/src/screens/Game/Shapes/ShapeS.js
similarity index 100%
rename from src/screens/Tetris/Shapes/ShapeS.js
rename to src/screens/Game/Shapes/ShapeS.js
diff --git a/src/screens/Tetris/Shapes/ShapeT.js b/src/screens/Game/Shapes/ShapeT.js
similarity index 100%
rename from src/screens/Tetris/Shapes/ShapeT.js
rename to src/screens/Game/Shapes/ShapeT.js
diff --git a/src/screens/Tetris/Shapes/ShapeZ.js b/src/screens/Game/Shapes/ShapeZ.js
similarity index 100%
rename from src/screens/Tetris/Shapes/ShapeZ.js
rename to src/screens/Game/Shapes/ShapeZ.js
diff --git a/src/screens/Tetris/__tests__/GridManager.test.js b/src/screens/Game/__tests__/GridManager.test.js
similarity index 100%
rename from src/screens/Tetris/__tests__/GridManager.test.js
rename to src/screens/Game/__tests__/GridManager.test.js
diff --git a/src/screens/Tetris/__tests__/Piece.test.js b/src/screens/Game/__tests__/Piece.test.js
similarity index 100%
rename from src/screens/Tetris/__tests__/Piece.test.js
rename to src/screens/Game/__tests__/Piece.test.js
diff --git a/src/screens/Tetris/__tests__/ScoreManager.test.js b/src/screens/Game/__tests__/ScoreManager.test.js
similarity index 100%
rename from src/screens/Tetris/__tests__/ScoreManager.test.js
rename to src/screens/Game/__tests__/ScoreManager.test.js
diff --git a/src/screens/Tetris/__tests__/Shape.test.js b/src/screens/Game/__tests__/Shape.test.js
similarity index 100%
rename from src/screens/Tetris/__tests__/Shape.test.js
rename to src/screens/Game/__tests__/Shape.test.js
diff --git a/src/screens/Tetris/components/Cell.js b/src/screens/Game/components/Cell.js
similarity index 100%
rename from src/screens/Tetris/components/Cell.js
rename to src/screens/Game/components/Cell.js
diff --git a/src/screens/Tetris/components/Grid.js b/src/screens/Game/components/Grid.js
similarity index 100%
rename from src/screens/Tetris/components/Grid.js
rename to src/screens/Game/components/Grid.js
diff --git a/src/screens/Tetris/components/Preview.js b/src/screens/Game/components/Preview.js
similarity index 100%
rename from src/screens/Tetris/components/Preview.js
rename to src/screens/Game/components/Preview.js