diff --git a/app/src/main/java/io/heckel/ntfy/ui/Colors.kt b/app/src/main/java/io/heckel/ntfy/ui/Colors.kt
index be5b499..5049292 100644
--- a/app/src/main/java/io/heckel/ntfy/ui/Colors.kt
+++ b/app/src/main/java/io/heckel/ntfy/ui/Colors.kt
@@ -11,7 +11,7 @@ import io.heckel.ntfy.util.isDarkThemeOn
 class Colors {
     companion object {
         fun notificationIcon(context: Context): Int {
-            return if (isDarkThemeOn(context)) R.color.teal_light else R.color.teal
+            return MaterialColors.getColor(context, R.attr.colorPrimary, Color.GREEN)
         }
 
         fun itemSelectedBackground(context: Context): Int {
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..6ad2866
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="md_theme_primary">#5ADBC0</color>
+    <color name="md_theme_onPrimary">#00382E</color>
+    <color name="md_theme_primaryContainer">#005144</color>
+    <color name="md_theme_onPrimaryContainer">#79F8DC</color>
+    <color name="md_theme_secondary">#B1CCC4</color>
+    <color name="md_theme_onSecondary">#1D352F</color>
+    <color name="md_theme_secondaryContainer">#334B45</color>
+    <color name="md_theme_onSecondaryContainer">#CDE8DF</color>
+    <color name="md_theme_tertiary">#AACBE4</color>
+    <color name="md_theme_onTertiary">#113447</color>
+    <color name="md_theme_tertiaryContainer">#2A4A5F</color>
+    <color name="md_theme_onTertiaryContainer">#C8E6FF</color>
+    <color name="md_theme_error">#FFB4AB</color>
+    <color name="md_theme_errorContainer">#93000A</color>
+    <color name="md_theme_onError">#690005</color>
+    <color name="md_theme_onErrorContainer">#FFDAD6</color>
+    <color name="md_theme_background">#191C1B</color>
+    <color name="md_theme_onBackground">#E0E3E1</color>
+    <color name="md_theme_surface">#191C1B</color>
+    <color name="md_theme_onSurface">#E0E3E1</color>
+    <color name="md_theme_surfaceVariant">#3F4946</color>
+    <color name="md_theme_onSurfaceVariant">#BFC9C4</color>
+    <color name="md_theme_outline">#89938F</color>
+    <color name="md_theme_inverseOnSurface">#191C1B</color>
+    <color name="md_theme_inverseSurface">#E0E3E1</color>
+    <color name="md_theme_inversePrimary">#006B5B</color>
+    <color name="md_theme_shadow">#000000</color>
+    <color name="md_theme_surfaceTint">#5ADBC0</color>
+    <color name="md_theme_outlineVariant">#3F4946</color>
+    <color name="md_theme_scrim">#000000</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index fdf5cf9..397d1cb 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!--
         This file contains only overrides for the dark theme.
         Also see "ui/Colors.kt" for colors that have to be defined in code.
@@ -10,17 +10,7 @@
         - https://developer.android.com/guide/topics/ui/look-and-feel/themes
    -->
 
-    <style name="AppTheme" parent="Theme.Material3.DayNight">
-        <item name="colorPrimary">@color/teal_light</item>
-        <item name="colorSecondary">@color/teal_light</item> <!-- checkboxes, text fields -->
-        <!-- Action bar background & text color -->
-        <item name="colorSurface">@color/black_800b</item>
-        <item name="colorOnSurface">@color/white</item>
-
-        <item name="android:colorBackground">?backgroundColor</item> <!-- background -->
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="actionModeBackground">?backgroundColor</item>
-
-        <item name="switchPreferenceCompatStyle">@style/MaterialSwitch</item>
+    <style name="AppTheme" parent="BaseTheme">
+        <item name="android:windowLightStatusBar" tools:ignore="NewApi">false</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 00ae975..684cfbf 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,17 +1,34 @@
 <!--?xml version="1.0" encoding="UTF-8"?-->
 <resources>
-    <color name="black">#ff000000</color>
-    <color name="black_900">#121212</color> <!-- Main dark mode surface color, as per style guide -->
-    <color name="black_800b">#1b2023</color> <!-- Action bar & item selection (dark mode); this has a touch of blue! -->
-    <color name="black_700b">#282F33</color> <!-- Card selection (dark mode); this has a touch of blue! -->
-    <color name="gray_500">#dddddd</color> <!-- Card selection (light mode) -->
-    <color name="gray_400">#eeeeee</color> <!-- Item selection (light mode) -->
-    <color name="white">#ffffffff</color>
-
-    <color name="teal">#338574</color> <!-- Primary color (light mode) -->
-    <color name="teal_light">#65b5a3</color> <!-- Primary color (dark mode) -->
-    <color name="teal_dark">#2a6e60</color> <!-- Action bar background in action mode (light mode) -->
-    <color name="red_light">#fe4d2e</color> <!-- Danger text (dark mode) -->
-    <color name="red_dark">#c30000</color> <!-- Danger text (light mode) -->
+    <color name="md_theme_primary">#006B5B</color>
+    <color name="md_theme_onPrimary">#FFFFFF</color>
+    <color name="md_theme_primaryContainer">#79F8DC</color>
+    <color name="md_theme_onPrimaryContainer">#00201A</color>
+    <color name="md_theme_secondary">#4B635C</color>
+    <color name="md_theme_onSecondary">#FFFFFF</color>
+    <color name="md_theme_secondaryContainer">#CDE8DF</color>
+    <color name="md_theme_onSecondaryContainer">#06201A</color>
+    <color name="md_theme_tertiary">#436278</color>
+    <color name="md_theme_onTertiary">#FFFFFF</color>
+    <color name="md_theme_tertiaryContainer">#C8E6FF</color>
+    <color name="md_theme_onTertiaryContainer">#001E2E</color>
+    <color name="md_theme_error">#BA1A1A</color>
+    <color name="md_theme_errorContainer">#FFDAD6</color>
+    <color name="md_theme_onError">#FFFFFF</color>
+    <color name="md_theme_onErrorContainer">#410002</color>
+    <color name="md_theme_background">#FAFDFA</color>
+    <color name="md_theme_onBackground">#191C1B</color>
+    <color name="md_theme_surface">#FAFDFA</color>
+    <color name="md_theme_onSurface">#191C1B</color>
+    <color name="md_theme_surfaceVariant">#DBE5E0</color>
+    <color name="md_theme_onSurfaceVariant">#3F4946</color>
+    <color name="md_theme_outline">#6F7976</color>
+    <color name="md_theme_inverseOnSurface">#EFF1EF</color>
+    <color name="md_theme_inverseSurface">#2E3130</color>
+    <color name="md_theme_inversePrimary">#5ADBC0</color>
+    <color name="md_theme_shadow">#000000</color>
+    <color name="md_theme_surfaceTint">#006B5B</color>
+    <color name="md_theme_outlineVariant">#BFC9C4</color>
+    <color name="md_theme_scrim">#000000</color>
 </resources>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c5939b8..fb7407d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,14 +1,40 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Main app theme; dark theme styles see values-night/styles.xml -->
-    <style name="AppTheme" parent="Theme.Material3.DayNight">
-        <item name="colorPrimary">@color/teal</item>
-        <item name="colorSecondary">@color/teal</item> <!-- checkboxes, text fields -->
-        <item name="android:colorBackground">@color/white</item> <!-- background -->
+    <style name="BaseTheme" parent="Theme.Material3.DayNight">
+        <item name="colorPrimary">@color/md_theme_primary</item>
+        <item name="colorOnPrimary">@color/md_theme_onPrimary</item>
+        <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
+        <item name="colorOnPrimaryContainer">@color/md_theme_onPrimaryContainer</item>
+        <item name="colorSecondary">@color/md_theme_secondary</item>
+        <item name="colorOnSecondary">@color/md_theme_onSecondary</item>
+        <item name="colorSecondaryContainer">@color/md_theme_secondaryContainer</item>
+        <item name="colorOnSecondaryContainer">@color/md_theme_onSecondaryContainer</item>
+        <item name="colorTertiary">@color/md_theme_tertiary</item>
+        <item name="colorOnTertiary">@color/md_theme_onTertiary</item>
+        <item name="colorTertiaryContainer">@color/md_theme_tertiaryContainer</item>
+        <item name="colorOnTertiaryContainer">@color/md_theme_onTertiaryContainer</item>
+        <item name="colorError">@color/md_theme_error</item>
+        <item name="colorErrorContainer">@color/md_theme_errorContainer</item>
+        <item name="colorOnError">@color/md_theme_onError</item>
+        <item name="colorOnErrorContainer">@color/md_theme_onErrorContainer</item>
+        <item name="android:colorBackground">@color/md_theme_background</item>
+        <item name="colorOnBackground">@color/md_theme_onBackground</item>
+        <item name="colorSurface">@color/md_theme_surface</item>
+        <item name="colorOnSurface">@color/md_theme_onSurface</item>
+        <item name="colorSurfaceVariant">@color/md_theme_surfaceVariant</item>
+        <item name="colorOnSurfaceVariant">@color/md_theme_onSurfaceVariant</item>
+        <item name="colorOutline">@color/md_theme_outline</item>
+        <item name="colorOnSurfaceInverse">@color/md_theme_inverseOnSurface</item>
+        <item name="colorSurfaceInverse">@color/md_theme_inverseSurface</item>
+        <item name="colorPrimaryInverse">@color/md_theme_inversePrimary</item>
 
-        <item name="android:windowLightStatusBar" tools:ignore="NewApi">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="actionModeBackground">?colorSecondary</item>
         <item name="switchPreferenceCompatStyle">@style/MaterialSwitch</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="actionModeBackground">?backgroundColor</item>
+    </style>
+
+    <style name="AppTheme" parent="BaseTheme">
+        <item name="android:windowLightStatusBar" tools:ignore="NewApi">true</item>
     </style>
 
     <style name="DangerText" parent="@android:style/TextAppearance">