diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index dd9a28d08..49cd150ca 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -297,64 +297,64 @@
     <color name="purple_md_theme_dark_shadow">#000000</color>
     <color name="purple_md_theme_dark_surfaceTint">#FFACE7</color>
     <color name="purple_md_theme_dark_surfaceTintColor">#FFACE7</color>
-
-    <color name="black_white_theme_light_primary">#9B3489</color>
-    <color name="black_white_theme_light_onPrimary">#FFFFFF</color>
-    <color name="black_white_theme_light_primaryContainer">#FFD7F0</color>
-    <color name="black_white_theme_light_onPrimaryContainer">#3A0032</color>
-    <color name="black_white_theme_light_secondary">#6F5767</color>
-    <color name="black_white_theme_light_onSecondary">#FFFFFF</color>
-    <color name="black_white_theme_light_secondaryContainer">#F9DAEC</color>
-    <color name="black_white_theme_light_onSecondaryContainer">#281623</color>
-    <color name="black_white_theme_light_tertiary">#815341</color>
-    <color name="black_white_theme_light_onTertiary">#FFFFFF</color>
-    <color name="black_white_theme_light_tertiaryContainer">#FFDBCE</color>
-    <color name="black_white_theme_light_onTertiaryContainer">#321205</color>
-    <color name="black_white_theme_light_error">#BA1A1A</color>
-    <color name="black_white_theme_light_errorContainer">#FFDAD6</color>
-    <color name="black_white_theme_light_onError">#FFFFFF</color>
-    <color name="black_white_theme_light_onErrorContainer">#410002</color>
-    <color name="black_white_theme_light_background">#FFFBFF</color>
-    <color name="black_white_theme_light_onBackground">#1F1A1D</color>
-    <color name="black_white_theme_light_surface">#FFFBFF</color>
-    <color name="black_white_theme_light_onSurface">#1F1A1D</color>
-    <color name="black_white_theme_light_surfaceVariant">#EFDEE6</color>
-    <color name="black_white_theme_light_onSurfaceVariant">#4F444A</color>
-    <color name="black_white_theme_light_outline">#81737B</color>
-    <color name="black_white_theme_light_inverseOnSurface">#F8EEF1</color>
-    <color name="black_white_theme_light_inverseSurface">#342F32</color>
-    <color name="black_white_theme_light_inversePrimary">#FFACE7</color>
+                                                                                 // Colors without comments seem to be not used
+    <color name="black_white_theme_light_primary">#616161</color>                // LibreTube Logo, Hyperlinks and on-off switch (on status: filling) (also influence on the navbar colour)
+    <color name="black_white_theme_light_onPrimary">#FFFFFF</color>              // on-off switch (on status: circle)
+    <color name="black_white_theme_light_primaryContainer">#DCDCDC</color>
+    <color name="black_white_theme_light_onPrimaryContainer">#272727</color>
+    <color name="black_white_theme_light_secondary">#797979</color>              // Headline Text
+    <color name="black_white_theme_light_onSecondary">#B39494</color>            // SponsorBlock marker
+    <color name="black_white_theme_light_secondaryContainer">#DCDCDC</color>     // NavBar Icon Container (selected)
+    <color name="black_white_theme_light_onSecondaryContainer">#272727</color>   // Navbar Icon (selected)
+    <color name="black_white_theme_light_tertiary">#DCDCDC</color>
+    <color name="black_white_theme_light_onTertiary">#272727</color>
+    <color name="black_white_theme_light_tertiaryContainer">#DCDCDC</color>
+    <color name="black_white_theme_light_onTertiaryContainer">#272727</color>
+    <color name="black_white_theme_light_error">#DCDCDC</color>
+    <color name="black_white_theme_light_errorContainer">#DCDCDC</color>
+    <color name="black_white_theme_light_onError">#272727</color>
+    <color name="black_white_theme_light_onErrorContainer">#272727</color>
+    <color name="black_white_theme_light_background">#FFFFFF</color>             // Background (Settings and home)
+    <color name="black_white_theme_light_onBackground">#272727</color>
+    <color name="black_white_theme_light_surface">#FFFFFF</color>                // Navbar and Flyouts (uses also the "primary" color)
+    <color name="black_white_theme_light_onSurface">#272727</color>              // NavBar Text (selected) and some Flyout Headlines
+    <color name="black_white_theme_light_surfaceVariant">#DCDCDC</color>         // on-off switch (off status: filling)
+    <color name="black_white_theme_light_onSurfaceVariant">#353535</color>       // text in Flyouts, Animation color (subscription button)
+    <color name="black_white_theme_light_outline">#797979</color>                // on-off switch (off status: border)
+    <color name="black_white_theme_light_inverseOnSurface">#DCDCDC</color>
+    <color name="black_white_theme_light_inverseSurface">#606060</color>
+    <color name="black_white_theme_light_inversePrimary">#C1C1C1</color>
     <color name="black_white_theme_light_shadow">#000000</color>
-    <color name="black_white_theme_light_surfaceTint">#9B3489</color>
-    <color name="black_white_theme_light_surfaceTintColor">#9B3489</color>
-    <color name="black_white_theme_dark_primary">#FFACE7</color>
-    <color name="black_white_theme_dark_onPrimary">#5E0052</color>
-    <color name="black_white_theme_dark_primaryContainer">#7E186F</color>
-    <color name="black_white_theme_dark_onPrimaryContainer">#FFD7F0</color>
-    <color name="black_white_theme_dark_secondary">#DCBED0</color>
-    <color name="black_white_theme_dark_onSecondary">#3E2A38</color>
-    <color name="black_white_theme_dark_secondaryContainer">#56404F</color>
-    <color name="black_white_theme_dark_onSecondaryContainer">#F9DAEC</color>
-    <color name="black_white_theme_dark_tertiary">#F5B9A2</color>
-    <color name="black_white_theme_dark_onTertiary">#4B2617</color>
-    <color name="black_white_theme_dark_tertiaryContainer">#663C2B</color>
-    <color name="black_white_theme_dark_onTertiaryContainer">#FFDBCE</color>
-    <color name="black_white_theme_dark_error">#FFB4AB</color>
-    <color name="black_white_theme_dark_errorContainer">#93000A</color>
-    <color name="black_white_theme_dark_onError">#690005</color>
-    <color name="black_white_theme_dark_onErrorContainer">#FFDAD6</color>
-    <color name="black_white_theme_dark_background">#1F1A1D</color>
-    <color name="black_white_theme_dark_onBackground">#EAE0E3</color>
-    <color name="black_white_theme_dark_surface">#1F1A1D</color>
-    <color name="black_white_theme_dark_onSurface">#EAE0E3</color>
-    <color name="black_white_theme_dark_surfaceVariant">#4F444A</color>
-    <color name="black_white_theme_dark_onSurfaceVariant">#D2C2CA</color>
-    <color name="black_white_theme_dark_outline">#9B8D94</color>
-    <color name="black_white_theme_dark_inverseOnSurface">#1F1A1D</color>
-    <color name="black_white_theme_dark_inverseSurface">#EAE0E3</color>
-    <color name="black_white_theme_dark_inversePrimary">#9B3489</color>
+    <color name="black_white_theme_light_surfaceTint">#717171</color>
+    <color name="black_white_theme_light_surfaceTintColor">#717171</color>
+    <color name="black_white_theme_dark_primary">#AAAAAA</color>                // LibreTube Logo, Hyperlinks and on-off switch (on status: filling) (also influence on the navbar colour)
+    <color name="black_white_theme_dark_onPrimary">#1C1C1C</color>              // on-off switch (on status: circle)
+    <color name="black_white_theme_dark_primaryContainer">#4D4D4D</color>
+    <color name="black_white_theme_dark_onPrimaryContainer">#A3A3A3</color>
+    <color name="black_white_theme_dark_secondary">#A3A3A3</color>              // Headline Text
+    <color name="black_white_theme_dark_onSecondary">#886A6A</color>            // SponsorBlock marker
+    <color name="black_white_theme_dark_secondaryContainer">#4D4D4D</color>     // NavBar Icon Container (selected)
+    <color name="black_white_theme_dark_onSecondaryContainer">#A3A3A3</color>   // Navbar Icon Color (selected)
+    <color name="black_white_theme_dark_tertiary">#4D4D4D</color>
+    <color name="black_white_theme_dark_onTertiary">#A3A3A3</color>
+    <color name="black_white_theme_dark_tertiaryContainer">#4D4D4D</color>
+    <color name="black_white_theme_dark_onTertiaryContainer">#A3A3A3</color>
+    <color name="black_white_theme_dark_error">#4D4D4D</color>
+    <color name="black_white_theme_dark_errorContainer">#4D4D4D</color>
+    <color name="black_white_theme_dark_onError">#A3A3A3</color>
+    <color name="black_white_theme_dark_onErrorContainer">#A3A3A3</color>
+    <color name="black_white_theme_dark_background">#1C1C1C</color>             // Background (Settings and home)
+    <color name="black_white_theme_dark_onBackground">#A3A3A3</color>
+    <color name="black_white_theme_dark_surface">#1C1C1C</color>                // Navbar and Flyouts (uses also the "primary" color) 252525
+    <color name="black_white_theme_dark_onSurface">#A3A3A3</color>              // NavBar Text (selected) and some Flyout Headlines
+    <color name="black_white_theme_dark_surfaceVariant">#4D4D4D</color>         // on-off switch (off status: filling)
+    <color name="black_white_theme_dark_onSurfaceVariant">#A3A3A3</color>       // text in Flyouts, Animation color (subscription button)
+    <color name="black_white_theme_dark_outline">#A3A3A3</color>                // on-off switch (off status: border)
+    <color name="black_white_theme_dark_inverseOnSurface">#404040</color>
+    <color name="black_white_theme_dark_inverseSurface">#C3C3C3</color>
+    <color name="black_white_theme_dark_inversePrimary">#707070</color>
     <color name="black_white_theme_dark_shadow">#000000</color>
-    <color name="black_white_theme_dark_surfaceTint">#FFACE7</color>
-    <color name="black_white_theme_dark_surfaceTintColor">#FFACE7</color>
+    <color name="black_white_theme_dark_surfaceTint">#C3C3C3</color>
+    <color name="black_white_theme_dark_surfaceTintColor">#C3C3C3</color>
 
 </resources>
\ No newline at end of file