diff --git a/google/themes/DarknessMeister/AndroidManifest.xml b/google/themes/DarknessMeister/AndroidManifest.xml
index d395e1f..6df6222 100644
--- a/google/themes/DarknessMeister/AndroidManifest.xml
+++ b/google/themes/DarknessMeister/AndroidManifest.xml
@@ -8,5 +8,5 @@
 
 
     <application android:hasCode="false"
-                 android:label="DarknessMeister" />
+                 android:label="Darkness Meister" />
 </manifest>
diff --git a/google/themes/DarknessMeister/res/values/colors.xml b/google/themes/DarknessMeister/res/values/colors.xml
index c27c602..662c463 100644
--- a/google/themes/DarknessMeister/res/values/colors.xml
+++ b/google/themes/DarknessMeister/res/values/colors.xml
@@ -14,29 +14,24 @@
     <color name="dark_blue_violet">#ff263288</color>
 
     <!-- dark_blue_light -->
-    <color name="primary_device_default_settings">#ff222a33</color> <!-- QS -->
-    <color name="primary_dark_device_default_dark">#ff222a33</color> <!-- original black -->
-    <color name="primary_dark_material_settings">#ff222a33</color> <!-- settings grey 950 -->
-    <color name="suggestion_condition_background">#ff222a33</color>
-    <color name="secondary_device_default_settings_light">#ff222a33</color>  <!-- settings entity, ie battery top view background -->
+    <color name="primary_dark_device_default_settings">#ff222a33</color> <!-- Main BG settings -->
+    <color name="background_material_dark">#ff222a33</color> <!-- some kind of overlay of the main bg -->
     <color name="primary_dark_device_default_light">#ff222a33</color>
+    <color name="secondary_device_default_settings">#ff222a33</color> <!-- Edit Quick Settings bottom parent of secondary_material_settings -->
+    <color name="condition_card_background">#ff222a33</color>
 
     <!-- dark_blue_dark -->
     <color name="primary_dark_material_settings_light">#ff111519</color> <!-- settings statusbar -->
-    <color name="background_material_dark">#ff111519</color> <!-- bg material grey 850 -->
-    <color name="primary_dark_device_default_settings">#ff111519</color> <!-- parent of primary_dark_material_settings -->
-    <color name="secondary_device_default_settings">#ff111519</color> <!-- Edit Quick Settings bottom parent of secondary_material_settings -->
-    <color name="primary_device_default_dark">#ff111519</color> <!-- parent of primary_material_dark -->
-    <color name="primary_device_default_light">#ff111519</color> <!-- parent of primary_material_light -->
-    <color name="primary_material_settings">#ff111519</color>
-    <color name="primary_material_settings_light">#ff111519</color>
-    <color name="condition_card_background">#ff111519</color>
+
+    <color name="suggestion_condition_background">#ff111519</color>
+    <color name="secondary_device_default_settings_light">#ff111519</color>  <!-- settings entity, ie battery top view background -->
+    <color name="primary_device_default_settings">#ff111519</color> <!-- QS -->
 
     <color name="dialog_background_material">#ff111519</color>
 
     <!-- accents -->
-    <color name="accent_device_default_light">#ff5fabff</color>
-    <color name="accent_device_default_dark">#ff78b8ff</color>
+    <color name="accent_device_default_light">#ff78b8ff</color>
+    <color name="accent_device_default_dark">#ff5fabff</color>
     <color name="colorAccent">#ffabd3ff</color>
 
     <!-- specials -->
@@ -44,7 +39,9 @@
     <color name="global_wifi_details_icon_color">#a0ffffff</color> <!-- settings/wifi/details iconsy -->
 
     <color name="chooser_service_row_background_color">#ff111519</color> <!-- resolver -->
-    <color name="primary_text_inverse_when_activated_material">#a0989898</color> <!-- very rare -->
+<!--    <color name="primary_text_inverse_when_activated_material">#a0989898</color> --><!-- very rare -->
+    <color name="primary_text_disable_only_material_dark">#ff00d3ff</color> <!-- display/font or bt details -->
+
 
     <!-- qs -->
     <color name="material_grey_900">#ff111519</color>  <!-- find a better way to do this -->
diff --git a/google/themes/DarknessMeister/res/values/settings.xml b/google/themes/DarknessMeister/res/values/settings.xml
index 51a9902..2f1be76 100644
--- a/google/themes/DarknessMeister/res/values/settings.xml
+++ b/google/themes/DarknessMeister/res/values/settings.xml
@@ -3,15 +3,15 @@
     <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.Material">
         <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
         <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
-        <item name="android:colorPrimary">@*android:color/primary_device_default_settings_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
         <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
         <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
         <item name="android:colorControlHighlight">@*android:color/accent_device_default_dark</item>
         <item name="android:colorEdgeEffect">@*android:color/accent_device_default_dark</item>
         <item name="android:navigationBarDividerColor">#00000000</item>
-        <item name="android:navigationBarColor">@*android:color/primary_device_default_dark</item>
+        <item name="android:navigationBarColor">@*android:color/primary_dark_device_default_settings</item>
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 </resources>
diff --git a/google/themes/DarknessMeister/res/values/themes.xml b/google/themes/DarknessMeister/res/values/themes.xml
index b2a69e1..5be6635 100644
--- a/google/themes/DarknessMeister/res/values/themes.xml
+++ b/google/themes/DarknessMeister/res/values/themes.xml
@@ -4,9 +4,11 @@
     inverse color profile. -->
     <style name="Theme.DeviceDefault.Light.DarkActionBar" parent="@*android:style/Theme.Material.Light.DarkActionBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_dark</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -18,9 +20,11 @@
     <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
     <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <!-- package installer acitivity example -->
         <item name="android:textColorPrimary">#ffffffff</item>
@@ -36,9 +40,11 @@
          This theme sets {@link android.R.attr#windowFullscreen} to true.  -->
     <style name="Theme.DeviceDefault.Light.NoActionBar.Fullscreen" parent="@*android:style/Theme.Material.NoActionBar.Fullscreen">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -54,9 +60,11 @@
     to true. -->
     <style name="Theme.DeviceDefault.Light.NoActionBar.Overscan" parent="@*android:style/Theme.Material.NoActionBar.Overscan">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -71,9 +79,11 @@
          {@link android.R.attr#windowTranslucentNavigation} to true. -->
     <style name="Theme.DeviceDefault.Light.NoActionBar.TranslucentDecor" parent="@*android:style/Theme.Material.NoActionBar.TranslucentDecor">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -100,18 +110,22 @@
         <item name="android:textColorAlertDialogListItem">#ffffffff</item>
 
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
     regular dialog. -->
     <style name="Theme.DeviceDefault.Light.Dialog.MinWidth" parent="@*android:style/Theme.Material.Dialog.MinWidth">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -124,9 +138,11 @@
      <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
     <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar" parent="@*android:style/Theme.Material.Dialog.NoActionBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -140,9 +156,11 @@
     width for a regular dialog. -->
     <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.MinWidth" parent="@*android:style/Theme.Material.Dialog.NoActionBar.MinWidth">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -160,9 +178,11 @@
         <item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
 
         <!-- Color pandroid:alette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -179,9 +199,11 @@
         <item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
 
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -196,9 +218,11 @@
     screens (small, normal) or as a dialog on larger screens (large, xlarge). -->
     <style name="Theme.DeviceDefault.Light.DialogWhenLarge" parent="@*android:style/Theme.Material.DialogWhenLarge">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -213,9 +237,11 @@
     xlarge). -->
     <style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar" parent="@*android:style/Theme.Material.DialogWhenLarge.NoActionBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -227,9 +253,11 @@
     <!-- DeviceDefault light theme for a presentation window on a secondary display. -->
     <style name="Theme.DeviceDefault.Light.Dialog.Presentation" parent="@*android:style/Theme.Material.Dialog.Presentation">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -244,9 +272,11 @@
     the window floating, with a transparent background, and turns off dimming behind the window. -->
     <style name="Theme.DeviceDefault.Light.Panel" parent="@*android:style/Theme.Material.Panel">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -260,9 +290,11 @@
         <item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
 
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -274,9 +306,11 @@
 
     <style name="Theme.DeviceDefault.Light.SearchBar" parent="@*android:style/Theme.Material.SearchBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -288,9 +322,11 @@
 
     <style name="Theme.DeviceDefault.Light.Voice" parent="@*android:style/Theme.Material.Voice">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -306,6 +342,7 @@
         <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
         <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
         <item name="android:colorControlNormal">?*android:attr/textColorPrimary</item>
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -329,10 +366,11 @@
     <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
     <style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -344,10 +382,11 @@
 
     <style name="Theme.DeviceDefault.Settings.Dialog" parent="@*android:style/Theme.Material.Settings.Dialog">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
         <item name="android:colorBackground">@*android:color/primary_device_default_settings</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
@@ -360,10 +399,11 @@
 
     <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -376,10 +416,11 @@
 
     <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -409,9 +450,11 @@
         <item name="android:listPreferredItemPaddingEnd">?*android:attr/dialogPreferredPadding</item>
 
         <!-- Color pandroid:alette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
diff --git a/google/themes/SluttyPink/AndroidManifest.xml b/google/themes/SluttyPink/AndroidManifest.xml
index 79b7d52..9fb9105 100644
--- a/google/themes/SluttyPink/AndroidManifest.xml
+++ b/google/themes/SluttyPink/AndroidManifest.xml
@@ -8,5 +8,5 @@
 
 
     <application android:hasCode="false"
-                 android:label="SluttyPink" />
+                 android:label="Slutty Pink" />
 </manifest>
diff --git a/google/themes/SluttyPink/res/values/colors.xml b/google/themes/SluttyPink/res/values/colors.xml
index fccc0a6..693ad40 100644
--- a/google/themes/SluttyPink/res/values/colors.xml
+++ b/google/themes/SluttyPink/res/values/colors.xml
@@ -14,23 +14,18 @@
     <color name="dark_blue_violet">#ff263288</color>
 
     <!-- dark_blue_light -->
-    <color name="primary_device_default_settings">#ff182a33</color> <!-- QS -->
-    <color name="primary_dark_device_default_dark">#ff182a33</color> <!-- original black -->
-    <color name="primary_dark_material_settings">#ff182a33</color> <!-- settings grey 950 -->
-    <color name="suggestion_condition_background">#ff182a33</color>
-    <color name="secondary_device_default_settings_light">#ff182a33</color>  <!-- settings entity, ie battery top view background -->
+    <color name="primary_dark_device_default_settings">#ff182a33</color> <!-- Main BG settings -->
+    <color name="background_material_dark">#ff182a33</color> <!-- some kind of overlay of the main bg -->
     <color name="primary_dark_device_default_light">#ff182a33</color>
+    <color name="secondary_device_default_settings">#ff182a33</color> <!-- Edit Quick Settings bottom parent of secondary_material_settings -->
+    <color name="condition_card_background">#ff182a33</color>
 
     <!-- dark_blue_dark -->
     <color name="primary_dark_material_settings_light">#ff0d2029</color> <!-- settings statusbar -->
-    <color name="background_material_dark">#ff0d2029</color> <!-- bg material grey 850 -->
-    <color name="primary_dark_device_default_settings">#ff0d2029</color> <!-- parent of primary_dark_material_settings -->
-    <color name="secondary_device_default_settings">#ff0d2029</color> <!-- Edit Quick Settings bottom parent of secondary_material_settings -->
-    <color name="primary_device_default_dark">#ff0d2029</color> <!-- parent of primary_material_dark -->
-    <color name="primary_device_default_light">#ff0d2029</color> <!-- parent of primary_material_light -->
-    <color name="primary_material_settings">#ff0d2029</color>
-    <color name="primary_material_settings_light">#ff0d2029</color>
-    <color name="condition_card_background">#ff0d2029</color>
+
+    <color name="suggestion_condition_background">#ff0d2029</color>
+    <color name="secondary_device_default_settings_light">#ff0d2029</color>  <!-- settings entity, ie battery top view background -->
+    <color name="primary_device_default_settings">#ff0d2029</color> <!-- QS -->
 
     <color name="dialog_background_material">#ff0d2029</color>
 
@@ -44,7 +39,8 @@
     <color name="global_wifi_details_icon_color">#a0ffffff</color> <!-- settings/wifi/details iconsy -->
 
     <color name="chooser_service_row_background_color">#ff0d2029</color> <!-- resolver -->
-    <color name="primary_text_inverse_when_activated_material">#a0989898</color> <!-- very rare -->
+<!--    <color name="primary_text_inverse_when_activated_material">#ff99ffc5</color> --> <!-- very rare -->
+    <color name="primary_text_disable_only_material_dark">#ff00ffc5</color>
 
     <!-- qs -->
     <color name="material_grey_900">#ff0d2029</color>  <!-- find a better way to do this -->
diff --git a/google/themes/SluttyPink/res/values/settings.xml b/google/themes/SluttyPink/res/values/settings.xml
index 51a9902..2f1be76 100644
--- a/google/themes/SluttyPink/res/values/settings.xml
+++ b/google/themes/SluttyPink/res/values/settings.xml
@@ -3,15 +3,15 @@
     <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.Material">
         <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
         <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
-        <item name="android:colorPrimary">@*android:color/primary_device_default_settings_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
         <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
         <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
         <item name="android:colorControlHighlight">@*android:color/accent_device_default_dark</item>
         <item name="android:colorEdgeEffect">@*android:color/accent_device_default_dark</item>
         <item name="android:navigationBarDividerColor">#00000000</item>
-        <item name="android:navigationBarColor">@*android:color/primary_device_default_dark</item>
+        <item name="android:navigationBarColor">@*android:color/primary_dark_device_default_settings</item>
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 </resources>
diff --git a/google/themes/SluttyPink/res/values/themes.xml b/google/themes/SluttyPink/res/values/themes.xml
index da88131..dd9be35 100644
--- a/google/themes/SluttyPink/res/values/themes.xml
+++ b/google/themes/SluttyPink/res/values/themes.xml
@@ -4,8 +4,9 @@
     inverse color profile. -->
     <style name="Theme.DeviceDefault.Light.DarkActionBar" parent="@*android:style/Theme.Material.Light.DarkActionBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_dark</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
@@ -13,14 +14,17 @@
         <item name="android:textColorTertiary">#b3f5f5f5</item>
         <item name="android:textColorHint">#ff999999</item>
         <item name="android:textColorAlertDialogListItem">#ffffffff</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
     </style>
     <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
     <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <!-- package installer acitivity example -->
         <item name="android:textColorPrimary">#ffffffff</item>
@@ -36,9 +40,11 @@
          This theme sets {@link android.R.attr#windowFullscreen} to true.  -->
     <style name="Theme.DeviceDefault.Light.NoActionBar.Fullscreen" parent="@*android:style/Theme.Material.NoActionBar.Fullscreen">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -54,9 +60,11 @@
     to true. -->
     <style name="Theme.DeviceDefault.Light.NoActionBar.Overscan" parent="@*android:style/Theme.Material.NoActionBar.Overscan">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -71,8 +79,9 @@
          {@link android.R.attr#windowTranslucentNavigation} to true. -->
     <style name="Theme.DeviceDefault.Light.NoActionBar.TranslucentDecor" parent="@*android:style/Theme.Material.NoActionBar.TranslucentDecor">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
@@ -80,6 +89,7 @@
         <item name="android:textColorTertiary">#b3f5f5f5</item>
         <item name="android:textColorHint">#ff999999</item>
         <item name="android:textColorAlertDialogListItem">#ffffffff</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
     </style>
 
@@ -100,18 +110,22 @@
         <item name="android:textColorAlertDialogListItem">#ffffffff</item>
 
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
     regular dialog. -->
     <style name="Theme.DeviceDefault.Light.Dialog.MinWidth" parent="@*android:style/Theme.Material.Dialog.MinWidth">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -124,9 +138,11 @@
      <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
     <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar" parent="@*android:style/Theme.Material.Dialog.NoActionBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -140,9 +156,11 @@
     width for a regular dialog. -->
     <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.MinWidth" parent="@*android:style/Theme.Material.Dialog.NoActionBar.MinWidth">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -160,9 +178,11 @@
         <item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
 
         <!-- Color pandroid:alette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -179,9 +199,11 @@
         <item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
 
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -196,9 +218,11 @@
     screens (small, normal) or as a dialog on larger screens (large, xlarge). -->
     <style name="Theme.DeviceDefault.Light.DialogWhenLarge" parent="@*android:style/Theme.Material.DialogWhenLarge">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -213,9 +237,11 @@
     xlarge). -->
     <style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar" parent="@*android:style/Theme.Material.DialogWhenLarge.NoActionBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -227,9 +253,11 @@
     <!-- DeviceDefault light theme for a presentation window on a secondary display. -->
     <style name="Theme.DeviceDefault.Light.Dialog.Presentation" parent="@*android:style/Theme.Material.Dialog.Presentation">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -244,9 +272,11 @@
     the window floating, with a transparent background, and turns off dimming behind the window. -->
     <style name="Theme.DeviceDefault.Light.Panel" parent="@*android:style/Theme.Material.Panel">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -260,9 +290,11 @@
         <item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
 
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -274,9 +306,11 @@
 
     <style name="Theme.DeviceDefault.Light.SearchBar" parent="@*android:style/Theme.Material.SearchBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -288,9 +322,11 @@
 
     <style name="Theme.DeviceDefault.Light.Voice" parent="@*android:style/Theme.Material.Voice">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -312,6 +348,21 @@
         <item name="android:textColorTertiary">#b3f5f5f5</item>
         <item name="android:textColorHint">#ff999999</item>
         <item name="android:textColorAlertDialogListItem">#ffffffff</item>
+        <item name="android:colorBackgroundFloating">#ff182a33</item>
+    </style>
+
+    <style name="qs_base" parent="@*android:style/Theme.DeviceDefault">
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
+        <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
+        <item name="android:textColorPrimary">#ffffffff</item>
+        <item name="android:textColorSecondary">#fff5f5f5</item>
+        <item name="android:textColorTertiary">#b3f5f5f5</item>
+        <item name="android:textColorHint">#ff999999</item>
+        <item name="android:textColorAlertDialogListItem">#ffffffff</item>
+        <item name="android:colorBackgroundFloating">#ff182a33</item>
     </style>
 
     <style name="Theme.DeviceDefault.QuickSettings.Dialog" parent="@*android:style/Theme.DeviceDefault.Light.Dialog">
@@ -319,6 +370,7 @@
         <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
         <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
         <item name="android:textColorTertiary">#b3f5f5f5</item>
@@ -329,10 +381,11 @@
     <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
     <style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -344,10 +397,11 @@
 
     <style name="Theme.DeviceDefault.Settings.Dialog" parent="@*android:style/Theme.Material.Settings.Dialog">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
         <item name="android:colorBackground">@*android:color/primary_device_default_settings</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
@@ -360,10 +414,11 @@
 
     <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -376,10 +431,11 @@
 
     <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -409,9 +465,11 @@
         <item name="android:listPreferredItemPaddingEnd">?*android:attr/dialogPreferredPadding</item>
 
         <!-- Color pandroid:alette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
diff --git a/google/themes/SmokedGreen/AndroidManifest.xml b/google/themes/SmokedGreen/AndroidManifest.xml
index aa288bb..7ba3c74 100644
--- a/google/themes/SmokedGreen/AndroidManifest.xml
+++ b/google/themes/SmokedGreen/AndroidManifest.xml
@@ -8,5 +8,5 @@
 
 
     <application android:hasCode="false"
-                 android:label="SmokedGreen" />
+                 android:label="Smoked Green" />
 </manifest>
diff --git a/google/themes/SmokedGreen/res/values/colors.xml b/google/themes/SmokedGreen/res/values/colors.xml
index 014b312..42300d3 100644
--- a/google/themes/SmokedGreen/res/values/colors.xml
+++ b/google/themes/SmokedGreen/res/values/colors.xml
@@ -14,29 +14,24 @@
     <color name="dark_blue_violet">#ff263288</color>
 
     <!-- dark_blue_light -->
-    <color name="primary_device_default_settings">#ff373c37</color> <!-- QS -->
-    <color name="primary_dark_device_default_dark">#ff373c37</color> <!-- original black -->
-    <color name="primary_dark_material_settings">#ff373c37</color> <!-- settings grey 950 -->
-    <color name="suggestion_condition_background">#ff373c37</color>
-    <color name="secondary_device_default_settings_light">#ff373c37</color>  <!-- settings entity, ie battery top view background -->
+    <color name="primary_dark_device_default_settings">#ff373c37</color> <!-- Main BG settings -->
+    <color name="background_material_dark">#ff373c37</color> <!-- some kind of overlay of the main bg -->
     <color name="primary_dark_device_default_light">#ff373c37</color>
+    <color name="secondary_device_default_settings">#ff373c37</color> <!-- Edit Quick Settings bottom parent of secondary_material_settings -->
+    <color name="condition_card_background">#ff373c37</color>
 
     <!-- dark_blue_dark -->
     <color name="primary_dark_material_settings_light">#ff212721</color> <!-- settings statusbar -->
-    <color name="background_material_dark">#ff212721</color> <!-- bg material grey 850 -->
-    <color name="primary_dark_device_default_settings">#ff212721</color> <!-- parent of primary_dark_material_settings -->
-    <color name="secondary_device_default_settings">#ff212721</color> <!-- Edit Quick Settings bottom parent of secondary_material_settings -->
-    <color name="primary_device_default_dark">#ff212721</color> <!-- parent of primary_material_dark -->
-    <color name="primary_device_default_light">#ff212721</color> <!-- parent of primary_material_light -->
-    <color name="primary_material_settings">#ff212721</color>
-    <color name="primary_material_settings_light">#ff212721</color>
-    <color name="condition_card_background">#ff212721</color>
+
+    <color name="suggestion_condition_background">#ff212721</color>
+    <color name="secondary_device_default_settings_light">#ff212721</color>  <!-- settings entity, ie battery top view background -->
+    <color name="primary_device_default_settings">#ff212721</color> <!-- QS -->
 
     <color name="dialog_background_material">#ff212721</color>
 
     <!-- accents -->
-    <color name="accent_device_default_light">#ff00C853</color>
-    <color name="accent_device_default_dark">#ff69F0AE</color>
+    <color name="accent_device_default_light">#ff69F0AE</color>
+    <color name="accent_device_default_dark">#ff00C853</color>
     <color name="colorAccent">#ff00E676</color>
 
     <!-- specials -->
@@ -44,7 +39,8 @@
     <color name="global_wifi_details_icon_color">#a0ffffff</color> <!-- settings/wifi/details iconsy -->
 
     <color name="chooser_service_row_background_color">#ff212721</color> <!-- resolver -->
-    <color name="primary_text_inverse_when_activated_material">#a0989898</color> <!-- very rare -->
+<!--    <color name="primary_text_inverse_when_activated_material">#a0989898</color> --> <!-- very rare -->
+    <color name="primary_text_disable_only_material_dark">#ffffE676</color> <!-- display/font or bt details -->
 
     <!-- qs -->
     <color name="material_grey_900">#ff212721</color>  <!-- find a better way to do this -->
diff --git a/google/themes/SmokedGreen/res/values/settings.xml b/google/themes/SmokedGreen/res/values/settings.xml
index 51a9902..2f1be76 100644
--- a/google/themes/SmokedGreen/res/values/settings.xml
+++ b/google/themes/SmokedGreen/res/values/settings.xml
@@ -3,15 +3,15 @@
     <style name="Theme.DeviceDefault.Settings" parent="@*android:style/Theme.Material">
         <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>
         <item name="android:popupTheme">@*android:style/ThemeOverlay.DeviceDefault.Popup.Light</item>
-        <item name="android:colorPrimary">@*android:color/primary_device_default_settings_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
         <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
         <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
         <item name="android:colorControlHighlight">@*android:color/accent_device_default_dark</item>
         <item name="android:colorEdgeEffect">@*android:color/accent_device_default_dark</item>
         <item name="android:navigationBarDividerColor">#00000000</item>
-        <item name="android:navigationBarColor">@*android:color/primary_device_default_dark</item>
+        <item name="android:navigationBarColor">@*android:color/primary_dark_device_default_settings</item>
         <item name="android:windowLightNavigationBar">false</item>
     </style>
 </resources>
diff --git a/google/themes/SmokedGreen/res/values/themes.xml b/google/themes/SmokedGreen/res/values/themes.xml
index c08dc62..efbe4c0 100644
--- a/google/themes/SmokedGreen/res/values/themes.xml
+++ b/google/themes/SmokedGreen/res/values/themes.xml
@@ -4,9 +4,11 @@
     inverse color profile. -->
     <style name="Theme.DeviceDefault.Light.DarkActionBar" parent="@*android:style/Theme.Material.Light.DarkActionBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_dark</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_dark</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -18,9 +20,11 @@
     <!-- Variant of {@link #Theme_DeviceDefault_Light} with no action bar -->
     <style name="Theme.DeviceDefault.Light.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <!-- package installer acitivity example -->
         <item name="android:textColorPrimary">#ffffffff</item>
@@ -36,9 +40,11 @@
          This theme sets {@link android.R.attr#windowFullscreen} to true.  -->
     <style name="Theme.DeviceDefault.Light.NoActionBar.Fullscreen" parent="@*android:style/Theme.Material.NoActionBar.Fullscreen">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -54,9 +60,11 @@
     to true. -->
     <style name="Theme.DeviceDefault.Light.NoActionBar.Overscan" parent="@*android:style/Theme.Material.NoActionBar.Overscan">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -71,9 +79,11 @@
          {@link android.R.attr#windowTranslucentNavigation} to true. -->
     <style name="Theme.DeviceDefault.Light.NoActionBar.TranslucentDecor" parent="@*android:style/Theme.Material.NoActionBar.TranslucentDecor">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -100,18 +110,22 @@
         <item name="android:textColorAlertDialogListItem">#ffffffff</item>
 
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
     </style>
 
     <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} that has a nice minimum width for a
     regular dialog. -->
     <style name="Theme.DeviceDefault.Light.Dialog.MinWidth" parent="@*android:style/Theme.Material.Dialog.MinWidth">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -124,9 +138,11 @@
      <!-- Variant of {@link #Theme_DeviceDefault_Light_Dialog} without an action bar -->
     <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar" parent="@*android:style/Theme.Material.Dialog.NoActionBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -140,9 +156,11 @@
     width for a regular dialog. -->
     <style name="Theme.DeviceDefault.Light.Dialog.NoActionBar.MinWidth" parent="@*android:style/Theme.Material.Dialog.NoActionBar.MinWidth">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -160,9 +178,11 @@
         <item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
 
         <!-- Color pandroid:alette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -179,9 +199,11 @@
         <item name="*android:windowFixedHeightMinor">@*android:dimen/dialog_fixed_height_minor</item>
 
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -196,9 +218,11 @@
     screens (small, normal) or as a dialog on larger screens (large, xlarge). -->
     <style name="Theme.DeviceDefault.Light.DialogWhenLarge" parent="@*android:style/Theme.Material.DialogWhenLarge">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -213,9 +237,11 @@
     xlarge). -->
     <style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar" parent="@*android:style/Theme.Material.DialogWhenLarge.NoActionBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -227,9 +253,11 @@
     <!-- DeviceDefault light theme for a presentation window on a secondary display. -->
     <style name="Theme.DeviceDefault.Light.Dialog.Presentation" parent="@*android:style/Theme.Material.Dialog.Presentation">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -244,9 +272,11 @@
     the window floating, with a transparent background, and turns off dimming behind the window. -->
     <style name="Theme.DeviceDefault.Light.Panel" parent="@*android:style/Theme.Material.Panel">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -260,9 +290,11 @@
         <item name="android:windowTitleStyle">@*android:style/DialogWindowTitle.DeviceDefault</item>
 
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -274,9 +306,11 @@
 
     <style name="Theme.DeviceDefault.Light.SearchBar" parent="@*android:style/Theme.Material.SearchBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -288,9 +322,11 @@
 
     <style name="Theme.DeviceDefault.Light.Voice" parent="@*android:style/Theme.Material.Voice">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -306,6 +342,7 @@
         <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
         <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
         <item name="android:colorControlNormal">?*android:attr/textColorPrimary</item>
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -329,10 +366,11 @@
     <!-- Variant of {@link #Theme_DeviceDefault_Settings_Dark} with no action bar -->
     <style name="Theme.DeviceDefault.Settings.Dark.NoActionBar" parent="@*android:style/Theme.Material.NoActionBar">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_dark</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -344,10 +382,11 @@
 
     <style name="Theme.DeviceDefault.Settings.Dialog" parent="@*android:style/Theme.Material.Settings.Dialog">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
         <item name="android:colorBackground">@*android:color/primary_device_default_settings</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
@@ -360,10 +399,11 @@
 
     <style name="Theme.DeviceDefault.Settings.DialogWhenLarge" parent="@*android:style/Theme.Material.Settings.DialogWhenLarge">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -376,10 +416,11 @@
 
     <style name="Theme.DeviceDefault.Settings.Dialog.Alert" parent="@*android:style/Theme.Material.Settings.Dialog.Alert">
         <!-- Color palette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_settings</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_settings</item>
-        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>
@@ -409,9 +450,11 @@
         <item name="android:listPreferredItemPaddingEnd">?*android:attr/dialogPreferredPadding</item>
 
         <!-- Color pandroid:alette -->
-        <item name="android:colorPrimary">@*android:color/primary_device_default_light</item>
-        <item name="android:colorPrimaryDark">@*android:color/primary_dark_device_default_light</item>
+        <item name="android:colorPrimary">@*android:color/primary_dark_device_default_settings</item>
+        <item name="android:colorPrimaryDark">@*android:color/primary_device_default_settings</item>
+        <item name="android:colorSecondary">@*android:color/secondary_device_default_settings_light</item>
         <item name="android:colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="android:colorControlNormal">@*android:color/accent_device_default_dark</item>
 
         <item name="android:textColorPrimary">#ffffffff</item>
         <item name="android:textColorSecondary">#fff5f5f5</item>