diff --git a/lawnchair/res/values-night/themes.xml b/lawnchair/res/values-night/themes.xml
new file mode 100644
index 00000000000..275cede579c
--- /dev/null
+++ b/lawnchair/res/values-night/themes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="Theme.Lawnchair" parent="Base.Theme.Lawnchair">
+        <item name="android:colorBackground">#ff121212</item>
+        <item name="android:windowLightStatusBar" >false</item>
+        <item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item>
+    </style>
+</resources>
diff --git a/lawnchair/res/values/themes.xml b/lawnchair/res/values/themes.xml
index 4ecac749c58..99e18dd76bf 100644
--- a/lawnchair/res/values/themes.xml
+++ b/lawnchair/res/values/themes.xml
@@ -11,14 +11,14 @@
         <item name="android:colorBackground">@color/white_50</item>
     </style>
 
-    <style name="Base.Theme.MaterialThemeBuilder" parent="android:Theme.Material.Light.NoActionBar">
+    <style name="Base.Theme.MaterialThemeBuilder" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:statusBarColor" tools:ignore="NewApi">?android:attr/colorBackground</item>
         <item name="android:windowLightStatusBar" tools:ignore="NewApi">true</item>
         <item name="android:navigationBarColor" tools:ignore="NewApi">?android:attr/colorBackground</item>
         <item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
     </style>
 
-    <style name="Theme.Transparent" parent="android:Theme.Material.Light">
+    <style name="Theme.Transparent" parent="Theme.AppCompat.Light">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowAnimationStyle">@null</item>
         <item name="android:windowBackground">@android:color/transparent</item>