diff --git a/app/src/main/java/com/owenlejeune/tvtime/ui/components/Palette.kt b/app/src/main/java/com/owenlejeune/tvtime/ui/components/Palette.kt
index 8e18fdd..e9c51d1 100644
--- a/app/src/main/java/com/owenlejeune/tvtime/ui/components/Palette.kt
+++ b/app/src/main/java/com/owenlejeune/tvtime/ui/components/Palette.kt
@@ -33,7 +33,7 @@ fun PaletteView() {
         PaletteItem(MaterialTheme.colorScheme.surfaceVariant, MaterialTheme.colorScheme.onSurfaceVariant, "surface variant"),
         PaletteItem(MaterialTheme.colorScheme.inverseSurface, MaterialTheme.colorScheme.inverseOnSurface, "inverse surface"),
         PaletteItem(MaterialTheme.colorScheme.error, MaterialTheme.colorScheme.onError, "error"),
-        PaletteItem(MaterialTheme.colorScheme.errorContainer, MaterialTheme.colorScheme.onErrorContainer, "primary"),
+        PaletteItem(MaterialTheme.colorScheme.errorContainer, MaterialTheme.colorScheme.onErrorContainer, "error container"),
         PaletteItem(MaterialTheme.colorScheme.outline, Color.Black, "outline")
     )
 
diff --git a/app/src/main/java/com/owenlejeune/tvtime/ui/theme/Color.kt b/app/src/main/java/com/owenlejeune/tvtime/ui/theme/Color.kt
index c070ca0..dc7d707 100644
--- a/app/src/main/java/com/owenlejeune/tvtime/ui/theme/Color.kt
+++ b/app/src/main/java/com/owenlejeune/tvtime/ui/theme/Color.kt
@@ -2,7 +2,50 @@ package com.owenlejeune.tvtime.ui.theme
 
 import androidx.compose.ui.graphics.Color
 
-val Purple200 = Color(0xFFBB86FC)
-val Purple500 = Color(0xFF6200EE)
-val Purple700 = Color(0xFF3700B3)
-val Teal200 = Color(0xFF03DAC5)
\ No newline at end of file
+// https://material-foundation.github.io/material-theme-builder/#/custom
+// https://github.com/material-components/material-components-android/blob/master/docs/theming/Color.md
+
+val N1_10 = Color(0xFFFCFCFF)
+val N1_50 = Color(0xFFF0F0F3)
+val N1_100 = Color(0xFFE1E3E5)
+val N1_800 = Color(0xFF2E3133)
+val N1_900 = Color(0xFF191C1E)
+
+val N2_100 = Color(0xFFDCE3E9)
+val N2_200 = Color(0xFFC0C7CD)
+val N2_400 = Color(0xFF8A9297)
+val N2_500 = Color(0xFF70777C)
+val N2_700 = Color(0xFF40484D)
+
+val A1_0 = Color(0xFFFFFFFF)
+val A1_100 = Color(0xFFD3E3FD)
+val A1_200 = Color(0xFFA8C7FA)
+val A1_600 = Color(0xFF0B57D0)
+val A1_700 = Color(0xFF0842A0)
+val A1_800 = Color(0xFF062E6F)
+val A1_900 = Color(0xFF041E49)
+
+val A2_0 = Color(0xFFFFFFFF)
+val A2_100 = Color(0xFFDFE0FF)
+val A2_200 = Color(0xFFC3C4E2)
+val A2_600 = Color(0xFF5A5C77)
+val A2_700 = Color(0xFF43455E)
+val A2_800 = Color(0xFF2C2F46)
+val A2_900 = Color(0xFF161A30)
+
+val A3_0 = Color(0xFFFFFFFF)
+val A3_100 = Color(0xFFF5D9FF)
+val A3_200 = Color(0xFFD8BDE6)
+val A3_600 = Color(0xFF6D567A)
+val A3_700 = Color(0xFF553E61)
+val A3_800 = Color(0xFF3D2849)
+val A3_900 = Color(0xFF271332)
+
+val ErrorLight = Color(0xFFB3261E)
+val White = Color(0xFFFFFFFF)
+val ErrorDark = Color(0xFFF2B8B5)
+val OnErrorDark = Color(0xFF601410)
+val ErrorContainerLight = Color(0xfff9dedc)
+val ErrorContainerDark = Color(0xff8c1d18)
+val OnErrorContainerLight = Color(0xff410e0b)
+val OnErrorContainerDark = Color(0xfff2b8b5)
\ No newline at end of file
diff --git a/app/src/main/java/com/owenlejeune/tvtime/ui/theme/Theme.kt b/app/src/main/java/com/owenlejeune/tvtime/ui/theme/Theme.kt
index 2a82c98..fb62029 100644
--- a/app/src/main/java/com/owenlejeune/tvtime/ui/theme/Theme.kt
+++ b/app/src/main/java/com/owenlejeune/tvtime/ui/theme/Theme.kt
@@ -8,24 +8,61 @@ import androidx.compose.ui.platform.LocalContext
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 
 private val DarkColorPalette = darkColorScheme(
-    primary = Purple200,
-    secondary = Purple700,
-    tertiary = Teal200
+    primary = A1_200,
+    onPrimary = A1_800,
+    primaryContainer = A1_700,
+    onPrimaryContainer = A1_100,
+    inversePrimary = A1_600,
+    secondary = A2_200,
+    onSecondary = A2_800,
+    secondaryContainer = A2_700,
+    onSecondaryContainer = A2_100,
+    tertiary = A3_200,
+    onTertiary = A3_800,
+    tertiaryContainer = A3_700,
+    onTertiaryContainer = A3_100,
+    error = ErrorDark,
+    onError = OnErrorDark,
+    errorContainer = ErrorContainerDark,
+    onErrorContainer = OnErrorContainerDark,
+    outline = N2_400,
+    background = N1_900,
+    onBackground = N1_100,
+    surface = N1_900,
+    onSurface = N1_100,
+    surfaceVariant = N2_700,
+    onSurfaceVariant = N2_200,
+    inverseSurface = N1_100,
+    inverseOnSurface = N1_900
 )
 
 private val LightColorPalette = lightColorScheme(
-    primary = Purple500,
-    secondary = Purple700,
-    tertiary = Teal200
-
-    /* Other default colors to override
-    background = Color.White,
-    surface = Color.White,
-    onPrimary = Color.White,
-    onSecondary = Color.Black,
-    onBackground = Color.Black,
-    onSurface = Color.Black,
-    */
+    primary = A1_600,
+    onPrimary = A1_0,
+    primaryContainer = A1_100,
+    onPrimaryContainer = A1_900,
+    inversePrimary = A1_200,
+    secondary = A2_600,
+    onSecondary = A2_0,
+    secondaryContainer = A2_100,
+    onSecondaryContainer = A2_900,
+    tertiary = A3_600,
+    onTertiary = A3_0,
+    tertiaryContainer = A3_100,
+    onTertiaryContainer = A3_900,
+    error = ErrorLight,
+    onError = White,
+    errorContainer = ErrorContainerLight,
+    onErrorContainer = OnErrorContainerLight,
+    outline = N2_500,
+    background = N1_10,
+    onBackground = N1_900,
+    surface = N1_10,
+    onSurface = N1_900,
+    surfaceVariant = N2_100,
+    onSurfaceVariant = N2_700,
+    inverseSurface = N1_800,
+    inverseOnSurface = N1_50
 )
 
 @Composable