diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index 8f1d014..0a7027c 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -2,31 +2,28 @@
 <resources>
     <!-- Override the default system theme for DARK mode -->
     <style name="Theme.DeviceDefault" parent="@android:style/Theme.DeviceDefault">
-        <item name="colorPrimary">@color/accent_device_default</item>
-        <item name="colorPrimaryDark">@color/accent_emphasis_dark</item>
-        <item name="colorAccent">@color/accent_device_default</item>
-        <item name="android:colorBackground">@android:color/background_dark</item>
-        <item name="android:windowBackground">@android:color/background_dark</item>
+        <item name="android:colorBackground">@color/background_dark</item>
+        <item name="android:windowBackground">@color/background_dark</item>
+        <item name="android:colorAccent">@color/accent_device_default</item>
+        <item name="android:colorControlNormal">@color/accent_device_default</item>
+        <item name="android:colorControlActivated">@color/accent_device_dark</item>
     </style>
 
     <!-- Dark theme variant -->
     <style name="Theme.DeviceDefault.Dark" parent="@android:style/Theme.DeviceDefault.Dark">
-        <item name="colorPrimary">@color/accent_device_dark</item>
-        <item name="colorPrimaryDark">@color/accent_emphasis_dark</item>
-        <item name="colorAccent">@color/accent_device_dark</item>
+        <item name="android:colorAccent">@color/accent_device_dark</item>
+        <item name="android:colorControlActivated">@color/accent_device_dark</item>
     </style>
 
     <!-- Settings-specific theme for DARK mode -->
     <style name="Theme.DeviceDefault.Settings" parent="@android:style/Theme.DeviceDefault.Settings">
-        <item name="colorPrimary">@color/accent_device_default</item>
-        <item name="colorPrimaryDark">@color/accent_emphasis_dark</item>
-        <item name="colorAccent">@color/accent_device_default</item>
+        <item name="android:colorAccent">@color/accent_device_default</item>
         <item name="android:actionBarStyle">@style/Widget.DeviceDefault.ActionBar.Settings</item>
     </style>
 
     <!-- ActionBar style for Settings (dark mode) -->
     <style name="Widget.DeviceDefault.ActionBar.Settings" parent="@android:style/Widget.DeviceDefault.ActionBar">
-        <item name="android:background">?attr/colorPrimary</item>
+        <item name="android:background">@color/accent_device_default</item>
         <item name="android:titleTextStyle">@style/Widget.DeviceDefault.ActionBar.TitleTextStyle.Settings</item>
     </style>