diff --git a/app/src/main/java/chat/stoat/ui/theme/Colour.kt b/app/src/main/java/chat/stoat/ui/theme/Colour.kt
index 4f23807b..9a03c83f 100644
--- a/app/src/main/java/chat/stoat/ui/theme/Colour.kt
+++ b/app/src/main/java/chat/stoat/ui/theme/Colour.kt
@@ -3,77 +3,116 @@ package chat.stoat.ui.theme
 import androidx.compose.ui.graphics.Color
 
 object Colour {
-    val RevoltUltraPink = Color(0xFFFF005C)
+    val Seed = Color(0xFF406FFF)
 
-    val PrimaryLight = Color(0xFFBD0042)
+    val PrimaryLight = Color(0xFF1250E1)
     val OnPrimaryLight = Color(0xFFFFFFFF)
-    val PrimaryContainerLight = Color(0xFFFFD9DC)
-    val OnPrimaryContainerLight = Color(0xFF910031)
-    val SecondaryLight = Color(0xFFC0001F)
+    val PrimaryContainerLight = Color(0xFFDCE1FF)
+    val OnPrimaryContainerLight = Color(0xFF003AB2)
+    val InversePrimaryLight = Color(0xFFB6C4FF)
+    val SecondaryLight = Color(0xFF5E5B7D)
     val OnSecondaryLight = Color(0xFFFFFFFF)
-    val SecondaryContainerLight = Color(0xFFFFDAD7)
-    val OnSecondaryContainerLight = Color(0xFF930015)
-    val TertiaryLight = Color(0xFF0060A9)
+    val SecondaryContainerLight = Color(0xFFE4DFFF)
+    val OnSecondaryContainerLight = Color(0xFF464364)
+    val TertiaryLight = Color(0xFF685587)
     val OnTertiaryLight = Color(0xFFFFFFFF)
-    val TertiaryContainerLight = Color(0xFFD3E4FF)
-    val OnTertiaryContainerLight = Color(0xFF004881)
-    val ErrorLight = Color(0xFFC0001F)
+    val TertiaryContainerLight = Color(0xFFECDCFF)
+    val OnTertiaryContainerLight = Color(0xFF503E6D)
+    val BackgroundLight = Color(0xFFFAF8FF)
+    val OnBackgroundLight = Color(0xFF191B25)
+    val SurfaceLight = Color(0xFFFAF8FF)
+    val OnSurfaceLight = Color(0xFF191B25)
+    val SurfaceVariantLight = Color(0xFFE0E1F3)
+    val OnSurfaceVariantLight = Color(0xFF434654)
+    val SurfaceTintLight = Color(0xFF1250E1)
+    val InverseSurfaceLight = Color(0xFF2E303A)
+    val InverseOnSurfaceLight = Color(0xFFEFF0FE)
+    val ErrorLight = Color(0xFFBA1A1A)
     val OnErrorLight = Color(0xFFFFFFFF)
-    val ErrorContainerLight = Color(0xFFFFDAD7)
-    val OnErrorContainerLight = Color(0xFF410004)
-    val BackgroundLight = Color(0xFFF9F9FF)
-    val OnBackgroundLight = Color(0xFF161B27)
-    val SurfaceLight = Color(0xFFF9F9FF)
-    val OnSurfaceLight = Color(0xFF161B27)
-    val SurfaceVariantLight = Color(0xFFDCE2F5)
-    val OnSurfaceVariantLight = Color(0xFF404756)
-    val OutlineLight = Color(0xFF717788)
-    val OutlineVariantLight = Color(0xFFC0C6D9)
+    val ErrorContainerLight = Color(0xFFFFDAD6)
+    val OnErrorContainerLight = Color(0xFF93000A)
+    val OutlineLight = Color(0xFF747685)
+    val OutlineVariantLight = Color(0xFFC4C5D6)
     val ScrimLight = Color(0xFF000000)
-    val InverseSurfaceLight = Color(0xFF2B303D)
-    val InverseOnSurfaceLight = Color(0xFFEDF0FF)
-    val InversePrimaryLight = Color(0xFFFFB2BA)
-    val SurfaceDimLight = Color(0xFFD5D9EA)
-    val SurfaceBrightLight = Color(0xFFF9F9FF)
+    val SurfaceBrightLight = Color(0xFFFAF8FF)
+    val SurfaceContainerLight = Color(0xFFEDEDFB)
+    val SurfaceContainerHighLight = Color(0xFFE7E7F5)
+    val SurfaceContainerHighestLight = Color(0xFFE1E1EF)
+    val SurfaceContainerLowLight = Color(0xFFF3F2FF)
     val SurfaceContainerLowestLight = Color(0xFFFFFFFF)
-    val SurfaceContainerLowLight = Color(0xFFF1F3FF)
-    val SurfaceContainerLight = Color(0xFFE9EDFE)
-    val SurfaceContainerHighLight = Color(0xFFE4E8F8)
-    val SurfaceContainerHighestLight = Color(0xFFDEE2F2)
+    val SurfaceDimLight = Color(0xFFD9D9E7)
+    val ShadowLight = Color(0xFF000000)
+    val ControlActivatedLight = Color(0xFFDCE1FF)
+    val ControlNormalLight = Color(0xFF434654)
+    val ControlHighlightLight = Color(0x1F000000)
+    val TextPrimaryInverseLight = Color(0xFFE1E1EF)
+    val TextSecondaryAndTertiaryInverseLight = Color(0xFFC4C5D6)
+    val TextPrimaryInverseDisableOnlyLight = Color(0xFFE1E1EF)
+    val TextSecondaryAndTertiaryInverseDisabledLight = Color(0xFFE1E1EF)
+    val TextHintInverseLight = Color(0xFFE1E1EF)
 
-    val PrimaryDark = Color(0xFFFFB2BA)
-    val OnPrimaryDark = Color(0xFF670020)
-    val PrimaryContainerDark = Color(0xFF910031)
-    val OnPrimaryContainerDark = Color(0xFFFFD9DC)
-    val SecondaryDark = Color(0xFFFFB3AE)
-    val OnSecondaryDark = Color(0xFF68000C)
-    val SecondaryContainerDark = Color(0xFF930015)
-    val OnSecondaryContainerDark = Color(0xFFFFDAD7)
-    val TertiaryDark = Color(0xFFA2C9FF)
-    val OnTertiaryDark = Color(0xFF00315B)
-    val TertiaryContainerDark = Color(0xFF004881)
-    val OnTertiaryContainerDark = Color(0xFFD3E4FF)
-    val ErrorDark = Color(0xFFFFB3AE)
-    val OnErrorDark = Color(0xFF68000C)
-    val ErrorContainerDark = Color(0xFF930015)
-    val OnErrorContainerDark = Color(0xFFFFDAD7)
-    val BackgroundDark = Color(0xFF0E131E)
-    val OnBackgroundDark = Color(0xFFDEE2F2)
-    val SurfaceDark = Color(0xFF0E131E)
-    val OnSurfaceDark = Color(0xFFDEE2F2)
-    val SurfaceVariantDark = Color(0xFF404756)
-    val OnSurfaceVariantDark = Color(0xFFC0C6D9)
-    val OutlineDark = Color(0xFF8A90A2)
-    val OutlineVariantDark = Color(0xFF404756)
+    val PrimaryDark = Color(0xFFB6C4FF)
+    val OnPrimaryDark = Color(0xFF00277F)
+    val PrimaryContainerDark = Color(0xFF003AB2)
+    val OnPrimaryContainerDark = Color(0xFFDCE1FF)
+    val InversePrimaryDark = Color(0xFF1250E1)
+    val SecondaryDark = Color(0xFFC7C2EA)
+    val OnSecondaryDark = Color(0xFF2F2D4C)
+    val SecondaryContainerDark = Color(0xFF464364)
+    val OnSecondaryContainerDark = Color(0xFFE4DFFF)
+    val TertiaryDark = Color(0xFFD3BDF5)
+    val OnTertiaryDark = Color(0xFF392755)
+    val TertiaryContainerDark = Color(0xFF503E6D)
+    val OnTertiaryContainerDark = Color(0xFFECDCFF)
+    val BackgroundDark = Color(0xFF11131C)
+    val OnBackgroundDark = Color(0xFFE1E1EF)
+    val SurfaceDark = Color(0xFF11131C)
+    val OnSurfaceDark = Color(0xFFE1E1EF)
+    val SurfaceVariantDark = Color(0xFF434654)
+    val OnSurfaceVariantDark = Color(0xFFC4C5D6)
+    val SurfaceTintDark = Color(0xFFB6C4FF)
+    val InverseSurfaceDark = Color(0xFFE1E1EF)
+    val InverseOnSurfaceDark = Color(0xFF2E303A)
+    val ErrorDark = Color(0xFFFFB4AB)
+    val OnErrorDark = Color(0xFF690005)
+    val ErrorContainerDark = Color(0xFF93000A)
+    val OnErrorContainerDark = Color(0xFFFFDAD6)
+    val OutlineDark = Color(0xFF8E909F)
+    val OutlineVariantDark = Color(0xFF434654)
     val ScrimDark = Color(0xFF000000)
-    val InverseSurfaceDark = Color(0xFFDEE2F2)
-    val InverseOnSurfaceDark = Color(0xFF2B303D)
-    val InversePrimaryDark = Color(0xFFBD0042)
-    val SurfaceDimDark = Color(0xFF0E131E)
-    val SurfaceBrightDark = Color(0xFF343946)
-    val SurfaceContainerLowestDark = Color(0xFF090E19)
-    val SurfaceContainerLowDark = Color(0xFF161B27)
-    val SurfaceContainerDark = Color(0xFF1A202B)
-    val SurfaceContainerHighDark = Color(0xFF252A36)
-    val SurfaceContainerHighestDark = Color(0xFF303541)
+    val SurfaceBrightDark = Color(0xFF373943)
+    val SurfaceContainerDark = Color(0xFF1D1F29)
+    val SurfaceContainerHighDark = Color(0xFF272934)
+    val SurfaceContainerHighestDark = Color(0xFF32343F)
+    val SurfaceContainerLowDark = Color(0xFF191B25)
+    val SurfaceContainerLowestDark = Color(0xFF0B0E17)
+    val SurfaceDimDark = Color(0xFF11131C)
+    val ShadowDark = Color(0xFF000000)
+    val ControlActivatedDark = Color(0xFF003AB2)
+    val ControlNormalDark = Color(0xFFC4C5D6)
+    val ControlHighlightDark = Color(0x33FFFFFF)
+    val TextPrimaryInverseDark = Color(0xFF191B25)
+    val TextSecondaryAndTertiaryInverseDark = Color(0xFF434654)
+    val TextPrimaryInverseDisableOnlyDark = Color(0xFF191B25)
+    val TextSecondaryAndTertiaryInverseDisabledDark = Color(0xFF191B25)
+    val TextHintInverseDark = Color(0xFF191B25)
+
+    val PrimaryFixed = Color(0xFFDCE1FF)
+    val PrimaryFixedDim = Color(0xFFB6C4FF)
+    val OnPrimaryFixed = Color(0xFF001550)
+    val OnPrimaryFixedVariant = Color(0xFF003AB2)
+    val SecondaryFixed = Color(0xFFE4DFFF)
+    val SecondaryFixedDim = Color(0xFFC7C2EA)
+    val OnSecondaryFixed = Color(0xFF1A1836)
+    val OnSecondaryFixedVariant = Color(0xFF464364)
+    val TertiaryFixed = Color(0xFFECDCFF)
+    val TertiaryFixedDim = Color(0xFFD3BDF5)
+    val OnTertiaryFixed = Color(0xFF23113F)
+    val OnTertiaryFixedVariant = Color(0xFF503E6D)
+    val PrimaryPaletteKeyColor = Color(0xFF406FFF)
+    val SecondaryPaletteKeyColor = Color(0xFF767397)
+    val TertiaryPaletteKeyColor = Color(0xFF826EA1)
+    val NeutralPaletteKeyColor = Color(0xFF757682)
+    val NeutralVariantPaletteKeyColor = Color(0xFF747685)
+    val ErrorPaletteKeyColor = Color(0xFFDE3730)
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/stoat/ui/theme/Theme.kt b/app/src/main/java/chat/stoat/ui/theme/Theme.kt
index 249415ac..fcb22089 100644
--- a/app/src/main/java/chat/stoat/ui/theme/Theme.kt
+++ b/app/src/main/java/chat/stoat/ui/theme/Theme.kt
@@ -25,6 +25,7 @@ val LightColorScheme = lightColorScheme(
     onPrimary = Colour.OnPrimaryLight,
     primaryContainer = Colour.PrimaryContainerLight,
     onPrimaryContainer = Colour.OnPrimaryContainerLight,
+    inversePrimary = Colour.InversePrimaryLight,
     secondary = Colour.SecondaryLight,
     onSecondary = Colour.OnSecondaryLight,
     secondaryContainer = Colour.SecondaryContainerLight,
@@ -33,29 +34,41 @@ val LightColorScheme = lightColorScheme(
     onTertiary = Colour.OnTertiaryLight,
     tertiaryContainer = Colour.TertiaryContainerLight,
     onTertiaryContainer = Colour.OnTertiaryContainerLight,
-    error = Colour.ErrorLight,
-    onError = Colour.OnErrorLight,
-    errorContainer = Colour.ErrorContainerLight,
-    onErrorContainer = Colour.OnErrorContainerLight,
     background = Colour.BackgroundLight,
     onBackground = Colour.OnBackgroundLight,
     surface = Colour.SurfaceLight,
     onSurface = Colour.OnSurfaceLight,
     surfaceVariant = Colour.SurfaceVariantLight,
     onSurfaceVariant = Colour.OnSurfaceVariantLight,
+    surfaceTint = Colour.SurfaceTintLight,
+    inverseSurface = Colour.InverseSurfaceLight,
+    inverseOnSurface = Colour.InverseOnSurfaceLight,
+    error = Colour.ErrorLight,
+    onError = Colour.OnErrorLight,
+    errorContainer = Colour.ErrorContainerLight,
+    onErrorContainer = Colour.OnErrorContainerLight,
     outline = Colour.OutlineLight,
     outlineVariant = Colour.OutlineVariantLight,
     scrim = Colour.ScrimLight,
-    inverseSurface = Colour.InverseSurfaceLight,
-    inverseOnSurface = Colour.InverseOnSurfaceLight,
-    inversePrimary = Colour.InversePrimaryLight,
-    surfaceDim = Colour.SurfaceDimLight,
     surfaceBright = Colour.SurfaceBrightLight,
-    surfaceContainerLowest = Colour.SurfaceContainerLowestLight,
-    surfaceContainerLow = Colour.SurfaceContainerLowLight,
     surfaceContainer = Colour.SurfaceContainerLight,
     surfaceContainerHigh = Colour.SurfaceContainerHighLight,
     surfaceContainerHighest = Colour.SurfaceContainerHighestLight,
+    surfaceContainerLow = Colour.SurfaceContainerLowLight,
+    surfaceContainerLowest = Colour.SurfaceContainerLowestLight,
+    surfaceDim = Colour.SurfaceDimLight,
+    primaryFixed = Colour.PrimaryFixed,
+    primaryFixedDim = Colour.PrimaryFixedDim,
+    onPrimaryFixed = Colour.OnPrimaryFixed,
+    onPrimaryFixedVariant = Colour.OnPrimaryFixedVariant,
+    secondaryFixed = Colour.SecondaryFixed,
+    secondaryFixedDim = Colour.SecondaryFixedDim,
+    onSecondaryFixed = Colour.OnSecondaryFixed,
+    onSecondaryFixedVariant = Colour.OnSecondaryFixedVariant,
+    tertiaryFixed = Colour.TertiaryFixed,
+    tertiaryFixedDim = Colour.TertiaryFixedDim,
+    onTertiaryFixed = Colour.OnTertiaryFixed,
+    onTertiaryFixedVariant = Colour.OnTertiaryFixedVariant,
 )
 
 private val DefaultColorScheme = darkColorScheme(
@@ -63,6 +76,7 @@ private val DefaultColorScheme = darkColorScheme(
     onPrimary = Colour.OnPrimaryDark,
     primaryContainer = Colour.PrimaryContainerDark,
     onPrimaryContainer = Colour.OnPrimaryContainerDark,
+    inversePrimary = Colour.InversePrimaryDark,
     secondary = Colour.SecondaryDark,
     onSecondary = Colour.OnSecondaryDark,
     secondaryContainer = Colour.SecondaryContainerDark,
@@ -71,29 +85,41 @@ private val DefaultColorScheme = darkColorScheme(
     onTertiary = Colour.OnTertiaryDark,
     tertiaryContainer = Colour.TertiaryContainerDark,
     onTertiaryContainer = Colour.OnTertiaryContainerDark,
-    error = Colour.ErrorDark,
-    onError = Colour.OnErrorDark,
-    errorContainer = Colour.ErrorContainerDark,
-    onErrorContainer = Colour.OnErrorContainerDark,
     background = Colour.BackgroundDark,
     onBackground = Colour.OnBackgroundDark,
     surface = Colour.SurfaceDark,
     onSurface = Colour.OnSurfaceDark,
     surfaceVariant = Colour.SurfaceVariantDark,
     onSurfaceVariant = Colour.OnSurfaceVariantDark,
+    surfaceTint = Colour.SurfaceTintDark,
+    inverseSurface = Colour.InverseSurfaceDark,
+    inverseOnSurface = Colour.InverseOnSurfaceDark,
+    error = Colour.ErrorDark,
+    onError = Colour.OnErrorDark,
+    errorContainer = Colour.ErrorContainerDark,
+    onErrorContainer = Colour.OnErrorContainerDark,
     outline = Colour.OutlineDark,
     outlineVariant = Colour.OutlineVariantDark,
     scrim = Colour.ScrimDark,
-    inverseSurface = Colour.InverseSurfaceDark,
-    inverseOnSurface = Colour.InverseOnSurfaceDark,
-    inversePrimary = Colour.InversePrimaryDark,
-    surfaceDim = Colour.SurfaceDimDark,
     surfaceBright = Colour.SurfaceBrightDark,
-    surfaceContainerLowest = Colour.SurfaceContainerLowestDark,
-    surfaceContainerLow = Colour.SurfaceContainerLowDark,
     surfaceContainer = Colour.SurfaceContainerDark,
     surfaceContainerHigh = Colour.SurfaceContainerHighDark,
     surfaceContainerHighest = Colour.SurfaceContainerHighestDark,
+    surfaceContainerLow = Colour.SurfaceContainerLowDark,
+    surfaceContainerLowest = Colour.SurfaceContainerLowestDark,
+    surfaceDim = Colour.SurfaceDimDark,
+    primaryFixed = Colour.PrimaryFixed,
+    primaryFixedDim = Colour.PrimaryFixedDim,
+    onPrimaryFixed = Colour.OnPrimaryFixed,
+    onPrimaryFixedVariant = Colour.OnPrimaryFixedVariant,
+    secondaryFixed = Colour.SecondaryFixed,
+    secondaryFixedDim = Colour.SecondaryFixedDim,
+    onSecondaryFixed = Colour.OnSecondaryFixed,
+    onSecondaryFixedVariant = Colour.OnSecondaryFixedVariant,
+    tertiaryFixed = Colour.TertiaryFixed,
+    tertiaryFixedDim = Colour.TertiaryFixedDim,
+    onTertiaryFixed = Colour.OnTertiaryFixed,
+    onTertiaryFixedVariant = Colour.OnTertiaryFixedVariant,
 )
 
 val AmoledColorScheme = DefaultColorScheme.copy(