diff --git a/lib/presentation/views/main_menu/settings_subpages/language_view.dart b/lib/presentation/views/main_menu/settings_subpages/language_view.dart
index 393304b..098d523 100644
--- a/lib/presentation/views/main_menu/settings_subpages/language_view.dart
+++ b/lib/presentation/views/main_menu/settings_subpages/language_view.dart
@@ -8,8 +8,17 @@ class LanguageView extends StatefulWidget {
   State<LanguageView> createState() => _LanguageViewState();
 }
 
+enum languageOptions {
+  systemDefault('Systemstandard'),
+  german('Deutsch'),
+  english('English');
+
+  final String label;
+  const languageOptions(this.label);
+}
+
 class _LanguageViewState extends State<LanguageView> {
-  String _selectedLanguage = "Systemstandard";
+  languageOptions? _selectedLanguage = languageOptions.systemDefault;
 
   @override
   Widget build(BuildContext context) {
@@ -19,47 +28,49 @@ class _LanguageViewState extends State<LanguageView> {
       body: Column(
         children: [
           ListTile(
-            title: Text("Systemstandard"),
+            title: Text(languageOptions.systemDefault.label),
             onTap: () {
               setState(() {
-                _selectedLanguage = "Systemstandard";
+                _selectedLanguage = languageOptions.systemDefault;
               });
             },
             leading: Radio(
-              value: "Systemstandard",
+              value: languageOptions.systemDefault,
+              groupValue: _selectedLanguage, 
+              onChanged: (value) {
+                setState(() {
+                  _selectedLanguage =  languageOptions.systemDefault;
+                });
+              },
+            ),
+          ),
+          ListTile(
+            title: Text(languageOptions.german.label),
+            onTap: () {
+              setState(() {
+                _selectedLanguage = languageOptions.german;
+              });
+            },
+            leading: Radio(
+              value: languageOptions.german,
               groupValue: _selectedLanguage, 
               onChanged: (value) {setState(() {
-                _selectedLanguage = value.toString();
+                _selectedLanguage = languageOptions.german;
               });},
             ),
           ),
           ListTile(
-            title: Text("Deutsch"),
+            title: Text(languageOptions.english.label),
             onTap: () {
               setState(() {
-                _selectedLanguage = "Deutsch";
+                _selectedLanguage = languageOptions.english;
               });
             },
             leading: Radio(
-              value: "Deutsch",
-              groupValue: _selectedLanguage, 
-              onChanged: (value) {setState(() {
-                _selectedLanguage = value.toString();
-              });},
-            ),
-          ),
-          ListTile(
-            title: Text("Englisch"),
-            onTap: () {
-              setState(() {
-                _selectedLanguage = "Englisch";
-              });
-            },
-            leading: Radio(
-              value: "Englisch",
+              value: languageOptions.english,
               groupValue: _selectedLanguage,
               onChanged: (value) {setState(() {
-                _selectedLanguage = value.toString();
+                _selectedLanguage = languageOptions.english;
               });},
             ),
           )
diff --git a/lib/presentation/views/main_menu/settings_subpages/theme_view.dart b/lib/presentation/views/main_menu/settings_subpages/theme_view.dart
index 54fb3d2..a822d5f 100644
--- a/lib/presentation/views/main_menu/settings_subpages/theme_view.dart
+++ b/lib/presentation/views/main_menu/settings_subpages/theme_view.dart
@@ -8,8 +8,17 @@ class ThemeView extends StatefulWidget {
   State<ThemeView> createState() => _ThemeViewState();
 }
 
+enum themeOptions {
+  systemDefault('Systemstandard'),
+  dark('Dunkel'),
+  light('Hell');
+
+  final String label;
+  const themeOptions(this.label);
+}
+
 class _ThemeViewState extends State<ThemeView> {
-  String _selectedTheme = "Systemstandard";
+  themeOptions? _selectedTheme = themeOptions.systemDefault;
 
   @override
   Widget build(BuildContext context) {
@@ -19,47 +28,49 @@ class _ThemeViewState extends State<ThemeView> {
       body: Column(
         children: [
           ListTile(
-            title: Text("Systemstandard"),
+            title: Text(themeOptions.systemDefault.label),
             onTap: () {
               setState(() {
-                _selectedTheme = "Systemstandard";
+                _selectedTheme = themeOptions.systemDefault;
               });
             },
             leading: Radio(
-              value: "Systemstandard",
+              value: themeOptions.systemDefault,
+              groupValue: _selectedTheme, 
+              onChanged: (value) {
+                setState(() {
+                  _selectedTheme =  themeOptions.systemDefault;
+                });
+              },
+            ),
+          ),
+          ListTile(
+            title: Text(themeOptions.dark.label),
+            onTap: () {
+              setState(() {
+                _selectedTheme = themeOptions.dark;
+              });
+            },
+            leading: Radio(
+              value: themeOptions.dark,
               groupValue: _selectedTheme, 
               onChanged: (value) {setState(() {
-                _selectedTheme = value.toString();
+                _selectedTheme = themeOptions.dark;
               });},
             ),
           ),
           ListTile(
-            title: Text("Dunkel"),
+            title: Text(themeOptions.light.label),
             onTap: () {
               setState(() {
-                _selectedTheme = "Dunkel";
+                _selectedTheme = themeOptions.light;
               });
             },
             leading: Radio(
-              value: "Dunkel",
-              groupValue: _selectedTheme, 
-              onChanged: (value) {setState(() {
-                _selectedTheme = value.toString();
-              });},
-            ),
-          ),
-          ListTile(
-            title: Text("Hell"),
-            onTap: () {
-              setState(() {
-                _selectedTheme = "Hell";
-              });
-            },
-            leading: Radio(
-              value: "Hell",
+              value: themeOptions.light,
               groupValue: _selectedTheme,
               onChanged: (value) {setState(() {
-                _selectedTheme = value.toString();
+                _selectedTheme = themeOptions.light;
               });},
             ),
           )