diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index de770855..d81e016e 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -1,47 +1,65 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
 
-  <style name="Theme.Main.Light" parent="@android:style/Theme.Material.Light.DarkActionBar">
-    <item name="android:windowActionBar">false</item>
-    <item name="android:windowNoTitle">true</item>
-    <item name="android:toolbarStyle">@style/Widget.Main.Toolbar</item>
-    <item name="android:windowBackground">@color/primary_dark_light</item>
-    <item name="android:colorBackground">@color/background_light</item>
-    <item name="android:colorPrimary">@color/primary_light</item>
-    <item name="android:colorPrimaryDark">@color/primary_dark_light</item>
-    <item name="android:colorAccent">@color/accent_light</item>
-    <item name="android:colorControlActivated">@color/accent_default_light</item>
-    <item name="colorError">@color/error_light</item>
-    <item name="android:textColor">@color/primary_dark_dark</item>
-  </style>
+    <style name="MainTheme" parent="@android:style/Theme.Material.Light.NoActionBar">
+        <item name="android:colorPrimaryDark">@color/white</item>
+    </style>
 
-  <style name="Theme.Main.Dark" parent="@android:style/Theme.Material">
-    <item name="android:windowActionBar">false</item>
-    <item name="android:windowNoTitle">true</item>
-    <item name="android:toolbarStyle">@style/Widget.Main.Toolbar</item>
-    <item name="android:windowBackground">@color/primary_dark_dark</item>
-    <item name="android:colorBackground">@color/background_dark</item>
-    <item name="android:colorPrimary">@color/primary_dark</item>
-    <item name="android:colorPrimaryDark">@color/primary_dark_dark</item>
-    <item name="android:colorAccent">@color/accent_dark</item>
-    <item name="android:colorControlActivated">@color/accent_default_dark</item>
-    <item name="colorError">@color/error_dark</item>
-    <item name="android:textColor">@color/primary_dark_light</item>
-  </style>
+    <style name="Theme.Main.Light" parent="@android:style/Theme.Material.Light.NoActionBar">
+        <item name="android:toolbarStyle">@style/Widget.Main.Toolbar</item>
+        <item name="android:windowBackground">@color/white</item>
+        <item name="android:colorPrimary">@color/default_green</item>
+        <item name="android:colorPrimaryDark">@color/white</item>
+        <item name="android:colorBackground">@color/white</item>
+        <item name="colorOnBackground">@color/default_green</item>
+        <item name="android:colorAccent">@color/accent_light</item>
+        <item name="android:colorControlActivated">@color/default_green</item>
+        <item name="colorError">@color/error_light</item>
+        <item name="android:textColor">@color/black</item>
+        <item name="android:titleTextColor">@color/black</item>
+        <item name="subTextColor">@color/grey_light</item>
+        <item name="android:popupTheme">@style/Theme.Popup.Light</item>
+        <item name="android:fastScrollThumbDrawable">@drawable/scrollbar_thumb</item>
+        <item name="android:fastScrollTrackDrawable">@drawable/scrollbar_track</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
 
-  <!--style name="Theme.Toolbar" parent="@android:style/Theme.Material">
-    <item name="android:colorPrimary">@color/transparent_pixel_green</item>
-    <item name="android:textColor">@color/pixel_green</item>
-  </style-->
+    <style name="Theme.Main.Dark" parent="@android:style/Theme.Material.NoActionBar">
+        <item name="android:toolbarStyle">@style/Widget.Main.Toolbar</item>
+        <item name="android:windowBackground">@color/black</item>
+        <item name="android:colorPrimary">@color/default_green_dark</item>
+        <item name="android:colorPrimaryDark">@color/black</item>
+        <item name="android:colorBackground">@color/black</item>
+        <item name="colorOnBackground">@color/grey_light</item>
+        <item name="android:colorAccent">@color/accent_dark</item>
+        <item name="android:colorControlActivated">@color/default_green_dark</item>
+        <item name="colorError">@color/error_dark</item>
+        <item name="android:titleTextColor">@color/default_green_dark</item>
+        <item name="android:textColorPrimary">@color/default_green</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="subTextColor">@color/grey_dark</item>
+        <item name="android:popupTheme">@style/Theme.Popup.Dark</item>
+        <item name="android:fastScrollThumbDrawable">@drawable/scrollbar_thumb</item>
+        <item name="android:fastScrollTrackDrawable">@drawable/scrollbar_track</item>
+    </style>
 
-  <style name="Widget.Main.Toolbar" parent="@android:style/Widget.Material.Toolbar">
-    <!-- Fixes invalid text style on Samsung devices -->
-    <item name="android:titleTextAppearance">@android:style/TextAppearance.Material.Widget.Toolbar.Title</item>
-    <item name="android:subtitleTextAppearance">@android:style/TextAppearance.Material.Widget.Toolbar.Subtitle</item>
-  </style>
+    <style name="Widget.Main.Toolbar" parent="@android:style/Widget.Material.Toolbar">
+        <item name="android:titleTextAppearance">
+            @android:style/TextAppearance.Material.Widget.Toolbar.Title
+        </item>
+        <item name="android:subtitleTextAppearance">
+            @android:style/TextAppearance.Material.Widget.Toolbar.Subtitle
+        </item>
+    </style>
 
-  <style name="Theme.Main.Toolbar.Popup" parent="Theme.Main.Dark">
-    <item name="android:colorBackground">?android:attr/colorPrimaryDark</item>
-  </style>
+    <style name="Theme.Popup.Light" parent="android:Theme.Material.Light.Dialog.Alert">
+        <item name="android:colorControlActivated">@color/default_green</item>
+        <item name="android:colorBackground">@color/white</item>
+    </style>
+
+    <style name="Theme.Popup.Dark" parent="android:Theme.Material.Dialog.Alert">
+        <item name="android:colorControlActivated">@color/default_green_dark</item>
+        <item name="android:colorBackground">@color/black</item>
+    </style>
 
 </resources>