diff --git a/app/src/main/java/com/sadellie/unitto/screens/main/components/KeyboardButton.kt b/app/src/main/java/com/sadellie/unitto/screens/main/components/KeyboardButton.kt
index 5a240905..50a69da7 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/main/components/KeyboardButton.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/main/components/KeyboardButton.kt
@@ -41,7 +41,8 @@ import com.sadellie.unitto.ui.theme.NumbersTextStyleTitleLarge
  *
  * @param modifier Modifier that is applied to a [Button] component.
  * @param digit Symbol to show on button.
- * @param isPrimary If true will use `inverseOnSurface` color, else `secondaryContainer`.
+ * @param isPrimary If true will use `inverseOnSurface` color, else `secondaryContainer`. Primary
+ * buttons are digits.
  * @param onLongClick Action to perform when holding this button.
  * @param onClick Action to perform when clicking this button.
  */
@@ -65,7 +66,7 @@ fun KeyboardButton(
         interactionSource = interactionSource,
         shape = RoundedCornerShape(cornerRadius),
         colors = ButtonDefaults.buttonColors(
-            containerColor = if (isPrimary) MaterialTheme.colorScheme.surfaceVariant else MaterialTheme.colorScheme.secondaryContainer,
+            containerColor = if (isPrimary) MaterialTheme.colorScheme.inverseOnSurface else MaterialTheme.colorScheme.primaryContainer,
             contentColor = MaterialTheme.colorScheme.onSecondaryContainer,
             disabledContentColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.3f)
         ),
diff --git a/app/src/main/java/com/sadellie/unitto/screens/main/components/UnitSelectionButton.kt b/app/src/main/java/com/sadellie/unitto/screens/main/components/UnitSelectionButton.kt
index 73d33bb5..927b2724 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/main/components/UnitSelectionButton.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/main/components/UnitSelectionButton.kt
@@ -57,7 +57,7 @@ fun UnitSelectionButton(
         onClick = { onClick() },
         enabled = !isLoading,
         colors = ButtonDefaults.buttonColors(
-            containerColor = MaterialTheme.colorScheme.secondaryContainer
+            containerColor = MaterialTheme.colorScheme.primaryContainer
         ),
         contentPadding = PaddingValues(vertical = 16.dp, horizontal = 8.dp)
     ) {
diff --git a/app/src/main/java/com/sadellie/unitto/screens/second/components/ChipsRow.kt b/app/src/main/java/com/sadellie/unitto/screens/second/components/ChipsRow.kt
index 3bb9f848..d7cf91cd 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/second/components/ChipsRow.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/second/components/ChipsRow.kt
@@ -139,7 +139,7 @@ private fun UnittoFilterChip(
             .height(32.dp)
             .clip(chipShape)
             .background(
-                if (isSelected) MaterialTheme.colorScheme.secondaryContainer else Color.Transparent
+                if (isSelected) MaterialTheme.colorScheme.primaryContainer else Color.Transparent
             )
             // Remove border when selected
             .border(
diff --git a/app/src/main/java/com/sadellie/unitto/screens/second/components/UnitListItem.kt b/app/src/main/java/com/sadellie/unitto/screens/second/components/UnitListItem.kt
index e97aad13..b85d0324 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/second/components/UnitListItem.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/second/components/UnitListItem.kt
@@ -88,7 +88,7 @@ private fun BasicUnitListItem(
         Row(
             modifier = Modifier
                         .background(
-                            if (isSelected) MaterialTheme.colorScheme.secondaryContainer else Color.Transparent,
+                            if (isSelected) MaterialTheme.colorScheme.primaryContainer else Color.Transparent,
                             RoundedCornerShape(24.dp)
                         ).padding(paddingValues = PaddingValues(horizontal = 12.dp, vertical = 8.dp))
                 .fillMaxWidth(),
diff --git a/app/src/main/java/com/sadellie/unitto/screens/setttings/UnitGroupsScreen.kt b/app/src/main/java/com/sadellie/unitto/screens/setttings/UnitGroupsScreen.kt
index afbc46d6..037b03ec 100644
--- a/app/src/main/java/com/sadellie/unitto/screens/setttings/UnitGroupsScreen.kt
+++ b/app/src/main/java/com/sadellie/unitto/screens/setttings/UnitGroupsScreen.kt
@@ -88,7 +88,7 @@ fun UnitGroupsScreen(
                 ReorderableItem(state, key = item) { isDragging ->
                     val transition = updateTransition(isDragging, label = "draggedTransition")
                     val background by transition.animateColor(label = "background") {
-                        if (it) MaterialTheme.colorScheme.secondaryContainer else MaterialTheme.colorScheme.surface
+                        if (it) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surface
                     }
                     val itemPadding by transition.animateDp(label = "itemPadding") {
                         if (it) 16.dp else 0.dp
diff --git a/app/src/main/java/com/sadellie/unitto/ui/theme/Color.kt b/app/src/main/java/com/sadellie/unitto/ui/theme/Color.kt
index 965a117a..a41a519b 100644
--- a/app/src/main/java/com/sadellie/unitto/ui/theme/Color.kt
+++ b/app/src/main/java/com/sadellie/unitto/ui/theme/Color.kt
@@ -36,9 +36,9 @@ val md_theme_light_error = Color(0xFFba1b1b)
 val md_theme_light_errorContainer = Color(0xFFffdad4)
 val md_theme_light_onError = Color(0xFFffffff)
 val md_theme_light_onErrorContainer = Color(0xFF410001)
-val md_theme_light_background = Color(0xFFfcfcf7)
+val md_theme_light_background = Color(0xFFffffff)
 val md_theme_light_onBackground = Color(0xFF1a1c19)
-val md_theme_light_surface = Color(0xFFfcfcf7)
+val md_theme_light_surface = Color(0xFFffffff)
 val md_theme_light_onSurface = Color(0xFF1a1c19)
 val md_theme_light_surfaceVariant = Color(0xFFdde5d9)
 val md_theme_light_onSurfaceVariant = Color(0xFF414940)
@@ -63,9 +63,9 @@ val md_theme_dark_error = Color(0xFFffb4a9)
 val md_theme_dark_errorContainer = Color(0xFF930006)
 val md_theme_dark_onError = Color(0xFF680003)
 val md_theme_dark_onErrorContainer = Color(0xFFffdad4)
-val md_theme_dark_background = Color(0xFF1a1c19)
+val md_theme_dark_background = Color(0xFF161616)
 val md_theme_dark_onBackground = Color(0xFFe1e3dd)
-val md_theme_dark_surface = Color(0xFF1a1c19)
+val md_theme_dark_surface = Color(0xFF161616)
 val md_theme_dark_onSurface = Color(0xFFe1e3dd)
 val md_theme_dark_surfaceVariant = Color(0xFF414940)
 val md_theme_dark_onSurfaceVariant = Color(0xFFc1c9be)