diff --git a/app/src/main/java/app/myzel394/alibi/ui/theme/Theme.kt b/app/src/main/java/app/myzel394/alibi/ui/theme/Theme.kt
index c57c67e..004f30b 100644
--- a/app/src/main/java/app/myzel394/alibi/ui/theme/Theme.kt
+++ b/app/src/main/java/app/myzel394/alibi/ui/theme/Theme.kt
@@ -57,8 +57,21 @@ fun AlibiTheme(
     if (!view.isInEditMode) {
         SideEffect {
             val window = (view.context as Activity).window
-            window.statusBarColor = colorScheme.primary.toArgb()
             WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
+
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                window.navigationBarColor = colorScheme.background.toArgb()
+                window.statusBarColor = colorScheme.background.toArgb()
+                WindowCompat.getInsetsController(
+                    window,
+                    view
+                ).isAppearanceLightStatusBars = !darkTheme
+                WindowCompat.getInsetsController(
+                    window,
+                    view
+                ).isAppearanceLightNavigationBars = !darkTheme
+            }
         }
     }
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..79b8e35 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,6 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+
+    <color name="windowBackground">#FFFFFFFF</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ce34631..2e42391 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <style name="Theme.Alibi" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.Alibi" parent="android:Theme.Material.Light.NoActionBar">
+        <item name="android:windowActionModeOverlay">true</item>
+        <item name="android:windowContentOverlay">@color/windowBackground</item>
+        <item name="android:windowBackground">@color/windowBackground</item>
+    </style>
 </resources>
\ No newline at end of file