diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index adc20a048..ec0f974f4 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.tasks"
     android:versionName="4.7.5"
-    android:versionCode="345">
+    android:versionCode="346">
 
     <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
     <!--    android:installLocation="internalOnly"> -->
@@ -276,7 +276,7 @@
         <!-- custom filters -->
         <activity
             android:name="com.todoroo.astrid.core.CustomFilterActivity"
-            android:theme="@style/Tasks.Dialog" />
+            android:theme="@style/TasksDialog" />
 
         <activity
             android:name="com.todoroo.astrid.core.DeleteFilterActivity"
@@ -311,7 +311,7 @@
         <activity
             android:name="com.todoroo.astrid.actfm.TagSettingsActivityTablet"
             android:windowSoftInputMode="stateHidden"
-            android:theme="@style/Tasks.Dialog" />
+            android:theme="@style/TasksDialog" />
 
         <!-- gtasks -->
         <activity
diff --git a/src/main/java/com/faizmalkani/floatingactionbutton/FloatingActionButton.java b/src/main/java/com/faizmalkani/floatingactionbutton/FloatingActionButton.java
index d9032317c..e4e175fb6 100644
--- a/src/main/java/com/faizmalkani/floatingactionbutton/FloatingActionButton.java
+++ b/src/main/java/com/faizmalkani/floatingactionbutton/FloatingActionButton.java
@@ -8,7 +8,6 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
@@ -19,10 +18,16 @@ import static com.todoroo.andlib.utility.AndroidUtilities.atLeastHoneycomb;
 
 public class FloatingActionButton extends View {
 
-    private final Paint mButtonPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    private final Paint mButtonPaint = new Paint(Paint.ANTI_ALIAS_FLAG) {{
+        setStyle(Style.FILL);
+    }};
+    private final Paint mButtonPaintStroke = new Paint(Paint.ANTI_ALIAS_FLAG) {{
+        setStyle(Style.STROKE);
+    }};
     private final Paint mDrawablePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
     private Bitmap mBitmap;
-    private int mColor;
+    private int tint;
+    private int stroke;
 
     public FloatingActionButton(Context context) {
         this(context, null);
@@ -36,15 +41,15 @@ public class FloatingActionButton extends View {
         super(context, attrs, defStyleAttr);
 
         TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.FloatingActionButton);
-        mColor = a.getColor(R.styleable.FloatingActionButton_tint, Color.WHITE);
-        mButtonPaint.setStyle(Paint.Style.FILL);
-        mButtonPaint.setColor(mColor);
-        float radius, dx, dy;
-        radius = a.getFloat(R.styleable.FloatingActionButton_shadowRadius, 10.0f);
-        dx = a.getFloat(R.styleable.FloatingActionButton_shadowDx, 0.0f);
-        dy = a.getFloat(R.styleable.FloatingActionButton_shadowDy, 3.5f);
-        int color = a.getInteger(R.styleable.FloatingActionButton_shadowColor, Color.argb(100, 0, 0, 0));
-        mButtonPaint.setShadowLayer(radius, dx, dy, color);
+        tint = a.getColor(R.styleable.FloatingActionButton_tint, Color.WHITE);
+        stroke = a.getColor(R.styleable.FloatingActionButton_stroke, Color.TRANSPARENT);
+        mButtonPaint.setColor(tint);
+        mButtonPaintStroke.setColor(stroke);
+        mButtonPaint.setShadowLayer(
+                a.getFloat(R.styleable.FloatingActionButton_shadowRadius, 10.0f),
+                a.getFloat(R.styleable.FloatingActionButton_shadowDx, 0.0f),
+                a.getFloat(R.styleable.FloatingActionButton_shadowDy, 3.5f),
+                a.getInteger(R.styleable.FloatingActionButton_shadowColor, Color.argb(100, 0, 0, 0)));
 
         Drawable drawable = a.getDrawable(R.styleable.FloatingActionButton_drawable);
         if (null != drawable) {
@@ -56,27 +61,17 @@ public class FloatingActionButton extends View {
         }
     }
 
-    public static int darkenColor(int color) {
+    private static int darkenColor(int color) {
         float[] hsv = new float[3];
         Color.colorToHSV(color, hsv);
         hsv[2] *= 0.8f;
         return Color.HSVToColor(hsv);
     }
 
-    public void setColor(int color) {
-        mColor = color;
-        mButtonPaint.setColor(mColor);
-        invalidate();
-    }
-
-    public void setDrawable(Drawable drawable) {
-        mBitmap = ((BitmapDrawable) drawable).getBitmap();
-        invalidate();
-    }
-
     @Override
     protected void onDraw(Canvas canvas) {
         canvas.drawCircle(getWidth() / 2, getHeight() / 2, (float) (getWidth() / 2.6), mButtonPaint);
+        canvas.drawCircle(getWidth() / 2, getHeight() / 2, (float) (getWidth() / 2.6), mButtonPaintStroke);
         if (null != mBitmap) {
             canvas.drawBitmap(mBitmap, (getWidth() - mBitmap.getWidth()) / 2,
                     (getHeight() - mBitmap.getHeight()) / 2, mDrawablePaint);
@@ -87,9 +82,9 @@ public class FloatingActionButton extends View {
     public boolean onTouchEvent(MotionEvent event) {
         int color;
         if (event.getAction() == MotionEvent.ACTION_UP) {
-            color = mColor;
+            color = tint;
         } else {
-            color = darkenColor(mColor);
+            color = darkenColor(tint);
         }
         mButtonPaint.setColor(color);
         invalidate();
diff --git a/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java b/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java
index 34c009b22..2b36457ab 100644
--- a/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java
+++ b/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java
@@ -379,6 +379,10 @@ public class AndroidUtilities {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH;
     }
 
+    public static boolean atLeastLollipop() {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
+    }
+
     /**
      * Sort files by date so the newest file is on top
      */
diff --git a/src/main/java/com/todoroo/astrid/activity/EditPreferences.java b/src/main/java/com/todoroo/astrid/activity/EditPreferences.java
index 159dea8cd..d30c036c6 100644
--- a/src/main/java/com/todoroo/astrid/activity/EditPreferences.java
+++ b/src/main/java/com/todoroo/astrid/activity/EditPreferences.java
@@ -343,6 +343,8 @@ public class EditPreferences extends TodorooPreferenceActivity {
     }
 
     public void addPreferenceListeners() {
+        findPreference(getString(R.string.p_use_dark_theme)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED));
+
         findPreference(getString(R.string.p_fontSize)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED));
 
         findPreference(getString(R.string.p_use_dark_theme_widget)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
diff --git a/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java b/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java
index 8e391ffdc..2b7079c22 100644
--- a/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java
+++ b/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java
@@ -9,6 +9,8 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
+import android.view.ContextThemeWrapper;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.RadioButton;
@@ -16,6 +18,7 @@ import android.widget.RadioButton;
 import com.todoroo.astrid.core.SortHelper;
 
 import org.tasks.R;
+import org.tasks.preferences.ActivityPreferences;
 
 /**
  * Shows the sort / hidden dialog
@@ -32,9 +35,12 @@ public class SortSelectionActivity {
     /**
      * Create the dialog
      */
-    public static AlertDialog createDialog(Activity activity, boolean showDragDrop,
+    public static AlertDialog createDialog(Activity activity, boolean showDragDrop, ActivityPreferences activityPreferences,
             OnSortSelectedListener listener, int flags, int sort) {
-        View body = activity.getLayoutInflater().inflate(R.layout.sort_selection_dialog, null);
+        int editDialogTheme = activityPreferences.getEditDialogTheme();
+        ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(activity, editDialogTheme);
+        LayoutInflater themedInflater = activity.getLayoutInflater().cloneInContext(contextThemeWrapper);
+        View body = themedInflater.inflate(R.layout.sort_selection_dialog, null);
 
         if((flags & SortHelper.FLAG_REVERSE_SORT) > 0) {
             ((CheckBox) body.findViewById(R.id.reverse)).setChecked(true);
@@ -81,7 +87,7 @@ public class SortSelectionActivity {
             }
         });
 
-        AlertDialog dialog = new AlertDialog.Builder(activity).
+        AlertDialog dialog = new AlertDialog.Builder(activity, editDialogTheme).
             setTitle(R.string.TLA_menu_sort).
             setView(body).
             setPositiveButton(R.string.SSD_save_always,
@@ -146,6 +152,4 @@ public class SortSelectionActivity {
             listener.onSortSelected(always, flags, sort);
         }
     }
-
-
 }
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
index e1b4570eb..7aa71eeb7 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
@@ -476,7 +476,7 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
                 return true;
             case R.id.menu_sort:
                 AlertDialog dialog = SortSelectionActivity.createDialog(
-                        this, tlf.hasDraggableOption(), tlf, tlf.getSortFlags(), tlf.getSort());
+                        this, tlf.hasDraggableOption(), preferences, tlf, tlf.getSortFlags(), tlf.getSort());
                 dialog.show();
                 return true;
             case R.id.menu_new_filter:
diff --git a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
index f59f3be37..fdfd916ee 100644
--- a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -30,6 +30,9 @@ import org.tasks.R;
 import org.tasks.filters.FilterCounter;
 import org.tasks.filters.FilterProvider;
 
+import static org.tasks.preferences.ResourceResolver.getData;
+import static org.tasks.preferences.ResourceResolver.getResource;
+
 public class FilterAdapter extends ArrayAdapter<Filter> {
 
     // --- style constants
@@ -168,7 +171,7 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
         }
 
         if (selected != null && selected.equals(viewHolder.item)) {
-            convertView.setBackgroundColor(activity.getResources().getColor(R.color.drawer_background_selected));
+            convertView.setBackgroundColor(getData(activity, R.attr.drawer_background_selected));
         }
 
         return convertView;
diff --git a/src/main/java/com/todoroo/astrid/helper/TaskEditControlSetBase.java b/src/main/java/com/todoroo/astrid/helper/TaskEditControlSetBase.java
index d5b3438ea..85cafa67b 100644
--- a/src/main/java/com/todoroo/astrid/helper/TaskEditControlSetBase.java
+++ b/src/main/java/com/todoroo/astrid/helper/TaskEditControlSetBase.java
@@ -42,8 +42,8 @@ public abstract class TaskEditControlSetBase implements TaskEditControlSet {
             initialized = true;
         }
 
-        themeColor = getData(activity, R.attr.task_edit_theme_color);
-        unsetColor = activity.getResources().getColor(R.color.task_edit_deadline_gray);
+        themeColor = getData(activity, R.attr.asTextColor);
+        unsetColor = getData(activity, R.attr.asTextColorHint);
     }
 
     @Override
diff --git a/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java b/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java
index 6ddc51b01..207ca3468 100644
--- a/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java
@@ -86,8 +86,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
 
     private final int cameraButton;
 
-    private final int color;
-
     private static boolean respondToPicture = false;
 
     private final List<UpdatesChangedListener> listeners = new LinkedList<>();
@@ -117,12 +115,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
 
         this.activity = (AstridActivity) fragment.getActivity();
 
-        TypedValue tv = new TypedValue();
-        fragment.getActivity().getTheme().resolveAttribute(R.attr.asTextColor, tv, false);
-        color = tv.data;
-
-        fragment.getActivity().getTheme().resolveAttribute(R.attr.asDueDateColor, tv, false);
-
         cameraButton = getDefaultCameraButton();
 
         setOrientation(VERTICAL);
@@ -334,7 +326,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
 
     public View getUpdateNotes(NoteOrUpdate note, ViewGroup parent) {
         View convertView = ((Activity)getContext()).getLayoutInflater().inflate(
-                    R.layout.update_adapter_row, parent, false);
+                    R.layout.comment_adapter_row, parent, false);
         bindView(convertView, note);
         return convertView;
     }
@@ -344,7 +336,6 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
         // name
         final TextView nameView = (TextView)view.findViewById(R.id.title); {
             nameView.setText(item.title);
-            nameView.setTextColor(color);
             Linkify.addLinks(nameView, Linkify.ALL);
         }
 
diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
index ccf1d9d10..49856f43b 100644
--- a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
+++ b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
@@ -13,6 +13,7 @@ import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
@@ -253,7 +254,13 @@ public class RepeatControlSet extends PopupControlSet {
     protected void afterInflate() {
         value = (Button) getView().findViewById(R.id.repeatValue);
         interval = (Spinner) getView().findViewById(R.id.repeatInterval);
+        interval.setAdapter(new ArrayAdapter<String>(activity, R.layout.simple_spinner_item, activity.getResources().getStringArray(R.array.repeat_interval)) {{
+            setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        }});
         type = (Spinner) getView().findViewById(R.id.repeatType);
+        type.setAdapter(new ArrayAdapter<String>(activity, R.layout.simple_spinner_item, activity.getResources().getStringArray(R.array.repeat_type)) {{
+            setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        }});
         daysOfWeekContainer = (LinearLayout) getView().findViewById(R.id.repeatDayOfWeekContainer);
         repeatUntil = (Button) getView().findViewById(R.id.repeatUntil);
         setRepeatValue(1);
diff --git a/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java b/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java
index d9eec0e52..76db00c14 100644
--- a/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java
+++ b/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java
@@ -55,7 +55,7 @@ public class RandomReminderControlSet extends TaskEditControlSetBase {
 
         // create adapter
         ArrayAdapter<String> adapter = new ArrayAdapter<>(
-                activity, android.R.layout.simple_spinner_item,
+                activity, R.layout.simple_spinner_item,
                 activity.getResources().getStringArray(R.array.TEA_reminder_random));
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         periodSpinner.setAdapter(adapter);
diff --git a/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
index 30cc0d4b8..a27c1992b 100644
--- a/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
+++ b/src/main/java/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
@@ -46,6 +46,8 @@ public class AstridDefaultPreferenceSpec {
 
         setPreference(prefs, editor, r, R.string.p_calendar_reminders, true);
 
+        setPreference(prefs, editor, r, R.string.p_use_dark_theme, false);
+
         setPreference(prefs, editor, r, R.string.p_show_task_edit_comments, true);
 
         setPreference(prefs, editor, r, R.string.p_rmd_quietStart_old, 22); // enable quiet hours by default
diff --git a/src/main/java/org/tasks/preferences/ActivityPreferences.java b/src/main/java/org/tasks/preferences/ActivityPreferences.java
index 7bd33e45b..6bb955b55 100644
--- a/src/main/java/org/tasks/preferences/ActivityPreferences.java
+++ b/src/main/java/org/tasks/preferences/ActivityPreferences.java
@@ -3,10 +3,10 @@ package org.tasks.preferences;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.graphics.PixelFormat;
 import android.util.DisplayMetrics;
-
-import com.todoroo.andlib.utility.AndroidUtilities;
+import android.view.Window;
 
 import org.tasks.R;
 
@@ -14,6 +14,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import static com.todoroo.andlib.utility.AndroidUtilities.atLeastIceCreamSandwich;
+import static com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop;
 
 @Singleton
 public class ActivityPreferences extends Preferences {
@@ -34,11 +35,23 @@ public class ActivityPreferences extends Preferences {
     }
 
     public void applyTheme() {
-        applyTheme(R.style.Tasks);
+        Window window = activity.getWindow();
+        Resources resources = activity.getResources();
+        if (isDarkTheme()) {
+            if (atLeastLollipop()) {
+                window.setStatusBarColor(resources.getColor(android.R.color.black));
+            }
+            applyTheme(R.style.Tasks_Dark);
+        } else {
+            if (atLeastLollipop()) {
+                window.setStatusBarColor(resources.getColor(R.color.primary_dark));
+            }
+            applyTheme(R.style.Tasks);
+        }
     }
 
     public void applyDialogTheme() {
-        applyTheme(R.style.Tasks_Dialog);
+        applyTheme(R.style.TasksDialog);
     }
 
     public void applyTranslucentDialogTheme() {
@@ -51,7 +64,11 @@ public class ActivityPreferences extends Preferences {
     }
 
     public int getEditDialogTheme() {
-        return atLeastIceCreamSandwich() ? R.style.TEA_Dialog_Light_ICS : R.style.TEA_Dialog;
+        return isDarkTheme() ? R.style.TEA_Dialog_Dark : R.style.TEA_Dialog;
+    }
+
+    public boolean isDarkTheme() {
+        return getBoolean(R.string.p_use_dark_theme, false);
     }
 
     /**
diff --git a/src/main/java/org/tasks/preferences/ResourceResolver.java b/src/main/java/org/tasks/preferences/ResourceResolver.java
index 7b986ae59..6d99e3adc 100644
--- a/src/main/java/org/tasks/preferences/ResourceResolver.java
+++ b/src/main/java/org/tasks/preferences/ResourceResolver.java
@@ -20,6 +20,10 @@ public class ResourceResolver {
         return getData(activity, attr);
     }
 
+    public int getResource(int attr) {
+        return getResource(activity, attr);
+    }
+
     public static int getResource(Activity activity, int attr) {
         TypedValue typedValue = new TypedValue();
         activity.getTheme().resolveAttribute(attr, typedValue, true);
diff --git a/src/main/res/drawable-hdpi/dialog_full_holo_dark.9.png b/src/main/res/drawable-hdpi/dialog_full_holo_dark.9.png
new file mode 100644
index 000000000..79e56f522
Binary files /dev/null and b/src/main/res/drawable-hdpi/dialog_full_holo_dark.9.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_alarm_white.png b/src/main/res/drawable-hdpi/ic_action_alarm_white.png
new file mode 100644
index 000000000..92c107c21
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_alarm_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_bell_white.png b/src/main/res/drawable-hdpi/ic_action_bell_white.png
new file mode 100644
index 000000000..e4991317f
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_bell_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_box_white.png b/src/main/res/drawable-hdpi/ic_action_box_white.png
new file mode 100644
index 000000000..17f22b7d5
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_box_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_clock_white.png b/src/main/res/drawable-hdpi/ic_action_clock_white.png
new file mode 100644
index 000000000..7d9d31e36
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_clock_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_flag_white.png b/src/main/res/drawable-hdpi/ic_action_flag_white.png
new file mode 100644
index 000000000..2d2f64dde
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_flag_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_gear_white.png b/src/main/res/drawable-hdpi/ic_action_gear_white.png
new file mode 100644
index 000000000..34a8a95c5
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_gear_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_list_white.png b/src/main/res/drawable-hdpi/ic_action_list_white.png
new file mode 100644
index 000000000..f59a69d84
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_list_white.png differ
diff --git a/src/main/res/drawable-hdpi/ic_action_tags_white.png b/src/main/res/drawable-hdpi/ic_action_tags_white.png
new file mode 100644
index 000000000..8d814be7b
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_tags_white.png differ
diff --git a/src/main/res/drawable-v21/filter_row_selector_dark.xml b/src/main/res/drawable-v21/filter_row_selector_dark.xml
new file mode 100644
index 000000000..1c4d914f4
--- /dev/null
+++ b/src/main/res/drawable-v21/filter_row_selector_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@drawable/ripple_dark"/>
+    <item android:state_pressed="false" android:drawable="@color/drawer_background_dark"/>
+</selector>
\ No newline at end of file
diff --git a/src/main/res/drawable-v21/ripple_dark.xml b/src/main/res/drawable-v21/ripple_dark.xml
new file mode 100644
index 000000000..f841e73b8
--- /dev/null
+++ b/src/main/res/drawable-v21/ripple_dark.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:colorControlHighlight">
+    <item android:id="@android:id/mask" android:drawable="@color/drawer_background_selected_dark"/>
+    <item android:drawable="@color/drawer_background_selected_dark"/>
+</ripple>
\ No newline at end of file
diff --git a/src/main/res/drawable-xhdpi/dialog_full_holo_dark.9.png b/src/main/res/drawable-xhdpi/dialog_full_holo_dark.9.png
new file mode 100644
index 000000000..f4970ad1c
Binary files /dev/null and b/src/main/res/drawable-xhdpi/dialog_full_holo_dark.9.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_alarm_white.png b/src/main/res/drawable-xhdpi/ic_action_alarm_white.png
new file mode 100644
index 000000000..3c0b2d098
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_alarm_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_bell_white.png b/src/main/res/drawable-xhdpi/ic_action_bell_white.png
new file mode 100644
index 000000000..db8cbfb76
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_bell_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_box_white.png b/src/main/res/drawable-xhdpi/ic_action_box_white.png
new file mode 100644
index 000000000..7e2a7e20b
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_box_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_clock_white.png b/src/main/res/drawable-xhdpi/ic_action_clock_white.png
new file mode 100644
index 000000000..530c9f4dc
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_clock_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_flag_white.png b/src/main/res/drawable-xhdpi/ic_action_flag_white.png
new file mode 100644
index 000000000..3f1bfcbec
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_flag_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_gear_white.png b/src/main/res/drawable-xhdpi/ic_action_gear_white.png
new file mode 100644
index 000000000..fcb6564be
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_gear_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_list_white.png b/src/main/res/drawable-xhdpi/ic_action_list_white.png
new file mode 100644
index 000000000..6907a7a24
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_list_white.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_tags_white.png b/src/main/res/drawable-xhdpi/ic_action_tags_white.png
new file mode 100644
index 000000000..096f8f537
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_tags_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_alarm_white.png b/src/main/res/drawable-xxhdpi/ic_action_alarm_white.png
new file mode 100644
index 000000000..2bb3242ae
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_alarm_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_bell_white.png b/src/main/res/drawable-xxhdpi/ic_action_bell_white.png
new file mode 100644
index 000000000..a8a69d1ad
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_bell_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_box_white.png b/src/main/res/drawable-xxhdpi/ic_action_box_white.png
new file mode 100644
index 000000000..e12c93d6c
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_box_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_clock_white.png b/src/main/res/drawable-xxhdpi/ic_action_clock_white.png
new file mode 100644
index 000000000..99e5595c9
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_clock_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_flag_white.png b/src/main/res/drawable-xxhdpi/ic_action_flag_white.png
new file mode 100644
index 000000000..1c65a5867
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_flag_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_gear_white.png b/src/main/res/drawable-xxhdpi/ic_action_gear_white.png
new file mode 100644
index 000000000..c4d30d4f4
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_gear_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_list_white.png b/src/main/res/drawable-xxhdpi/ic_action_list_white.png
new file mode 100644
index 000000000..a69ac9889
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_list_white.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_tags_white.png b/src/main/res/drawable-xxhdpi/ic_action_tags_white.png
new file mode 100644
index 000000000..13fc3132b
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_tags_white.png differ
diff --git a/src/main/res/drawable/dialog_full_holo_dark.9.png b/src/main/res/drawable/dialog_full_holo_dark.9.png
new file mode 100644
index 000000000..fb3660eab
Binary files /dev/null and b/src/main/res/drawable/dialog_full_holo_dark.9.png differ
diff --git a/src/main/res/drawable/filter_row_selector_dark.xml b/src/main/res/drawable/filter_row_selector_dark.xml
new file mode 100644
index 000000000..db74fe7a0
--- /dev/null
+++ b/src/main/res/drawable/filter_row_selector_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@color/drawer_background_selected_dark"/>
+    <item android:state_pressed="false" android:drawable="@color/drawer_background_dark"/>
+</selector>
\ No newline at end of file
diff --git a/src/main/res/drawable/ic_action_alarm_white.png b/src/main/res/drawable/ic_action_alarm_white.png
new file mode 100644
index 000000000..f851e47ac
Binary files /dev/null and b/src/main/res/drawable/ic_action_alarm_white.png differ
diff --git a/src/main/res/drawable/ic_action_bell_white.png b/src/main/res/drawable/ic_action_bell_white.png
new file mode 100644
index 000000000..8e8179cdc
Binary files /dev/null and b/src/main/res/drawable/ic_action_bell_white.png differ
diff --git a/src/main/res/drawable/ic_action_box_white.png b/src/main/res/drawable/ic_action_box_white.png
new file mode 100644
index 000000000..eadcaa6b3
Binary files /dev/null and b/src/main/res/drawable/ic_action_box_white.png differ
diff --git a/src/main/res/drawable/ic_action_clock_white.png b/src/main/res/drawable/ic_action_clock_white.png
new file mode 100644
index 000000000..0410ed9dd
Binary files /dev/null and b/src/main/res/drawable/ic_action_clock_white.png differ
diff --git a/src/main/res/drawable/ic_action_flag_white.png b/src/main/res/drawable/ic_action_flag_white.png
new file mode 100644
index 000000000..1ca97fe86
Binary files /dev/null and b/src/main/res/drawable/ic_action_flag_white.png differ
diff --git a/src/main/res/drawable/ic_action_gear_white.png b/src/main/res/drawable/ic_action_gear_white.png
new file mode 100644
index 000000000..6a3d0393b
Binary files /dev/null and b/src/main/res/drawable/ic_action_gear_white.png differ
diff --git a/src/main/res/drawable/ic_action_list_white.png b/src/main/res/drawable/ic_action_list_white.png
new file mode 100644
index 000000000..fdeb3ad3a
Binary files /dev/null and b/src/main/res/drawable/ic_action_list_white.png differ
diff --git a/src/main/res/drawable/ic_action_tags_white.png b/src/main/res/drawable/ic_action_tags_white.png
new file mode 100644
index 000000000..5701c22f9
Binary files /dev/null and b/src/main/res/drawable/ic_action_tags_white.png differ
diff --git a/src/main/res/layout/update_adapter_row.xml b/src/main/res/layout/comment_adapter_row.xml
similarity index 95%
rename from src/main/res/layout/update_adapter_row.xml
rename to src/main/res/layout/comment_adapter_row.xml
index 26e0656c6..9fcbd8f58 100644
--- a/src/main/res/layout/update_adapter_row.xml
+++ b/src/main/res/layout/comment_adapter_row.xml
@@ -28,7 +28,8 @@
 	        android:paddingLeft="5dip"
 	        android:paddingRight="3dip"
 	        style="@style/TextAppearance.TAd_ItemTitle"
-	        android:textSize="16sp"/>
+            android:textColor="?attr/asTextColor"
+            android:textSize="16sp"/>
 	    
 	        
         <!-- activity date -->
diff --git a/src/main/res/layout/control_set_deadline.xml b/src/main/res/layout/control_set_deadline.xml
index 24118b96d..3b4db4d60 100644
--- a/src/main/res/layout/control_set_deadline.xml
+++ b/src/main/res/layout/control_set_deadline.xml
@@ -9,7 +9,7 @@
     android:orientation="horizontal">
 
     <ImageView
-        android:src="@drawable/ic_action_clock"
+        android:src="?attr/ic_action_clock"
         android:contentDescription="@string/TEA_deadline_hint"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/src/main/res/layout/control_set_description.xml b/src/main/res/layout/control_set_description.xml
index 6096b23c2..8cc90361e 100644
--- a/src/main/res/layout/control_set_description.xml
+++ b/src/main/res/layout/control_set_description.xml
@@ -9,7 +9,7 @@
     android:orientation="horizontal">
 
     <ImageView
-        android:src="@drawable/ic_action_list"
+        android:src="?attr/ic_action_list"
         android:contentDescription="@string/TEA_note_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -33,6 +33,8 @@
             android:paddingEnd="@dimen/task_edit_padding_right"
             android:scrollbars="vertical"
             android:hint="@string/TEA_notes_empty"
+            android:textColorHint="?attr/asTextColorHint"
+            android:textSize="@dimen/task_edit_text_size"
             android:inputType="textCapSentences|textMultiLine"
             android:imeOptions="flagNoExtractUi"
             android:textColor="?attr/asTextColor"
diff --git a/src/main/res/layout/control_set_files.xml b/src/main/res/layout/control_set_files.xml
index 15c600539..cf40ec9c9 100644
--- a/src/main/res/layout/control_set_files.xml
+++ b/src/main/res/layout/control_set_files.xml
@@ -9,7 +9,7 @@
     android:orientation="horizontal">
 
     <ImageView
-        android:src="@drawable/ic_action_attachment_2_dark"
+        android:src="?attr/ic_action_attachment"
         android:contentDescription="@string/TEA_control_files"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/src/main/res/layout/control_set_hide.xml b/src/main/res/layout/control_set_hide.xml
index ad579c239..8eb85ba2c 100644
--- a/src/main/res/layout/control_set_hide.xml
+++ b/src/main/res/layout/control_set_hide.xml
@@ -9,7 +9,7 @@
     android:orientation="horizontal">
 
     <ImageView
-        android:src="@drawable/ic_action_box"
+        android:src="?attr/ic_action_box"
         android:contentDescription="@string/TEA_hideUntil_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -26,7 +26,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="start|center_vertical"
-            android:textColor="?attr/asThemeTextColor"
+            android:textColor="?attr/asTextColor"
+            android:textColorHint="?attr/asTextColorHint"
             android:textSize="@dimen/task_edit_text_size"
             android:paddingTop="@dimen/task_edit_padding_top_bottom"
             android:paddingBottom="@dimen/task_edit_padding_top_bottom"
diff --git a/src/main/res/layout/control_set_importance.xml b/src/main/res/layout/control_set_importance.xml
index ead72e0de..d9e82f538 100644
--- a/src/main/res/layout/control_set_importance.xml
+++ b/src/main/res/layout/control_set_importance.xml
@@ -9,7 +9,7 @@
     android:orientation="horizontal">
 
     <ImageView
-        android:src="@drawable/ic_action_flag"
+        android:src="?attr/ic_action_flag"
         android:contentDescription="@string/TEA_importance_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -40,7 +40,7 @@
                 android:paddingBottom="@dimen/task_edit_padding_top_bottom"
                 android:gravity="start|center_vertical"
                 android:text="@string/TEA_importance_label"
-                android:textColor="@color/black_text"
+                android:textColor="?attr/asTextColor"
                 android:textSize="@dimen/task_edit_text_size" />
 
         </LinearLayout>
diff --git a/src/main/res/layout/control_set_reminders.xml b/src/main/res/layout/control_set_reminders.xml
index abda416f8..f2faaa2c1 100644
--- a/src/main/res/layout/control_set_reminders.xml
+++ b/src/main/res/layout/control_set_reminders.xml
@@ -9,7 +9,7 @@
     android:orientation="horizontal">
 
     <ImageView
-        android:src="@drawable/ic_action_bell"
+        android:src="?attr/ic_action_bell"
         android:contentDescription="@string/TEA_control_reminders"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/src/main/res/layout/control_set_repeat.xml b/src/main/res/layout/control_set_repeat.xml
index 536d16134..975a1116e 100644
--- a/src/main/res/layout/control_set_repeat.xml
+++ b/src/main/res/layout/control_set_repeat.xml
@@ -32,16 +32,14 @@
           android:layout_weight="1"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content" 
-          android:prompt="@string/repeat_interval_prompt"
-          android:entries="@array/repeat_interval"/>
+          android:prompt="@string/repeat_interval_prompt"/>
           
     </LinearLayout>
     
     <Spinner
         android:id="@+id/repeatType"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content" 
-        android:entries="@array/repeat_type"/>
+        android:layout_height="wrap_content"/>
     
     <LinearLayout android:id="@+id/repeatDayOfWeekContainer"
         android:orientation="horizontal"
diff --git a/src/main/res/layout/control_set_tags.xml b/src/main/res/layout/control_set_tags.xml
index 244348e4f..41b5b3ae7 100644
--- a/src/main/res/layout/control_set_tags.xml
+++ b/src/main/res/layout/control_set_tags.xml
@@ -9,7 +9,7 @@
     android:orientation="horizontal">
 
     <ImageView
-        android:src="@drawable/ic_action_tags"
+        android:src="?attr/ic_action_tags"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
diff --git a/src/main/res/layout/control_set_timers.xml b/src/main/res/layout/control_set_timers.xml
index cd2349f1c..bcc467cb9 100644
--- a/src/main/res/layout/control_set_timers.xml
+++ b/src/main/res/layout/control_set_timers.xml
@@ -9,7 +9,7 @@
     android:orientation="horizontal">
 
     <ImageView
-        android:src="@drawable/ic_action_alarm"
+        android:src="?attr/ic_action_alarm"
         android:contentDescription="@string/TEA_timer_controls"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/src/main/res/layout/control_set_title.xml b/src/main/res/layout/control_set_title.xml
index 093a0ed0a..43609df67 100644
--- a/src/main/res/layout/control_set_title.xml
+++ b/src/main/res/layout/control_set_title.xml
@@ -37,6 +37,7 @@
         android:scrollbars="vertical"
         android:imeOptions="flagNoExtractUi|actionDone"
         android:text=""
-        android:textColor="?attr/asTextColor" />
+        android:textColor="?attr/asTextColor"
+        android:textColorHint="?attr/asTextColorHint"/>
 
 </LinearLayout>
diff --git a/src/main/res/layout/custom_filter_activity.xml b/src/main/res/layout/custom_filter_activity.xml
index 73424a5a8..ac8e75096 100644
--- a/src/main/res/layout/custom_filter_activity.xml
+++ b/src/main/res/layout/custom_filter_activity.xml
@@ -21,6 +21,8 @@
         android:layout_weight="1"
         android:background="@null"
         android:hint="@string/CFA_filterName_hint"
+        android:textColor="?attr/asTextColor"
+        android:textColorHint="?attr/asTextColorHint"
         android:capitalize="sentences" />
     
     <View 
diff --git a/src/main/res/layout/fragment_navigation_drawer.xml b/src/main/res/layout/fragment_navigation_drawer.xml
index 9de97ee35..a34fc7742 100644
--- a/src/main/res/layout/fragment_navigation_drawer.xml
+++ b/src/main/res/layout/fragment_navigation_drawer.xml
@@ -9,7 +9,8 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:background="@color/drawer_background"
+        android:background="?attr/drawer_background"
+        android:listSelector="?attr/asFilterRowSelected"
         android:cacheColorHint="@android:color/transparent"
         android:choiceMode="singleChoice"
         android:divider="@android:color/transparent"
@@ -22,7 +23,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:background="@color/drawer_background"
+        android:background="?attr/drawer_background"
         android:orientation="vertical">
 
         <View
@@ -37,7 +38,7 @@
             android:layout_height="45dp"
             android:clickable="true"
             android:longClickable="false"
-            android:background="@drawable/filter_row_selector"
+            android:background="?attr/asFilterRowSelected"
             android:drawableLeft="?attr/ic_action_settings"
             android:paddingLeft="10dp"
             android:drawablePadding="10dp"
diff --git a/src/main/res/layout/simple_spinner_item.xml b/src/main/res/layout/simple_spinner_item.xml
new file mode 100644
index 000000000..d454c7522
--- /dev/null
+++ b/src/main/res/layout/simple_spinner_item.xml
@@ -0,0 +1,9 @@
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    style="?android:attr/spinnerItemStyle"
+    android:singleLine="true"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:ellipsize="marquee"
+    android:textColor="?attr/asTextColor"
+    android:textAlignment="inherit"/>
\ No newline at end of file
diff --git a/src/main/res/layout/sort_selection_dialog.xml b/src/main/res/layout/sort_selection_dialog.xml
index 6e26e3b1d..7dc07bc84 100644
--- a/src/main/res/layout/sort_selection_dialog.xml
+++ b/src/main/res/layout/sort_selection_dialog.xml
@@ -8,8 +8,7 @@
   android:layout_width="fill_parent"
   android:layout_height="wrap_content"
   android:paddingLeft="10dip"
-  android:paddingRight="10dip"
-    android:background="?attr/asContentBackground">
+  android:paddingRight="10dip">
 
     <LinearLayout
       android:layout_width="fill_parent"
diff --git a/src/main/res/layout/tag_edit_row.xml b/src/main/res/layout/tag_edit_row.xml
index 4a1c18de8..4a0650b6c 100644
--- a/src/main/res/layout/tag_edit_row.xml
+++ b/src/main/res/layout/tag_edit_row.xml
@@ -24,8 +24,8 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:layout_gravity="center_vertical"
-        android:textColor="@color/black_text"
-        android:textColorHint="@color/black_text_hint"
+        style="@style/TextBoxText"
+        android:textColorHint="?attr/asTextColorHint"
         android:inputType="textCapSentences"/>
         
     <ImageButton android:id="@+id/button1"
diff --git a/src/main/res/layout/tag_settings_activity.xml b/src/main/res/layout/tag_settings_activity.xml
index 073921037..1f485bfb6 100644
--- a/src/main/res/layout/tag_settings_activity.xml
+++ b/src/main/res/layout/tag_settings_activity.xml
@@ -45,7 +45,7 @@
 
                 <EditText
                     android:id="@+id/tag_name"
-                    style="@style/TextAppearance"
+                    android:textColor="@android:color/black"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:background="#00000000"
diff --git a/src/main/res/layout/task_edit_activity.xml b/src/main/res/layout/task_edit_activity.xml
index c774dd355..ec8bb202c 100644
--- a/src/main/res/layout/task_edit_activity.xml
+++ b/src/main/res/layout/task_edit_activity.xml
@@ -29,7 +29,7 @@
             <View
                 android:layout_width="fill_parent"
                 android:layout_height="1px"
-                android:background="@color/task_edit_divider"/>
+                android:background="?attr/task_edit_divider"/>
 
             <LinearLayout
                 android:id="@+id/basic_controls"
@@ -53,7 +53,7 @@
     <View
         android:layout_width="fill_parent"
         android:layout_height="1px"
-        android:background="?attr/asThemeTextColor"/>
+        android:background="?attr/asToolbarSeparator"/>
 
     <LinearLayout
         android:id="@+id/updatesFooter"
diff --git a/src/main/res/layout/task_edit_divider.xml b/src/main/res/layout/task_edit_divider.xml
index 894bb2e2a..00ad2a65e 100644
--- a/src/main/res/layout/task_edit_divider.xml
+++ b/src/main/res/layout/task_edit_divider.xml
@@ -2,5 +2,5 @@
 <View xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="1px"
-    android:background="@color/task_edit_divider"
+    android:background="?attr/task_edit_divider"
     android:layout_gravity="end|bottom"/>
\ No newline at end of file
diff --git a/src/main/res/layout/task_list_activity.xml b/src/main/res/layout/task_list_activity.xml
index 7b90422f4..22124e4ac 100644
--- a/src/main/res/layout/task_list_activity.xml
+++ b/src/main/res/layout/task_list_activity.xml
@@ -25,6 +25,7 @@
         android:layout_marginBottom="16dp"
         android:layout_marginRight="16dp"
         tasks:drawable="?attr/ic_action_add"
-        tasks:tint="?attr/asAbBackgroundColor"/>
+        tasks:tint="?attr/asAbBackgroundColor"
+        tasks:stroke="?attr/floatingActionButtonStroke"/>
 
 </FrameLayout>
diff --git a/src/main/res/layout/task_list_swipe_layout_empty.xml b/src/main/res/layout/task_list_swipe_layout_empty.xml
index 7eced1864..bb30703d8 100644
--- a/src/main/res/layout/task_list_swipe_layout_empty.xml
+++ b/src/main/res/layout/task_list_swipe_layout_empty.xml
@@ -16,6 +16,7 @@
             android:clickable="true"
             android:drawableTop="@drawable/icon"
             android:gravity="center"
+            android:textColor="?attr/asTextColor"
             android:text="@string/TLA_no_items" />
     </ScrollView>
 
diff --git a/src/main/res/layout/toolbar.xml b/src/main/res/layout/toolbar.xml
index e66fad4f0..b1d5ddfb4 100644
--- a/src/main/res/layout/toolbar.xml
+++ b/src/main/res/layout/toolbar.xml
@@ -1,9 +1,21 @@
-<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tasks="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/toolbar"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:layout_height="?attr/actionBarSize"
-    android:background="?attr/asAbBackgroundColor"
-    tasks:theme="@style/ActionBarThemeOverlay"
-    tasks:popupTheme="@style/ActionBarPopupThemeOverlay"
-    tasks:titleTextAppearance="@style/ActionBar.TitleText" />
+    android:orientation="vertical">
+
+    <android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tasks="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/asAbBackgroundColor"
+        tasks:theme="@style/ActionBarThemeOverlay"
+        tasks:popupTheme="@style/ActionBarPopupThemeOverlay"
+        tasks:titleTextAppearance="@style/ActionBar.TitleText" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?attr/asToolbarSeparator" />
+
+</LinearLayout>
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index fc904332f..4910bb4a8 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -497,6 +497,7 @@
 	<string name="EPr_voiceRemindersEnabled_desc_enabled">Tasks ще изтоваря имената на задачите по време на напомняния за задача</string>
 	<string name="EPr_voiceRemindersEnabled_desc_disabled">Tasks ще изпълнява мелодия по време на напомняния за задача </string>
 	<string name="widget_mini">Задачи</string>
+	<string name="EPr_use_dark_theme">Тъмна тема</string>
 	<string name="EPr_use_dark_theme_widget">Тъмна тема на виджета</string>
 	<string name="delete_task">Изтрий задача</string>
 	<string name="TLA_menu_support">Поддръжка</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index a7e7849da..f3e71469f 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -479,6 +479,7 @@
 	<string name="voice_create_prompt">Mluvte pro vytvoření úkolu</string>
 	<string name="EPr_voiceRemindersEnabled_title">Hlasové upomínky</string>
 	<string name="widget_mini">Úkoly</string>
+	<string name="EPr_use_dark_theme">Tmavé téma</string>
 	<string name="EPr_use_dark_theme_widget">Tmavé téma widgetu</string>
 	<string name="delete_task">Smazat úkol</string>
 	<string name="TLA_menu_support">Podpora</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 16326304a..f37dae274 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -485,6 +485,7 @@
 	<string name="EPr_voiceRemindersEnabled_title">Sprach-Erinnerungen</string>
 	<string name="EPr_voiceRemindersEnabled_desc_enabled">Tasks wird Aufgabennamen bei der Erinnerung aussprechen</string>
 	<string name="EPr_voiceRemindersEnabled_desc_disabled">Tasks wird bei der Erinnerung einen Klingelton abspielen</string>
+	<string name="EPr_use_dark_theme">Dunkles Theme</string>
 	<string name="EPr_use_dark_theme_widget">Dunkles Widget Theme</string>
 	<string name="delete_task">Aufgabe löschen</string>
 	<string name="TLA_menu_support">Unterstützung</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 94f1993d8..c7c252cc6 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -487,6 +487,7 @@
 	<string name="EPr_voiceRemindersEnabled_desc_enabled">Η εφαρμογή θα λέει να ονόματα των εργασιών κατά την διάρκεια των υπενθυμίσεων</string>
 	<string name="EPr_voiceRemindersEnabled_desc_disabled">Η εφαρμογή θα ηχεί ένα ringtone κατά την διάρκεια των υπενθυμίσεων</string>
 	<string name="widget_mini">Εργασίες</string>
+	<string name="EPr_use_dark_theme">Σκοτεινό θέμα</string>
 	<string name="EPr_use_dark_theme_widget">Widget σκοτεινού θέματος</string>
 	<string name="delete_task">Διαγραφή καθήκοντος</string>
 	<string name="TLA_menu_support">Υποστήριξη</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 10fe3cceb..d257bad78 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -492,6 +492,7 @@
 	<string name="EPr_voiceRemindersEnabled_desc_enabled">Tasks dirá los nombres de las tareas durante los avisos</string>
 	<string name="EPr_voiceRemindersEnabled_desc_disabled">Tasks reproducirá un tono durante los recordatorios</string>
 	<string name="widget_mini">Tareas</string>
+	<string name="EPr_use_dark_theme">Estilo oscuro</string>
 	<string name="EPr_use_dark_theme_widget">Estilo de componentes oscuros</string>
 	<string name="delete_task">Eliminar tarea</string>
 	<string name="TLA_menu_support">Soporte</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index dc614883e..193709ddf 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -490,6 +490,7 @@
 	<string name="EPr_voiceRemindersEnabled_desc_enabled">Tasks donnera le nom de la tâche</string>
 	<string name="EPr_voiceRemindersEnabled_desc_disabled">Tasks sonnera pendant les rappels</string>
 	<string name="widget_mini">Tâches</string>
+	<string name="EPr_use_dark_theme">Thème foncé</string>
 	<string name="EPr_use_dark_theme_widget">Thème de widget foncé</string>
 	<string name="delete_task">Supprimer la tâche ? </string>
 	<string name="TLA_menu_support">Assistance</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 4a0581624..444194ba1 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -496,6 +496,7 @@
 	<string name="EPr_voiceRemindersEnabled_desc_enabled">Tasks はタスクリマインダーでタスク名を話します</string>
 	<string name="EPr_voiceRemindersEnabled_desc_disabled">Tasks はタスクリマインダーで通知音を鳴らします</string>
 	<string name="widget_mini">タスク</string>
+	<string name="EPr_use_dark_theme">ダークテーマ</string>
 	<string name="EPr_use_dark_theme_widget">ダークウィジットテーマ</string>
 	<string name="delete_task">タスクを削除</string>
 	<string name="TLA_menu_support">サポート</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 7fd01b38e..e75bbc301 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -492,6 +492,7 @@
 	<string name="EPr_voiceRemindersEnabled_desc_enabled">Bij herinneringen zullen de taaknamen uitgesproken worden</string>
 	<string name="EPr_voiceRemindersEnabled_desc_disabled">Er wordt een geluid weergegeven bij herinneringen</string>
 	<string name="widget_mini">Taken</string>
+	<string name="EPr_use_dark_theme">Donker thema</string>
 	<string name="EPr_use_dark_theme_widget">Donker widget thema</string>
 	<string name="delete_task">Verwijder taak</string>
 	<string name="TLA_menu_support">Ondersteuning</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 286bb8770..0c9371c83 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -493,6 +493,7 @@ i odzyskanie zadań z kopi zapasowej (Settings-&gt;Sync and backup-&gt;Backup-&g
 	<string name="EPr_voiceRemindersEnabled_desc_enabled">Tasks będzie mówił nazwę zadania podczas przypomnienia</string>
 	<string name="EPr_voiceRemindersEnabled_desc_disabled">Tasks będzie uruchamiał dzwonek podczas przypomnienia zadania</string>
 	<string name="widget_mini">Zadania</string>
+	<string name="EPr_use_dark_theme">Ciemny motyw</string>
 	<string name="EPr_use_dark_theme_widget">Ciemny motyw widgetu</string>
 	<string name="delete_task">Usuń zadanie</string>
 	<string name="TLA_menu_support">Wsparcie</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 826c95d4e..4bb573353 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -496,6 +496,7 @@ das tarefas através de um backup em Definições-&gt;Sincronização e backup-&
 	<string name="EPr_voiceRemindersEnabled_desc_enabled">O Tasks irá reproduzir o nome da tarefa durante os lembretes</string>
 	<string name="EPr_voiceRemindersEnabled_desc_disabled">O Tasks irá reproduzir um toque durante os lembretes</string>
 	<string name="widget_mini">Tarefas</string>
+	<string name="EPr_use_dark_theme">Tema escuro</string>
 	<string name="EPr_use_dark_theme_widget">Widget escuro</string>
 	<string name="delete_task">Eliminar tarefa</string>
 	<string name="TLA_menu_support">Suporte</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index c245840ea..68d65d710 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -497,6 +497,7 @@
 	<string name="EPr_voiceRemindersEnabled_desc_enabled">Tasks должен произносить название задач во время напоминаний</string>
 	<string name="EPr_voiceRemindersEnabled_desc_disabled">Оповещение звуком во время напоминания</string>
 	<string name="widget_mini">Задачи</string>
+	<string name="EPr_use_dark_theme">Тёмная тема</string>
 	<string name="EPr_use_dark_theme_widget">Темная тема виджета</string>
 	<string name="delete_task">Удалить задачу</string>
 	<string name="TLA_menu_support">Поддержка</string>
diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml
index cb178fe06..ef25ff69a 100644
--- a/src/main/res/values-sl-rSI/strings.xml
+++ b/src/main/res/values-sl-rSI/strings.xml
@@ -494,6 +494,7 @@
 	<string name="EPr_voiceRemindersEnabled_desc_enabled">Aplikacija Opravki bo med opominjanjem glede opravkov izgovarjala nazive opravkov</string>
 	<string name="EPr_voiceRemindersEnabled_desc_disabled">Aplikacija Opravki bo med opominjanjem glede opravkov zvonila.</string>
 	<string name="widget_mini">Opravki</string>
+	<string name="EPr_use_dark_theme">Temni videz</string>
 	<string name="EPr_use_dark_theme_widget">Temni videz gradnika</string>
 	<string name="delete_task">Zbriši opravek</string>
 	<plurals name="Ntasks">
diff --git a/src/main/res/values-v11/styles.xml b/src/main/res/values-v11/styles.xml
deleted file mode 100644
index 6ed1b39b5..000000000
--- a/src/main/res/values-v11/styles.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-    </style>
-
-    <style name="DialogTheme" parent="@android:style/Theme.Dialog">
-    </style>
-
-    <style name="TEA_Dialog_Light_ICS" parent="@android:style/Theme.Holo.Light.Dialog">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowTitleStyle">@style/TEA_DialogWindowTitle</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
-        <item name="asTextColor">#000000</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values-v14/styles.xml b/src/main/res/values-v14/styles.xml
new file mode 100644
index 000000000..9870f61f4
--- /dev/null
+++ b/src/main/res/values-v14/styles.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TEA_Dialog" parent="Theme.AppCompat.Light.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
+        <item name="asTextColor">@android:color/black</item>
+    </style>
+
+    <style name="TEA_Dialog_Dark" parent="Theme.AppCompat.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
+        <item name="asTextColor">@android:color/white</item>
+    </style>
+
+    <style name="TextBoxText">
+        <item name="android:textColor">?attr/asTextColor</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-v21/styles.xml b/src/main/res/values-v21/styles.xml
index 4d23050f0..3722bb0fb 100644
--- a/src/main/res/values-v21/styles.xml
+++ b/src/main/res/values-v21/styles.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index d0a2849be..b3c855426 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -467,6 +467,7 @@
 	<string name="EPr_voiceRemindersEnabled_title">語音提醒</string>
 	<string name="EPr_voiceRemindersEnabled_desc_enabled">Tasks在工作提醒時會以語音說出工作名稱</string>
 	<string name="EPr_voiceRemindersEnabled_desc_disabled">Tasks在工作提醒時將會播放鈴聲</string>
+	<string name="EPr_use_dark_theme">暗色主題</string>
 	<string name="EPr_use_dark_theme_widget">暗色小工具主題</string>
 	<string name="delete_task">刪除工作</string>
 	<string name="TLA_menu_support">支持</string>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index a4cb80454..7d516a072 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -7,20 +7,26 @@
 <resources>
 
   <!-- theme attributes -->
+    <attr name="drawer_background" format="color" />
+    <attr name="drawer_background_selected" format="color" />
+    <attr name="task_edit_divider" format="color" />
   <attr name="asContentBackground" format="color"/>
   <attr name="asEditBackground" format="color"/>
   <attr name="asEditRowBackground" format="reference"/>
   <attr name="asTextColor" format="color"/>
   <attr name="asTextColorInverse" format="color"/>
+    <attr name="asTextColorHint" format="color"/>
   <attr name="asDetailsColor" format="color"/>
   <attr name="asDueDateColor" format="color"/>
   <attr name="asDueDateOverdueColor" format="color"/>
   <attr name="asDueDateCompletedColor" format="color"/>
   <attr name="asSeparatorBackground" format="color"/>
+    <attr name="asToolbarSeparator" format="color"/>
   <attr name="asListDividerColor" format="color"/>
   <attr name="asThemeTextColor" format="color"/>
   <attr name="asEditTextBackground" format="reference"/>
   <attr name="asAbBackgroundColor" format="color"/>
+    <attr name="floatingActionButtonStroke" format="color"/>
   <attr name="asFilterSelectedIcon" format="reference"/>
   <attr name="asTaskRowSelector" format="reference" />
     <attr name="ic_action_add" format="reference" />
@@ -32,10 +38,18 @@
     <attr name="ic_action_mic" format="reference" />
     <attr name="ic_action_search" format="reference"/>
     <attr name="ic_action_settings" format="reference"/>
+    <attr name="ic_action_attachment" format="reference" />
+    <attr name="ic_action_clock" format="reference" />
+    <attr name="ic_action_flag" format="reference" />
+    <attr name="ic_action_tags" format="reference" />
+    <attr name="ic_action_list" format="reference" />
+    <attr name="ic_action_box" format="reference" />
+    <attr name="ic_action_bell" format="reference" />
+    <attr name="ic_action_alarm" format="reference" />
     <attr name="drawer_text" format="color"/>
-    <attr name="task_edit_theme_color" format="color"/>
     <attr name="importance_background_selected" format="reference"/>
     <attr name="tea_icn_addcal" format="reference"/>
+    <attr name="asFilterRowSelected" format="reference"/>
 
   <declare-styleable name="DateAndTimePicker">
       <attr name="shortcutLabels" format="reference"/>
@@ -44,6 +58,7 @@
     <declare-styleable name="FloatingActionButton">
         <attr name="drawable" format="integer"/>
         <attr name="tint" format="color"/>
+        <attr name="stroke" format="color" />
         <attr name="shadowRadius" format="float"/>
         <attr name="shadowDx" format="float"/>
         <attr name="shadowDy" format="float"/>
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 54570773e..51cbc7656 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -27,13 +27,16 @@
     <color name="task_row_bg_dark_pressed">#303030</color>
     <color name="task_row_bg_white_pressed">#dde1eb</color>
 
-    <color name="drawer_background_selected">#dddddd</color>
     <color name="drawer_background">#efefef</color>
+    <color name="drawer_background_dark">#303030</color>
+    <color name="drawer_background_selected">#dddddd</color>
+    <color name="drawer_background_selected_dark">#535353</color>
     <color name="white_text">#fff</color>
     <color name="white_text_hint">#eee</color>
     <color name="black_text">#000</color>
     <color name="black_text_hint">#535353</color>
     <color name="task_edit_divider">#343434</color>
+    <color name="task_edit_divider_dark">#dddddd</color>
 
     <color name="importance_1">#ffff5555</color>
     <color name="importance_2">#fffea400</color>
diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml
index 426c598da..9fb3100d7 100644
--- a/src/main/res/values/keys.xml
+++ b/src/main/res/values/keys.xml
@@ -256,6 +256,7 @@
   <string name="TEA_ctrl_reminders_pref">TEA_ctrl_reminders_pref</string>
   <string name="TEA_ctrl_timer_pref">TEA_ctrl_timer_pref</string>
   <string name="TEA_ctrl_share_pref">TEA_ctrl_share_pref</string>
+    <string name="p_use_dark_theme">use_dark_theme</string>
     <string name="p_use_dark_theme_widget">use_dark_theme_widget</string>
     <string name="p_debug_logging">debug_logging</string>
     <!-- Deprecated -->
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 014141d65..45ab88597 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="EPr_use_dark_theme">Dark theme</string>
     <string name="EPr_use_dark_theme_widget">Dark widget theme</string>
     <string name="delete_task">Delete task</string>
     <string name="TLA_menu_support">Support</string>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 16c7273c7..23b46a259 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -2,38 +2,19 @@
 
     <!-- ========================================================== General  -->
 
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
     </style>
 
-    <style name="DialogTheme" parent="@android:style/Theme.Dialog">
-    </style>
-
-    <style name="Tasks" parent="AppTheme">
+    <style name="Tasks" parent="AppThemeBase">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <!--<item name="colorAccent">@android:color/holo_purple</item>-->
 
         <item name="android:windowBackground">@null</item>
         <item name="asDueDateOverdueColor">#ee5555</item>
-        <item name="asDueDateCompletedColor">#ff777777</item>
-        <item name="asSeparatorBackground">#888888</item>
         <item name="asEditTextBackground">@null</item>
-
         <item name="windowActionModeOverlay">true</item>
-        <item name="android:actionModeBackground">@color/primary</item>
-        <!--<item name="android:statusBarColor">@android:color/transparent</item>-->
-        <item name="asContentBackground">@android:color/white</item>
-        <item name="asEditBackground">@android:color/white</item>
-        <item name="asTextColor">#000000</item>
-        <item name="asTextColorInverse">#ffffff</item>
-        <item name="asDetailsColor">#6666aa</item>
-        <item name="asDueDateColor">#878787</item>
-        <item name="asListDividerColor">#dddddd</item>
-        <item name="asEditRowBackground">@drawable/task_edit_background_white</item>
-        <item name="asFilterSelectedIcon">@drawable/filter_selected_icon_black</item>
-        <item name="asTaskRowSelector">@drawable/task_row_bg_white</item>
-        <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
-        <item name="asAbBackgroundColor">#607d8b</item>
+
         <item name="ic_action_add">@drawable/ic_action_add_light</item>
         <item name="ic_action_new_attachment">@drawable/ic_action_attachment_2</item>
         <item name="ic_action_discard">@drawable/ic_action_discard</item>
@@ -43,44 +24,79 @@
         <item name="ic_action_mic">@drawable/ic_action_mic</item>
         <item name="ic_action_search">@drawable/ic_action_search</item>
         <item name="ic_action_settings">@drawable/ic_action_gear</item>
-        <item name="task_edit_theme_color">@color/black_text</item>
-        <item name="importance_background_selected">@drawable/importance_background_selected</item>
         <item name="tea_icn_addcal">@drawable/tea_icn_addcal</item>
 
-        <item name="drawer_text">#000</item>
-
         <!-- actionbar-styling -->
         <item name="homeAsUpIndicator">@drawable/ic_up</item>
         <item name="android:homeAsUpIndicator">@drawable/ic_up</item>
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
         <item name="android:windowContentOverlay">@null</item>
-    </style>
 
-    <style name="ActionBar.TitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
-        <item name="android:textColor">#fff</item>
-    </style>
+        <item name="drawer_background">@color/drawer_background</item>
+        <item name="drawer_background_selected">@color/drawer_background_selected</item>
+        <item name="asDueDateCompletedColor">#ff777777</item>
+        <item name="asToolbarSeparator">@android:color/transparent</item>
+        <item name="asSeparatorBackground">#888888</item>
 
-    <style name="ActionBarThemeOverlay" parent="">
-        <item name="android:textColorPrimary">#fff</item>
-        <item name="colorControlNormal">#fff</item>
-        <item name="colorControlHighlight">#3fff</item>
+        <item name="android:actionModeBackground">@color/primary</item>
+        <item name="asContentBackground">@android:color/white</item>
+        <item name="asEditBackground">@android:color/white</item>
+        <item name="asTextColor">@android:color/black</item>
+        <item name="asTextColorHint">@android:color/darker_gray</item>
+        <item name="asTextColorInverse">@android:color/white</item>
+        <item name="asDetailsColor">#6666aa</item>
+        <item name="asDueDateColor">#878787</item>
+        <item name="asListDividerColor">#dddddd</item>
+        <item name="asEditRowBackground">@drawable/task_edit_background_white</item>
+        <item name="asFilterSelectedIcon">@drawable/filter_selected_icon_black</item>
+        <item name="asFilterRowSelected">@drawable/filter_row_selector</item>
+        <item name="asTaskRowSelector">@drawable/task_row_bg_white</item>
+        <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
+        <item name="asAbBackgroundColor">#607d8b</item>
+        <item name="floatingActionButtonStroke">@android:color/transparent</item>
+        <item name="importance_background_selected">@drawable/importance_background_selected</item>
+        <item name="task_edit_divider">@color/task_edit_divider</item>
+        <item name="drawer_text">@android:color/black</item>
+        <item name="ic_action_attachment">@drawable/ic_action_attachment_2_dark</item>
+        <item name="ic_action_clock">@drawable/ic_action_clock</item>
+        <item name="ic_action_flag">@drawable/ic_action_flag</item>
+        <item name="ic_action_tags">@drawable/ic_action_tags</item>
+        <item name="ic_action_list">@drawable/ic_action_list</item>
+        <item name="ic_action_box">@drawable/ic_action_box</item>
+        <item name="ic_action_bell">@drawable/ic_action_bell</item>
+        <item name="ic_action_alarm">@drawable/ic_action_alarm</item>
     </style>
 
-    <style name="ActionBarPopupThemeOverlay" parent="ThemeOverlay.AppCompat.Light" />
-
-    <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
-        <item name="spinBars">false</item>
+    <style name="Tasks.Dark">
+        <item name="colorPrimary">@android:color/black</item>
+        <item name="colorPrimaryDark">@android:color/black</item>
+        <item name="drawer_background">@color/drawer_background_dark</item>
+        <item name="drawer_background_selected">@color/drawer_background_selected_dark</item>
+        <item name="asToolbarSeparator">@android:color/white</item>
+        <item name="android:actionModeBackground">@android:color/black</item>
+        <item name="asContentBackground">@android:color/black</item>
+        <item name="asEditBackground">@android:color/black</item>
+        <item name="asTextColor">@android:color/white</item>
+        <item name="asTextColorHint">@android:color/darker_gray</item>
+        <item name="asTextColorInverse">@android:color/black</item>
+        <item name="asAbBackgroundColor">@android:color/black</item>
+        <item name="floatingActionButtonStroke">@android:color/white</item>
+        <item name="drawer_text">@android:color/white</item>
+        <item name="ic_action_settings">@drawable/ic_action_gear_white</item>
+        <item name="asFilterRowSelected">@drawable/filter_row_selector_dark</item>
+        <item name="task_edit_divider">@color/task_edit_divider_dark</item>
+        <item name="ic_action_attachment">@drawable/ic_action_attachment_2</item>
+        <item name="ic_action_clock">@drawable/ic_action_clock_white</item>
+        <item name="ic_action_flag">@drawable/ic_action_flag_white</item>
+        <item name="ic_action_tags">@drawable/ic_action_tags_white</item>
+        <item name="ic_action_list">@drawable/ic_action_list_white</item>
+        <item name="ic_action_box">@drawable/ic_action_box_white</item>
+        <item name="ic_action_bell">@drawable/ic_action_bell_white</item>
+        <item name="ic_action_alarm">@drawable/ic_action_alarm_white</item>
+        <item name="asDueDateColor">#c3c3c3</item>
     </style>
 
-    <style name="Tasks.FullTransparent" parent="@style/Theme.AppCompat">
-        <item name="android:windowIsTranslucent">true</item>
-	    <item name="android:windowBackground">@android:color/transparent</item>
-	    <item name="android:backgroundDimEnabled">false</item>
-	    <item name="android:windowIsFloating">true</item>
-	</style>
-
-    <style name="Tasks.Dialog" parent="DialogTheme">
-        <!--<item name="android:windowBackground">@null</item>-->
+    <style name="TasksDialog" parent="@android:style/Theme.Dialog">
         <item name="asDueDateOverdueColor">#ffee5555</item>
         <item name="asDueDateCompletedColor">#ff777777</item>
         <item name="asSeparatorBackground">#888888</item>
@@ -108,6 +124,33 @@
         <item name="asThemeTextColor">@color/blue_theme_color</item>
     </style>
 
+    <style name="ActionBar.TitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
+        <item name="android:textColor">#fff</item>
+    </style>
+
+    <style name="TextBoxText">
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+
+    <style name="ActionBarThemeOverlay" parent="">
+        <item name="android:textColorPrimary">#fff</item>
+        <item name="colorControlNormal">#fff</item>
+        <item name="colorControlHighlight">#3fff</item>
+    </style>
+
+    <style name="ActionBarPopupThemeOverlay" parent="ThemeOverlay.AppCompat.Light" />
+
+    <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
+        <item name="spinBars">false</item>
+    </style>
+
+    <style name="Tasks.FullTransparent" parent="@style/Theme.AppCompat">
+        <item name="android:windowIsTranslucent">true</item>
+	    <item name="android:windowBackground">@android:color/transparent</item>
+	    <item name="android:backgroundDimEnabled">false</item>
+	    <item name="android:windowIsFloating">true</item>
+	</style>
+
     <!--================================================== General == -->
 
     <style name="TextAppearance" parent="android:TextAppearance">
@@ -144,24 +187,22 @@
 
     <!-- =============================================== TaskEditActivity == -->
 
-   	<style name="TEA_Dialog" parent="@android:style/Theme.Dialog">
-	    <item name="android:windowFrame">@null</item>
-	    <item name="android:windowTitleStyle">@style/TEA_DialogWindowTitle</item>
-	    <item name="android:windowIsFloating">true</item>
-	    <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-	    <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
-   	    <item name="android:windowBackground">@drawable/dialog_full_holo_light</item>
-   	    <item name="asTextColor">#000000</item>
-   	</style>
-
-    <style name="TEA_DialogWindowTitle">
-        <item name="android:maxLines">1</item>
-        <item name="android:scrollHorizontally">true</item>
-        <item name="android:textSize">18sp</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">?attr/asTextColor</item>
+    <style name="TEA_Dialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
+        <item name="android:windowBackground">@drawable/dialog_full_holo_light</item>
+        <item name="asTextColor">#000000</item>
     </style>
-    
+
+    <style name="TEA_Dialog_Dark" parent="TEA_Dialog">
+        <item name="android:windowBackground">@drawable/dialog_full_holo_dark</item>
+        <item name="asTextColor">#ffffff</item>
+    </style>
+
     <!-- ==================================================== TaskAdapter == -->
 
     <style name="TextAppearance.TAd_ItemTitle">
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index c33e7d1e8..95bf74d2b 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -11,6 +11,11 @@
     <PreferenceScreen
         android:title="@string/EPr_appearance_header">
 
+        <CheckBoxPreference
+            android:title="@string/EPr_use_dark_theme"
+            android:key="@string/p_use_dark_theme"
+            android:defaultValue="false" />
+
         <CheckBoxPreference
             android:title="@string/EPr_use_dark_theme_widget"
             android:key="@string/p_use_dark_theme_widget"