diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
index 3e00ce9..b95354f 100644
--- a/composeApp/build.gradle.kts
+++ b/composeApp/build.gradle.kts
@@ -89,7 +89,7 @@ android {
         minSdk = libs.versions.android.minSdk.get().toInt()
         targetSdk = libs.versions.android.targetSdk.get().toInt()
         versionCode = 2
-        versionName = "1.0.1"
+        versionName = "1.0.1-2"
     }
     packaging {
         resources {
diff --git a/composeApp/src/androidMain/kotlin/com/digitoolsolutions/app/torquevaultkmp/theme/Theme.android.kt b/composeApp/src/androidMain/kotlin/com/digitoolsolutions/app/torquevaultkmp/theme/Theme.android.kt
new file mode 100644
index 0000000..0ac528f
--- /dev/null
+++ b/composeApp/src/androidMain/kotlin/com/digitoolsolutions/app/torquevaultkmp/theme/Theme.android.kt
@@ -0,0 +1,20 @@
+package com.digitoolsolutions.app.torquevaultkmp.theme
+
+import android.app.Activity
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.platform.LocalView
+import androidx.core.view.WindowCompat
+
+@Composable
+actual fun SystemAppearance(isDark: Boolean) {
+    val view = LocalView.current
+    if (!view.isInEditMode) {
+        SideEffect {
+            val window = (view.context as Activity).window
+            val windowInsetsController = WindowCompat.getInsetsController(window, view)
+            windowInsetsController.isAppearanceLightStatusBars = !isDark
+            windowInsetsController.isAppearanceLightNavigationBars = !isDark
+        }
+    }
+}
diff --git a/composeApp/src/commonMain/kotlin/com/digitoolsolutions/app/torquevaultkmp/App.kt b/composeApp/src/commonMain/kotlin/com/digitoolsolutions/app/torquevaultkmp/App.kt
index b971d61..69dddeb 100644
--- a/composeApp/src/commonMain/kotlin/com/digitoolsolutions/app/torquevaultkmp/App.kt
+++ b/composeApp/src/commonMain/kotlin/com/digitoolsolutions/app/torquevaultkmp/App.kt
@@ -21,7 +21,9 @@ fun App(
         BluetoothRequirementWrapper {
             MainScreen(
                 isDarkTheme = isDarkTheme,
-                onThemeToggle = { viewModel.toggleTheme(it) },
+                onThemeToggle = {
+                    viewModel.toggleTheme(it)
+                },
                 isLoggedIn = isLoggedIn
             )
         }
diff --git a/composeApp/src/commonMain/kotlin/com/digitoolsolutions/app/torquevaultkmp/theme/Theme.kt b/composeApp/src/commonMain/kotlin/com/digitoolsolutions/app/torquevaultkmp/theme/Theme.kt
index 1495369..cdf4004 100644
--- a/composeApp/src/commonMain/kotlin/com/digitoolsolutions/app/torquevaultkmp/theme/Theme.kt
+++ b/composeApp/src/commonMain/kotlin/com/digitoolsolutions/app/torquevaultkmp/theme/Theme.kt
@@ -52,6 +52,9 @@ private val LightColorScheme = lightColorScheme(
     onSurface = Color(0xFF1C1B1F)
 )
 
+@Composable
+expect fun SystemAppearance(isDark: Boolean)
+
 @Composable
 fun TorqueVaultTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
@@ -69,6 +72,8 @@ fun TorqueVaultTheme(
         else -> LightColorScheme
     }
 
+    SystemAppearance(darkTheme)
+
     MaterialTheme(
         colorScheme = colorScheme,
         typography = Typography,
diff --git a/composeApp/src/iosMain/kotlin/com/digitoolsolutions/app/torquevaultkmp/theme/Theme.ios.kt b/composeApp/src/iosMain/kotlin/com/digitoolsolutions/app/torquevaultkmp/theme/Theme.ios.kt
new file mode 100644
index 0000000..200a4d0
--- /dev/null
+++ b/composeApp/src/iosMain/kotlin/com/digitoolsolutions/app/torquevaultkmp/theme/Theme.ios.kt
@@ -0,0 +1,7 @@
+package com.digitoolsolutions.app.torquevaultkmp.theme
+
+import androidx.compose.runtime.Composable
+
+@Composable
+actual fun SystemAppearance(isDark: Boolean) {
+}