diff --git a/app/src/main/java/org/oxycblt/auxio/accent/AccentAdapter.kt b/app/src/main/java/org/oxycblt/auxio/accent/AccentAdapter.kt
index 594d0ba79..2b208a010 100644
--- a/app/src/main/java/org/oxycblt/auxio/accent/AccentAdapter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/accent/AccentAdapter.kt
@@ -18,12 +18,14 @@
 
 package org.oxycblt.auxio.accent
 
+import android.content.res.ColorStateList
 import android.view.ViewGroup
 import androidx.appcompat.widget.TooltipCompat
 import androidx.recyclerview.widget.RecyclerView
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.ItemAccentBinding
 import org.oxycblt.auxio.util.inflater
+import org.oxycblt.auxio.util.resolveAttr
 import org.oxycblt.auxio.util.resolveStateList
 
 /**
@@ -81,7 +83,7 @@ class AccentAdapter(
                 selectedViewHolder?.setSelected(false)
                 selectedViewHolder = this
 
-                R.color.surface.resolveStateList(context)
+                ColorStateList.valueOf(R.attr.colorSurface.resolveAttr(context))
             } else {
                 android.R.color.transparent.resolveStateList(context)
             }
diff --git a/app/src/main/java/org/oxycblt/auxio/home/FloatingActionButtonContainer.kt b/app/src/main/java/org/oxycblt/auxio/home/FloatingActionButtonContainer.kt
index 761b7a98e..490e69b16 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/FloatingActionButtonContainer.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/FloatingActionButtonContainer.kt
@@ -30,6 +30,10 @@ class FloatingActionButtonContainer @JvmOverloads constructor(
     attrs: AttributeSet? = null,
     defStyleAttr: Int = -1
 ) : FrameLayout(context, attrs, defStyleAttr) {
+    init {
+        clipToPadding = false
+    }
+
     override fun dispatchApplyWindowInsets(insets: WindowInsets): WindowInsets {
         return onApplyWindowInsets(insets)
     }
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/CompactPlaybackView.kt b/app/src/main/java/org/oxycblt/auxio/playback/CompactPlaybackView.kt
index ef1e2f125..2d256982d 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/CompactPlaybackView.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/CompactPlaybackView.kt
@@ -85,10 +85,13 @@ class CompactPlaybackView @JvmOverloads constructor(
             mCallback?.onPlayPauseClick()
         }
 
-        // By default, LinearProgressIndicator will not actually color the track with the proper
-        // opacity. Why? Who knows!
+        // Deliberately override the progress bar color [in a Lollipop-friendly way] so that
+        // we use colorSecondary instead of colorSurfaceVariant. This is for two reasons:
+        // 1. colorSurfaceVariant is used with the assumption that the view that is using it
+        // is not elevated and is therefore not colored. This view is elevated.
+        // 2. The way a solid color plays along with a ripple just doesnt look that good.
         binding.playbackProgressBar.trackColor = MaterialColors.compositeARGBWithAlpha(
-            binding.playbackProgressBar.trackColor, (255 * 0.2).toInt()
+            R.attr.colorSecondary.resolveAttr(context), (255 * 0.2).toInt()
         )
     }
 
diff --git a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackSeekBar.kt b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackSeekBar.kt
index 5ee25e20c..5b03030d8 100644
--- a/app/src/main/java/org/oxycblt/auxio/playback/PlaybackSeekBar.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/PlaybackSeekBar.kt
@@ -19,12 +19,16 @@
 package org.oxycblt.auxio.playback
 
 import android.content.Context
+import android.content.res.ColorStateList
 import android.util.AttributeSet
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.google.android.material.color.MaterialColors
 import com.google.android.material.slider.Slider
+import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.ViewSeekBarBinding
 import org.oxycblt.auxio.music.toDuration
 import org.oxycblt.auxio.util.inflater
+import org.oxycblt.auxio.util.resolveAttr
 
 /**
  * A custom view that bundles together a seekbar with a current duration and a total duration.
@@ -45,6 +49,13 @@ class PlaybackSeekBar @JvmOverloads constructor(
     init {
         binding.seekBar.addOnChangeListener(this)
         binding.seekBar.addOnSliderTouchListener(this)
+
+        // Override the inactive color so that it lines up with the playback progress bar.
+        binding.seekBar.trackInactiveTintList = ColorStateList.valueOf(
+            MaterialColors.compositeARGBWithAlpha(
+                R.attr.colorSecondary.resolveAttr(context), (255 * 0.2).toInt()
+            )
+        )
     }
 
     fun setProgress(seconds: Long) {
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index f50e0b7dd..716fe376d 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -41,7 +41,7 @@
                         android:inputType="textFilter"
                         android:paddingStart="0dp"
                         android:paddingEnd="0dp"
-                        android:textAppearance="@style/TextAppearance.Auxio.BodyLarge" />
+                        android:textAppearance="@style/TextAppearance.Auxio.TitleMedium" />
 
                 </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/item_detail.xml b/app/src/main/res/layout/item_detail.xml
index 35d787ad4..cc63902c0 100644
--- a/app/src/main/res/layout/item_detail.xml
+++ b/app/src/main/res/layout/item_detail.xml
@@ -72,6 +72,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_small"
             android:text="@string/lbl_shuffle"
+            android:clipToPadding="false"
             app:layout_constraintBottom_toBottomOf="@+id/detail_play_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/detail_play_button"
diff --git a/app/src/main/res/layout/view_compact_playback.xml b/app/src/main/res/layout/view_compact_playback.xml
index 940408267..925eb1d39 100644
--- a/app/src/main/res/layout/view_compact_playback.xml
+++ b/app/src/main/res/layout/view_compact_playback.xml
@@ -74,12 +74,11 @@
             android:id="@+id/playback_progress_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:disabledAlpha="0.24"
             android:max="@{(int) song.seconds}"
+            app:trackColor="?attr/colorPrimary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:trackColor="@color/blue_primary"
             tools:progress="70" />
 
     </merge>
diff --git a/app/src/main/res/layout/view_seek_bar.xml b/app/src/main/res/layout/view_seek_bar.xml
index 04f1a77db..6c55d6638 100644
--- a/app/src/main/res/layout/view_seek_bar.xml
+++ b/app/src/main/res/layout/view_seek_bar.xml
@@ -42,6 +42,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/spacing_medium"
             android:layout_marginBottom="@dimen/spacing_small"
+            android:textColor="?android:attr/textColorSecondary"
             android:textAppearance="@style/TextAppearance.Auxio.BodyMedium"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 28ab22489..7ad6a0b77 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,118 +1,439 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="surface">@color/surface_night</color>
-    <color name="surface_variant">@color/surface_day</color>
     <color name="nav_bar">#01151515</color>
 
-    <!--
-    Each accent's color roles.
-    Note that some accents might have different tones used for legibility. Those are not errors.
-    -->
-    <color name="red_primary">@color/red_80</color>
-    <color name="red_on_primary">@color/red_20</color>
-    <color name="red_primary_inverse">@color/red_40</color>
-    <color name="red_primary_container">@color/red_30</color>
-    <color name="red_on_primary_container">@color/red_90</color>
+    <color name="red_primary">#FFB4A8</color>
+    <color name="red_on_primary">#680001</color>
+    <color name="red_primary_container">#940002</color>
+    <color name="red_on_primary_container">#FFDAD3</color>
+    <color name="red_primary_inverse">#BC1714</color>
+    <color name="red_secondary">#E7BCB6</color>
+    <color name="red_on_secondary">#442A26</color>
+    <color name="red_secondary_container">#5D3F3B</color>
+    <color name="red_on_secondary_container">#FFDAD4</color>
+    <color name="red_tertiary">#DFC38C</color>
+    <color name="red_on_tertiary">#3F2E04</color>
+    <color name="red_tertiary_container">#574419</color>
+    <color name="red_on_tertiary_container">#FCDFA6</color>
+    <color name="red_error">#FFB4A9</color>
+    <color name="red_on_error">#680003</color>
+    <color name="red_error_container">#930006</color>
+    <color name="red_on_error_container">#FFDAD4</color>
+    <color name="red_surface">#211A19</color>
+    <color name="red_on_surface">#EDE0DE</color>
+    <color name="red_surface_variant">#534341</color>
+    <color name="red_on_surface_variant">#D8C2BF</color>
+    <color name="red_surface_inverse">#EDE0DE</color>
+    <color name="red_on_surface_inverse">#211A19</color>
 
-    <color name="pink_primary">@color/pink_80</color>
-    <color name="pink_on_primary">@color/pink_20</color>
-    <color name="pink_primary_inverse">@color/pink_40</color>
-    <color name="pink_primary_container">@color/pink_30</color>
-    <color name="pink_on_primary_container">@color/pink_90</color>
+    <color name="pink_primary">#FFB2C0</color>
+    <color name="pink_on_primary">#670024</color>
+    <color name="pink_primary_container">#900036</color>
+    <color name="pink_on_primary_container">#FFD9DF</color>
+    <color name="pink_primary_inverse">#BC0049</color>
+    <color name="pink_secondary">#E5BDC2</color>
+    <color name="pink_on_secondary">#43292D</color>
+    <color name="pink_secondary_container">#5C3F43</color>
+    <color name="pink_on_secondary_container">#FFD9DE</color>
+    <color name="pink_tertiary">#EBBF90</color>
+    <color name="pink_on_tertiary">#452B08</color>
+    <color name="pink_tertiary_container">#5F411C</color>
+    <color name="pink_on_tertiary_container">#FFDDB8</color>
+    <color name="pink_error">#FFB4A9</color>
+    <color name="pink_on_error">#680003</color>
+    <color name="pink_error_container">#930006</color>
+    <color name="pink_on_error_container">#FFDAD4</color>
+    <color name="pink_surface">#201A1B</color>
+    <color name="pink_on_surface">#ECE0E0</color>
+    <color name="pink_surface_variant">#524345</color>
+    <color name="pink_on_surface_variant">#D6C1C3</color>
+    <color name="pink_surface_inverse">#ECE0E0</color>
+    <color name="pink_on_surface_inverse">#201A1B</color>
 
-    <color name="purple_primary">@color/purple_80</color>
-    <color name="purple_on_primary">@color/purple_20</color>
-    <color name="purple_primary_inverse">@color/purple_40</color>
-    <color name="purple_primary_container">@color/purple_30</color>
-    <color name="purple_on_primary_container">@color/purple_90</color>
+    <color name="purple_primary">#FBAAFF</color>
+    <color name="purple_on_primary">#570068</color>
+    <color name="purple_primary_container">#7B0091</color>
+    <color name="purple_on_primary_container">#FFD5FF</color>
+    <color name="purple_primary_inverse">#9A25AE</color>
+    <color name="purple_secondary">#D7BFD5</color>
+    <color name="purple_on_secondary">#3B2B3B</color>
+    <color name="purple_secondary_container">#534153</color>
+    <color name="purple_on_secondary_container">#F5DBF2</color>
+    <color name="purple_tertiary">#F6B8AE</color>
+    <color name="purple_on_tertiary">#4C251F</color>
+    <color name="purple_tertiary_container">#663B34</color>
+    <color name="purple_on_tertiary_container">#FFDAD2</color>
+    <color name="purple_error">#FFB4A9</color>
+    <color name="purple_on_error">#680003</color>
+    <color name="purple_error_container">#930006</color>
+    <color name="purple_on_error_container">#FFDAD4</color>
+    <color name="purple_surface">#1E1A1D</color>
+    <color name="purple_on_surface">#E9E0E5</color>
+    <color name="purple_surface_variant">#4D444C</color>
+    <color name="purple_on_surface_variant">#D0C3CC</color>
+    <color name="purple_surface_inverse">#E9E0E5</color>
+    <color name="purple_on_surface_inverse">#1E1A1D</color>
 
-    <color name="deep_purple_primary">@color/deep_purple_80</color>
-    <color name="deep_purple_on_primary">@color/deep_purple_20</color>
-    <color name="deep_purple_primary_inverse">@color/deep_purple_40</color>
-    <color name="deep_purple_primary_container">@color/deep_purple_30</color>
-    <color name="deep_purple_on_primary_container">@color/deep_purple_90</color>
+    <color name="deep_purple_primary">#D4BAFF</color>
+    <color name="deep_purple_on_primary">#3E008E</color>
+    <color name="deep_purple_primary_container">#5727A7</color>
+    <color name="deep_purple_on_primary_container">#ECDCFF</color>
+    <color name="deep_purple_primary_inverse">#6F43BF</color>
+    <color name="deep_purple_secondary">#CDC2DB</color>
+    <color name="deep_purple_on_secondary">#342D41</color>
+    <color name="deep_purple_secondary_container">#4B4358</color>
+    <color name="deep_purple_on_secondary_container">#E9DEF7</color>
+    <color name="deep_purple_tertiary">#F0B8C5</color>
+    <color name="deep_purple_on_tertiary">#4A2530</color>
+    <color name="deep_purple_tertiary_container">#643B46</color>
+    <color name="deep_purple_on_tertiary_container">#FFD9E2</color>
+    <color name="deep_purple_error">#FFB4A9</color>
+    <color name="deep_purple_on_error">#680003</color>
+    <color name="deep_purple_error_container">#930006</color>
+    <color name="deep_purple_on_error_container">#FFDAD4</color>
+    <color name="deep_purple_surface">#1D1B1F</color>
+    <color name="deep_purple_on_surface">#E6E1E5</color>
+    <color name="deep_purple_surface_variant">#49454E</color>
+    <color name="deep_purple_on_surface_variant">#CBC4CF</color>
+    <color name="deep_purple_surface_inverse">#E6E1E5</color>
+    <color name="deep_purple_on_surface_inverse">#1D1B1F</color>
 
-    <color name="indigo_primary">@color/indigo_80</color>
-    <color name="indigo_on_primary">@color/indigo_20</color>
-    <color name="indigo_primary_inverse">@color/indigo_40</color>
-    <color name="indigo_primary_container">@color/indigo_30</color>
-    <color name="indigo_on_primary_container">@color/indigo_90</color>
+    <color name="indigo_primary">#B9C3FF</color>
+    <color name="indigo_on_primary">#08218A</color>
+    <color name="indigo_primary_container">#293CA0</color>
+    <color name="indigo_on_primary_container">#DDE0FF</color>
+    <color name="indigo_primary_inverse">#4355B9</color>
+    <color name="indigo_secondary">#C4C5DD</color>
+    <color name="indigo_on_secondary">#2D2F42</color>
+    <color name="indigo_secondary_container">#43465A</color>
+    <color name="indigo_on_secondary_container">#E0E1FA</color>
+    <color name="indigo_tertiary">#E5BAD7</color>
+    <color name="indigo_on_tertiary">#45263E</color>
+    <color name="indigo_tertiary_container">#5D3C55</color>
+    <color name="indigo_on_tertiary_container">#FFD7F3</color>
+    <color name="indigo_error">#FFB4A9</color>
+    <color name="indigo_on_error">#680003</color>
+    <color name="indigo_error_container">#930006</color>
+    <color name="indigo_on_error_container">#FFDAD4</color>
+    <color name="indigo_surface">#1B1B1F</color>
+    <color name="indigo_on_surface">#E4E1E6</color>
+    <color name="indigo_surface_variant">#46464F</color>
+    <color name="indigo_on_surface_variant">#C6C5D0</color>
+    <color name="indigo_surface_inverse">#E4E1E6</color>
+    <color name="indigo_on_surface_inverse">#1B1B1F</color>
 
-    <color name="blue_primary">@color/blue_80</color>
-    <color name="blue_on_primary">@color/blue_20</color>
-    <color name="blue_primary_inverse">@color/blue_40</color>
-    <color name="blue_primary_container">@color/blue_30</color>
-    <color name="blue_on_primary_container">@color/blue_90</color>
+    <color name="blue_primary">#9CCAFF</color>
+    <color name="blue_on_primary">#00325A</color>
+    <color name="blue_primary_container">#00497F</color>
+    <color name="blue_on_primary_container">#D0E4FF</color>
+    <color name="blue_primary_inverse">#0061A6</color>
+    <color name="blue_secondary">#BBC8DB</color>
+    <color name="blue_on_secondary">#253140</color>
+    <color name="blue_secondary_container">#3C4858</color>
+    <color name="blue_on_secondary_container">#D6E3F7</color>
+    <color name="blue_tertiary">#D6BEE4</color>
+    <color name="blue_on_tertiary">#3B2948</color>
+    <color name="blue_tertiary_container">#523F5F</color>
+    <color name="blue_on_tertiary_container">#F3DAFF</color>
+    <color name="blue_error">#FFB4A9</color>
+    <color name="blue_error_container">#930006</color>
+    <color name="blue_on_error">#680003</color>
+    <color name="blue_on_error_container">#FFDAD4</color>
+    <color name="blue_surface">#1B1B1B</color>
+    <color name="blue_on_surface">#E2E2E6</color>
+    <color name="blue_surface_variant">#42474E</color>
+    <color name="blue_on_surface_variant">#C3C7D0</color>
+    <color name="blue_surface_inverse">#E2E2E6</color>
+    <color name="blue_on_surface_inverse">#1B1B1B</color>
 
-    <color name="light_blue_primary">@color/light_blue_80</color>
-    <color name="light_blue_on_primary">@color/light_blue_20</color>
-    <color name="light_blue_primary_inverse">@color/light_blue_40</color>
-    <color name="light_blue_primary_container">@color/light_blue_30</color>
-    <color name="light_blue_on_primary_container">@color/light_blue_90</color>
+    <color name="light_blue_primary">#8BCEFF</color>
+    <color name="light_blue_on_primary">#003450</color>
+    <color name="light_blue_primary_container">#004B71</color>
+    <color name="light_blue_on_primary_container">#C8E6FF</color>
+    <color name="light_blue_primary_inverse">#006494</color>
+    <color name="light_blue_secondary">#B7C8D8</color>
+    <color name="light_blue_on_secondary">#22323F</color>
+    <color name="light_blue_secondary_container">#384956</color>
+    <color name="light_blue_on_secondary_container">#D3E4F5</color>
+    <color name="light_blue_tertiary">#CFBFE8</color>
+    <color name="light_blue_on_tertiary">#362B4B</color>
+    <color name="light_blue_tertiary_container">#4D4162</color>
+    <color name="light_blue_on_tertiary_container">#ECDCFF</color>
+    <color name="light_blue_error">#FFB4A9</color>
+    <color name="light_blue_on_error">#680003</color>
+    <color name="light_blue_error_container">#930006</color>
+    <color name="light_blue_on_error_container">#FFDAD4</color>
+    <color name="light_blue_surface">#1A1C1E</color>
+    <color name="light_blue_on_surface">#E2E2E5</color>
+    <color name="light_blue_surface_variant">#41474D</color>
+    <color name="light_blue_on_surface_variant">#C1C7CE</color>
+    <color name="light_blue_surface_inverse">#E2E2E5</color>
+    <color name="light_blue_on_surface_inverse">#1A1C1E</color>
 
-    <color name="cyan_primary">@color/cyan_80</color>
-    <color name="cyan_on_primary">@color/cyan_20</color>
-    <color name="cyan_primary_inverse">@color/cyan_40</color>
-    <color name="cyan_primary_container">@color/cyan_30</color>
-    <color name="cyan_on_primary_container">@color/cyan_90</color>
+    <color name="cyan_primary">#44D8F1</color>
+    <color name="cyan_on_primary">#00363F</color>
+    <color name="cyan_primary_container">#004E5A</color>
+    <color name="cyan_on_primary_container">#9CEFFF</color>
+    <color name="cyan_primary_inverse">#006877</color>
+    <color name="cyan_secondary">#B1CBD1</color>
+    <color name="cyan_on_secondary">#1C3439</color>
+    <color name="cyan_secondary_container">#334A4F</color>
+    <color name="cyan_on_secondary_container">#CDE7ED</color>
+    <color name="cyan_tertiary">#BCC5EA</color>
+    <color name="cyan_on_tertiary">#262F4D</color>
+    <color name="cyan_tertiary_container">#3D4665</color>
+    <color name="cyan_on_tertiary_container">#DAE1FF</color>
+    <color name="cyan_error">#FFB4A9</color>
+    <color name="cyan_on_error">#680003</color>
+    <color name="cyan_error_container">#930006</color>
+    <color name="cyan_on_error_container">#FFDAD4</color>
+    <color name="cyan_surface">#191C1D</color>
+    <color name="cyan_on_surface">#E1E3E3</color>
+    <color name="cyan_surface_variant">#3F484A</color>
+    <color name="cyan_on_surface_variant">#BFC8CA</color>
+    <color name="cyan_surface_inverse">#E1E3E3</color>
+    <color name="cyan_on_surface_inverse">#191C1D</color>
 
-    <color name="teal_primary">@color/teal_80</color>
-    <color name="teal_on_primary">@color/teal_20</color>
-    <color name="teal_primary_inverse">@color/teal_40</color>
-    <color name="teal_primary_container">@color/teal_30</color>
-    <color name="teal_on_primary_container">@color/teal_90</color>
+    <color name="teal_primary">#53DBC9</color>
+    <color name="teal_on_primary">#003730</color>
+    <color name="teal_primary_container">#005047</color>
+    <color name="teal_on_primary_container">#74F7E5</color>
+    <color name="teal_primary_inverse">#006A5F</color>
+    <color name="teal_secondary">#B1CCC6</color>
+    <color name="teal_on_secondary">#1C3531</color>
+    <color name="teal_secondary_container">#334B47</color>
+    <color name="teal_on_secondary_container">#CDE8E2</color>
+    <color name="teal_tertiary">#ADCAE6</color>
+    <color name="teal_on_tertiary">#153349</color>
+    <color name="teal_tertiary_container">#2D4960</color>
+    <color name="teal_on_tertiary_container">#CBE5FF</color>
+    <color name="teal_error">#FFB4A9</color>
+    <color name="teal_on_error">#680003</color>
+    <color name="teal_error_container">#930006</color>
+    <color name="teal_on_error_container">#FFDAD4</color>
+    <color name="teal_surface">#191C1B</color>
+    <color name="teal_on_surface">#E0E3E1</color>
+    <color name="teal_surface_variant">#3F4947</color>
+    <color name="teal_on_surface_variant">#BFC9C6</color>
+    <color name="teal_surface_inverse">#E0E3E1</color>
+    <color name="teal_on_surface_inverse">#191C1B</color>
 
-    <color name="green_primary">@color/green_80</color>
-    <color name="green_on_primary">@color/green_20</color>
-    <color name="green_primary_inverse">@color/green_40</color>
-    <color name="green_primary_container">@color/green_30</color>
-    <color name="green_on_primary_container">@color/green_90</color>
+    <color name="green_primary">#78DC77</color>
+    <color name="green_on_primary">#003907</color>
+    <color name="green_primary_container">#00530F</color>
+    <color name="green_on_primary_container">#93F990</color>
+    <color name="green_primary_inverse">#006E17</color>
+    <color name="green_secondary">#B9CCB3</color>
+    <color name="green_on_secondary">#253423</color>
+    <color name="green_secondary_container">#3B4B38</color>
+    <color name="green_on_secondary_container">#D5E8CE</color>
+    <color name="green_tertiary">#A1CFD5</color>
+    <color name="green_on_tertiary">#00363B</color>
+    <color name="green_tertiary_container">#1E4D52</color>
+    <color name="green_on_tertiary_container">#BCEBF0</color>
+    <color name="green_error">#FFB4A9</color>
+    <color name="green_on_error">#680003</color>
+    <color name="green_error_container">#930006</color>
+    <color name="green_on_error_container">#FFDAD4</color>
+    <color name="green_surface">#1A1C19</color>
+    <color name="green_on_surface">#E2E3DD</color>
+    <color name="green_surface_variant">#424840</color>
+    <color name="green_on_surface_variant">#C2C8BD</color>
+    <color name="green_surface_inverse">#E2E3DD</color>
+    <color name="green_on_surface_inverse">#1A1C19</color>
 
-    <color name="light_green_primary">@color/light_green_80</color>
-    <color name="light_green_on_primary">@color/light_green_20</color>
-    <color name="light_green_primary_inverse">@color/light_green_40</color>
-    <color name="light_green_primary_container">@color/light_green_30</color>
-    <color name="light_green_on_primary_container">@color/light_green_90</color>
+    <color name="light_green_primary">#9ED75C</color>
+    <color name="light_green_on_primary">#1C3700</color>
+    <color name="light_green_primary_container">#2C5000</color>
+    <color name="light_green_on_primary_container">#B9F475</color>
+    <color name="light_green_primary_inverse">#3C6A00</color>
+    <color name="light_green_secondary">#BFCAAD</color>
+    <color name="light_green_on_secondary">#2A331E</color>
+    <color name="light_green_secondary_container">#404A34</color>
+    <color name="light_green_on_secondary_container">#DBE7C7</color>
+    <color name="light_green_tertiary">#A0D0CC</color>
+    <color name="light_green_on_tertiary">#003735</color>
+    <color name="light_green_tertiary_container">#1E4E4B</color>
+    <color name="light_green_on_tertiary_container">#BCECE8</color>
+    <color name="light_green_error">#FFB4A9</color>
+    <color name="light_green_on_error">#680003</color>
+    <color name="light_green_error_container">#930006</color>
+    <color name="light_green_on_error_container">#FFDAD4</color>
+    <color name="light_green_surface">#1A1C17</color>
+    <color name="light_green_on_surface">#E3E3DB</color>
+    <color name="light_green_surface_variant">#44483D</color>
+    <color name="light_green_on_surface_variant">#C4C8B9</color>
+    <color name="light_green_surface_inverse">#E3E3DB</color>
+    <color name="light_green_on_surface_inverse">#1A1C17</color>
 
-    <color name="lime_primary">@color/lime_80</color>
-    <color name="lime_on_primary">@color/lime_20</color>
-    <color name="lime_primary_inverse">@color/lime_40</color>
-    <color name="lime_primary_container">@color/lime_30</color>
-    <color name="lime_on_primary_container">@color/lime_90</color>
+    <color name="lime_primary">#C1D02C</color>
+    <color name="lime_on_primary">#2E3400</color>
+    <color name="lime_primary_container">#434B00</color>
+    <color name="lime_on_primary_container">#DEED49</color>
+    <color name="lime_primary_inverse">#5A6400</color>
+    <color name="lime_secondary">#C7C9A6</color>
+    <color name="lime_on_secondary">#30321A</color>
+    <color name="lime_secondary_container">#46492E</color>
+    <color name="lime_on_secondary_container">#E4E5C1</color>
+    <color name="lime_tertiary">#A3D0C1</color>
+    <color name="lime_on_tertiary">#06372C</color>
+    <color name="lime_tertiary_container">#234E43</color>
+    <color name="lime_on_tertiary_container">#BEECDC</color>
+    <color name="lime_error">#FFB4A9</color>
+    <color name="lime_on_error">#680003</color>
+    <color name="lime_error_container">#930006</color>
+    <color name="lime_on_error_container">#FFDAD4</color>
+    <color name="lime_surface">#1C1C17</color>
+    <color name="lime_on_surface">#E5E2DA</color>
+    <color name="lime_surface_variant">#47473B</color>
+    <color name="lime_on_surface_variant">#C8C7B7</color>
+    <color name="lime_surface_inverse">#E5E2DA</color>
+    <color name="lime_on_surface_inverse">#1C1C17</color>
 
-    <color name="yellow_primary">@color/yellow_80</color>
-    <color name="yellow_on_primary">@color/yellow_20</color>
-    <color name="yellow_primary_inverse">@color/yellow_40</color>
-    <color name="yellow_primary_container">@color/yellow_30</color>
-    <color name="yellow_on_primary_container">@color/yellow_90</color>
+    <color name="yellow_primary">#FABD00</color>
+    <color name="yellow_on_primary">#402D00</color>
+    <color name="yellow_primary_container">#5C4300</color>
+    <color name="yellow_on_primary_container">#FFDF99</color>
+    <color name="yellow_primary_inverse">#795900</color>
+    <color name="yellow_secondary">#D7C4A0</color>
+    <color name="yellow_on_secondary">#3B2F15</color>
+    <color name="yellow_secondary_container">#52452A</color>
+    <color name="yellow_on_secondary_container">#F4E0BB</color>
+    <color name="yellow_tertiary">#B0CFA9</color>
+    <color name="yellow_on_tertiary">#1D361C</color>
+    <color name="yellow_tertiary_container">#334D31</color>
+    <color name="yellow_on_tertiary_container">#CCEBC5</color>
+    <color name="yellow_error">#FFB4A9</color>
+    <color name="yellow_on_error">#680003</color>
+    <color name="yellow_error_container">#930006</color>
+    <color name="yellow_on_error_container">#FFDAD4</color>
+    <color name="yellow_surface">#1E1B16</color>
+    <color name="yellow_on_surface">#E9E1D8</color>
+    <color name="yellow_surface_variant">#4D4639</color>
+    <color name="yellow_on_surface_variant">#D0C5B4</color>
+    <color name="yellow_surface_inverse">#E9E1D8</color>
+    <color name="yellow_on_surface_inverse">#1E1B16</color>
 
-    <color name="orange_primary">@color/orange_80</color>
-    <color name="orange_on_primary">@color/orange_20</color>
-    <color name="orange_primary_inverse">@color/orange_40</color>
-    <color name="orange_primary_container">@color/orange_30</color>
-    <color name="orange_on_primary_container">@color/orange_90</color>
+    <color name="orange_primary">#FFB86D</color>
+    <color name="orange_on_primary">#4B2800</color>
+    <color name="orange_primary_container">#6A3B00</color>
+    <color name="orange_on_primary_container">#FFDCBB</color>
+    <color name="orange_secondary">#E2C1A4</color>
+    <color name="orange_on_secondary">#402C18</color>
+    <color name="orange_primary_inverse">#8C5000</color>
+    <color name="orange_secondary_container">#59422C</color>
+    <color name="orange_on_secondary_container">#FEDCBE</color>
+    <color name="orange_tertiary">#C0CC9A</color>
+    <color name="orange_on_tertiary">#2B3410</color>
+    <color name="orange_tertiary_container">#414B25</color>
+    <color name="orange_on_tertiary_container">#DCE8B4</color>
+    <color name="orange_error">#FFB4A9</color>
+    <color name="orange_on_error">#680003</color>
+    <color name="orange_error_container">#930006</color>
+    <color name="orange_on_error_container">#FFDAD4</color>
+    <color name="orange_surface">#1F1B17</color>
+    <color name="orange_on_surface">#EBE0D9</color>
+    <color name="orange_surface_variant">#51453A</color>
+    <color name="orange_on_surface_variant">#D5C3B5</color>
+    <color name="orange_surface_inverse">#EBE0D9</color>
+    <color name="orange_on_surface_inverse">#1F1B17</color>
 
-    <color name="deep_orange_primary">@color/deep_orange_80</color>
-    <color name="deep_orange_on_primary">@color/deep_orange_20</color>
-    <color name="deep_orange_primary_inverse">@color/deep_orange_40</color>
-    <color name="deep_orange_primary_container">@color/deep_orange_30</color>
-    <color name="deep_orange_on_primary_container">@color/deep_orange_90</color>
+    <color name="deep_orange_primary">#FFB49D</color>
+    <color name="deep_orange_on_primary">#611300</color>
+    <color name="deep_orange_primary_container">#881F00</color>
+    <color name="deep_orange_on_primary_container">#FFDACF</color>
+    <color name="deep_orange_primary_inverse">#B22C00</color>
+    <color name="deep_orange_secondary">#E7BDB2</color>
+    <color name="deep_orange_on_secondary">#442A22</color>
+    <color name="deep_orange_secondary_container">#5D3F37</color>
+    <color name="deep_orange_on_secondary_container">#FFDACF</color>
+    <color name="deep_orange_tertiary">#D8C58D</color>
+    <color name="deep_orange_on_tertiary">#3A2F04</color>
+    <color name="deep_orange_tertiary_container">#534619</color>
+    <color name="deep_orange_on_tertiary_container">#F6E1A6</color>
+    <color name="deep_orange_error">#FFB4A9</color>
+    <color name="deep_orange_on_error">#680003</color>
+    <color name="deep_orange_error_container">#930006</color>
+    <color name="deep_orange_on_error_container">#FFDAD4</color>
+    <color name="deep_orange_surface">#201A18</color>
+    <color name="deep_orange_on_surface">#EDE0DD</color>
+    <color name="deep_orange_surface_variant">#53433F</color>
+    <color name="deep_orange_on_surface_variant">#D8C2BC</color>
+    <color name="deep_orange_surface_inverse">#EDE0DD</color>
+    <color name="deep_orange_on_surface_inverse">#201A18</color>
 
-    <color name="brown_primary">@color/brown_80</color>
-    <color name="brown_on_primary">@color/brown_20</color>
-    <color name="brown_primary_inverse">@color/brown_40</color>
-    <color name="brown_primary_container">@color/brown_30</color>
-    <color name="brown_on_primary_container">@color/brown_90</color>
+    <color name="brown_primary">#E7BEB0</color>
+    <color name="brown_on_primary">#442A20</color>
+    <color name="brown_primary_container">#5D4035</color>
+    <color name="brown_on_primary_container">#FFDBCD</color>
+    <color name="brown_primary_inverse">#77574C</color>
+    <color name="brown_secondary">#FFB598</color>
+    <color name="brown_on_secondary">#5C1A00</color>
+    <color name="brown_secondary_container">#7B2E0D</color>
+    <color name="brown_on_secondary_container">#FFDBCD</color>
+    <color name="brown_tertiary">#D5C78E</color>
+    <color name="brown_on_tertiary">#383005</color>
+    <color name="brown_tertiary_container">#50461A</color>
+    <color name="brown_on_tertiary_container">#F1E2A7</color>
+    <color name="brown_error">#FFB4A9</color>
+    <color name="brown_on_error">#680003</color>
+    <color name="brown_error_container">#930006</color>
+    <color name="brown_on_error_container">#FFDAD4</color>
+    <color name="brown_background">#201A18</color>
+    <color name="brown_on_background">#EDE0DC</color>
+    <color name="brown_surface">#201A18</color>
+    <color name="brown_on_surface">#EDE0DC</color>
+    <color name="brown_surface_variant">#52433E</color>
+    <color name="brown_on_surface_variant">#D8C2BB</color>
+    <color name="brown_outline">#A08C86</color>
+    <color name="brown_surface_inverse">#EDE0DC</color>
+    <color name="brown_on_surface_inverse">#201A18</color>
+    
+    <color name="grey_primary">#EEEEEE</color>
+    <color name="grey_on_primary">#424242</color>
+    <color name="grey_primary_inverse">#757575</color>
+    <color name="grey_primary_container">#616161</color>
+    <color name="grey_on_primary_container">#F5F5F5</color>
+    <color name="grey_secondary">#B4B4B4</color>
+    <color name="grey_on_secondary">#1F1F1F</color>
+    <color name="grey_secondary_container">#353535</color>
+    <color name="grey_on_secondary_container">#D0D0D0</color>
+    <color name="grey_tertiary">#C5C5C5</color>
+    <color name="grey_on_tertiary">#2E2E2E</color>
+    <color name="grey_tertiary_container">#454545</color>
+    <color name="grey_on_tertiary_container">#E3E3E3</color>
+    <color name="grey_error">#FFB4B4</color>
+    <color name="grey_on_error">#680000</color>
+    <color name="grey_error_container">#930000</color>
+    <color name="grey_on_error_container">#FFDADA</color>
+    <color name="grey_surface">#1F1F1F</color>
+    <color name="grey_on_surface">#E1E1E1</color>
+    <color name="grey_surface_variant">#484848</color>
+    <color name="grey_on_surface_variant">#C8C8C8</color>
+    <color name="grey_surface_inverse">#fafafa</color>
+    <color name="grey_on_surface_inverse">#191919</color>
 
-    <color name="grey_primary">@color/grey_80</color>
-    <color name="grey_on_primary">@color/grey_20</color>
-    <color name="grey_primary_inverse">@color/grey_40</color>
-    <color name="grey_primary_container">@color/grey_30</color>
-    <color name="grey_on_primary_container">@color/grey_90</color>
-
-    <color name="blue_grey_primary">@color/blue_grey_80</color>
-    <color name="blue_grey_on_primary">@color/blue_grey_20</color>
-    <color name="blue_grey_primary_inverse">@color/blue_grey_40</color>
-    <color name="blue_grey_primary_container">@color/blue_grey_30</color>
-    <color name="blue_grey_on_primary_container">@color/blue_grey_90</color>
+    <color name="blue_grey_primary">#62D3FF</color>
+    <color name="blue_grey_on_primary">#003546</color>
+    <color name="blue_grey_primary_container">#004D64</color>
+    <color name="blue_grey_on_primary_container">#BAE9FF</color>
+    <color name="blue_grey_primary_inverse">#006684</color>
+    <color name="blue_grey_secondary">#B4CAD6</color>
+    <color name="blue_grey_on_secondary">#1F333C</color>
+    <color name="blue_grey_secondary_container">#354A53</color>
+    <color name="blue_grey_on_secondary_container">#D0E6F2</color>
+    <color name="blue_grey_tertiary">#C5C2EA</color>
+    <color name="blue_grey_on_tertiary">#2E2D4C</color>
+    <color name="blue_grey_tertiary_container">#454365</color>
+    <color name="blue_grey_on_tertiary_container">#E3DFFF</color>
+    <color name="blue_grey_error">#FFB4A9</color>
+    <color name="blue_grey_on_error">#680003</color>
+    <color name="blue_grey_error_container">#930006</color>
+    <color name="blue_grey_on_error_container">#FFDAD4</color>
+    <color name="blue_grey_surface">#191C1E</color>
+    <color name="blue_grey_on_surface">#E1E2E4</color>
+    <color name="blue_grey_surface_variant">#40484C</color>
+    <color name="blue_grey_on_surface_variant">#C0C8CD</color>
+    <color name="blue_grey_surface_inverse">#E1E2E4</color>
+    <color name="blue_grey_on_surface_inverse">#191C1E</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 21b33fbf8..ae1f67176 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,123 +1,441 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Base app colors -->
-    <color name="surface">#fafafa</color>
-    <color name="surface_variant">@color/surface_night</color>
     <color name="nav_bar">#01fafafa</color>
 
-    <color name="surface_day">#fafafa</color>
-    <color name="surface_night">#1f1f1f</color>
-    <color name="surface_black">@android:color/black</color>
+    <color name="red_primary">#BC1714</color>
+    <color name="red_on_primary">#FFFFFF</color>
+    <color name="red_primary_container">#FFDAD3</color>
+    <color name="red_on_primary_container">#410001</color>
+    <color name="red_primary_inverse">#FFB4A8</color>
+    <color name="red_secondary">#775652</color>
+    <color name="red_on_secondary">#FFFFFF</color>
+    <color name="red_secondary_container">#FFDAD4</color>
+    <color name="red_on_secondary_container">#2C1512</color>
+    <color name="red_tertiary">#715C2E</color>
+    <color name="red_on_tertiary">#FFFFFF</color>
+    <color name="red_tertiary_container">#FCDFA6</color>
+    <color name="red_on_tertiary_container">#261A00</color>
+    <color name="red_error">#BA1B1B</color>
+    <color name="red_on_error">#FFFFFF</color>
+    <color name="red_error_container">#FFDAD4</color>
+    <color name="red_on_error_container">#410001</color>
+    <color name="red_surface">#FCFCFC</color>
+    <color name="red_on_surface">#211A19</color>
+    <color name="red_surface_variant">#F4DDDA</color>
+    <color name="red_on_surface_variant">#534341</color>
+    <color name="red_surface_inverse">#362F2E</color>
+    <color name="red_on_surface_inverse">#FBEEEC</color>
 
-    <!--
-    Each accent's color roles.
-    Note that some accents might have different tones used for legibility. Those are not errors.
-    -->
-    <color name="red_primary">@color/red_40</color>
-    <color name="red_on_primary">@color/red_100</color>
-    <color name="red_primary_inverse">@color/red_80</color>
-    <color name="red_primary_container">@color/red_90</color>
-    <color name="red_on_primary_container">@color/red_10</color>
+    <color name="pink_primary">#BC0049</color>
+    <color name="pink_on_primary">#FFFFFF</color>
+    <color name="pink_primary_container">#FFD9DF</color>
+    <color name="pink_on_primary_container">#400013</color>
+    <color name="pink_primary_inverse">#FFB2C0</color>
+    <color name="pink_secondary">#76565B</color>
+    <color name="pink_on_secondary">#FFFFFF</color>
+    <color name="pink_secondary_container">#FFD9DE</color>
+    <color name="pink_on_secondary_container">#2B1519</color>
+    <color name="pink_tertiary">#795831</color>
+    <color name="pink_on_tertiary">#FFFFFF</color>
+    <color name="pink_tertiary_container">#FFDDB8</color>
+    <color name="pink_on_tertiary_container">#2C1700</color>
+    <color name="pink_error">#BA1B1B</color>
+    <color name="pink_on_error">#FFFFFF</color>
+    <color name="pink_error_container">#FFDAD4</color>
+    <color name="pink_on_error_container">#410001</color>
+    <color name="pink_surface">#FCFCFC</color>
+    <color name="pink_on_surface">#201A1B</color>
+    <color name="pink_surface_variant">#F4DDDF</color>
+    <color name="pink_on_surface_variant">#524345</color>
+    <color name="pink_outline">#847375</color>
+    <color name="pink_surface_inverse">#362F30</color>
+    <color name="pink_on_surface_inverse">#FAEEEE</color>
 
-    <color name="pink_primary">@color/pink_40</color>
-    <color name="pink_on_primary">@color/pink_100</color>
-    <color name="pink_primary_inverse">@color/pink_80</color>
-    <color name="pink_primary_container">@color/pink_90</color>
-    <color name="pink_on_primary_container">@color/pink_10</color>
+    <color name="purple_primary">#9A25AE</color>
+    <color name="purple_on_primary">#FFFFFF</color>
+    <color name="purple_primary_container">#FFD5FF</color>
+    <color name="purple_on_primary_container">#350040</color>
+    <color name="purple_primary_inverse">#FBAAFF</color>
+    <color name="purple_secondary">#6B586B</color>
+    <color name="purple_on_secondary">#FFFFFF</color>
+    <color name="purple_secondary_container">#F5DBF2</color>
+    <color name="purple_on_secondary_container">#251626</color>
+    <color name="purple_tertiary">#82524A</color>
+    <color name="purple_on_tertiary">#FFFFFF</color>
+    <color name="purple_tertiary_container">#FFDAD2</color>
+    <color name="purple_on_tertiary_container">#32110C</color>
+    <color name="purple_error">#BA1B1B</color>
+    <color name="purple_on_error">#FFFFFF</color>
+    <color name="purple_error_container">#FFDAD4</color>
+    <color name="purple_on_error_container">#410001</color>
+    <color name="purple_surface">#FCFCFC</color>
+    <color name="purple_on_surface">#1E1A1D</color>
+    <color name="purple_surface_variant">#ECDEE8</color>
+    <color name="purple_on_surface_variant">#4D444C</color>
+    <color name="purple_outline">#7E747C</color>
+    <color name="purple_surface_inverse">#332F32</color>
+    <color name="purple_on_surface_inverse">#F7EEF3</color>
 
-    <color name="purple_primary">@color/purple_40</color>
-    <color name="purple_on_primary">@color/purple_100</color>
-    <color name="purple_primary_inverse">@color/purple_80</color>
-    <color name="purple_primary_container">@color/purple_90</color>
-    <color name="purple_on_primary_container">@color/purple_10</color>
+    <color name="deep_purple_primary">#6F43BF</color>
+    <color name="deep_purple_on_primary">#FFFFFF</color>
+    <color name="deep_purple_primary_container">#ECDCFF</color>
+    <color name="deep_purple_on_primary_container">#25005A</color>
+    <color name="deep_purple_primary_inverse">#D4BAFF</color>
+    <color name="deep_purple_secondary">#635B70</color>
+    <color name="deep_purple_on_secondary">#FFFFFF</color>
+    <color name="deep_purple_secondary_container">#E9DEF7</color>
+    <color name="deep_purple_on_secondary_container">#1F182B</color>
+    <color name="deep_purple_tertiary">#7F525E</color>
+    <color name="deep_purple_on_tertiary">#FFFFFF</color>
+    <color name="deep_purple_tertiary_container">#FFD9E2</color>
+    <color name="deep_purple_on_tertiary_container">#32101B</color>
+    <color name="deep_purple_error">#BA1B1B</color>
+    <color name="deep_purple_on_error">#FFFFFF</color>
+    <color name="deep_purple_error_container">#FFDAD4</color>
+    <color name="deep_purple_on_error_container">#410001</color>
+    <color name="deep_purple_surface">#FFFBFD</color>
+    <color name="deep_purple_on_surface">#1D1B1F</color>
+    <color name="deep_purple_surface_variant">#E7E0EB</color>
+    <color name="deep_purple_on_surface_variant">#49454E</color>
+    <color name="deep_purple_surface_inverse">#323033</color>
+    <color name="deep_purple_on_surface_inverse">#F5EFF4</color>
 
-    <color name="deep_purple_primary">@color/deep_purple_40</color>
-    <color name="deep_purple_on_primary">@color/deep_purple_100</color>
-    <color name="deep_purple_primary_inverse">@color/deep_purple_80</color>
-    <color name="deep_purple_primary_container">@color/deep_purple_90</color>
-    <color name="deep_purple_on_primary_container">@color/deep_purple_10</color>
+    <color name="indigo_primary">#4355B9</color>
+    <color name="indigo_on_primary">#FFFFFF</color>
+    <color name="indigo_primary_container">#DDE0FF</color>
+    <color name="indigo_on_primary_container">#000D61</color>
+    <color name="indigo_primary_inverse">#B9C3FF</color>
+    <color name="indigo_secondary">#5B5D71</color>
+    <color name="indigo_on_secondary">#FFFFFF</color>
+    <color name="indigo_secondary_container">#E0E1FA</color>
+    <color name="indigo_on_secondary_container">#171A2C</color>
+    <color name="indigo_tertiary">#77536D</color>
+    <color name="indigo_on_tertiary">#FFFFFF</color>
+    <color name="indigo_tertiary_container">#FFD7F3</color>
+    <color name="indigo_on_tertiary_container">#2D1228</color>
+    <color name="indigo_error">#BA1B1B</color>
+    <color name="indigo_on_error">#FFFFFF</color>
+    <color name="indigo_error_container">#FFDAD4</color>
+    <color name="indigo_on_error_container">#410001</color>
+    <color name="indigo_surface">#FEFBFF</color>
+    <color name="indigo_on_surface">#1B1B1F</color>
+    <color name="indigo_surface_variant">#E3E1EC</color>
+    <color name="indigo_on_surface_variant">#46464F</color>
+    <color name="indigo_surface_inverse">#303034</color>
+    <color name="indigo_on_surface_inverse">#F3F0F5</color>
 
-    <color name="indigo_primary">@color/indigo_40</color>
-    <color name="indigo_on_primary">@color/indigo_100</color>
-    <color name="indigo_primary_inverse">@color/indigo_80</color>
-    <color name="indigo_primary_container">@color/indigo_90</color>
-    <color name="indigo_on_primary_container">@color/indigo_10</color>
+    <color name="blue_primary">#0061A6</color>
+    <color name="blue_on_primary">#FFFFFF</color>
+    <color name="blue_primary_container">#D0E4FF</color>
+    <color name="blue_on_primary_container">#001D36</color>
+    <color name="blue_primary_inverse">#9CCAFF</color>
+    <color name="blue_secondary">#535F70</color>
+    <color name="blue_on_secondary">#FFFFFF</color>
+    <color name="blue_secondary_container">#D6E3F7</color>
+    <color name="blue_on_secondary_container">#101C2B</color>
+    <color name="blue_tertiary">#6B5778</color>
+    <color name="blue_on_tertiary">#FFFFFF</color>
+    <color name="blue_tertiary_container">#F3DAFF</color>
+    <color name="blue_on_tertiary_container">#251432</color>
+    <color name="blue_error">#BA1B1B</color>
+    <color name="blue_error_container">#FFDAD4</color>
+    <color name="blue_on_error">#FFFFFF</color>
+    <color name="blue_on_error_container">#410001</color>
+    <color name="blue_surface">#FDFCFF</color>
+    <color name="blue_on_surface">#1B1B1B</color>
+    <color name="blue_surface_variant">#DFE2EB</color>
+    <color name="blue_on_surface_variant">#42474E</color>
+    <color name="blue_surface_inverse">#2F3033</color>
+    <color name="blue_on_surface_inverse">#F1F0F4</color>
 
-    <color name="blue_primary">@color/blue_40</color>
-    <color name="blue_on_primary">@color/blue_100</color>
-    <color name="blue_primary_inverse">@color/blue_80</color>
-    <color name="blue_primary_container">@color/blue_90</color>
-    <color name="blue_on_primary_container">@color/blue_10</color>
+    <color name="light_blue_primary">#006494</color>
+    <color name="light_blue_on_primary">#FFFFFF</color>
+    <color name="light_blue_primary_container">#C8E6FF</color>
+    <color name="light_blue_on_primary_container">#001E31</color>
+    <color name="light_blue_primary_inverse">#8BCEFF</color>
+    <color name="light_blue_secondary">#50606E</color>
+    <color name="light_blue_on_secondary">#FFFFFF</color>
+    <color name="light_blue_secondary_container">#D3E4F5</color>
+    <color name="light_blue_on_secondary_container">#0C1D29</color>
+    <color name="light_blue_tertiary">#65597B</color>
+    <color name="light_blue_on_tertiary">#FFFFFF</color>
+    <color name="light_blue_tertiary_container">#ECDCFF</color>
+    <color name="light_blue_on_tertiary_container">#201634</color>
+    <color name="light_blue_error">#BA1B1B</color>
+    <color name="light_blue_on_error">#FFFFFF</color>
+    <color name="light_blue_error_container">#FFDAD4</color>
+    <color name="light_blue_on_error_container">#410001</color>
+    <color name="light_blue_surface">#FCFCFF</color>
+    <color name="light_blue_on_surface">#1A1C1E</color>
+    <color name="light_blue_surface_variant">#DEE3EA</color>
+    <color name="light_blue_on_surface_variant">#41474D</color>
+    <color name="light_blue_surface_inverse">#2F3032</color>
+    <color name="light_blue_on_surface_inverse">#F0F0F3</color>
 
-    <color name="light_blue_primary">@color/light_blue_40</color>
-    <color name="light_blue_on_primary">@color/light_blue_100</color>
-    <color name="light_blue_primary_inverse">@color/light_blue_80</color>
-    <color name="light_blue_primary_container">@color/light_blue_90</color>
-    <color name="light_blue_on_primary_container">@color/light_blue_10</color>
+    <color name="cyan_primary">#006877</color>
+    <color name="cyan_on_primary">#FFFFFF</color>
+    <color name="cyan_primary_container">#9CEFFF</color>
+    <color name="cyan_on_primary_container">#001F25</color>
+    <color name="cyan_primary_inverse">#44D8F1</color>
+    <color name="cyan_secondary">#4A6267</color>
+    <color name="cyan_on_secondary">#FFFFFF</color>
+    <color name="cyan_secondary_container">#CDE7ED</color>
+    <color name="cyan_on_secondary_container">#051F23</color>
+    <color name="cyan_tertiary">#545D7D</color>
+    <color name="cyan_on_tertiary">#FFFFFF</color>
+    <color name="cyan_tertiary_container">#DAE1FF</color>
+    <color name="cyan_on_tertiary_container">#101A37</color>
+    <color name="cyan_error">#BA1B1B</color>
+    <color name="cyan_on_error">#FFFFFF</color>
+    <color name="cyan_error_container">#FFDAD4</color>
+    <color name="cyan_on_error_container">#410001</color>
+    <color name="cyan_surface">#FBFDFE</color>
+    <color name="cyan_on_surface">#191C1D</color>
+    <color name="cyan_surface_variant">#DBE4E6</color>
+    <color name="cyan_on_surface_variant">#3F484A</color>
+    <color name="cyan_surface_inverse">#2D3132</color>
+    <color name="cyan_on_surface_inverse">#EFF1F2</color>
 
-    <color name="cyan_primary">@color/cyan_40</color>
-    <color name="cyan_on_primary">@color/cyan_100</color>
-    <color name="cyan_primary_inverse">@color/cyan_80</color>
-    <color name="cyan_primary_container">@color/cyan_90</color>
-    <color name="cyan_on_primary_container">@color/cyan_10</color>
+    <color name="teal_primary">#006A5F</color>
+    <color name="teal_on_primary">#FFFFFF</color>
+    <color name="teal_primary_container">#74F7E5</color>
+    <color name="teal_on_primary_container">#00201C</color>
+    <color name="teal_primary_inverse">#53DBC9</color>
+    <color name="teal_secondary">#4A635F</color>
+    <color name="teal_on_secondary">#FFFFFF</color>
+    <color name="teal_secondary_container">#CDE8E2</color>
+    <color name="teal_on_secondary_container">#05201C</color>
+    <color name="teal_tertiary">#466179</color>
+    <color name="teal_on_tertiary">#FFFFFF</color>
+    <color name="teal_tertiary_container">#CBE5FF</color>
+    <color name="teal_on_tertiary_container">#001D31</color>
+    <color name="teal_error">#BA1B1B</color>
+    <color name="teal_on_error">#FFFFFF</color>
+    <color name="teal_error_container">#FFDAD4</color>
+    <color name="teal_on_error_container">#410001</color>
+    <color name="teal_surface">#FAFDFA</color>
+    <color name="teal_on_surface">#191C1B</color>
+    <color name="teal_surface_variant">#DBE5E2</color>
+    <color name="teal_on_surface_variant">#3F4947</color>
+    <color name="teal_surface_inverse">#2D3130</color>
+    <color name="teal_on_surface_inverse">#EFF1EF</color>
 
-    <color name="teal_primary">@color/teal_40</color>
-    <color name="teal_on_primary">@color/teal_100</color>
-    <color name="teal_primary_inverse">@color/teal_80</color>
-    <color name="teal_primary_container">@color/teal_90</color>
-    <color name="teal_on_primary_container">@color/teal_10</color>
+    <color name="green_primary">#006E17</color>
+    <color name="green_on_primary">#FFFFFF</color>
+    <color name="green_primary_container">#93F990</color>
+    <color name="green_on_primary_container">#002203</color>
+    <color name="green_primary_inverse">#78DC77</color>
+    <color name="green_secondary">#52634F</color>
+    <color name="green_on_secondary">#FFFFFF</color>
+    <color name="green_secondary_container">#D5E8CE</color>
+    <color name="green_on_secondary_container">#101F0F</color>
+    <color name="green_tertiary">#38656A</color>
+    <color name="green_on_tertiary">#FFFFFF</color>
+    <color name="green_tertiary_container">#BCEBF0</color>
+    <color name="green_on_tertiary_container">#001F23</color>
+    <color name="green_error">#BA1B1B</color>
+    <color name="green_on_error">#FFFFFF</color>
+    <color name="green_error_container">#FFDAD4</color>
+    <color name="green_on_error_container">#410001</color>
+    <color name="green_surface">#FCFDF6</color>
+    <color name="green_on_surface">#1A1C19</color>
+    <color name="green_surface_variant">#DEE5D8</color>
+    <color name="green_on_surface_variant">#424840</color>
+    <color name="green_surface_inverse">#2F312D</color>
+    <color name="green_on_surface_inverse">#F0F1EB</color>
 
-    <color name="green_primary">@color/green_40</color>
-    <color name="green_on_primary">@color/green_100</color>
-    <color name="green_primary_inverse">@color/green_80</color>
-    <color name="green_primary_container">@color/green_90</color>
-    <color name="green_on_primary_container">@color/green_10</color>
+    <color name="light_green_primary">#3C6A00</color>
+    <color name="light_green_on_primary">#FFFFFF</color>
+    <color name="light_green_primary_container">#B9F475</color>
+    <color name="light_green_on_primary_container">#0E2000</color>
+    <color name="light_green_primary_inverse">#9ED75C</color>
+    <color name="light_green_secondary">#58624A</color>
+    <color name="light_green_on_secondary">#FFFFFF</color>
+    <color name="light_green_secondary_container">#DBE7C7</color>
+    <color name="light_green_on_secondary_container">#151E0B</color>
+    <color name="light_green_tertiary">#386663</color>
+    <color name="light_green_on_tertiary">#FFFFFF</color>
+    <color name="light_green_tertiary_container">#BCECE8</color>
+    <color name="light_green_on_tertiary_container">#00201E</color>
+    <color name="light_green_error">#BA1B1B</color>
+    <color name="light_green_on_error">#FFFFFF</color>
+    <color name="light_green_error_container">#FFDAD4</color>
+    <color name="light_green_on_error_container">#410001</color>
+    <color name="light_green_surface">#FDFCF5</color>
+    <color name="light_green_on_surface">#1A1C17</color>
+    <color name="light_green_surface_variant">#E1E4D6</color>
+    <color name="light_green_on_surface_variant">#44483D</color>
+    <color name="light_green_surface_inverse">#30312D</color>
+    <color name="light_green_on_surface_inverse">#F2F1EA</color>
 
-    <color name="light_green_primary">@color/light_green_40</color>
-    <color name="light_green_on_primary">@color/light_green_100</color>
-    <color name="light_green_primary_inverse">@color/light_green_80</color>
-    <color name="light_green_primary_container">@color/light_green_90</color>
-    <color name="light_green_on_primary_container">@color/light_green_10</color>
+    <color name="lime_primary">#5A6400</color>
+    <color name="lime_on_primary">#FFFFFF</color>
+    <color name="lime_primary_container">#DEED49</color>
+    <color name="lime_on_primary_container">#1A1E00</color>
+    <color name="lime_primary_inverse">#C1D02C</color>
+    <color name="lime_secondary">#5E6044</color>
+    <color name="lime_on_secondary">#FFFFFF</color>
+    <color name="lime_secondary_container">#E4E5C1</color>
+    <color name="lime_on_secondary_container">#1B1D07</color>
+    <color name="lime_tertiary">#3C665A</color>
+    <color name="lime_on_tertiary">#FFFFFF</color>
+    <color name="lime_tertiary_container">#BEECDC</color>
+    <color name="lime_on_tertiary_container">#002019</color>
+    <color name="lime_error">#BA1B1B</color>
+    <color name="lime_on_error">#FFFFFF</color>
+    <color name="lime_error_container">#FFDAD4</color>
+    <color name="lime_on_error_container">#410001</color>
+    <color name="lime_surface">#FFFCF3</color>
+    <color name="lime_on_surface">#1C1C17</color>
+    <color name="lime_surface_variant">#E5E3D2</color>
+    <color name="lime_on_surface_variant">#47473B</color>
+    <color name="lime_surface_inverse">#31312B</color>
+    <color name="lime_on_surface_inverse">#F3F0E8</color>
 
-    <color name="lime_primary">@color/lime_40</color>
-    <color name="lime_on_primary">@color/lime_100</color>
-    <color name="lime_primary_inverse">@color/lime_80</color>
-    <color name="lime_primary_container">@color/lime_90</color>
-    <color name="lime_on_primary_container">@color/lime_10</color>
+    <color name="yellow_primary">#FFB300</color>
+    <color name="yellow_on_primary">#FFFFFF</color>
+    <color name="yellow_primary_container">#FFDF99</color>
+    <color name="yellow_on_primary_container">#261A00</color>
+    <color name="yellow_primary_inverse">#FABD00</color>
+    <color name="yellow_secondary">#6B5C3F</color>
+    <color name="yellow_on_secondary">#FFFFFF</color>
+    <color name="yellow_secondary_container">#F4E0BB</color>
+    <color name="yellow_on_secondary_container">#241A04</color>
+    <color name="yellow_tertiary">#496546</color>
+    <color name="yellow_on_tertiary">#FFFFFF</color>
+    <color name="yellow_tertiary_container">#CCEBC5</color>
+    <color name="yellow_on_tertiary_container">#082009</color>
+    <color name="yellow_error">#BA1B1B</color>
+    <color name="yellow_on_error">#FFFFFF</color>
+    <color name="yellow_error_container">#FFDAD4</color>
+    <color name="yellow_on_error_container">#410001</color>
+    <color name="yellow_surface">#FFFBF8</color>
+    <color name="yellow_on_surface">#1E1B16</color>
+    <color name="yellow_surface_variant">#EDE1CF</color>
+    <color name="yellow_on_surface_variant">#4D4639</color>
+    <color name="yellow_surface_inverse">#34302A</color>
+    <color name="yellow_on_surface_inverse">#F8F0E7</color>
 
-    <color name="yellow_primary">@color/yellow_40</color>
-    <color name="yellow_on_primary">@color/yellow_100</color>
-    <color name="yellow_primary_inverse">@color/yellow_80</color>
-    <color name="yellow_primary_container">@color/yellow_90</color>
-    <color name="yellow_on_primary_container">@color/yellow_10</color>
+    <color name="orange_primary">#FB8C00</color>
+    <color name="orange_on_primary">#FFFFFF</color>
+    <color name="orange_primary_container">#FFDCBB</color>
+    <color name="orange_on_primary_container">#2D1600</color>
+    <color name="orange_primary_inverse">#FFB86D</color>
+    <color name="orange_secondary">#735A42</color>
+    <color name="orange_on_secondary">#FFFFFF</color>
+    <color name="orange_secondary_container">#FEDCBE</color>
+    <color name="orange_on_secondary_container">#291806</color>
+    <color name="orange_tertiary">#586339</color>
+    <color name="orange_on_tertiary">#FFFFFF</color>
+    <color name="orange_tertiary_container">#DCE8B4</color>
+    <color name="orange_on_tertiary_container">#161E01</color>
+    <color name="orange_error">#BA1B1B</color>
+    <color name="orange_error_container">#FFDAD4</color>
+    <color name="orange_on_error">#FFFFFF</color>
+    <color name="orange_on_error_container">#410001</color>
+    <color name="orange_surface">#FCFCFC</color>
+    <color name="orange_on_surface">#1F1B17</color>
+    <color name="orange_surface_variant">#F2DFD1</color>
+    <color name="orange_on_surface_variant">#51453A</color>
+    <color name="orange_surface_inverse">#352F2A</color>
+    <color name="orange_on_surface_inverse">#FAEFE7</color>
 
-    <color name="orange_primary">@color/orange_40</color>
-    <color name="orange_on_primary">@color/orange_100</color>
-    <color name="orange_primary_inverse">@color/orange_80</color>
-    <color name="orange_primary_container">@color/orange_90</color>
-    <color name="orange_on_primary_container">@color/orange_10</color>
+    <color name="deep_orange_primary">#B22C00</color>
+    <color name="deep_orange_on_primary">#FFFFFF</color>
+    <color name="deep_orange_primary_container">#FFDACF</color>
+    <color name="deep_orange_on_primary_container">#3C0800</color>
+    <color name="deep_orange_primary_inverse">#FFB49D</color>
+    <color name="deep_orange_secondary">#77574E</color>
+    <color name="deep_orange_on_secondary">#FFFFFF</color>
+    <color name="deep_orange_secondary_container">#FFDACF</color>
+    <color name="deep_orange_on_secondary_container">#2C150F</color>
+    <color name="deep_orange_tertiary">#6C5D2F</color>
+    <color name="deep_orange_on_tertiary">#FFFFFF</color>
+    <color name="deep_orange_tertiary_container">#F6E1A6</color>
+    <color name="deep_orange_on_tertiary_container">#231B00</color>
+    <color name="deep_orange_error">#BA1B1B</color>
+    <color name="deep_orange_on_error">#FFFFFF</color>
+    <color name="deep_orange_error_container">#FFDAD4</color>
+    <color name="deep_orange_on_error_container">#410001</color>
+    <color name="deep_orange_surface">#FCFCFC</color>
+    <color name="deep_orange_on_surface">#201A18</color>
+    <color name="deep_orange_surface_variant">#F5DED8</color>
+    <color name="deep_orange_on_surface_variant">#53433F</color>
+    <color name="deep_orange_surface_inverse">#362F2D</color>
+    <color name="deep_orange_on_surface_inverse">#FBEEEB</color>
 
-    <color name="deep_orange_primary">@color/deep_orange_40</color>
-    <color name="deep_orange_on_primary">@color/deep_orange_100</color>
-    <color name="deep_orange_primary_inverse">@color/deep_orange_80</color>
-    <color name="deep_orange_primary_container">@color/deep_orange_90</color>
-    <color name="deep_orange_on_primary_container">@color/deep_orange_10</color>
+    <color name="brown_primary">#77574C</color>
+    <color name="brown_on_primary">#FFFFFF</color>
+    <color name="brown_primary_container">#FFDBCD</color>
+    <color name="brown_on_primary_container">#2C160D</color>
+    <color name="brown_primary_inverse">#E7BEB0</color>
+    <color name="brown_secondary">#9A4523</color>
+    <color name="brown_on_secondary">#FFFFFF</color>
+    <color name="brown_secondary_container">#FFDBCD</color>
+    <color name="brown_on_secondary_container">#380C00</color>
+    <color name="brown_tertiary">#695E2F</color>
+    <color name="brown_on_tertiary">#FFFFFF</color>
+    <color name="brown_tertiary_container">#F1E2A7</color>
+    <color name="brown_on_tertiary_container">#221B00</color>
+    <color name="brown_error">#BA1B1B</color>
+    <color name="brown_on_error">#FFFFFF</color>
+    <color name="brown_error_container">#FFDAD4</color>
+    <color name="brown_on_error_container">#410001</color>
+    <color name="brown_background">#FCFCFC</color>
+    <color name="brown_on_background">#201A18</color>
+    <color name="brown_surface">#FCFCFC</color>
+    <color name="brown_on_surface">#201A18</color>
+    <color name="brown_surface_variant">#F5DED6</color>
+    <color name="brown_on_surface_variant">#52433E</color>
+    <color name="brown_outline">#85736D</color>
+    <color name="brown_surface_inverse">#362F2D</color>
+    <color name="brown_on_surface_inverse">#FCEEEA</color>
 
-    <color name="brown_primary">@color/brown_40</color>
-    <color name="brown_on_primary">@color/brown_100</color>
-    <color name="brown_primary_inverse">@color/brown_80</color>
-    <color name="brown_primary_container">@color/brown_90</color>
-    <color name="brown_on_primary_container">@color/brown_10</color>
+    <color name="grey_primary">#757575</color>
+    <color name="grey_on_primary">#FFFFFF</color>
+    <color name="grey_primary_inverse">#EEEEEE</color>
+    <color name="grey_primary_container">#E0E0E0</color>
+    <color name="grey_on_primary_container">#212121</color>
+    <color name="grey_secondary">#4D4D4D</color>
+    <color name="grey_on_secondary">#FFFFFF</color>
+    <color name="grey_secondary_container">#D0E6F2</color>
+    <color name="grey_on_secondary_container">#081E27</color>
+    <color name="grey_tertiary">#5D5D5D</color>
+    <color name="grey_on_tertiary">#FFFFFF</color>
+    <color name="grey_tertiary_container">#E3E3E3</color>
+    <color name="grey_on_tertiary_container">#191919</color>
+    <color name="grey_error">#BA1B1B</color>
+    <color name="grey_on_error">#FFFFFF</color>
+    <color name="grey_error_container">#FFDADA</color>
+    <color name="grey_on_error_container">#410000</color>
+    <color name="grey_surface">#fafafa</color>
+    <color name="grey_on_surface">#191919</color>
+    <color name="grey_surface_variant">#DCDCDC</color>
+    <color name="grey_on_surface_variant">#484848</color>
+    <color name="grey_surface_inverse">#1f1f1f</color>
+    <color name="grey_on_surface_inverse">#F0F0F0</color>
 
-    <color name="grey_primary">@color/grey_40</color>
-    <color name="grey_on_primary">@color/grey_100</color>
-    <color name="grey_primary_inverse">@color/grey_80</color>
-    <color name="grey_primary_container">@color/grey_70</color>
-    <color name="grey_on_primary_container">@color/grey_10</color>
-
-    <color name="blue_grey_primary">@color/blue_grey_40</color>
-    <color name="blue_grey_on_primary">@color/blue_grey_100</color>
-    <color name="blue_grey_primary_inverse">@color/blue_grey_80</color>
-    <color name="blue_grey_primary_container">@color/blue_grey_90</color>
-    <color name="blue_grey_on_primary_container">@color/blue_grey_10</color>
+    <color name="blue_grey_primary">#006684</color>
+    <color name="blue_grey_on_primary">#FFFFFF</color>
+    <color name="blue_grey_primary_container">#BAE9FF</color>
+    <color name="blue_grey_on_primary_container">#001F2A</color>
+    <color name="blue_grey_primary_inverse">#62D3FF</color>
+    <color name="blue_grey_secondary">#4D616B</color>
+    <color name="blue_grey_on_secondary">#FFFFFF</color>
+    <color name="blue_grey_secondary_container">#D0E6F2</color>
+    <color name="blue_grey_on_secondary_container">#081E27</color>
+    <color name="blue_grey_tertiary">#5D5B7E</color>
+    <color name="blue_grey_on_tertiary">#FFFFFF</color>
+    <color name="blue_grey_tertiary_container">#E3DFFF</color>
+    <color name="blue_grey_on_tertiary_container">#191836</color>
+    <color name="blue_grey_error">#BA1B1B</color>
+    <color name="blue_grey_on_error">#FFFFFF</color>
+    <color name="blue_grey_error_container">#FFDAD4</color>
+    <color name="blue_grey_on_error_container">#410001</color>
+    <color name="blue_grey_surface">#FBFCFE</color>
+    <color name="blue_grey_on_surface">#191C1E</color>
+    <color name="blue_grey_surface_variant">#DCE4E9</color>
+    <color name="blue_grey_on_surface_variant">#40484C</color>
+    <color name="blue_grey_surface_inverse">#2E3133</color>
+    <color name="blue_grey_on_surface_inverse">#F0F1F3</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/palette.xml b/app/src/main/res/values/palette.xml
deleted file mode 100644
index e8f59a621..000000000
--- a/app/src/main/res/values/palette.xml
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!--
-    Each accent's color palette.
-    Each color here follows the Material3 notation for describing shades, with 0 being black and
-    100 being white.
-    -->
-    <color name="red_10">#B71C1C</color>
-    <color name="red_20">#C62828</color>
-    <color name="red_30">#D32F2F</color>
-    <color name="red_40">#E53935</color>
-    <color name="red_80">#EF9A9A</color>
-    <color name="red_90">#FFCDD2</color>
-    <color name="red_100">#FFFFFF</color>
-
-    <color name="pink_10">#880E4F</color>
-    <color name="pink_20">#AD1457</color>
-    <color name="pink_30">#C2185B</color>
-    <color name="pink_40">#D81B60</color>
-    <color name="pink_80">#F48FB1</color>
-    <color name="pink_90">#F8BBD0</color>
-    <color name="pink_100">#FFFFFF</color>
-
-    <color name="purple_10">#4A148C</color>
-    <color name="purple_20">#6A1B9A</color>
-    <color name="purple_30">#7B1FA2</color>
-    <color name="purple_40">#8E24AA</color>
-    <color name="purple_80">#CE93D8</color>
-    <color name="purple_90">#F8BBD0</color>
-    <color name="purple_100">#E1BEE7</color>
-
-    <color name="deep_purple_10">#311B92</color>
-    <color name="deep_purple_20">#4527A0</color>
-    <color name="deep_purple_30">#512DA8</color>
-    <color name="deep_purple_40">#5E35B1</color>
-    <color name="deep_purple_80">#B39DDB</color>
-    <color name="deep_purple_90">#D1C4E9</color>
-    <color name="deep_purple_100">#FFFFFF</color>
-
-    <color name="indigo_10">#1A237E</color>
-    <color name="indigo_20">#283593</color>
-    <color name="indigo_30">#303F9F</color>
-    <color name="indigo_40">#3949AB</color>
-    <color name="indigo_80">#9FA8DA</color>
-    <color name="indigo_90">#C5CAE9</color>
-    <color name="indigo_100">#FFFFFF</color>
-
-    <color name="blue_10">#0D47A1</color>
-    <color name="blue_20">#1565C0</color>
-    <color name="blue_30">#1976D2</color>
-    <color name="blue_40">#1E88E5</color>
-    <color name="blue_80">#90CAF9</color>
-    <color name="blue_90">#BBDEFB</color>
-    <color name="blue_100">#FFFFFF</color>
-
-    <color name="light_blue_10">#01579B</color>
-    <color name="light_blue_20">#0277BD</color>
-    <color name="light_blue_30">#0288D1</color>
-    <color name="light_blue_40">#039BE5</color>
-    <color name="light_blue_80">#81D4FA</color>
-    <color name="light_blue_90">#B3E5FC</color>
-    <color name="light_blue_100">#FFFFFF</color>
-
-    <color name="cyan_10">#006064</color>
-    <color name="cyan_20">#00838F</color>
-    <color name="cyan_30">#0097A7</color>
-    <color name="cyan_40">#00ACC1</color>
-    <color name="cyan_80">#80DEEA</color>
-    <color name="cyan_90">#B2EBF2</color>
-    <color name="cyan_100">#FFFFFF</color>
-
-    <color name="teal_10">#004D40</color>
-    <color name="teal_20">#00695C</color>
-    <color name="teal_30">#00796B</color>
-    <color name="teal_40">#00897B</color>
-    <color name="teal_80">#80CBC4</color>
-    <color name="teal_90">#B2DFDB</color>
-    <color name="teal_100">#FFFFFF</color>
-
-    <color name="green_10">#1B5E20</color>
-    <color name="green_20">#2E7D32</color>
-    <color name="green_30">#388E3C</color>
-    <color name="green_40">#43A047</color>
-    <color name="green_80">#A5D6A7</color>
-    <color name="green_90">#C8E6C9</color>
-    <color name="green_100">#FFFFFF</color>
-
-    <color name="light_green_10">#33691E</color>
-    <color name="light_green_20">#558B2F</color>
-    <color name="light_green_30">#689F38</color>
-    <color name="light_green_40">#7CB342</color>
-    <color name="light_green_80">#C5E1A5</color>
-    <color name="light_green_90">#DCEDC8</color>
-    <color name="light_green_100">#FFFFFF</color>
-
-    <color name="lime_10">#827717</color>
-    <color name="lime_20">#9E9D24</color>
-    <color name="lime_30">#AFB42B</color>
-    <color name="lime_40">#C0CA33</color>
-    <color name="lime_80">#E6EE9C</color>
-    <color name="lime_90">#F0F4C3</color>
-    <color name="lime_100">#FFFFFF</color>
-
-    <color name="yellow_10">#FF6F00</color>
-    <color name="yellow_20">#FF8F00</color>
-    <color name="yellow_30">#FFA000</color>
-    <color name="yellow_40">#FFB300</color>
-    <color name="yellow_80">#FFE082</color>
-    <color name="yellow_90">#FFECB3</color>
-    <color name="yellow_100">#FFFFFF</color>
-
-    <color name="orange_10">#E65100</color>
-    <color name="orange_20">#EF6C00</color>
-    <color name="orange_30">#F57C00</color>
-    <color name="orange_40">#FB8C00</color>
-    <color name="orange_80">#FFCC80</color>
-    <color name="orange_90">#FFE0B2</color>
-    <color name="orange_100">#FFFFFF</color>
-
-    <color name="deep_orange_10">#BF360C</color>
-    <color name="deep_orange_20">#D84315</color>
-    <color name="deep_orange_30">#E64A19</color>
-    <color name="deep_orange_40">#F4511E</color>
-    <color name="deep_orange_80">#FFAB91</color>
-    <color name="deep_orange_90">#FFCCBC</color>
-    <color name="deep_orange_100">#FFFFFF</color>
-
-    <color name="brown_10">#3E2723</color>
-    <color name="brown_20">#4E342E</color>
-    <color name="brown_30">#5D4037</color>
-    <color name="brown_40">#6D4C41</color>
-    <color name="brown_80">#BCAAA4</color>
-    <color name="brown_90">#D7CCC8</color>
-    <color name="brown_100">#FFFFFF</color>
-
-    <color name="grey_10">#212121</color>
-    <color name="grey_20">#424242</color>
-    <color name="grey_30">#616161</color>
-    <color name="grey_40">#757575</color>
-    <color name="grey_70">#e0e0e0</color>
-    <color name="grey_80">#EEEEEE</color>
-    <color name="grey_90">#F5F5F5</color>
-    <color name="grey_100">#FFFFFF</color>
-
-    <color name="blue_grey_10">#263238</color>
-    <color name="blue_grey_20">#37474F</color>
-    <color name="blue_grey_30">#455A64</color>
-    <color name="blue_grey_40">#546E7A</color>
-    <color name="blue_grey_80">#B0BEC5</color>
-    <color name="blue_grey_90">#CFD8DC</color>
-    <color name="blue_grey_100">#FFFFFF</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_android.xml b/app/src/main/res/values/styles_android.xml
index e27da5c01..5992b6efa 100644
--- a/app/src/main/res/values/styles_android.xml
+++ b/app/src/main/res/values/styles_android.xml
@@ -9,6 +9,8 @@
     <style name="Theme.Auxio.Dialog" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
         <item name="android:checkedTextViewStyle">@style/Widget.Auxio.Dialog.CheckedTextView</item>
         <item name="materialAlertDialogTitleTextStyle">@style/Widget.Auxio.Dialog.TextView</item>
+        <item name="buttonBarPositiveButtonStyle">@style/Widget.Material3.Button.TextButton.Dialog</item>
+        <item name="buttonBarNegativeButtonStyle">@style/Widget.Material3.Button.TextButton.Dialog</item>
         <item name="buttonBarNeutralButtonStyle">@style/Widget.Auxio.Dialog.Button.Flush</item>
     </style>
 
diff --git a/app/src/main/res/values/styles_core.xml b/app/src/main/res/values/styles_core.xml
index a137b2b72..7134752c3 100644
--- a/app/src/main/res/values/styles_core.xml
+++ b/app/src/main/res/values/styles_core.xml
@@ -8,20 +8,7 @@
     </style>
     <!-- Android 12 configuration -->
     <style name="Theme.Auxio.V31" parent="Theme.Auxio.V27">
-        <!-- Make sure to apply more accent-friendly values on older versions -->
-        <item name="colorSurface">@color/surface</item>
-        <item name="colorSurfaceVariant">@color/surface_variant</item>
-        <item name="colorControlNormal">?attr/colorSurfaceVariant</item>
 
-        <item name="colorSecondary">?attr/colorPrimary</item>
-        <item name="colorOnSecondary">?attr/colorOnPrimary</item>
-        <item name="colorSecondaryContainer">?attr/colorPrimaryContainer</item>
-        <item name="colorOnSecondaryContainer">?attr/colorOnPrimaryContainer</item>
-
-        <item name="colorTertiary">?attr/colorPrimary</item>
-        <item name="colorOnTertiary">?attr/colorOnPrimary</item>
-        <item name="colorTertiaryContainer">?attr/colorPrimaryContainer</item>
-        <item name="colorOnTertiaryContainer">?attr/colorOnPrimaryContainer</item>
     </style>
 
     <!-- Base theme -->
@@ -30,7 +17,7 @@
         <item name="colorAccent">?attr/colorSecondary</item>
         <item name="colorOutline">@color/overlay_stroke</item>
         <item name="indicatorColor">?attr/colorPrimary</item>
-        <item name="colorControlActivated">?attr/colorSecondary</item>
+        <item name="colorControlActivated">?attr/colorPrimary</item>
 
         <!-- Fix dumb default android behavior -->
         <item name="android:colorBackground">?attr/colorSurface</item>
@@ -61,15 +48,6 @@
         <item name="textAppearanceBodySmall">@style/TextAppearance.Auxio.BodySmall</item>
     </style>
 
-    <!-- The basic black theme derived in all black accents. -->
-    <style name="Theme.Auxio.App.Black" parent="Theme.Auxio.App">
-        <!--
-        Assume that Android's night mode will do the rest of the work
-        for us and set the background to pitch-black
-        -->
-        <item name="colorSurface">@color/surface_black</item>
-    </style>
-
     <!--
     Theming widgets is technically possible below Android 12, but I *really* don't care enough
     to bother with it.
diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml
index e6262ff2e..bbb5a8e4a 100644
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@@ -106,6 +106,7 @@
     <style name="Widget.Auxio.TextView.Secondary.Compact" parent="Widget.Auxio.TextView.Base">
         <item name="android:maxLines">1</item>
         <item name="android:ellipsize">end</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
         <item name="android:textAppearance">@style/TextAppearance.Auxio.LabelMedium</item>
     </style>
 
@@ -147,7 +148,11 @@
     </style>
 
     <style name="Widget.Auxio.Button.Primary" parent="Widget.Material3.Button">
+        <!-- TODO: Report elevation bug -->
         <item name="android:textAppearance">@style/TextAppearance.Auxio.LabelLarger</item>
+        <item name="android:stateListAnimator">@null</item>
+        <item name="android:elevation">0dp</item>
+        <item name="elevation">0dp</item>
     </style>
 
     <style name="Widget.Auxio.Button.Secondary" parent="Widget.Material3.Button.OutlinedButton">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 1c09d0ac4..b0601ece9 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -9,6 +9,28 @@
         <item name="colorPrimaryInverse">@color/red_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/red_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/red_on_primary_container</item>
+
+        <item name="colorSecondary">@color/red_secondary</item>
+        <item name="colorOnSecondary">@color/red_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/red_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/red_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/red_tertiary</item>
+        <item name="colorOnTertiary">@color/red_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/red_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/red_on_tertiary_container</item>
+
+        <item name="colorError">@color/red_error</item>
+        <item name="colorOnError">@color/red_on_error</item>
+        <item name="colorErrorContainer">@color/red_error_container</item>
+        <item name="colorOnErrorContainer">@color/red_on_error_container</item>
+
+        <item name="colorSurface">@color/red_surface</item>
+        <item name="colorOnSurface">@color/red_on_surface</item>
+        <item name="colorSurfaceInverse">@color/red_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/red_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/red_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/red_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.Pink" parent="Theme.Auxio.App">
@@ -17,6 +39,28 @@
         <item name="colorPrimaryInverse">@color/pink_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/pink_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/pink_on_primary_container</item>
+
+        <item name="colorSecondary">@color/pink_secondary</item>
+        <item name="colorOnSecondary">@color/pink_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/pink_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/pink_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/pink_tertiary</item>
+        <item name="colorOnTertiary">@color/pink_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/pink_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/pink_on_tertiary_container</item>
+
+        <item name="colorError">@color/pink_error</item>
+        <item name="colorOnError">@color/pink_on_error</item>
+        <item name="colorErrorContainer">@color/pink_error_container</item>
+        <item name="colorOnErrorContainer">@color/pink_on_error_container</item>
+
+        <item name="colorSurface">@color/pink_surface</item>
+        <item name="colorOnSurface">@color/pink_on_surface</item>
+        <item name="colorSurfaceInverse">@color/pink_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/pink_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/pink_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/pink_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.Purple" parent="Theme.Auxio.App">
@@ -25,6 +69,28 @@
         <item name="colorPrimaryInverse">@color/purple_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/purple_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/purple_on_primary_container</item>
+
+        <item name="colorSecondary">@color/purple_secondary</item>
+        <item name="colorOnSecondary">@color/purple_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/purple_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/purple_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/purple_tertiary</item>
+        <item name="colorOnTertiary">@color/purple_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/purple_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/purple_on_tertiary_container</item>
+
+        <item name="colorError">@color/purple_error</item>
+        <item name="colorOnError">@color/purple_on_error</item>
+        <item name="colorErrorContainer">@color/purple_error_container</item>
+        <item name="colorOnErrorContainer">@color/purple_on_error_container</item>
+
+        <item name="colorSurface">@color/purple_surface</item>
+        <item name="colorOnSurface">@color/purple_on_surface</item>
+        <item name="colorSurfaceInverse">@color/purple_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/purple_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/purple_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/purple_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.DeepPurple" parent="Theme.Auxio.App">
@@ -33,6 +99,28 @@
         <item name="colorPrimaryInverse">@color/deep_purple_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/deep_purple_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/deep_purple_on_primary_container</item>
+
+        <item name="colorSecondary">@color/deep_purple_secondary</item>
+        <item name="colorOnSecondary">@color/deep_purple_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/deep_purple_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/deep_purple_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/deep_purple_tertiary</item>
+        <item name="colorOnTertiary">@color/deep_purple_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/deep_purple_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/deep_purple_on_tertiary_container</item>
+
+        <item name="colorError">@color/deep_purple_error</item>
+        <item name="colorOnError">@color/deep_purple_on_error</item>
+        <item name="colorErrorContainer">@color/deep_purple_error_container</item>
+        <item name="colorOnErrorContainer">@color/deep_purple_on_error_container</item>
+
+        <item name="colorSurface">@color/deep_purple_surface</item>
+        <item name="colorOnSurface">@color/deep_purple_on_surface</item>
+        <item name="colorSurfaceInverse">@color/deep_purple_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/deep_purple_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/deep_purple_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/deep_purple_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.Indigo" parent="Theme.Auxio.App">
@@ -41,6 +129,28 @@
         <item name="colorPrimaryInverse">@color/indigo_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/indigo_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/indigo_on_primary_container</item>
+
+        <item name="colorSecondary">@color/indigo_secondary</item>
+        <item name="colorOnSecondary">@color/indigo_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/indigo_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/indigo_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/indigo_tertiary</item>
+        <item name="colorOnTertiary">@color/indigo_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/indigo_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/indigo_on_tertiary_container</item>
+
+        <item name="colorError">@color/indigo_error</item>
+        <item name="colorOnError">@color/indigo_on_error</item>
+        <item name="colorErrorContainer">@color/indigo_error_container</item>
+        <item name="colorOnErrorContainer">@color/indigo_on_error_container</item>
+
+        <item name="colorSurface">@color/indigo_surface</item>
+        <item name="colorOnSurface">@color/indigo_on_surface</item>
+        <item name="colorSurfaceInverse">@color/indigo_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/indigo_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/indigo_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/indigo_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.Blue" parent="Theme.Auxio.App">
@@ -49,6 +159,28 @@
         <item name="colorPrimaryInverse">@color/blue_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/blue_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/blue_on_primary_container</item>
+        
+        <item name="colorSecondary">@color/blue_secondary</item>
+        <item name="colorOnSecondary">@color/blue_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/blue_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/blue_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/blue_tertiary</item>
+        <item name="colorOnTertiary">@color/blue_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/blue_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/blue_on_tertiary_container</item>
+
+        <item name="colorError">@color/blue_error</item>
+        <item name="colorOnError">@color/blue_on_error</item>
+        <item name="colorErrorContainer">@color/blue_error_container</item>
+        <item name="colorOnErrorContainer">@color/blue_on_error_container</item>
+
+        <item name="colorSurface">@color/blue_surface</item>
+        <item name="colorOnSurface">@color/blue_on_surface</item>
+        <item name="colorSurfaceInverse">@color/blue_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/blue_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/blue_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/blue_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.LightBlue" parent="Theme.Auxio.App">
@@ -57,6 +189,28 @@
         <item name="colorPrimaryInverse">@color/light_blue_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/light_blue_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/light_blue_on_primary_container</item>
+
+        <item name="colorSecondary">@color/light_blue_secondary</item>
+        <item name="colorOnSecondary">@color/light_blue_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/light_blue_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/light_blue_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/light_blue_tertiary</item>
+        <item name="colorOnTertiary">@color/light_blue_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/light_blue_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/light_blue_on_tertiary_container</item>
+
+        <item name="colorError">@color/light_blue_error</item>
+        <item name="colorOnError">@color/light_blue_on_error</item>
+        <item name="colorErrorContainer">@color/light_blue_error_container</item>
+        <item name="colorOnErrorContainer">@color/light_blue_on_error_container</item>
+
+        <item name="colorSurface">@color/light_blue_surface</item>
+        <item name="colorOnSurface">@color/light_blue_on_surface</item>
+        <item name="colorSurfaceInverse">@color/light_blue_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/light_blue_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/light_blue_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/light_blue_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.Cyan" parent="Theme.Auxio.App">
@@ -65,6 +219,28 @@
         <item name="colorPrimaryInverse">@color/cyan_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/cyan_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/cyan_on_primary_container</item>
+
+        <item name="colorSecondary">@color/cyan_secondary</item>
+        <item name="colorOnSecondary">@color/cyan_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/cyan_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/cyan_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/cyan_tertiary</item>
+        <item name="colorOnTertiary">@color/cyan_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/cyan_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/cyan_on_tertiary_container</item>
+
+        <item name="colorError">@color/cyan_error</item>
+        <item name="colorOnError">@color/cyan_on_error</item>
+        <item name="colorErrorContainer">@color/cyan_error_container</item>
+        <item name="colorOnErrorContainer">@color/cyan_on_error_container</item>
+
+        <item name="colorSurface">@color/cyan_surface</item>
+        <item name="colorOnSurface">@color/cyan_on_surface</item>
+        <item name="colorSurfaceInverse">@color/cyan_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/cyan_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/cyan_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/cyan_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.Teal" parent="Theme.Auxio.App">
@@ -73,6 +249,28 @@
         <item name="colorPrimaryInverse">@color/teal_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/teal_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/teal_on_primary_container</item>
+
+        <item name="colorSecondary">@color/teal_secondary</item>
+        <item name="colorOnSecondary">@color/teal_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/teal_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/teal_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/teal_tertiary</item>
+        <item name="colorOnTertiary">@color/teal_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/teal_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/teal_on_tertiary_container</item>
+
+        <item name="colorError">@color/teal_error</item>
+        <item name="colorOnError">@color/teal_on_error</item>
+        <item name="colorErrorContainer">@color/teal_error_container</item>
+        <item name="colorOnErrorContainer">@color/teal_on_error_container</item>
+
+        <item name="colorSurface">@color/teal_surface</item>
+        <item name="colorOnSurface">@color/teal_on_surface</item>
+        <item name="colorSurfaceInverse">@color/teal_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/teal_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/teal_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/teal_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.Green" parent="Theme.Auxio.App">
@@ -81,6 +279,28 @@
         <item name="colorPrimaryInverse">@color/green_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/green_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/green_on_primary_container</item>
+
+        <item name="colorSecondary">@color/green_secondary</item>
+        <item name="colorOnSecondary">@color/green_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/green_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/green_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/green_tertiary</item>
+        <item name="colorOnTertiary">@color/green_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/green_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/green_on_tertiary_container</item>
+
+        <item name="colorError">@color/green_error</item>
+        <item name="colorOnError">@color/green_on_error</item>
+        <item name="colorErrorContainer">@color/green_error_container</item>
+        <item name="colorOnErrorContainer">@color/green_on_error_container</item>
+
+        <item name="colorSurface">@color/green_surface</item>
+        <item name="colorOnSurface">@color/green_on_surface</item>
+        <item name="colorSurfaceInverse">@color/green_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/green_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/green_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/green_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.LightGreen" parent="Theme.Auxio.App">
@@ -89,6 +309,28 @@
         <item name="colorPrimaryInverse">@color/light_green_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/light_green_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/light_green_on_primary_container</item>
+
+        <item name="colorSecondary">@color/light_green_secondary</item>
+        <item name="colorOnSecondary">@color/light_green_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/light_green_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/light_green_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/light_green_tertiary</item>
+        <item name="colorOnTertiary">@color/light_green_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/light_green_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/light_green_on_tertiary_container</item>
+
+        <item name="colorError">@color/light_green_error</item>
+        <item name="colorOnError">@color/light_green_on_error</item>
+        <item name="colorErrorContainer">@color/light_green_error_container</item>
+        <item name="colorOnErrorContainer">@color/light_green_on_error_container</item>
+
+        <item name="colorSurface">@color/light_green_surface</item>
+        <item name="colorOnSurface">@color/light_green_on_surface</item>
+        <item name="colorSurfaceInverse">@color/light_green_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/light_green_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/light_green_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/light_green_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.Lime" parent="Theme.Auxio.App">
@@ -97,6 +339,28 @@
         <item name="colorPrimaryInverse">@color/lime_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/lime_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/lime_on_primary_container</item>
+
+        <item name="colorSecondary">@color/lime_secondary</item>
+        <item name="colorOnSecondary">@color/lime_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/lime_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/lime_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/lime_tertiary</item>
+        <item name="colorOnTertiary">@color/lime_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/lime_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/lime_on_tertiary_container</item>
+
+        <item name="colorError">@color/lime_error</item>
+        <item name="colorOnError">@color/lime_on_error</item>
+        <item name="colorErrorContainer">@color/lime_error_container</item>
+        <item name="colorOnErrorContainer">@color/lime_on_error_container</item>
+
+        <item name="colorSurface">@color/lime_surface</item>
+        <item name="colorOnSurface">@color/lime_on_surface</item>
+        <item name="colorSurfaceInverse">@color/lime_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/lime_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/lime_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/lime_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.Yellow" parent="Theme.Auxio.App">
@@ -105,6 +369,28 @@
         <item name="colorPrimaryInverse">@color/yellow_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/yellow_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/yellow_on_primary_container</item>
+
+        <item name="colorSecondary">@color/yellow_secondary</item>
+        <item name="colorOnSecondary">@color/yellow_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/yellow_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/yellow_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/yellow_tertiary</item>
+        <item name="colorOnTertiary">@color/yellow_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/yellow_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/yellow_on_tertiary_container</item>
+
+        <item name="colorError">@color/yellow_error</item>
+        <item name="colorOnError">@color/yellow_on_error</item>
+        <item name="colorErrorContainer">@color/yellow_error_container</item>
+        <item name="colorOnErrorContainer">@color/yellow_on_error_container</item>
+
+        <item name="colorSurface">@color/yellow_surface</item>
+        <item name="colorOnSurface">@color/yellow_on_surface</item>
+        <item name="colorSurfaceInverse">@color/yellow_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/yellow_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/yellow_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/yellow_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.Orange" parent="Theme.Auxio.App">
@@ -113,6 +399,28 @@
         <item name="colorPrimaryInverse">@color/orange_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/orange_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/orange_on_primary_container</item>
+
+        <item name="colorSecondary">@color/orange_secondary</item>
+        <item name="colorOnSecondary">@color/orange_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/orange_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/orange_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/orange_tertiary</item>
+        <item name="colorOnTertiary">@color/orange_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/orange_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/orange_on_tertiary_container</item>
+
+        <item name="colorError">@color/orange_error</item>
+        <item name="colorOnError">@color/orange_on_error</item>
+        <item name="colorErrorContainer">@color/orange_error_container</item>
+        <item name="colorOnErrorContainer">@color/orange_on_error_container</item>
+
+        <item name="colorSurface">@color/orange_surface</item>
+        <item name="colorOnSurface">@color/orange_on_surface</item>
+        <item name="colorSurfaceInverse">@color/orange_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/orange_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/orange_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/orange_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.DeepOrange" parent="Theme.Auxio.App">
@@ -121,6 +429,28 @@
         <item name="colorPrimaryInverse">@color/deep_orange_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/deep_orange_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/deep_orange_on_primary_container</item>
+
+        <item name="colorSecondary">@color/deep_orange_secondary</item>
+        <item name="colorOnSecondary">@color/deep_orange_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/deep_orange_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/deep_orange_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/deep_orange_tertiary</item>
+        <item name="colorOnTertiary">@color/deep_orange_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/deep_orange_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/deep_orange_on_tertiary_container</item>
+
+        <item name="colorError">@color/deep_orange_error</item>
+        <item name="colorOnError">@color/deep_orange_on_error</item>
+        <item name="colorErrorContainer">@color/deep_orange_error_container</item>
+        <item name="colorOnErrorContainer">@color/deep_orange_on_error_container</item>
+
+        <item name="colorSurface">@color/deep_orange_surface</item>
+        <item name="colorOnSurface">@color/deep_orange_on_surface</item>
+        <item name="colorSurfaceInverse">@color/deep_orange_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/deep_orange_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/deep_orange_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/deep_orange_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.Brown" parent="Theme.Auxio.App">
@@ -129,6 +459,28 @@
         <item name="colorPrimaryInverse">@color/brown_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/brown_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/brown_on_primary_container</item>
+
+        <item name="colorSecondary">@color/brown_secondary</item>
+        <item name="colorOnSecondary">@color/brown_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/brown_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/brown_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/brown_tertiary</item>
+        <item name="colorOnTertiary">@color/brown_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/brown_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/brown_on_tertiary_container</item>
+
+        <item name="colorError">@color/brown_error</item>
+        <item name="colorOnError">@color/brown_on_error</item>
+        <item name="colorErrorContainer">@color/brown_error_container</item>
+        <item name="colorOnErrorContainer">@color/brown_on_error_container</item>
+
+        <item name="colorSurface">@color/brown_surface</item>
+        <item name="colorOnSurface">@color/brown_on_surface</item>
+        <item name="colorSurfaceInverse">@color/brown_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/brown_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/brown_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/brown_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.Grey" parent="Theme.Auxio.App">
@@ -137,6 +489,28 @@
         <item name="colorPrimaryInverse">@color/grey_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/grey_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/grey_on_primary_container</item>
+
+        <item name="colorSecondary">@color/grey_secondary</item>
+        <item name="colorOnSecondary">@color/grey_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/grey_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/grey_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/grey_tertiary</item>
+        <item name="colorOnTertiary">@color/grey_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/grey_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/grey_on_tertiary_container</item>
+
+        <item name="colorError">@color/grey_error</item>
+        <item name="colorOnError">@color/grey_on_error</item>
+        <item name="colorErrorContainer">@color/grey_error_container</item>
+        <item name="colorOnErrorContainer">@color/grey_on_error_container</item>
+
+        <item name="colorSurface">@color/grey_surface</item>
+        <item name="colorOnSurface">@color/grey_on_surface</item>
+        <item name="colorSurfaceInverse">@color/grey_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/grey_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/grey_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/grey_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.BlueGrey" parent="Theme.Auxio.App">
@@ -145,6 +519,28 @@
         <item name="colorPrimaryInverse">@color/blue_grey_primary_inverse</item>
         <item name="colorPrimaryContainer">@color/blue_grey_primary_container</item>
         <item name="colorOnPrimaryContainer">@color/blue_grey_on_primary_container</item>
+
+        <item name="colorSecondary">@color/blue_grey_secondary</item>
+        <item name="colorOnSecondary">@color/blue_grey_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/blue_grey_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/blue_grey_on_secondary_container</item>
+
+        <item name="colorTertiary">@color/blue_grey_tertiary</item>
+        <item name="colorOnTertiary">@color/blue_grey_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/blue_grey_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/blue_grey_on_tertiary_container</item>
+
+        <item name="colorError">@color/blue_grey_error</item>
+        <item name="colorOnError">@color/blue_grey_on_error</item>
+        <item name="colorErrorContainer">@color/blue_grey_error_container</item>
+        <item name="colorOnErrorContainer">@color/blue_grey_on_error_container</item>
+
+        <item name="colorSurface">@color/blue_grey_surface</item>
+        <item name="colorOnSurface">@color/blue_grey_on_surface</item>
+        <item name="colorSurfaceInverse">@color/blue_grey_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/blue_grey_on_surface_inverse</item>
+        <item name="colorSurfaceVariant">@color/blue_grey_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/blue_grey_on_surface_variant</item>
     </style>
 
     <style name="Theme.Auxio.Neutral" parent="Theme.Auxio.App">
diff --git a/app/src/main/res/values/themes_black.xml b/app/src/main/res/values/themes_black.xml
index 2a7a21399..fa4608e0d 100644
--- a/app/src/main/res/values/themes_black.xml
+++ b/app/src/main/res/values/themes_black.xml
@@ -1,149 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!--
-    All the base themes/accents.
-    -->
-    <style name="Theme.Auxio.Black.Red" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/red_primary</item>
-        <item name="colorOnPrimary">@color/red_on_primary</item>
-        <item name="colorPrimaryInverse">@color/red_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/red_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/red_on_primary_container</item>
+    <style name="Theme.Auxio.Black.Red" parent="Theme.Auxio.Red">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.Pink" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/pink_primary</item>
-        <item name="colorOnPrimary">@color/pink_on_primary</item>
-        <item name="colorPrimaryInverse">@color/pink_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/pink_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/pink_on_primary_container</item>
+    <style name="Theme.Auxio.Black.Pink" parent="Theme.Auxio.Pink">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.Purple" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/purple_primary</item>
-        <item name="colorOnPrimary">@color/purple_on_primary</item>
-        <item name="colorPrimaryInverse">@color/purple_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/purple_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/purple_on_primary_container</item>
+    <style name="Theme.Auxio.Black.Purple" parent="Theme.Auxio.Purple">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.DeepPurple" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/deep_purple_primary</item>
-        <item name="colorOnPrimary">@color/deep_purple_on_primary</item>
-        <item name="colorPrimaryInverse">@color/deep_purple_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/deep_purple_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/deep_purple_on_primary_container</item>
+    <style name="Theme.Auxio.Black.DeepPurple" parent="Theme.Auxio.DeepPurple">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.Indigo" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/indigo_primary</item>
-        <item name="colorOnPrimary">@color/indigo_on_primary</item>
-        <item name="colorPrimaryInverse">@color/indigo_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/indigo_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/indigo_on_primary_container</item>
+    <style name="Theme.Auxio.Black.Indigo" parent="Theme.Auxio.Indigo">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.Blue" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/blue_primary</item>
-        <item name="colorOnPrimary">@color/blue_on_primary</item>
-        <item name="colorPrimaryInverse">@color/blue_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/blue_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/blue_on_primary_container</item>
+    <style name="Theme.Auxio.Black.Blue" parent="Theme.Auxio.Blue">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.LightBlue" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/light_blue_primary</item>
-        <item name="colorOnPrimary">@color/light_blue_on_primary</item>
-        <item name="colorPrimaryInverse">@color/light_blue_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/light_blue_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/light_blue_on_primary_container</item>
+    <style name="Theme.Auxio.Black.LightBlue" parent="Theme.Auxio.LightBlue">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.Cyan" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/cyan_primary</item>
-        <item name="colorOnPrimary">@color/cyan_on_primary</item>
-        <item name="colorPrimaryInverse">@color/cyan_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/cyan_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/cyan_on_primary_container</item>
+    <style name="Theme.Auxio.Black.Cyan" parent="Theme.Auxio.Cyan">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.Teal" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/teal_primary</item>
-        <item name="colorOnPrimary">@color/teal_on_primary</item>
-        <item name="colorPrimaryInverse">@color/teal_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/teal_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/teal_on_primary_container</item>
+    <style name="Theme.Auxio.Black.Teal" parent="Theme.Auxio.Teal">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.Green" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/green_primary</item>
-        <item name="colorOnPrimary">@color/green_on_primary</item>
-        <item name="colorPrimaryInverse">@color/green_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/green_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/green_on_primary_container</item>
+    <style name="Theme.Auxio.Black.Green" parent="Theme.Auxio.Green">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.LightGreen" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/light_green_primary</item>
-        <item name="colorOnPrimary">@color/light_green_on_primary</item>
-        <item name="colorPrimaryInverse">@color/light_green_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/light_green_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/light_green_on_primary_container</item>
+    <style name="Theme.Auxio.Black.LightGreen" parent="Theme.Auxio.LightGreen">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.Lime" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/lime_primary</item>
-        <item name="colorOnPrimary">@color/lime_on_primary</item>
-        <item name="colorPrimaryInverse">@color/lime_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/lime_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/lime_on_primary_container</item>
+    <style name="Theme.Auxio.Black.Lime" parent="Theme.Auxio.Lime">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.Yellow" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/yellow_primary</item>
-        <item name="colorOnPrimary">@color/yellow_on_primary</item>
-        <item name="colorPrimaryInverse">@color/yellow_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/yellow_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/yellow_on_primary_container</item>
+    <style name="Theme.Auxio.Black.Yellow" parent="Theme.Auxio.Yellow">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.Orange" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/orange_primary</item>
-        <item name="colorOnPrimary">@color/orange_on_primary</item>
-        <item name="colorPrimaryInverse">@color/orange_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/orange_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/orange_on_primary_container</item>
+    <style name="Theme.Auxio.Black.Orange" parent="Theme.Auxio.Orange">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.DeepOrange" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/deep_orange_primary</item>
-        <item name="colorOnPrimary">@color/deep_orange_on_primary</item>
-        <item name="colorPrimaryInverse">@color/deep_orange_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/deep_orange_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/deep_orange_on_primary_container</item>
+    <style name="Theme.Auxio.Black.DeepOrange" parent="Theme.Auxio.DeepOrange">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.Brown" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/brown_primary</item>
-        <item name="colorOnPrimary">@color/brown_on_primary</item>
-        <item name="colorPrimaryInverse">@color/brown_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/brown_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/brown_on_primary_container</item>
+    <style name="Theme.Auxio.Black.Brown" parent="Theme.Auxio.Brown">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.Grey" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/grey_primary</item>
-        <item name="colorOnPrimary">@color/grey_on_primary</item>
-        <item name="colorPrimaryInverse">@color/grey_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/grey_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/grey_on_primary_container</item>
+    <style name="Theme.Auxio.Black.Grey" parent="Theme.Auxio.Grey">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.BlueGrey" parent="Theme.Auxio.App.Black">
-        <item name="colorPrimary">@color/blue_grey_primary</item>
-        <item name="colorOnPrimary">@color/blue_grey_on_primary</item>
-        <item name="colorPrimaryInverse">@color/blue_grey_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/blue_grey_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/blue_grey_on_primary_container</item>
+    <style name="Theme.Auxio.Black.BlueGrey" parent="Theme.Auxio.BlueGrey">
+        <item name="colorSurface">@android:color/black</item>
     </style>
 </resources>
\ No newline at end of file