diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 4933ba604..9cca6f10b 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -70,11 +70,11 @@
 
         <activity
             android:name=".AboutActivity"
-            android:theme="@style/AppThemeWithActionBarBlackText" />
+            android:theme="@style/AppThemeWithActionBarBlackText"/>
         <activity
             android:name=".TaskFormActivity"
-            android:parentActivityName=".MainActivity"
-            android:theme="@style/AppThemeWithActionBarBlackText" >
+            android:theme="@style/AppThemeWithActionBarBlackText"
+            android:parentActivityName=".MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.habitrpg.android.habitica.MainActivity" />
@@ -82,8 +82,7 @@
         <activity
             android:name=".TavernActivity"
             android:label="@string/title_activity_tavern"
-            android:parentActivityName=".MainActivity"
-            android:theme="@style/AppThemeWithOwnActionBar" >
+            android:parentActivityName=".MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.habitrpg.android.habitica.MainActivity" />
@@ -91,7 +90,7 @@
         <activity
             android:name=".PartyActivity"
             android:label="@string/title_activity_party"
-            android:parentActivityName=".MainActivity" >
+            android:parentActivityName=".MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.habitrpg.android.habitica.MainActivity" />
@@ -99,7 +98,7 @@
         <activity
             android:name=".GemPurchaseActivity"
             android:label="@string/title_activity_gem_purchase"
-            android:parentActivityName=".MainActivity" >
+            android:parentActivityName=".MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.habitrpg.android.habitica.MainActivity" />
diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml
index 625e13e90..83974dcdd 100644
--- a/Habitica/res/layout/activity_main.xml
+++ b/Habitica/res/layout/activity_main.xml
@@ -76,7 +76,7 @@
                 app:tabIndicatorColor="@android:color/white"
                 app:tabMode="fixed" />
 
-        </android.support.design.widget.AppBarLayout>
+        </android.support.design.widget.AppBarLayout>/
 
 
         <com.github.clans.fab.FloatingActionMenu
diff --git a/Habitica/res/layout/activity_task_form.xml b/Habitica/res/layout/activity_task_form.xml
index 81463559e..cefe26349 100644
--- a/Habitica/res/layout/activity_task_form.xml
+++ b/Habitica/res/layout/activity_task_form.xml
@@ -19,6 +19,13 @@
         android:layout_marginTop="@dimen/abc_action_bar_content_inset_material"
         android:layout_marginBottom="@dimen/abc_action_bar_content_inset_material">
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="@string/task"
+            android:id="@+id/task_text_textview" />
+
         <android.support.design.widget.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="72dp"
diff --git a/Habitica/res/layout/activity_tavern.xml b/Habitica/res/layout/activity_tavern.xml
index 87f07fa79..2048ca7c0 100644
--- a/Habitica/res/layout/activity_tavern.xml
+++ b/Habitica/res/layout/activity_tavern.xml
@@ -1,5 +1,6 @@
 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -18,7 +19,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/colorPrimary"
-            android:minHeight="?attr/actionBarSize" />
+            android:minHeight="?attr/actionBarSize"
+            android:theme="@style/Toolbar"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Dark" />
 
         <LinearLayout
             android:id="@+id/content_frame"
diff --git a/Habitica/res/layout/tavern_chat_new_entry_item.xml b/Habitica/res/layout/tavern_chat_new_entry_item.xml
index a18b421de..964fa1ba3 100644
--- a/Habitica/res/layout/tavern_chat_new_entry_item.xml
+++ b/Habitica/res/layout/tavern_chat_new_entry_item.xml
@@ -30,7 +30,9 @@
         <Button
             android:id="@+id/btn.send.message"
             android:layout_width="50dp"
-            android:layout_height="50dp" />
+            android:layout_height="50dp"
+            android:textColor="@color/white"
+            android:drawableTint="@color/white"/>
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/tavern_daniel_item.xml b/Habitica/res/layout/tavern_daniel_item.xml
index f720c3255..5eb570d12 100644
--- a/Habitica/res/layout/tavern_daniel_item.xml
+++ b/Habitica/res/layout/tavern_daniel_item.xml
@@ -21,7 +21,8 @@
             android:layout_height="wrap_content"
             android:text="Sleep"
             android:layout_gravity="center"
-
+            android:textColor="@color/white"
+            android:drawableTint="@color/white"
             android:backgroundTint="@color/brand"/>
     </LinearLayout>
 
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index edd2266e9..d5d47fce3 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -3,9 +3,8 @@
 
 
     <!-- Application theme. -->
-    <style name="AppTheme" parent="@style/MaterialDrawerTheme.Light.DarkToolbar.TranslucentStatus">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
 		<item name="android:listSeparatorTextViewStyle">@style/MyOwnListSeperatorTextViewStyle</item>
-        <item name="android:textColorPrimary">@android:color/white</item>
 
         <item name="android:elevation" tools:targetApi="21">0dp</item>
         <item name="elevation">0dp</item>
@@ -21,8 +20,6 @@
         <item name="colorPrimary">@color/brand</item>
         <item name="colorPrimaryDark">@color/brand</item>
         <item name="colorAccent">@color/brand</item>
-        <item name="android:colorPrimaryDark" tools:targetApi="21">@color/brand</item>
-        <item name="android:statusBarColor" tools:targetApi="21">@color/brand</item>
 
 
         <!-- MaterialDrawer specific values -->
@@ -42,16 +39,12 @@
     </style>
 
     <style name="AppThemeWithOwnActionBar" parent="AppTheme">
-        <item name="android:windowDrawsSystemBarBackgrounds" tools:targetApi="21">false</item>
-        <item name="android:windowTranslucentStatus" tools:targetApi="21">false</item>
     </style>
 
     <style name="AppThemeWithActionBar" parent="AppTheme">
         <item name="windowActionBar">true</item>
         <item name="windowNoTitle">false</item>
 
-        <item name="android:windowDrawsSystemBarBackgrounds" tools:targetApi="21">false</item>
-        <item name="android:windowTranslucentStatus" tools:targetApi="21">false</item>
     </style>
 
     <style name="AppThemeWithActionBarBlackText" parent="AppThemeWithActionBar">
@@ -98,7 +91,6 @@
         <item name="android:fontFamily">sans-serif-condensed</item>-->
     </style>
 
-
 	<style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.ProgressBar">
 		<item name="android:maxHeight">1.0dip</item>
 		<item name="android:indeterminateOnly">false</item>
diff --git a/Habitica/src/com/habitrpg/android/habitica/TavernActivity.java b/Habitica/src/com/habitrpg/android/habitica/TavernActivity.java
index c4c670e23..31e82c26e 100644
--- a/Habitica/src/com/habitrpg/android/habitica/TavernActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/TavernActivity.java
@@ -61,9 +61,6 @@ public class TavernActivity extends AppCompatActivity {
         }
 
         Drawer drawer = MainDrawerBuilder.CreateDefaultBuilderSettings(this, toolbar)
-                .withTranslucentNavigationBar(false)
-                .withTranslucentStatusBar(false)
-                .withDisplayBelowStatusBar(false)
                 .withSelectedItem(2)
                 .build();