diff --git a/lib/utility/theme.dart b/lib/utility/apptheme.dart
similarity index 98%
rename from lib/utility/theme.dart
rename to lib/utility/apptheme.dart
index 8d8ec8e..ebbbab6 100644
--- a/lib/utility/theme.dart
+++ b/lib/utility/apptheme.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/cupertino.dart';
 
-class Theme {
+class AppTheme {
   static Color white = CupertinoColors.white;
   static Color primaryColor = CupertinoColors.systemGreen;
   static Color backgroundColor = const Color(0xFF101010);
diff --git a/lib/views/active_game_view.dart b/lib/views/active_game_view.dart
index 10c296f..85d5a70 100644
--- a/lib/views/active_game_view.dart
+++ b/lib/views/active_game_view.dart
@@ -1,5 +1,5 @@
 import 'package:cabo_counter/data/game_session.dart';
-import 'package:cabo_counter/utility/theme.dart';
+import 'package:cabo_counter/utility/apptheme.dart';
 import 'package:cabo_counter/views/round_view.dart';
 import 'package:flutter/cupertino.dart';
 
@@ -28,7 +28,7 @@ class _ActiveGameViewState extends State<ActiveGameView> {
               padding: const EdgeInsets.fromLTRB(10, 10, 0, 0),
               child: Text(
                 'Spieler:innen',
-                style: Theme.createGameTitle,
+                style: AppTheme.createGameTitle,
               ),
             ),
             ListView.builder(
@@ -61,7 +61,7 @@ class _ActiveGameViewState extends State<ActiveGameView> {
               padding: const EdgeInsets.fromLTRB(10, 10, 0, 0),
               child: Text(
                 'Runden',
-                style: Theme.createGameTitle,
+                style: AppTheme.createGameTitle,
               ),
             ),
             ListView.builder(
diff --git a/lib/views/create_game_view.dart b/lib/views/create_game_view.dart
index a239337..15ea53f 100644
--- a/lib/views/create_game_view.dart
+++ b/lib/views/create_game_view.dart
@@ -1,5 +1,7 @@
 import 'package:cabo_counter/data/game_session.dart';
-import 'package:cabo_counter/utility/theme.dart';
+import 'package:cabo_counter/utility/apptheme.dart';
+import 'package:cabo_counter/utility/globals.dart';
+import 'package:cabo_counter/utility/local_storage_service.dart';
 import 'package:cabo_counter/views/active_game_view.dart';
 import 'package:cabo_counter/views/mode_selection_view.dart';
 import 'package:flutter/cupertino.dart';
@@ -42,7 +44,7 @@ class _CreateGameState extends State<CreateGame> {
               padding: const EdgeInsets.fromLTRB(10, 10, 0, 0),
               child: Text(
                 'Spiel',
-                style: Theme.createGameTitle,
+                style: AppTheme.createGameTitle,
               ),
             ),
             Padding(
@@ -96,7 +98,7 @@ class _CreateGameState extends State<CreateGame> {
               padding: const EdgeInsets.fromLTRB(10, 10, 0, 0),
               child: Text(
                 'Spieler:innen',
-                style: Theme.createGameTitle,
+                style: AppTheme.createGameTitle,
               ),
             ),
             Expanded(
@@ -285,6 +287,8 @@ class _CreateGameState extends State<CreateGame> {
                     players: players,
                     gameHasPointLimit: selectedMode!,
                   );
+                  Globals.addGameSession(gameSession);
+                  LocalStorageService.saveGameSessions();
                   Navigator.pushReplacement(
                       context,
                       CupertinoPageRoute(
diff --git a/lib/views/information_view.dart b/lib/views/information_view.dart
index 667d180..e2f3ba8 100644
--- a/lib/views/information_view.dart
+++ b/lib/views/information_view.dart
@@ -14,6 +14,7 @@ class InformationView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return CupertinoPageScaffold(
+        resizeToAvoidBottomInset: false,
         navigationBar: const CupertinoNavigationBar(
           middle: Text('Über'),
         ),
diff --git a/lib/views/mode_selection_view.dart b/lib/views/mode_selection_view.dart
index 949060b..7b55b30 100644
--- a/lib/views/mode_selection_view.dart
+++ b/lib/views/mode_selection_view.dart
@@ -1,4 +1,4 @@
-import 'package:cabo_counter/utility/theme.dart';
+import 'package:cabo_counter/utility/apptheme.dart';
 import 'package:flutter/cupertino.dart';
 
 class ModeSelectionMenu extends StatelessWidget {
@@ -15,10 +15,10 @@ class ModeSelectionMenu extends StatelessWidget {
           Padding(
             padding: const EdgeInsets.fromLTRB(0, 16, 0, 0),
             child: CupertinoListTile(
-              title: Text('101 Punkte', style: Theme.modeTitle),
+              title: Text('101 Punkte', style: AppTheme.modeTitle),
               subtitle: const Text(
                 'Es wird solange gespielt, bis einer Spieler mehr als 100 Punkte erreicht',
-                style: Theme.modeDescription,
+                style: AppTheme.modeDescription,
                 maxLines: 3,
               ),
               onTap: () {
@@ -29,11 +29,11 @@ class ModeSelectionMenu extends StatelessWidget {
           Padding(
             padding: const EdgeInsets.symmetric(vertical: 16.0),
             child: CupertinoListTile(
-              title: Text('Unbegrenzt', style: Theme.modeTitle),
+              title: Text('Unbegrenzt', style: AppTheme.modeTitle),
               subtitle: const Text(
                 'Dem Spiel sind keine Grenzen gesetzt. Es wird so lange '
                 'gespielt, bis Ihr keine Lust mehr habt.',
-                style: Theme.modeDescription,
+                style: AppTheme.modeDescription,
                 maxLines: 3,
               ),
               onTap: () {