Fixes #91

app/src/main/res/layout-sw600dp-land/activity_setup.xml

@@ -33,7 +33,7 @@
     android:layout_width="56dp"
     android:layout_height="?actionBarSize"
     android:layout_gravity="end|top"
-    android:theme="?attr/actionBarTheme" />
+    android:theme="?attr/actionBarPopupTheme" />
 
   <android.support.design.widget.FloatingActionButton
     android:id="@+id/next_button"

app/src/main/res/layout-sw600dp/activity_setup.xml

@@ -33,7 +33,7 @@
     android:layout_width="56dp"
     android:layout_height="?actionBarSize"
     android:layout_gravity="end|top"
-    android:theme="?attr/actionBarTheme" />
+    android:theme="?attr/actionBarPopupTheme" />
 
   <android.support.design.widget.FloatingActionButton
     android:id="@+id/next_button"

app/src/main/res/layout/activity_setup.xml

@@ -33,7 +33,7 @@
     android:layout_width="56dp"
     android:layout_height="?actionBarSize"
     android:layout_gravity="end|top"
-    android:theme="?attr/actionBarTheme" />
+    android:theme="?attr/actionBarPopupTheme" />
 
   <android.support.design.widget.FloatingActionButton
     android:id="@+id/next_button"

app/src/main/res/values-sw600dp/themes_base.xml

@@ -19,9 +19,24 @@
 
 <resources>
 
-  <style name="Theme.SetupTheme" parent="Theme.ChatTheme.Material_Light">
+  <style name="Theme.SetupTheme" parent="Theme.AppTheme.Light">
     <item name="windowActionBar">false</item>
     <item name="windowNoTitle">true</item>
+
+    <item name="actionBarPopupTheme">@style/Widget.PopupOverlay.Setup</item>
+
+    <item name="colorTextPrimary">#de000000</item>
+    <item name="colorTextPrimaryInverse">#ffffffff</item>
+    <item name="colorTextSecondary">#8a000000</item>
+    <item name="colorTextSecondaryInverse">#b3ffffff</item>
+    <item name="colorDivider">#1F000000</item>
+
+    <item name="android:textColor">?colorTextPrimary</item>
+    <item name="android:textColorPrimary">?colorTextPrimary</item>
+    <item name="android:textColorSecondary">?colorTextSecondary</item>
+    <item name="colorControlNormal">?colorTextPrimary</item>
+
     <item name="android:windowBackground">?attr/colorPrimary</item>
+    <item name="colorBackground">#FAFAFA</item>
   </style>
 </resources>

app/src/main/res/values/themes_base.xml

@@ -57,9 +57,24 @@
 
   <style name="Theme.Base.ChatTheme.Light" parent="Theme.AppTheme.Light.NoActionBar" />
 
-  <style name="Theme.SetupTheme" parent="Theme.ChatTheme.Material_Light">
+  <style name="Theme.SetupTheme" parent="Theme.AppTheme.Light">
     <item name="windowActionBar">false</item>
     <item name="windowNoTitle">true</item>
+
+    <item name="actionBarPopupTheme">@style/Widget.PopupOverlay.Setup</item>
+
+    <item name="colorTextPrimary">#de000000</item>
+    <item name="colorTextPrimaryInverse">#ffffffff</item>
+    <item name="colorTextSecondary">#8a000000</item>
+    <item name="colorTextSecondaryInverse">#b3ffffff</item>
+    <item name="colorDivider">#1F000000</item>
+
+    <item name="android:textColorPrimary">?colorTextPrimary</item>
+    <item name="android:textColorSecondary">?colorTextSecondary</item>
+    <item name="colorControlNormal">?colorTextPrimary</item>
+
+    <item name="android:windowBackground">@color/material_light_background</item>
+    <item name="colorBackground">#FAFAFA</item>
   </style>
 
   <style name="Theme.SplashTheme" parent="Theme.AppTheme.Light.NoActionBar">
@@ -150,4 +165,11 @@
     <item name="android:textColorSecondary">?colorTextSecondary</item>
     <item name="colorControlNormal">?colorTextPrimary</item>
   </style>
+
+  <style name="Widget.PopupOverlay.Setup" parent="Widget.AppBarOverlay.Light">
+    <item name="colorControlNormal">?colorTextPrimaryInverse</item>
+    <item name="android:textColorPrimary">?colorTextPrimary</item>
+    <item name="android:textColorSecondary">?colorTextSecondary</item>
+    <item name="android:actionModeBackground">?colorPrimary</item>
+  </style>
 </resources>