diff --git a/foliary/src/commonMain/kotlin/dev/appoutlet/foliary/core/ui/theme/Color.kt b/foliary/src/commonMain/kotlin/dev/appoutlet/foliary/core/ui/theme/Color.kt
index 7c0e19b..1967894 100644
--- a/foliary/src/commonMain/kotlin/dev/appoutlet/foliary/core/ui/theme/Color.kt
+++ b/foliary/src/commonMain/kotlin/dev/appoutlet/foliary/core/ui/theme/Color.kt
@@ -37,38 +37,38 @@ val surfaceContainerLight = Color(0xFFF1EDEC)
 val surfaceContainerHighLight = Color(0xFFEBE7E6)
 val surfaceContainerHighestLight = Color(0xFFE5E2E1)
 
-val primaryDark = Color(0xFF9ED1BD)
+val primaryDark = Color(0xFF00E796)
 val onPrimaryDark = Color(0xFF00382A)
-val primaryContainerDark = Color(0xFF1B4D3E)
-val onPrimaryContainerDark = Color(0xFF8ABDA9)
-val secondaryDark = Color(0xFFFFFFFF)
-val onSecondaryDark = Color(0xFF29322F)
-val secondaryContainerDark = Color(0xFFDBE5E0)
-val onSecondaryContainerDark = Color(0xFF5D6663)
-val tertiaryDark = Color(0xFF93D5AC)
+val primaryContainerDark = Color(0xFF1D5643)
+val onPrimaryContainerDark = Color(0xFFB9E6D3)
+val secondaryDark = Color(0xFF1F6F6E)
+val onSecondaryDark = Color(0xFFF4FFFB)
+val secondaryContainerDark = Color(0xFF35473C)
+val onSecondaryContainerDark = Color(0xFFD2E4D9)
+val tertiaryDark = Color(0xFF86D2A9)
 val onTertiaryDark = Color(0xFF003921)
-val tertiaryContainerDark = Color(0xFF5E9E79)
-val onTertiaryContainerDark = Color(0xFF001F10)
-val errorDark = Color(0xFFFFB3AE)
-val onErrorDark = Color(0xFF68000C)
-val errorContainerDark = Color(0xFFF65C5A)
-val onErrorContainerDark = Color(0xFF1E0001)
-val backgroundDark = Color(0xFF111413)
-val onBackgroundDark = Color(0xFFE2E3E0)
-val surfaceDark = Color(0xFF141313)
+val tertiaryContainerDark = Color(0xFF2E7350)
+val onTertiaryContainerDark = Color(0xFFF4FFFB)
+val errorDark = Color(0xFFFFB4AB)
+val onErrorDark = Color(0xFF690005)
+val errorContainerDark = Color(0xFF93000A)
+val onErrorContainerDark = Color(0xFFFFDAD6)
+val backgroundDark = Color(0xFF2B3228)
+val onBackgroundDark = Color(0xFFE4E2DD)
+val surfaceDark = Color(0xFF1B1F19)
 val onSurfaceDark = Color(0xFFE5E2E1)
 val surfaceVariantDark = Color(0xFF404945)
 val onSurfaceVariantDark = Color(0xFFC0C9C3)
-val outlineDark = Color(0xFF8A938E)
-val outlineVariantDark = Color(0xFF404945)
+val outlineDark = Color(0x1FFFFFFF)
+val outlineVariantDark = Color(0x1FFFFFFF)
 val scrimDark = Color(0xFF000000)
 val inverseSurfaceDark = Color(0xFFE5E2E1)
-val inverseOnSurfaceDark = Color(0xFF313030)
-val inversePrimaryDark = Color(0xFF376757)
-val surfaceDimDark = Color(0xFF141313)
-val surfaceBrightDark = Color(0xFF3A3939)
-val surfaceContainerLowestDark = Color(0xFF0E0E0E)
-val surfaceContainerLowDark = Color(0xFF1C1B1B)
-val surfaceContainerDark = Color(0xFF201F1F)
-val surfaceContainerHighDark = Color(0xFF2A2A29)
-val surfaceContainerHighestDark = Color(0xFF353434)
+val inverseOnSurfaceDark = Color(0xFF242423)
+val inversePrimaryDark = Color(0xFF1A4D3E)
+val surfaceDimDark = Color(0xFF1B1F19)
+val surfaceBrightDark = Color(0xFF444A3C)
+val surfaceContainerLowestDark = Color(0xFF14170F)
+val surfaceContainerLowDark = Color(0xFF22261E)
+val surfaceContainerDark = Color(0xFF272B22)
+val surfaceContainerHighDark = Color(0xFF32372B)
+val surfaceContainerHighestDark = Color(0xFF3D4235)
diff --git a/foliary/src/commonMain/kotlin/dev/appoutlet/foliary/core/ui/theme/Theme.kt b/foliary/src/commonMain/kotlin/dev/appoutlet/foliary/core/ui/theme/Theme.kt
index 0a1a3a6..3b5de6d 100644
--- a/foliary/src/commonMain/kotlin/dev/appoutlet/foliary/core/ui/theme/Theme.kt
+++ b/foliary/src/commonMain/kotlin/dev/appoutlet/foliary/core/ui/theme/Theme.kt
@@ -1,5 +1,6 @@
 package dev.appoutlet.foliary.core.ui.theme
 
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
@@ -83,7 +84,7 @@ private val darkScheme = darkColorScheme(
 
 @Composable
 fun FoliaryTheme(
-    isDarkTheme: Boolean = false, // isSystemInDarkTheme(), Dark mode will be enabled later
+    isDarkTheme: Boolean = isSystemInDarkTheme(),
     content: @Composable () -> Unit
 ) {
     SetupPlatformStatusBar(isDarkTheme)