diff --git a/src/main/res/color/switch_thumb_tint.xml b/src/main/res/color/switch_thumb_tint.xml
index a1815adf..9d29e868 100644
--- a/src/main/res/color/switch_thumb_tint.xml
+++ b/src/main/res/color/switch_thumb_tint.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.5" android:color="?attr/colorPrimary" android:state_checked="false" />
-    <item android:color="?attr/colorPrimary" android:state_checked="true" />
+    <item android:color="?attr/colorOnSurfaceInverse" android:state_enabled="false"/>
+    <item android:color="?attr/colorPrimary" android:state_checked="true"/>
+    <item android:color="?attr/colorOutline"/>
 </selector>
\ No newline at end of file
diff --git a/src/main/res/color/switch_track_color.xml b/src/main/res/color/switch_track_color.xml
deleted file mode 100644
index fd39b89a..00000000
--- a/src/main/res/color/switch_track_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.5" android:color="?attr/colorSurface" android:state_checked="false" />
-    <item android:color="?attr/colorPrimary" android:state_checked="true" />
-</selector>
\ No newline at end of file
diff --git a/src/main/res/color/switch_track_tint.xml b/src/main/res/color/switch_track_tint.xml
new file mode 100644
index 00000000..453c15bf
--- /dev/null
+++ b/src/main/res/color/switch_track_tint.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="@dimen/material_emphasis_disabled_background" android:color="?attr/colorOnSurface" android:state_enabled="false" />
+    <item android:color="?attr/colorPrimaryContainer" android:state_checked="true" />
+    <item android:color="?attr/colorOutline" />
+</selector>
\ No newline at end of file
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index a526af86..1e47c97c 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="green50">#E8F5E9</color>
+    <color name="green75">#D3FAD6</color>
     <color name="green100">#A3EBB7</color>
     <color name="green200">#6EC898</color>
     <color name="green300">#51DF93</color>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 656468d0..8c1356d7 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -7,6 +7,7 @@
 
     <style name="Theme.Main.Light" parent="Theme.Material3.Light.NoActionBar">
         <item name="colorPrimary">@color/green300</item>
+        <item name="colorPrimaryContainer">@color/green100</item>
         <item name="colorOnPrimary">@color/black</item>
         <item name="colorSurface">@color/green50</item>
         <item name="colorOnSurface">@color/black</item>
@@ -14,6 +15,7 @@
         <item name="colorOnBackground">@color/grey_dark</item>
         <item name="android:colorAccent">@color/accent_light</item>
         <item name="colorError">@color/error_light</item>
+        <item name="colorOutline">@color/green75</item>
         <item name="colorControlActivated">@color/green300</item>
         <item name="android:textColor">@color/black</item>
         <item name="android:textColorPrimary">@color/green900</item>
@@ -33,6 +35,7 @@
 
     <style name="Theme.Main.Dark" parent="Theme.Material3.Dark.NoActionBar">
         <item name="colorPrimary">@color/green200</item>
+        <item name="colorPrimaryContainer">@color/green900</item>
         <item name="colorOnPrimary">@color/black</item>
         <item name="colorSurface">@color/grey_dark</item>
         <item name="colorOnSurface">@color/green50</item>
@@ -40,6 +43,7 @@
         <item name="colorOnBackground">@color/green200</item>
         <item name="android:colorAccent">@color/accent_dark</item>
         <item name="colorError">@color/error_dark</item>
+        <item name="colorOutline">@color/green50</item>
         <item name="colorControlActivated">@color/green200</item>
         <item name="android:textColorPrimary">@color/green200</item>
         <item name="android:textColor">@color/white</item>
@@ -58,6 +62,7 @@
 
     <style name="Theme.Main.Amoled" parent="Theme.Material3.Dark.NoActionBar">
         <item name="colorPrimary">@color/green100</item>
+        <item name="colorPrimaryContainer">@color/green900</item>
         <item name="colorOnPrimary">@color/black</item>
         <item name="colorSurface">@color/black</item>
         <item name="colorOnSurface">@color/green50</item>
@@ -65,6 +70,7 @@
         <item name="colorOnBackground">@color/green50</item>
         <item name="android:colorAccent">@color/accent_dark</item>
         <item name="colorError">@color/error_dark</item>
+        <item name="colorOutline">@color/green50</item>
         <item name="colorControlActivated">@color/green100</item>
         <item name="colorControlNormal">@color/green300</item>
         <item name="android:textColorPrimary">@color/green100</item>
@@ -130,7 +136,7 @@
     </style>
 
     <style name="Theme.Switch" parent="Widget.Material3.CompoundButton.Switch">
-        <item name="trackTint">@color/switch_track_color</item>
+        <item name="trackTint">@color/switch_track_tint</item>
         <item name="thumbTint">@color/switch_thumb_tint</item>
     </style>