diff --git a/app/src/main/java/org/mosad/teapod/ui/activity/player/fragment/LanguageSettingsDialogFragment.kt b/app/src/main/java/org/mosad/teapod/ui/activity/player/fragment/LanguageSettingsDialogFragment.kt
index 73e0bef..ca68b77 100644
--- a/app/src/main/java/org/mosad/teapod/ui/activity/player/fragment/LanguageSettingsDialogFragment.kt
+++ b/app/src/main/java/org/mosad/teapod/ui/activity/player/fragment/LanguageSettingsDialogFragment.kt
@@ -109,7 +109,7 @@ class LanguageSettingsDialogFragment : DialogFragment() {
             gravity = Gravity.CENTER_VERTICAL
             text = if (locale == Locale.ROOT) context.getString(R.string.no_subtitles) else locale.displayLanguage
             setTextSize(TypedValue.COMPLEX_UNIT_SP, 16f)
-            setTextColor(context.resources.getColor(R.color.textSecondaryDark, context.theme))
+            setTextColor(context.resources.getColor(R.color.player_text, context.theme))
             setPadding(75, 0, 0, 0)
 
             setOnClickListener(onClick)
@@ -131,7 +131,7 @@ class LanguageSettingsDialogFragment : DialogFragment() {
         languageLayout.children.forEach { child ->
             if (child is TextView) {
                 child.apply {
-                    setTextColor(context.resources.getColor(R.color.textPrimaryDark, context.theme))
+                    setTextColor(context.resources.getColor(R.color.player_text, context.theme))
                     setTypeface(null, Typeface.NORMAL)
                     setCompoundDrawablesRelativeWithIntrinsicBounds(0, 0, 0, 0)
                     setPadding(75, 0, 0, 0)
diff --git a/app/src/main/res/layout/item_episode_player.xml b/app/src/main/res/layout/item_episode_player.xml
index 9f18325..f2b16b8 100644
--- a/app/src/main/res/layout/item_episode_player.xml
+++ b/app/src/main/res/layout/item_episode_player.xml
@@ -44,7 +44,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="7dp"
         android:text="@string/component_episode_title"
-        android:textColor="@color/textPrimaryDark"
+        android:textColor="@color/player_text"
         android:textSize="16sp" />
 
     <View
@@ -53,7 +53,7 @@
         android:layout_height="1dp"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="5dp"
-        android:background="@color/textSecondaryDark" />
+        android:background="@color/player_text_secondary" />
 
     <TextView
         android:id="@+id/text_episode_desc2"
@@ -62,6 +62,6 @@
         android:layout_marginTop="5dp"
         android:maxLines="10"
         android:text="@string/text_overview_ex"
-        android:textColor="@color/textPrimaryDark" />
+        android:textColor="@color/player_text" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/player_language_settings.xml b/app/src/main/res/layout/player_language_settings.xml
index fda6fbd..8140e32 100644
--- a/app/src/main/res/layout/player_language_settings.xml
+++ b/app/src/main/res/layout/player_language_settings.xml
@@ -138,9 +138,9 @@
             android:layout_marginEnd="7dp"
             android:text="@string/cancel"
             android:textAllCaps="false"
-            android:textColor="@color/player_white"
+            android:textColor="@color/button_text_color_light"
             android:textSize="16sp"
-            app:backgroundTint="@color/buttonBackgroundLight"
+            app:backgroundTint="@color/button_background_light"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -151,9 +151,9 @@
             android:layout_height="wrap_content"
             android:text="@string/apply"
             android:textAllCaps="false"
-            android:textColor="@color/themePrimaryDark"
+            android:textColor="@color/button_text_color_dark"
             android:textSize="16sp"
-            app:backgroundTint="@color/buttonBackgroundDark"
+            app:backgroundTint="@color/button_background_dark"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 0de24d5..0d8ec1f 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -2,12 +2,12 @@
 <resources>
 
     <style name="Widget.App.Button" parent="Widget.Material3.Button">
-        <item name="backgroundTint">@color/buttonBackgroundDark</item>
-        <item name="android:textColor">@color/buttonTextColorDark</item>
-        <item name="iconTint">@color/buttonTextColorDark</item>
+        <item name="backgroundTint">@color/button_background_dark</item>
+        <item name="android:textColor">@color/button_text_color_dark</item>
+        <item name="iconTint">@color/button_text_color_dark</item>
     </style>
 
-    <style name="AppThemeGenerated" parent="Theme.Material3.Dark.NoActionBar">
+    <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
 <!--        <item name="materialButtonStyle">@style/Widget.App.Button</item>-->
         <item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6ad6575..edb6e9f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,46 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- base theme colors -->
-    <color name="colorPrimary">#66aa00</color>
-    <color name="colorOnPrimary">#FFFFFF</color>
-    <color name="colorSecondary">#607d8b</color>
-    <color name="colorTertiary">#899579</color>
-
-    <color name="colorPrimaryLight">#99dc45</color>
-    <color name="colorPrimaryDark">#317a00</color>
+    <!-- theme independent colors -->
     <color name="colorAccent">#607d8b</color>
     <color name="imagePlaceholder">#c2c2c2</color>
 
     <!-- light theme colors -->
-    <color name="themePrimaryLight">#ffffff</color>
-    <color name="themeSecondaryLight">#ffffff</color>
-    <color name="textPrimaryLight">#de000000</color>
-    <color name="textSecondaryLight">#99000000</color>
-    <color name="textBackgroundLight">#55000000</color>
-    <color name="iconColorLight">#99000000</color>
-    <color name="buttonBackgroundLight">#000000</color>
-    <color name="buttonTextColorLight">#ffffff</color>
-
+    <color name="button_background_light">#000000</color>
+    <color name="button_text_color_light">#ffffff</color>
 
     <!-- dark theme colors -->
-    <color name="themePrimaryDark">#121212</color>
-    <color name="themeSecondaryDark">#202020</color>
-    <color name="textPrimaryDark">#deffffff</color>
-    <color name="textSecondaryDark">#99ffffff</color>
-    <color name="textBackgroundDark">#55ffffff</color>
-    <color name="iconColorDark">#99ffffff</color>
-    <color name="buttonBackgroundDark">#ffffff</color>
-    <color name="buttonTextColorDark">#000000</color>
-    <color name="controlHighlightDark">#11ffffff</color>
-
-    <!-- player colors -->
-    <color name="player_white">#ffffff</color>
-
-    <color name="ic_launcher_background">#ffffff</color>
-    <color name="ic_splash_background">#ffffff</color>
+    <color name="button_background_dark">#ffffff</color>
+    <color name="button_text_color_dark">#000000</color>
 
     <!-- material3 colors -->
-    <color name="seed">#66aa00</color>
+    <color name="seed">#66aa00</color> <!-- base/primary color -->
     <color name="md_theme_light_primary">#3E6A00</color>
     <color name="md_theme_light_onPrimary">#FFFFFF</color>
     <color name="md_theme_light_primaryContainer">#99d853</color>
@@ -101,4 +74,14 @@
     <color name="md_theme_dark_surfaceTint">#92DA3E</color>
     <color name="md_theme_dark_outlineVariant">#44483D</color>
     <color name="md_theme_dark_scrim">#000000</color>
+
+    <!-- player colors -->
+    <color name="player_white">#ffffff</color>
+    <color name="player_text">#deffffff</color>
+    <color name="player_text_secondary">#99ffffff</color>
+
+    <!-- launcher/splash screen colors -->
+    <color name="ic_launcher_background">#ffffff</color>
+    <color name="ic_splash_background">#ffffff</color>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8b016f8..6cdc7f6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,96 +1,33 @@
 <resources>
     <!-- application themes -->
-    <style name="AppTheme.DayNight" parent="Theme.Material3.DayNight.NoActionBar">
-       <!-- <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorOnPrimary">@color/colorOnPrimary</item>
-        <item name="colorOutline">#ffffff</item>
-        <item name="colorSurfaceVariant">#c5c8ba</item>
-        <item name="colorOnPrimaryContainer">#2d5000</item>
-        <item name="colorPrimaryContainer">@color/colorSecondary</item>
-        <item name="colorSecondary">@color/colorSecondary</item>
-        <item name="colorTertiary">@color/colorTertiary</item>
-        <item name="materialButtonStyle">@style/Widget.App.Button.DayNight</item>
-        <item name="popupMenuStyle">@style/Widget.App.PopupMenu</item>
-        <item name="searchViewStyle">@style/SearchViewStyle</item>
-        <item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>-->
-    </style>
+<!--    <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">-->
+<!--        <item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>-->
 
-    <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
-        <!--        <item name="materialButtonStyle">@style/Widget.App.Button</item>-->
-        <item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>
-
-        <item name="colorPrimary">@color/seed</item>
-        <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
-        <item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
-        <item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
-        <item name="colorSecondary">@color/md_theme_light_secondary</item>
-        <item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
-        <item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
-        <item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
-        <item name="colorTertiary">@color/md_theme_light_tertiary</item>
-        <item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
-        <item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
-        <item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
-        <item name="colorError">@color/md_theme_light_error</item>
-        <item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
-        <item name="colorOnError">@color/md_theme_light_onError</item>
-        <item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
-        <item name="colorSurface">@color/md_theme_light_surface</item>
-        <item name="colorOnSurface">@color/md_theme_light_onSurface</item>
-        <item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
-        <item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
-        <item name="colorOutline">@color/md_theme_light_outline</item>
-        <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
-        <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
-        <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
-    </style>
-
-<!--    <style name="AppTheme.Light" parent="AppTheme">
-        <item name="themePrimary">@color/themePrimaryLight</item>
-        <item name="themeSecondary">@color/themeSecondaryLight</item>
-        <item name="textPrimary">@color/textPrimaryLight</item>
-        <item name="textSecondary">@color/textSecondaryLight</item>
-        <item name="android:textColor">@color/textPrimaryLight</item>
-        <item name="android:textColorPrimary">@color/textPrimaryLight</item>
-        <item name="android:textColorHint">@color/textSecondaryLight</item>
-        <item name="shapeTextBackground">@color/textBackgroundLight</item>
-        <item name="iconColor">@color/iconColorLight</item>
-        <item name="buttonBackground">@color/buttonBackgroundLight</item>
-    </style>
-
-    <style name="AppTheme.Dark" parent="AppTheme">
-        <item name="themePrimary">@color/themePrimaryDark</item>
-        <item name="themeSecondary">@color/themeSecondaryDark</item>
-        <item name="textPrimary">@color/textPrimaryDark</item>
-        <item name="textSecondary">@color/textSecondaryDark</item>
-        <item name="android:textColor">@color/textPrimaryDark</item>
-        <item name="android:textColorPrimary">@color/textPrimaryDark</item>
-        <item name="android:textColorHint">@color/textSecondaryDark</item>
-        <item name="shapeTextBackground">@color/textBackgroundDark</item>
-        <item name="iconColor">@color/iconColorDark</item>
-        <item name="buttonBackground">@color/buttonBackgroundDark</item>
-
-        <item name="materialAlertDialogTheme">@style/ThemeOverlay.App.MaterialAlertDialog.Dark</item>
-        &lt;!&ndash; change on click indicator color for manually set components &ndash;&gt;
-        <item name="colorControlHighlight">@color/controlHighlightDark</item>
-    </style>-->
-
-    <style name="Widget.App.Button.DayNight" parent="Widget.App.Button">
-        <item name="shapeAppearance">@style/ShapeAppearance.Material3.SmallComponent</item>
-    </style>
-
-    <!-- dialog themes -->
-    <style name="ThemeOverlay.App.MaterialAlertDialog.Dark" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorSurface">@color/themeSecondaryDark</item>
-        <item name="colorOnSurface">@color/textPrimaryDark</item>
-        <item name="android:colorControlNormal">@color/textSecondaryDark</item> <!-- Radio button unchecked-->
-        <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialog.App.Title.Text</item>
-    </style>
-
-    <style name="MaterialAlertDialog.App.Title.Text" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
-        <item name="android:textColor">?textPrimary</item>
-    </style>
+<!--        <item name="colorPrimary">@color/seed</item>-->
+<!--        <item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>-->
+<!--        <item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>-->
+<!--        <item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>-->
+<!--        <item name="colorSecondary">@color/md_theme_light_secondary</item>-->
+<!--        <item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>-->
+<!--        <item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>-->
+<!--        <item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>-->
+<!--        <item name="colorTertiary">@color/md_theme_light_tertiary</item>-->
+<!--        <item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>-->
+<!--        <item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>-->
+<!--        <item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>-->
+<!--        <item name="colorError">@color/md_theme_light_error</item>-->
+<!--        <item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>-->
+<!--        <item name="colorOnError">@color/md_theme_light_onError</item>-->
+<!--        <item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>-->
+<!--        <item name="colorSurface">@color/md_theme_light_surface</item>-->
+<!--        <item name="colorOnSurface">@color/md_theme_light_onSurface</item>-->
+<!--        <item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>-->
+<!--        <item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>-->
+<!--        <item name="colorOutline">@color/md_theme_light_outline</item>-->
+<!--        <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>-->
+<!--        <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>-->
+<!--        <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>-->
+<!--    </style>-->
 
     <!-- search view theme -->
     <style name="SearchViewStyle" parent="Widget.AppCompat.SearchView.ActionBar">
@@ -120,7 +57,7 @@
         <item name="windowSplashScreenAnimationDuration">200</item>
 
         <!-- Set the theme of the Activity that directly follows your splash screen. -->
-        <item name="postSplashScreenTheme">@style/AppTheme</item>  # Required.
+        <item name="postSplashScreenTheme">@style/AppTheme</item> <!-- Required -->
     </style>
 
     <!-- shapes -->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2486b8d..7f0b7bd 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="Widget.App.Button" parent="Widget.Material3.Button">
-        <item name="backgroundTint">@color/buttonBackgroundLight</item>
-        <item name="android:textColor">@color/buttonTextColorLight</item>
-        <item name="iconTint">@color/buttonTextColorLight</item>
+        <item name="backgroundTint">@color/button_background_light</item>
+        <item name="android:textColor">@color/button_text_color_light</item>
+        <item name="iconTint">@color/button_text_color_light</item>
     </style>
 
-    <style name="AppThemeGenerated" parent="Theme.Material3.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
 <!--        <item name="materialButtonStyle">@style/Widget.App.Button</item>-->
         <item name="materialCardViewStyle">?attr/materialCardViewElevatedStyle</item>