diff --git a/lib/utility/custom_theme.dart b/lib/core/custom_theme.dart
similarity index 100%
rename from lib/utility/custom_theme.dart
rename to lib/core/custom_theme.dart
diff --git a/lib/utility/globals.dart b/lib/core/globals.dart
similarity index 100%
rename from lib/utility/globals.dart
rename to lib/core/globals.dart
diff --git a/lib/main.dart b/lib/main.dart
index b826072..2b6a163 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,9 +1,9 @@
+import 'package:cabo_counter/core/custom_theme.dart';
 import 'package:cabo_counter/l10n/app_localizations.dart';
 import 'package:cabo_counter/presentation/views/tab_view.dart';
 import 'package:cabo_counter/services/config_service.dart';
 import 'package:cabo_counter/services/local_storage_service.dart';
 import 'package:cabo_counter/services/version_service.dart';
-import 'package:cabo_counter/utility/custom_theme.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
 
diff --git a/lib/presentation/views/active_game_view.dart b/lib/presentation/views/active_game_view.dart
index ddc0299..37fd652 100644
--- a/lib/presentation/views/active_game_view.dart
+++ b/lib/presentation/views/active_game_view.dart
@@ -1,3 +1,4 @@
+import 'package:cabo_counter/core/custom_theme.dart';
 import 'package:cabo_counter/data/game_manager.dart';
 import 'package:cabo_counter/data/game_session.dart';
 import 'package:cabo_counter/l10n/app_localizations.dart';
@@ -5,7 +6,6 @@ import 'package:cabo_counter/presentation/views/create_game_view.dart';
 import 'package:cabo_counter/presentation/views/graph_view.dart';
 import 'package:cabo_counter/presentation/views/round_view.dart';
 import 'package:cabo_counter/services/local_storage_service.dart';
-import 'package:cabo_counter/utility/custom_theme.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
diff --git a/lib/presentation/views/create_game_view.dart b/lib/presentation/views/create_game_view.dart
index 2c04e74..37123ca 100644
--- a/lib/presentation/views/create_game_view.dart
+++ b/lib/presentation/views/create_game_view.dart
@@ -1,10 +1,10 @@
+import 'package:cabo_counter/core/custom_theme.dart';
 import 'package:cabo_counter/data/game_manager.dart';
 import 'package:cabo_counter/data/game_session.dart';
 import 'package:cabo_counter/l10n/app_localizations.dart';
 import 'package:cabo_counter/presentation/views/active_game_view.dart';
 import 'package:cabo_counter/presentation/views/mode_selection_view.dart';
 import 'package:cabo_counter/services/config_service.dart';
-import 'package:cabo_counter/utility/custom_theme.dart';
 import 'package:flutter/cupertino.dart';
 
 enum CreateStatus {
diff --git a/lib/presentation/views/main_menu_view.dart b/lib/presentation/views/main_menu_view.dart
index 230c4de..425cf46 100644
--- a/lib/presentation/views/main_menu_view.dart
+++ b/lib/presentation/views/main_menu_view.dart
@@ -1,3 +1,4 @@
+import 'package:cabo_counter/core/custom_theme.dart';
 import 'package:cabo_counter/data/game_manager.dart';
 import 'package:cabo_counter/l10n/app_localizations.dart';
 import 'package:cabo_counter/presentation/views/active_game_view.dart';
@@ -5,7 +6,6 @@ import 'package:cabo_counter/presentation/views/create_game_view.dart';
 import 'package:cabo_counter/presentation/views/settings_view.dart';
 import 'package:cabo_counter/services/config_service.dart';
 import 'package:cabo_counter/services/local_storage_service.dart';
-import 'package:cabo_counter/utility/custom_theme.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
diff --git a/lib/presentation/views/mode_selection_view.dart b/lib/presentation/views/mode_selection_view.dart
index 93cdc7a..cc2ac52 100644
--- a/lib/presentation/views/mode_selection_view.dart
+++ b/lib/presentation/views/mode_selection_view.dart
@@ -1,5 +1,5 @@
+import 'package:cabo_counter/core/custom_theme.dart';
 import 'package:cabo_counter/l10n/app_localizations.dart';
-import 'package:cabo_counter/utility/custom_theme.dart';
 import 'package:flutter/cupertino.dart';
 
 class ModeSelectionMenu extends StatelessWidget {
diff --git a/lib/presentation/views/round_view.dart b/lib/presentation/views/round_view.dart
index 4e114fe..4dfb45c 100644
--- a/lib/presentation/views/round_view.dart
+++ b/lib/presentation/views/round_view.dart
@@ -1,7 +1,7 @@
+import 'package:cabo_counter/core/custom_theme.dart';
 import 'package:cabo_counter/data/game_session.dart';
 import 'package:cabo_counter/l10n/app_localizations.dart';
 import 'package:cabo_counter/services/local_storage_service.dart';
-import 'package:cabo_counter/utility/custom_theme.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
diff --git a/lib/presentation/views/settings_view.dart b/lib/presentation/views/settings_view.dart
index 84916c2..20c97ec 100644
--- a/lib/presentation/views/settings_view.dart
+++ b/lib/presentation/views/settings_view.dart
@@ -1,10 +1,10 @@
+import 'package:cabo_counter/core/custom_theme.dart';
 import 'package:cabo_counter/l10n/app_localizations.dart';
 import 'package:cabo_counter/presentation/widgets/custom_form_row.dart';
 import 'package:cabo_counter/presentation/widgets/stepper.dart';
 import 'package:cabo_counter/services/config_service.dart';
 import 'package:cabo_counter/services/local_storage_service.dart';
 import 'package:cabo_counter/services/version_service.dart';
-import 'package:cabo_counter/utility/custom_theme.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:url_launcher/url_launcher.dart';
diff --git a/lib/presentation/views/tab_view.dart b/lib/presentation/views/tab_view.dart
index efa4311..a3d06de 100644
--- a/lib/presentation/views/tab_view.dart
+++ b/lib/presentation/views/tab_view.dart
@@ -1,7 +1,7 @@
+import 'package:cabo_counter/core/custom_theme.dart';
 import 'package:cabo_counter/l10n/app_localizations.dart';
 import 'package:cabo_counter/presentation/views/information_view.dart';
 import 'package:cabo_counter/presentation/views/main_menu_view.dart';
-import 'package:cabo_counter/utility/custom_theme.dart';
 import 'package:flutter/cupertino.dart';
 
 class TabView extends StatefulWidget {
diff --git a/lib/presentation/widgets/custom_form_row.dart b/lib/presentation/widgets/custom_form_row.dart
index 7a266ae..96067c3 100644
--- a/lib/presentation/widgets/custom_form_row.dart
+++ b/lib/presentation/widgets/custom_form_row.dart
@@ -1,5 +1,5 @@
+import 'package:cabo_counter/core/custom_theme.dart';
 import 'package:cabo_counter/presentation/widgets/stepper.dart';
-import 'package:cabo_counter/utility/custom_theme.dart';
 import 'package:flutter/cupertino.dart';
 
 class CustomFormRow extends StatefulWidget {
diff --git a/lib/presentation/widgets/stepper.dart b/lib/presentation/widgets/stepper.dart
index 8ca2635..5d0bce8 100644
--- a/lib/presentation/widgets/stepper.dart
+++ b/lib/presentation/widgets/stepper.dart
@@ -1,4 +1,4 @@
-import 'package:cabo_counter/utility/custom_theme.dart';
+import 'package:cabo_counter/core/custom_theme.dart';
 import 'package:flutter/cupertino.dart'; // Für iOS-Style
 
 class Stepper extends StatefulWidget {
diff --git a/lib/services/version_service.dart b/lib/services/version_service.dart
index c23d187..b116d9b 100644
--- a/lib/services/version_service.dart
+++ b/lib/services/version_service.dart
@@ -1,4 +1,4 @@
-import 'package:cabo_counter/utility/globals.dart';
+import 'package:cabo_counter/core/globals.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 
 class VersionService {