diff --git a/res/values-night/lineage_bools.xml b/res/values-night/lineage_bools.xml
new file mode 100644
index 0000000..0116948
--- /dev/null
+++ b/res/values-night/lineage_bools.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2018 The LineageOS Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <bool name="light_navigation_bar">false</bool>
+</resources>
diff --git a/res/values/lineage_bools.xml b/res/values/lineage_bools.xml
new file mode 100644
index 0000000..d10d221
--- /dev/null
+++ b/res/values/lineage_bools.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2018 The LineageOS Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <bool name="light_navigation_bar">true</bool>
+</resources>
diff --git a/res/values/lineage_colors.xml b/res/values/lineage_colors.xml
index b4ff869..55bd0b3 100644
--- a/res/values/lineage_colors.xml
+++ b/res/values/lineage_colors.xml
@@ -20,7 +20,7 @@
 
     <color name="window_background">@*android:color/system_neutral1_50</color>
 
-    <color name="navigation_bar_bg">@*android:color/system_neutral1_10</color>
+    <color name="navigation_bar_bg">@color/window_background</color>
 
     <color name="compose_send_text_background_color">@android:color/white</color>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 0cf841b..7aef254 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -22,7 +22,7 @@
     <style name="BugleBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="android:forceDarkAllowed">true</item>
         <item name="android:navigationBarColor">@color/navigation_bar_bg</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightNavigationBar">@bool/light_navigation_bar</item>
     </style>
 
     <!-- Application theme. -->