diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/AppearanceSettings.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/AppearanceSettings.kt
index 3a9d42f20e2823d1be9b13570b1a222592500447..a9741f275bbb70f7aa3dce3f00356558e6d94a04 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/AppearanceSettings.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/settings/data/AppearanceSettings.kt
@@ -30,7 +30,9 @@ data class AppearanceSettings(
     QUASSEL_DARK(R.style.Theme_ChatTheme_Quassel_Dark),
     AMOLED(R.style.Theme_ChatTheme_Amoled),
     SOLARIZED_LIGHT(R.style.Theme_ChatTheme_Solarized_Light),
-    SOLARIZED_DARK(R.style.Theme_ChatTheme_Solarized_Dark)
+    SOLARIZED_DARK(R.style.Theme_ChatTheme_Solarized_Dark),
+    GRUVBOX_LIGHT(R.style.Theme_ChatTheme_Gruvbox_Light),
+    GRUVBOX_DARK(R.style.Theme_ChatTheme_Gruvbox_Dark)
   }
 
   companion object {
diff --git a/app/src/main/res/layout-sw720dp-land/activity_main.xml b/app/src/main/res/layout-sw720dp-land/activity_main.xml
index edf148a84aef77c3f8e4046b59e5ea634edfe284..253b7a84523bde40e002830b9350a9568e2c60e7 100644
--- a/app/src/main/res/layout-sw720dp-land/activity_main.xml
+++ b/app/src/main/res/layout-sw720dp-land/activity_main.xml
@@ -17,10 +17,30 @@
       android:layout_height="match_parent"
       tools:layout="@layout/fragment_chat_list" />
 
-    <View
+    <LinearLayout
       android:layout_width="1dp"
       android:layout_height="match_parent"
-      android:background="?colorDivider" />
+      android:orientation="vertical">
+
+      <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:theme="?attr/actionBarTheme">
+
+        <android.support.v7.widget.Toolbar
+          android:layout_width="match_parent"
+          android:layout_height="?attr/actionBarSize"
+          app:contentInsetStartWithNavigation="0dp"
+          app:popupTheme="@style/Widget.PopupOverlay" />
+
+      </android.support.design.widget.AppBarLayout>
+
+      <View
+        android:layout_width="1dp"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:background="?colorDivider" />
+    </LinearLayout>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout-sw720dp/activity_settings.xml b/app/src/main/res/layout-sw720dp/activity_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..33c312ffd3149b82ec8688e76678574ce8471fba
--- /dev/null
+++ b/app/src/main/res/layout-sw720dp/activity_settings.xml
@@ -0,0 +1,39 @@
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:fitsSystemWindows="true">
+
+  <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical">
+
+    <android.support.design.widget.AppBarLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:theme="?attr/actionBarTheme">
+
+      <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        app:contentInsetStartWithNavigation="0dp"
+        app:popupTheme="@style/Widget.PopupOverlay" />
+
+    </android.support.design.widget.AppBarLayout>
+
+    <fragment
+      android:id="@+id/settingsFragment"
+      android:name="de.kuschku.quasseldroid_ng.ui.settings.SettingsFragment"
+      android:layout_width="600dp"
+      android:layout_height="match_parent"
+      android:layout_gravity="center_horizontal"
+      tools:layout="@xml/preferences" />
+  </LinearLayout>
+
+</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings_preferences.xml b/app/src/main/res/values/strings_preferences.xml
index 45d29077190b8458878e0d920b888049c0a430b3..ff091e394736aa75eb2f7b534dab6bb7895fbadc 100644
--- a/app/src/main/res/values/strings_preferences.xml
+++ b/app/src/main/res/values/strings_preferences.xml
@@ -9,12 +9,16 @@
   <string name="preference_theme_entry_amoled">AMOLED</string>
   <string name="preference_theme_entry_solarized_light">Solarized (Light)</string>
   <string name="preference_theme_entry_solarized_dark">Solarized (Dark)</string>
+  <string name="preference_theme_entry_gruvbox_light">Gruvbox (Light)</string>
+  <string name="preference_theme_entry_gruvbox_dark">Gruvbox (Dark)</string>
   <string-array name="preference_theme_entries">
     <item>@string/preference_theme_entry_quassel_light</item>
     <item>@string/preference_theme_entry_quassel_dark</item>
     <item>@string/preference_theme_entry_amoled</item>
     <item>@string/preference_theme_entry_solarized_light</item>
     <item>@string/preference_theme_entry_solarized_dark</item>
+    <item>@string/preference_theme_entry_gruvbox_light</item>
+    <item>@string/preference_theme_entry_gruvbox_dark</item>
   </string-array>
   <string-array name="preference_theme_entryvalues">
     <item>QUASSEL_LIGHT</item>
@@ -22,6 +26,8 @@
     <item>AMOLED</item>
     <item>SOLARIZED_LIGHT</item>
     <item>SOLARIZED_DARK</item>
+    <item>GRUVBOX_LIGHT</item>
+    <item>GRUVBOX_DARK</item>
   </string-array>
 
   <string name="preference_colorize_mirc_key" translatable="false">colorize_mirc</string>
diff --git a/app/src/main/res/values/styles_widgets.xml b/app/src/main/res/values/styles_widgets.xml
index 7c72974099ec0791346f033dd16aa62775e7d814..1c6c4a5adf17510b3c81889db563dfb27e94fc5d 100644
--- a/app/src/main/res/values/styles_widgets.xml
+++ b/app/src/main/res/values/styles_widgets.xml
@@ -12,20 +12,12 @@
     <item name="colorControlNormal">@color/colorFillDark</item>
     <item name="android:textColorPrimary">@color/colorFillDark</item>
     <item name="drawerArrowStyle">@style/Widget.DrawerArrowToggle</item>
-
-    <item name="colorFill">@color/colorFillDark</item>
-    <item name="colorOffline">@color/colorOfflineDark</item>
-    <item name="colorAway">@color/colorAwayDark</item>
   </style>
 
   <style name="Widget.AppBarOverlay.Light" parent="ThemeOverlay.AppCompat.ActionBar">
     <item name="colorControlNormal">@color/colorFillLight</item>
     <item name="android:textColorPrimary">@color/colorFillLight</item>
     <item name="drawerArrowStyle">@style/Widget.DrawerArrowToggle.Light</item>
-
-    <item name="colorFill">@color/colorFillLight</item>
-    <item name="colorOffline">@color/colorOfflineLight</item>
-    <item name="colorAway">@color/colorAwayLight</item>
   </style>
 
   <style name="Widget.DrawerArrowToggle" parent="Widget.AppCompat.DrawerArrowToggle">
diff --git a/app/src/main/res/values/themes_base.xml b/app/src/main/res/values/themes_base.xml
index a0d987b33571b22b6075cc78a7fc4da508b94394..ce34f2dfa92f3fe33fbeb4acd2b977a71e77169c 100644
--- a/app/src/main/res/values/themes_base.xml
+++ b/app/src/main/res/values/themes_base.xml
@@ -76,7 +76,7 @@
 
     <item name="colorTextPrimary">#212121</item>
     <item name="colorTextSecondary">#757575</item>
-    <item name="colorDivider">#1F000000</item>>
+    <item name="colorDivider">#1F000000</item>
 
     <item name="colorFill">@color/colorFillLight</item>
     <item name="colorOffline">@color/colorOfflineLight</item>
diff --git a/app/src/main/res/values/themes_gruvbox.xml b/app/src/main/res/values/themes_gruvbox.xml
new file mode 100644
index 0000000000000000000000000000000000000000..135b000cb239f37ded77dbaafb335de43f05f2eb
--- /dev/null
+++ b/app/src/main/res/values/themes_gruvbox.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+  <color name="gruvbox_light_background">#fbf1c7</color>
+
+  <style name="Widget.AppBarOverlay.Gruvbox_Light" parent="Widget.AppBarOverlay.Light">
+    <item name="colorControlNormal">#3c3836</item>
+    <item name="android:textColorPrimary">#3c3836</item>
+    <item name="android:textColorSecondary">#665c54</item>
+  </style>
+
+  <style name="Theme.ChatTheme.Gruvbox_Light" parent="Theme.ChatTheme.Light">
+    <item name="colorPrimary">?attr/colorBackgroundCard</item>
+    <item name="colorPrimaryDark">#b6ae91</item>
+    <item name="colorAccent">#d65d0e</item>
+
+    <item name="actionBarTheme">@style/Widget.AppBarOverlay.Gruvbox_Light</item>
+
+    <item name="senderColor0">#d65d0e</item>
+    <item name="senderColor1">#cc241d</item>
+    <item name="senderColor2">#98971a</item>
+    <item name="senderColor3">#d79921</item>
+    <item name="senderColor4">#458588</item>
+    <item name="senderColor5">#b16286</item>
+    <item name="senderColor6">#689d6a</item>
+    <item name="senderColor7">#7c6f64</item>
+    <item name="senderColor8">#928374</item>
+    <item name="senderColor9">#9d0006</item>
+    <item name="senderColorA">#79740e</item>
+    <item name="senderColorB">#b57614</item>
+    <item name="senderColorC">#076678</item>
+    <item name="senderColorD">#8f3f71</item>
+    <item name="senderColorE">#427b58</item>
+    <item name="senderColorF">#af3a03</item>
+
+    <item name="colorForeground">#3c3836</item>
+    <item name="colorForegroundHighlight">#282828</item>
+    <item name="colorForegroundSecondary">#665c54</item>
+    <item name="colorForegroundAction">#076678</item>
+    <item name="colorForegroundNotice">#b57614</item>
+    <item name="colorForegroundError">#9d0006</item>
+
+    <item name="colorTextPrimary">#3c3836</item>
+    <item name="colorTextSecondary">#665c54</item>
+    <item name="colorDivider">#2d928374</item>
+
+    <item name="colorForegroundMirc">0x1</item>
+
+    <item name="android:windowBackground">@color/gruvbox_light_background</item>
+    <item name="colorBackground">#fbf1c7</item>
+    <item name="colorBackgroundHighlight">#d79921</item>
+    <item name="colorBackgroundSecondary">@null</item>
+    <item name="colorBackgroundCard">#ebdbb2</item>
+    <item name="colorBackgroundDialog">#f2d5bc</item>
+
+    <item name="colorOffline">#665c54</item>
+    <item name="colorAway">#665c54</item>
+
+    <item name="colorMarkerLine">#9d0006</item>
+
+    <item name="colorTintActivity">#98971a</item>
+    <item name="colorTintMessage">#458588</item>
+    <item name="colorTintHighlight">#d65d0e</item>
+  </style>
+
+  <color name="gruvbox_dark_background">#282828</color>
+
+  <style name="Widget.AppBarOverlay.Gruvbox_Dark" parent="Widget.AppBarOverlay.Light">
+    <item name="colorControlNormal">#dbdbb2</item>
+    <item name="android:textColorPrimary">#dbdbb2</item>
+    <item name="android:textColorSecondary">#bdae93</item>
+  </style>
+
+  <style name="Theme.ChatTheme.Gruvbox_Dark" parent="Theme.ChatTheme">
+    <item name="colorPrimary">?attr/colorBackgroundCard</item>
+    <item name="colorPrimaryDark">#3c3734</item>
+    <item name="colorAccent">#d65d0e</item>
+
+    <item name="actionBarTheme">@style/Widget.AppBarOverlay.Gruvbox_Dark</item>
+
+    <item name="senderColor0">#d65d0e</item>
+    <item name="senderColor1">#cc241d</item>
+    <item name="senderColor2">#98971a</item>
+    <item name="senderColor3">#d79921</item>
+    <item name="senderColor4">#458588</item>
+    <item name="senderColor5">#b16286</item>
+    <item name="senderColor6">#689d6a</item>
+    <item name="senderColor7">#a89984</item>
+    <item name="senderColor8">#928374</item>
+    <item name="senderColor9">#fb4934</item>
+    <item name="senderColorA">#b8bb26</item>
+    <item name="senderColorB">#fabd2f</item>
+    <item name="senderColorC">#83a598</item>
+    <item name="senderColorD">#d3869b</item>
+    <item name="senderColorE">#8ec07c</item>
+    <item name="senderColorF">#fe8019</item>
+
+    <item name="colorForeground">#dbdbb2</item>
+    <item name="colorForegroundHighlight">#282828</item>
+    <item name="colorForegroundSecondary">#bdae93</item>
+    <item name="colorForegroundAction">#458588</item>
+    <item name="colorForegroundNotice">#d79921</item>
+    <item name="colorForegroundError">#cc241d</item>
+
+    <item name="colorTextPrimary">#dbdbb2</item>
+    <item name="colorTextSecondary">#bdae93</item>
+    <item name="colorDivider">#33928374</item>
+
+    <item name="colorForegroundMirc">0x0</item>
+
+    <item name="android:windowBackground">@color/gruvbox_dark_background</item>
+    <item name="colorBackground">#282828</item>
+    <item name="colorBackgroundHighlight">#d79921</item>
+    <item name="colorBackgroundSecondary">@null</item>
+    <item name="colorBackgroundCard">#504945</item>
+    <item name="colorBackgroundDialog">#3c3836</item>
+
+    <item name="colorOffline">#bdae93</item>
+    <item name="colorAway">#bdae93</item>
+
+    <item name="colorMarkerLine">#cc241d</item>
+
+    <item name="colorTintActivity">#98971a</item>
+    <item name="colorTintMessage">#458588</item>
+    <item name="colorTintHighlight">#d65d0e</item>
+  </style>
+</resources>
diff --git a/app/src/main/res/values/themes_solarized.xml b/app/src/main/res/values/themes_solarized.xml
index 38d84d9c7ba5de97e3765aa899ea544ed9dcfd37..a1d7b3254d8868a4247ccbc5f4ce46f228ed38cd 100644
--- a/app/src/main/res/values/themes_solarized.xml
+++ b/app/src/main/res/values/themes_solarized.xml
@@ -2,12 +2,18 @@
 
 <resources>
   <color name="solarized_light_background">#FDF6E3</color>
+
+  <style name="Widget.AppBarOverlay.Solarized_Light" parent="Widget.AppBarOverlay.Light">
+    <item name="colorControlNormal">#586e75</item>
+    <item name="android:textColorPrimary">#586e75</item>
+    <item name="android:textColorSecondary">#657b83</item>
+  </style>
   <style name="Theme.ChatTheme.Solarized_Light" parent="Theme.ChatTheme.Light">
     <item name="colorPrimary">?attr/colorBackgroundCard</item>
     <item name="colorPrimaryDark">#b0ac9e</item>
     <item name="colorAccent">#B58900</item>
 
-    <item name="actionBarTheme">@style/Widget.AppBarOverlay.Light</item>
+    <item name="actionBarTheme">@style/Widget.AppBarOverlay.Solarized_Light</item>
 
     <item name="senderColor0">#B58900</item>
     <item name="senderColor1">#CB4B16</item>
@@ -33,6 +39,10 @@
     <item name="colorForegroundNotice">#B58900</item>
     <item name="colorForegroundError">#B00000</item>
 
+    <item name="colorTextPrimary">#586e75</item>
+    <item name="colorTextSecondary">#657b83</item>
+    <item name="colorDivider">#19586e75</item>
+
     <item name="colorForegroundMirc">0x1</item>
 
     <item name="android:windowBackground">@color/solarized_light_background</item>
@@ -42,6 +52,9 @@
     <item name="colorBackgroundCard">#EEE8D5</item>
     <item name="colorBackgroundDialog">#FDF6E3</item>
 
+    <item name="colorOffline">#657b83</item>
+    <item name="colorAway">#657b83</item>
+
     <item name="colorMarkerLine">#CB4B16</item>
 
     <item name="colorTintActivity">#859900</item>
@@ -50,11 +63,19 @@
   </style>
 
   <color name="solarized_dark_background">#002B36</color>
+
+  <style name="Widget.AppBarOverlay.Solarized_Dark" parent="Widget.AppBarOverlay.Light">
+    <item name="colorControlNormal">#93a1a1</item>
+    <item name="android:textColorPrimary">#93a1a1</item>
+    <item name="android:textColorSecondary">#839496</item>
+  </style>
   <style name="Theme.ChatTheme.Solarized_Dark" parent="Theme.ChatTheme">
     <item name="colorPrimary">?attr/colorBackgroundCard</item>
     <item name="colorPrimaryDark">?attr/colorBackground</item>
     <item name="colorAccent">#B58900</item>
 
+    <item name="actionBarTheme">@style/Widget.AppBarOverlay.Solarized_Dark</item>
+
     <item name="senderColor0">#B58900</item>
     <item name="senderColor1">#CB4B16</item>
     <item name="senderColor2">#DC322f</item>
@@ -79,6 +100,10 @@
     <item name="colorForegroundNotice">#B58900</item>
     <item name="colorForegroundError">#B00000</item>
 
+    <item name="colorTextPrimary">#93a1a1</item>
+    <item name="colorTextSecondary">#839496</item>
+    <item name="colorDivider">#1993a1a1</item>
+
     <item name="colorForegroundMirc">0x0</item>
 
     <item name="android:windowBackground">@color/solarized_dark_background</item>
@@ -88,6 +113,9 @@
     <item name="colorBackgroundCard">#073642</item>
     <item name="colorBackgroundDialog">#002B36</item>
 
+    <item name="colorOffline">#839496</item>
+    <item name="colorAway">#839496</item>
+
     <item name="colorMarkerLine">#CB4B16</item>
 
     <item name="colorTintActivity">#859900</item>