diff --git a/android-pickers/.gitignore b/android-pickers/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/android-pickers/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/android-pickers/build.gradle b/android-pickers/build.gradle
new file mode 100644
index 000000000..68ee1e42d
--- /dev/null
+++ b/android-pickers/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
+
+
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 25
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation 'com.android.support:appcompat-v7:25.3.1'
+}
diff --git a/android-pickers/proguard-rules.pro b/android-pickers/proguard-rules.pro
new file mode 100644
index 000000000..2d5885450
--- /dev/null
+++ b/android-pickers/proguard-rules.pro
@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /gemini-b/opt/android-sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/android-pickers/src/main/AndroidManifest.xml b/android-pickers/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..c8e4c8bd3
--- /dev/null
+++ b/android-pickers/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<manifest package="com.android"
+          xmlns:android="http://schemas.android.com/apk/res/android"/>
diff --git a/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerDialog.java b/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java
similarity index 94%
rename from uhabits-android/src/main/java/com/android/colorpicker/ColorPickerDialog.java
rename to android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java
index 114c5fed5..1060faf5b 100644
--- a/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerDialog.java
+++ b/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java
@@ -16,18 +16,15 @@
 
 package com.android.colorpicker;
 
-import android.app.Activity;
-import android.app.Dialog;
-import android.os.Bundle;
+import android.app.*;
+import android.os.*;
 import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatDialogFragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ProgressBar;
+import android.support.v7.app.*;
+import android.view.*;
+import android.widget.*;
 
-import com.android.colorpicker.ColorPickerSwatch.OnColorSelectedListener;
-
-import org.isoron.uhabits.R;
+import com.android.*;
+import com.android.colorpicker.ColorPickerSwatch.*;
 
 /**
  * A dialog which takes in as input an array of palette and creates a palette allowing the user to
diff --git a/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerPalette.java b/android-pickers/src/main/java/com/android/colorpicker/ColorPickerPalette.java
similarity index 94%
rename from uhabits-android/src/main/java/com/android/colorpicker/ColorPickerPalette.java
rename to android-pickers/src/main/java/com/android/colorpicker/ColorPickerPalette.java
index add5ba86e..0e7102ad9 100644
--- a/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerPalette.java
+++ b/android-pickers/src/main/java/com/android/colorpicker/ColorPickerPalette.java
@@ -16,18 +16,14 @@
 
 package com.android.colorpicker;
 
-import org.isoron.uhabits.R;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TableLayout;
-import android.widget.TableRow;
-
-import com.android.colorpicker.ColorPickerSwatch.OnColorSelectedListener;
+import android.content.*;
+import android.content.res.*;
+import android.util.*;
+import android.view.*;
+import android.widget.*;
+
+import com.android.*;
+import com.android.colorpicker.ColorPickerSwatch.*;
 
 /**
  * A color picker custom view which creates an grid of color squares.  The number of squares per
diff --git a/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerSwatch.java b/android-pickers/src/main/java/com/android/colorpicker/ColorPickerSwatch.java
similarity index 91%
rename from uhabits-android/src/main/java/com/android/colorpicker/ColorPickerSwatch.java
rename to android-pickers/src/main/java/com/android/colorpicker/ColorPickerSwatch.java
index fb15a84ab..a7598ca3b 100644
--- a/uhabits-android/src/main/java/com/android/colorpicker/ColorPickerSwatch.java
+++ b/android-pickers/src/main/java/com/android/colorpicker/ColorPickerSwatch.java
@@ -16,14 +16,12 @@
 
 package com.android.colorpicker;
 
-import org.isoron.uhabits.R;
+import android.content.*;
+import android.graphics.drawable.*;
+import android.view.*;
+import android.widget.*;
 
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
+import com.android.*;
 
 /**
  * Creates a circular swatch of a specified color.  Adds a checkmark if marked as checked.
diff --git a/uhabits-android/src/main/java/com/android/colorpicker/ColorStateDrawable.java b/android-pickers/src/main/java/com/android/colorpicker/ColorStateDrawable.java
similarity index 100%
rename from uhabits-android/src/main/java/com/android/colorpicker/ColorStateDrawable.java
rename to android-pickers/src/main/java/com/android/colorpicker/ColorStateDrawable.java
diff --git a/uhabits-android/src/main/java/com/android/colorpicker/HsvColorComparator.java b/android-pickers/src/main/java/com/android/colorpicker/HsvColorComparator.java
similarity index 100%
rename from uhabits-android/src/main/java/com/android/colorpicker/HsvColorComparator.java
rename to android-pickers/src/main/java/com/android/colorpicker/HsvColorComparator.java
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java b/android-pickers/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java
similarity index 100%
rename from uhabits-android/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java
rename to android-pickers/src/main/java/com/android/datetimepicker/AccessibleLinearLayout.java
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/AccessibleTextView.java b/android-pickers/src/main/java/com/android/datetimepicker/AccessibleTextView.java
similarity index 100%
rename from uhabits-android/src/main/java/com/android/datetimepicker/AccessibleTextView.java
rename to android-pickers/src/main/java/com/android/datetimepicker/AccessibleTextView.java
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/HapticFeedbackController.java b/android-pickers/src/main/java/com/android/datetimepicker/HapticFeedbackController.java
similarity index 100%
rename from uhabits-android/src/main/java/com/android/datetimepicker/HapticFeedbackController.java
rename to android-pickers/src/main/java/com/android/datetimepicker/HapticFeedbackController.java
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/Utils.java b/android-pickers/src/main/java/com/android/datetimepicker/Utils.java
similarity index 100%
rename from uhabits-android/src/main/java/com/android/datetimepicker/Utils.java
rename to android-pickers/src/main/java/com/android/datetimepicker/Utils.java
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java b/android-pickers/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java
similarity index 100%
rename from uhabits-android/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java
rename to android-pickers/src/main/java/com/android/datetimepicker/date/AccessibleDateAnimator.java
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/DatePickerController.java b/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerController.java
similarity index 100%
rename from uhabits-android/src/main/java/com/android/datetimepicker/date/DatePickerController.java
rename to android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerController.java
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java b/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java
similarity index 94%
rename from uhabits-android/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java
rename to android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java
index b6581ecf9..dd4e06942 100644
--- a/uhabits-android/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java
+++ b/android-pickers/src/main/java/com/android/datetimepicker/date/DatePickerDialog.java
@@ -16,36 +16,23 @@
 
 package com.android.datetimepicker.date;
 
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Locale;
-
-import org.isoron.uhabits.R;
-
-import android.animation.ObjectAnimator;
-import android.app.Activity;
-import android.app.DialogFragment;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.text.format.DateUtils;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.animation.AlphaAnimation;
-import android.view.animation.Animation;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.datetimepicker.HapticFeedbackController;
-import com.android.datetimepicker.Utils;
-import com.android.datetimepicker.date.MonthAdapter.CalendarDay;
+import android.animation.*;
+import android.app.*;
+import android.content.res.*;
+import android.os.*;
+import android.text.format.*;
+import android.util.*;
+import android.view.*;
+import android.view.View.*;
+import android.view.animation.*;
+import android.widget.*;
+
+import com.android.*;
+import com.android.datetimepicker.*;
+import com.android.datetimepicker.date.MonthAdapter.*;
+
+import java.text.*;
+import java.util.*;
 
 /**
  * Dialog allowing users to select a date.
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/DayPickerView.java b/android-pickers/src/main/java/com/android/datetimepicker/date/DayPickerView.java
similarity index 100%
rename from uhabits-android/src/main/java/com/android/datetimepicker/date/DayPickerView.java
rename to android-pickers/src/main/java/com/android/datetimepicker/date/DayPickerView.java
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/MonthAdapter.java b/android-pickers/src/main/java/com/android/datetimepicker/date/MonthAdapter.java
similarity index 100%
rename from uhabits-android/src/main/java/com/android/datetimepicker/date/MonthAdapter.java
rename to android-pickers/src/main/java/com/android/datetimepicker/date/MonthAdapter.java
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/MonthView.java b/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java
similarity index 95%
rename from uhabits-android/src/main/java/com/android/datetimepicker/date/MonthView.java
rename to android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java
index 8b5defab2..eff8b8186 100644
--- a/uhabits-android/src/main/java/com/android/datetimepicker/date/MonthView.java
+++ b/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java
@@ -16,37 +16,25 @@
 
 package com.android.datetimepicker.date;
 
-import java.security.InvalidParameterException;
-import java.util.Calendar;
+import android.content.*;
+import android.content.res.*;
+import android.graphics.*;
+import android.graphics.Paint.*;
+import android.os.*;
+import android.support.v4.view.*;
+import android.support.v4.view.accessibility.*;
+import android.support.v4.widget.*;
+import android.text.format.*;
+import android.view.*;
+import android.view.accessibility.*;
+
+import com.android.*;
+import com.android.datetimepicker.*;
+import com.android.datetimepicker.date.MonthAdapter.*;
+
+import java.security.*;
+import java.util.*;
 import java.util.Formatter;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-
-import org.isoron.uhabits.R;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Paint.Align;
-import android.graphics.Paint.Style;
-import android.graphics.Rect;
-import android.graphics.Typeface;
-import android.os.Bundle;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
-import android.support.v4.widget.ExploreByTouchHelper;
-import android.text.format.DateFormat;
-import android.text.format.DateUtils;
-import android.text.format.Time;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityNodeInfo;
-
-import com.android.datetimepicker.Utils;
-import com.android.datetimepicker.date.MonthAdapter.CalendarDay;
 
 /**
  * A calendar-like view displaying a specified month and the appropriate selectable day numbers
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java b/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java
similarity index 100%
rename from uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java
rename to android-pickers/src/main/java/com/android/datetimepicker/date/SimpleDayPickerView.java
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java b/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java
similarity index 100%
rename from uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java
rename to android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthAdapter.java
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java b/android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java
similarity index 100%
rename from uhabits-android/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java
rename to android-pickers/src/main/java/com/android/datetimepicker/date/SimpleMonthView.java
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java b/android-pickers/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java
similarity index 89%
rename from uhabits-android/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java
rename to android-pickers/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java
index 64d6404e7..148f2faf2 100644
--- a/uhabits-android/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java
+++ b/android-pickers/src/main/java/com/android/datetimepicker/date/TextViewWithCircularIndicator.java
@@ -16,16 +16,14 @@
 
 package com.android.datetimepicker.date;
 
-import org.isoron.uhabits.R;
+import android.content.*;
+import android.content.res.*;
+import android.graphics.*;
+import android.graphics.Paint.*;
+import android.util.*;
+import android.widget.*;
 
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Paint.Align;
-import android.graphics.Paint.Style;
-import android.util.AttributeSet;
-import android.widget.TextView;
+import com.android.*;
 
 /**
  * A text view which, when pressed or activated, displays a blue circle around the text.
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/date/YearPickerView.java b/android-pickers/src/main/java/com/android/datetimepicker/date/YearPickerView.java
similarity index 89%
rename from uhabits-android/src/main/java/com/android/datetimepicker/date/YearPickerView.java
rename to android-pickers/src/main/java/com/android/datetimepicker/date/YearPickerView.java
index 5abc4ca1a..b2c33f6b5 100644
--- a/uhabits-android/src/main/java/com/android/datetimepicker/date/YearPickerView.java
+++ b/android-pickers/src/main/java/com/android/datetimepicker/date/YearPickerView.java
@@ -16,24 +16,18 @@
 
 package com.android.datetimepicker.date;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.isoron.uhabits.R;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.drawable.StateListDrawable;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.accessibility.AccessibilityEvent;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import com.android.datetimepicker.date.DatePickerDialog.OnDateChangedListener;
+import android.content.*;
+import android.content.res.*;
+import android.graphics.drawable.*;
+import android.view.*;
+import android.view.accessibility.*;
+import android.widget.*;
+import android.widget.AdapterView.*;
+
+import com.android.*;
+import com.android.datetimepicker.date.DatePickerDialog.*;
+
+import java.util.*;
 
 /**
  * Displays a selectable list of years.
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java b/android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java
similarity index 95%
rename from uhabits-android/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java
rename to android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java
index 993ea0c91..f310a1d85 100644
--- a/uhabits-android/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java
+++ b/android-pickers/src/main/java/com/android/datetimepicker/time/AmPmCirclesView.java
@@ -16,20 +16,17 @@
 
 package com.android.datetimepicker.time;
 
-import java.text.DateFormatSymbols;
+import android.content.*;
+import android.content.res.*;
+import android.graphics.*;
+import android.graphics.Paint.*;
+import android.util.*;
+import android.view.*;
 
-import org.isoron.uhabits.R;
+import com.android.*;
+import com.android.datetimepicker.*;
 
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Paint.Align;
-import android.graphics.Typeface;
-import android.util.Log;
-import android.view.View;
-
-import com.android.datetimepicker.Utils;
+import java.text.*;
 
 /**
  * Draw the two smaller AM and PM circles next to where the larger circle will be.
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/time/CircleView.java b/android-pickers/src/main/java/com/android/datetimepicker/time/CircleView.java
similarity index 94%
rename from uhabits-android/src/main/java/com/android/datetimepicker/time/CircleView.java
rename to android-pickers/src/main/java/com/android/datetimepicker/time/CircleView.java
index bd0ccc99c..1765bff93 100644
--- a/uhabits-android/src/main/java/com/android/datetimepicker/time/CircleView.java
+++ b/android-pickers/src/main/java/com/android/datetimepicker/time/CircleView.java
@@ -16,14 +16,14 @@
 
 package com.android.datetimepicker.time;
 
-import org.isoron.uhabits.R;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.util.Log;
-import android.view.View;
+
+import android.content.*;
+import android.content.res.*;
+import android.graphics.*;
+import android.util.*;
+import android.view.*;
+
+import com.android.*;
 
 /**
  * Draws a simple white circle on which the numbers will be drawn.
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java b/android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java
similarity index 97%
rename from uhabits-android/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java
rename to android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java
index 3ada25315..265b98cf8 100644
--- a/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java
+++ b/android-pickers/src/main/java/com/android/datetimepicker/time/RadialPickerLayout.java
@@ -16,30 +16,20 @@
 
 package com.android.datetimepicker.time;
 
-import org.isoron.uhabits.R;
-
-import android.animation.AnimatorSet;
-import android.animation.ObjectAnimator;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.os.Handler;
-import android.text.format.DateUtils;
-import android.text.format.Time;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnTouchListener;
-import android.view.ViewConfiguration;
-import android.view.ViewGroup;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityManager;
-import android.view.accessibility.AccessibilityNodeInfo;
-import android.widget.FrameLayout;
-
-import com.android.datetimepicker.HapticFeedbackController;
+import android.animation.*;
+import android.annotation.*;
+import android.content.*;
+import android.content.res.*;
+import android.os.*;
+import android.text.format.*;
+import android.util.*;
+import android.view.*;
+import android.view.View.*;
+import android.view.accessibility.*;
+import android.widget.*;
+
+import com.android.*;
+import com.android.datetimepicker.*;
 
 /**
  * The primary layout to hold the circular picker, and the am/pm buttons. This view well measure
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java b/android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java
similarity index 97%
rename from uhabits-android/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java
rename to android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java
index 1ccf511c1..48e4385b5 100644
--- a/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java
+++ b/android-pickers/src/main/java/com/android/datetimepicker/time/RadialSelectorView.java
@@ -16,21 +16,16 @@
 
 package com.android.datetimepicker.time;
 
-import org.isoron.uhabits.R;
-
-import android.animation.Keyframe;
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
-import android.animation.ValueAnimator;
-import android.animation.ValueAnimator.AnimatorUpdateListener;
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.util.Log;
-import android.view.View;
-
-import com.android.datetimepicker.Utils;
+import android.animation.*;
+import android.animation.ValueAnimator.*;
+import android.content.*;
+import android.content.res.*;
+import android.graphics.*;
+import android.util.*;
+import android.view.*;
+
+import com.android.*;
+import com.android.datetimepicker.*;
 
 /**
  * View to show what number is selected. This will draw a blue circle over the number, with a blue
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialTextsView.java b/android-pickers/src/main/java/com/android/datetimepicker/time/RadialTextsView.java
similarity index 96%
rename from uhabits-android/src/main/java/com/android/datetimepicker/time/RadialTextsView.java
rename to android-pickers/src/main/java/com/android/datetimepicker/time/RadialTextsView.java
index e6a99a657..a944901bf 100644
--- a/uhabits-android/src/main/java/com/android/datetimepicker/time/RadialTextsView.java
+++ b/android-pickers/src/main/java/com/android/datetimepicker/time/RadialTextsView.java
@@ -16,21 +16,16 @@
 
 package com.android.datetimepicker.time;
 
-import org.isoron.uhabits.R;
-
-import android.animation.Keyframe;
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
-import android.animation.ValueAnimator;
-import android.animation.ValueAnimator.AnimatorUpdateListener;
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Paint.Align;
-import android.graphics.Typeface;
-import android.util.Log;
-import android.view.View;
+import android.animation.*;
+import android.animation.ValueAnimator.*;
+import android.content.*;
+import android.content.res.*;
+import android.graphics.*;
+import android.graphics.Paint.*;
+import android.util.*;
+import android.view.*;
+
+import com.android.*;
 
 /**
  * A view to show a series of numbers in a circular pattern.
diff --git a/uhabits-android/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java b/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
similarity index 97%
rename from uhabits-android/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
rename to android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
index 8f22206f4..0bbb741e2 100644
--- a/uhabits-android/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
+++ b/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
@@ -16,37 +16,25 @@
 
 package com.android.datetimepicker.time;
 
-import java.text.DateFormatSymbols;
-import java.util.ArrayList;
-import java.util.Locale;
-
-import org.isoron.uhabits.R;
-
-import android.animation.ObjectAnimator;
-import android.annotation.SuppressLint;
+import android.animation.*;
+import android.annotation.*;
+import android.app.ActionBar.*;
 import android.app.*;
-import android.app.ActionBar;
-import android.app.ActionBar.LayoutParams;
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.Resources;
-import android.os.Bundle;
+import android.content.*;
+import android.content.res.*;
+import android.os.*;
 import android.support.v7.app.*;
-import android.util.Log;
-import android.view.KeyCharacterMap;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnKeyListener;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.android.datetimepicker.HapticFeedbackController;
-import com.android.datetimepicker.Utils;
-import com.android.datetimepicker.time.RadialPickerLayout.OnValueSelectedListener;
+import android.util.*;
+import android.view.*;
+import android.view.View.*;
+import android.widget.*;
+
+import com.android.*;
+import com.android.datetimepicker.*;
+import com.android.datetimepicker.time.RadialPickerLayout.*;
+
+import java.text.*;
+import java.util.*;
 
 /**
  * Dialog to set a time.
diff --git a/uhabits-android/src/main/res/color/date_picker_selector.xml b/android-pickers/src/main/res/color/date_picker_selector.xml
similarity index 100%
rename from uhabits-android/src/main/res/color/date_picker_selector.xml
rename to android-pickers/src/main/res/color/date_picker_selector.xml
diff --git a/uhabits-android/src/main/res/color/date_picker_year_selector.xml b/android-pickers/src/main/res/color/date_picker_year_selector.xml
similarity index 100%
rename from uhabits-android/src/main/res/color/date_picker_year_selector.xml
rename to android-pickers/src/main/res/color/date_picker_year_selector.xml
diff --git a/android-pickers/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png b/android-pickers/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png
new file mode 100644
index 000000000..3cbfe1a84
Binary files /dev/null and b/android-pickers/src/main/res/drawable-hdpi/ic_colorpicker_swatch_selected.png differ
diff --git a/android-pickers/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png b/android-pickers/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png
new file mode 100644
index 000000000..acbdecac2
Binary files /dev/null and b/android-pickers/src/main/res/drawable-mdpi/ic_colorpicker_swatch_selected.png differ
diff --git a/android-pickers/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png b/android-pickers/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png
new file mode 100644
index 000000000..812ff2c39
Binary files /dev/null and b/android-pickers/src/main/res/drawable-xhdpi/ic_colorpicker_swatch_selected.png differ
diff --git a/android-pickers/src/main/res/drawable/color_picker_swatch.xml b/android-pickers/src/main/res/drawable/color_picker_swatch.xml
new file mode 100644
index 000000000..db71091aa
--- /dev/null
+++ b/android-pickers/src/main/res/drawable/color_picker_swatch.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval"  />
\ No newline at end of file
diff --git a/android-pickers/src/main/res/drawable/done_background_color.xml b/android-pickers/src/main/res/drawable/done_background_color.xml
new file mode 100644
index 000000000..19a386134
--- /dev/null
+++ b/android-pickers/src/main/res/drawable/done_background_color.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true"
+          android:state_pressed="false"
+          android:drawable="@color/blue_focused" />
+
+    <item android:state_pressed="true"
+          android:drawable="@color/blue" />
+
+    <item android:drawable="@color/circle_background" />
+</selector>
\ No newline at end of file
diff --git a/android-pickers/src/main/res/drawable/done_background_color_dark.xml b/android-pickers/src/main/res/drawable/done_background_color_dark.xml
new file mode 100644
index 000000000..1665eee3f
--- /dev/null
+++ b/android-pickers/src/main/res/drawable/done_background_color_dark.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true"
+          android:state_pressed="false"
+          android:drawable="@color/red_focused" />
+
+    <item android:state_pressed="true"
+          android:drawable="@color/red" />
+
+    <item android:drawable="@color/light_gray" />
+</selector>
\ No newline at end of file
diff --git a/uhabits-android/src/main/res/layout/color_picker_dialog.xml b/android-pickers/src/main/res/layout/color_picker_dialog.xml
similarity index 100%
rename from uhabits-android/src/main/res/layout/color_picker_dialog.xml
rename to android-pickers/src/main/res/layout/color_picker_dialog.xml
diff --git a/uhabits-android/src/main/res/layout/color_picker_swatch.xml b/android-pickers/src/main/res/layout/color_picker_swatch.xml
similarity index 100%
rename from uhabits-android/src/main/res/layout/color_picker_swatch.xml
rename to android-pickers/src/main/res/layout/color_picker_swatch.xml
diff --git a/uhabits-android/src/main/res/layout/date_picker_dialog.xml b/android-pickers/src/main/res/layout/date_picker_dialog.xml
similarity index 100%
rename from uhabits-android/src/main/res/layout/date_picker_dialog.xml
rename to android-pickers/src/main/res/layout/date_picker_dialog.xml
diff --git a/uhabits-android/src/main/res/layout/date_picker_done_button.xml b/android-pickers/src/main/res/layout/date_picker_done_button.xml
similarity index 100%
rename from uhabits-android/src/main/res/layout/date_picker_done_button.xml
rename to android-pickers/src/main/res/layout/date_picker_done_button.xml
diff --git a/uhabits-android/src/main/res/layout/date_picker_header_view.xml b/android-pickers/src/main/res/layout/date_picker_header_view.xml
similarity index 100%
rename from uhabits-android/src/main/res/layout/date_picker_header_view.xml
rename to android-pickers/src/main/res/layout/date_picker_header_view.xml
diff --git a/uhabits-android/src/main/res/layout/date_picker_selected_date.xml b/android-pickers/src/main/res/layout/date_picker_selected_date.xml
similarity index 100%
rename from uhabits-android/src/main/res/layout/date_picker_selected_date.xml
rename to android-pickers/src/main/res/layout/date_picker_selected_date.xml
diff --git a/uhabits-android/src/main/res/layout/date_picker_view_animator.xml b/android-pickers/src/main/res/layout/date_picker_view_animator.xml
similarity index 100%
rename from uhabits-android/src/main/res/layout/date_picker_view_animator.xml
rename to android-pickers/src/main/res/layout/date_picker_view_animator.xml
diff --git a/uhabits-android/src/main/res/layout/time_header_label.xml b/android-pickers/src/main/res/layout/time_header_label.xml
similarity index 100%
rename from uhabits-android/src/main/res/layout/time_header_label.xml
rename to android-pickers/src/main/res/layout/time_header_label.xml
diff --git a/uhabits-android/src/main/res/layout/time_picker_dialog.xml b/android-pickers/src/main/res/layout/time_picker_dialog.xml
similarity index 100%
rename from uhabits-android/src/main/res/layout/time_picker_dialog.xml
rename to android-pickers/src/main/res/layout/time_picker_dialog.xml
diff --git a/uhabits-android/src/main/res/layout/year_label_text_view.xml b/android-pickers/src/main/res/layout/year_label_text_view.xml
similarity index 100%
rename from uhabits-android/src/main/res/layout/year_label_text_view.xml
rename to android-pickers/src/main/res/layout/year_label_text_view.xml
diff --git a/uhabits-android/src/main/res/values/pickers.xml b/android-pickers/src/main/res/values/pickers.xml
similarity index 55%
rename from uhabits-android/src/main/res/values/pickers.xml
rename to android-pickers/src/main/res/values/pickers.xml
index c83a58066..0e6021524 100644
--- a/uhabits-android/src/main/res/values/pickers.xml
+++ b/android-pickers/src/main/res/values/pickers.xml
@@ -24,16 +24,36 @@
     <dimen name="color_swatch_margins_large">8dip</dimen>
     <dimen name="color_swatch_margins_small">4dip</dimen>
 
-    <item name="circle_radius_multiplier" format="float" type="string" translatable="false">0.82</item>
-    <item name="circle_radius_multiplier_24HourMode" format="float" type="string" translatable="false">0.85</item>
-    <item name="selection_radius_multiplier" format="float" type="string" translatable="false">0.16</item>
-    <item name="ampm_circle_radius_multiplier" format="float" type="string" translatable="false">0.19</item>
-    <item name="numbers_radius_multiplier_normal" format="float" type="string" translatable="false">0.81</item>
-    <item name="numbers_radius_multiplier_inner" format="float" type="string" translatable="false">0.60</item>
-    <item name="numbers_radius_multiplier_outer" format="float" type="string" translatable="false">0.83</item>
-    <item name="text_size_multiplier_normal" format="float" type="string" translatable="false">0.17</item>
-    <item name="text_size_multiplier_inner" format="float" type="string" translatable="false">0.14</item>
-    <item name="text_size_multiplier_outer" format="float" type="string" translatable="false">0.11</item>
+    <item name="circle_radius_multiplier" format="float" translatable="false" type="string">
+        0.82
+    </item>
+    <item name="circle_radius_multiplier_24HourMode" format="float" translatable="false" type="string">
+        0.85
+    </item>
+    <item name="selection_radius_multiplier" format="float" translatable="false" type="string">
+        0.16
+    </item>
+    <item name="ampm_circle_radius_multiplier" format="float" translatable="false" type="string">
+        0.19
+    </item>
+    <item name="numbers_radius_multiplier_normal" format="float" translatable="false" type="string">
+        0.81
+    </item>
+    <item name="numbers_radius_multiplier_inner" format="float" translatable="false" type="string">
+        0.60
+    </item>
+    <item name="numbers_radius_multiplier_outer" format="float" translatable="false" type="string">
+        0.83
+    </item>
+    <item name="text_size_multiplier_normal" format="float" translatable="false" type="string">
+        0.17
+    </item>
+    <item name="text_size_multiplier_inner" format="float" translatable="false" type="string">
+        0.14
+    </item>
+    <item name="text_size_multiplier_outer" format="float" translatable="false" type="string">
+        0.11
+    </item>
 
     <dimen name="time_label_size">60sp</dimen>
     <dimen name="extra_time_label_margin">-30dp</dimen>
@@ -64,8 +84,8 @@
     <dimen name="year_label_height">64dp</dimen>
     <dimen name="year_label_text_size">22dp</dimen>
 
-    <string name="color_swatch_description" translatable="false">Color <xliff:g id="color_index" example="14">%1$d</xliff:g></string>
-    <string name="color_swatch_description_selected" translatable="false">Color <xliff:g id="color_index" example="14">%1$d</xliff:g> selected</string>
+    <string name="color_swatch_description" translatable="false">Color <xliff:g example="14" id="color_index">%1$d</xliff:g></string>
+    <string name="color_swatch_description_selected" translatable="false">Color <xliff:g example="14" id="color_index">%1$d</xliff:g> selected</string>
 
     <!-- Date and time picker -->
     <string name="hour_picker_description" translatable="false">Hours circular slider</string>
@@ -74,11 +94,56 @@
     <string name="year_picker_description" translatable="false">Year list</string>
     <string name="select_day" translatable="false">Select month and day</string>
     <string name="select_year" translatable="false">Select year</string>
-    <string name="item_is_selected" translatable="false"><xliff:g id="item" example="2013">%1$s</xliff:g> selected</string>
-    <string name="deleted_key" translatable="false"><xliff:g id="key" example="4">%1$s</xliff:g> deleted</string>
+    <string name="item_is_selected" translatable="false"><xliff:g example="2013" id="item">%1$s</xliff:g> selected</string>
+    <string name="deleted_key" translatable="false"><xliff:g example="4" id="key">%1$s</xliff:g> deleted</string>
     <string name="time_placeholder" translatable="false">--</string>
     <string name="time_separator" translatable="false">:</string>
     <string name="radial_numbers_typeface" translatable="false">sans-serif</string>
     <string name="sans_serif" translatable="false">sans-serif</string>
     <string name="day_of_week_label_typeface" translatable="false">sans-serif</string>
+
+    <!-- Time and Date picker -->
+    <color name="circle_background">#f2f2f2</color>
+    <color name="line_background">#cccccc</color>
+    <color name="ampm_text_color">#8c8c8c</color>
+    <color name="done_text_color_normal">#000000</color>
+    <color name="done_text_color_disabled">#cccccc</color>
+    <color name="numbers_text_color">#8c8c8c</color>
+    <color name="transparent">#00000000</color>
+    <color name="transparent_black">#7f000000</color>
+    <color name="blue">#33b5e5</color>
+    <color name="blue_focused">#c1e8f7</color>
+    <color name="neutral_pressed">#33999999</color>
+    <color name="darker_blue">#0099cc</color>
+    <color name="date_picker_text_normal">#ff999999</color>
+    <color name="calendar_header">#999999</color>
+    <color name="date_picker_view_animator">#f2f2f2</color>
+    <color name="calendar_selected_date_text">#ffd1d2d4</color>
+    <color name="done_text_color">#888888</color>
+    <color name="done_text_color_dark">#888888</color>
+    <color name="white">#ffffff</color>
+    <color name="black">#000000</color>
+
+    <!-- Colors for red theme -->
+    <color name="red">#ff3333</color>
+    <color name="red_focused">#853333</color>
+    <color name="light_gray">#404040</color>
+    <color name="dark_gray">#363636</color>
+    <color name="line_dark">#808080</color>
+
+    <style name="time_label">
+        <item name="android:textSize">@dimen/time_label_size</item>
+        <item name="android:textColor">@color/numbers_text_color</item>
+    </style>
+
+    <style name="ampm_label">
+        <item name="android:textSize">@dimen/ampm_label_size</item>
+        <item name="android:textAllCaps">true</item>
+        <item name="android:textColor">@color/ampm_text_color</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="TimePickerDialog" parent="@style/Theme.AppCompat.Light.Dialog">
+        <item name="windowNoTitle">true</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/android-pickers/src/main/res/values/strings.xml b/android-pickers/src/main/res/values/strings.xml
new file mode 100644
index 000000000..9e6581a37
--- /dev/null
+++ b/android-pickers/src/main/res/values/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="select_hours"/>
+    <string name="select_minutes"/>
+    <string name="color_picker_default_title"/>
+    <string name="clear"/>
+    <string name="clear_label"/>
+    <string name="done_label"/>
+</resources>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 7180450d1..bbd1aad49 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':uhabits-android', ':uhabits-core', ':android-base'
+include ':uhabits-android', ':uhabits-core', ':android-base', ':android-pickers'
diff --git a/uhabits-android/build.gradle b/uhabits-android/build.gradle
index 79fcfe202..121a2245b 100644
--- a/uhabits-android/build.gradle
+++ b/uhabits-android/build.gradle
@@ -54,6 +54,7 @@ android {
 dependencies {
     implementation project(":uhabits-core")
     implementation project(":android-base")
+    implementation project(":android-pickers")
 
     implementation 'com.android.support:appcompat-v7:25.3.1'
     implementation 'com.android.support:design:25.3.1'
diff --git a/uhabits-android/src/main/res/values/colors.xml b/uhabits-android/src/main/res/values/colors.xml
index 49338f051..1e65dade9 100644
--- a/uhabits-android/src/main/res/values/colors.xml
+++ b/uhabits-android/src/main/res/values/colors.xml
@@ -1,21 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
 <resources>
-
     <array name="lightPalette">
         <item>@color/red_700</item>
         <item>@color/deep_orange_700</item>
@@ -84,31 +68,4 @@
         <item>@color/black_aa</item>
         <item>@color/black_aa</item>
     </array>
-
-    <!-- Time and Date picker -->
-    <color name="circle_background">#f2f2f2</color>
-    <color name="line_background">#cccccc</color>
-    <color name="ampm_text_color">#8c8c8c</color>
-    <color name="done_text_color_normal">#000000</color>
-    <color name="done_text_color_disabled">#cccccc</color>
-    <color name="numbers_text_color">#8c8c8c</color>
-    <color name="transparent">#00000000</color>
-    <color name="transparent_black">#7f000000</color>
-    <color name="blue">#33b5e5</color>
-    <color name="blue_focused">#c1e8f7</color>
-    <color name="neutral_pressed">#33999999</color>
-    <color name="darker_blue">#0099cc</color>
-    <color name="date_picker_text_normal">#ff999999</color>
-    <color name="calendar_header">#999999</color>
-    <color name="date_picker_view_animator">#f2f2f2</color>
-    <color name="calendar_selected_date_text">#ffd1d2d4</color>
-    <color name="done_text_color">#888888</color>
-    <color name="done_text_color_dark">#888888</color>
-    
-    <!-- Colors for red theme -->
-    <color name="red">#ff3333</color>
-    <color name="red_focused">#853333</color>
-    <color name="light_gray">#404040</color>
-    <color name="dark_gray">#363636</color>
-    <color name="line_dark">#808080</color>
 </resources>
\ No newline at end of file
diff --git a/uhabits-android/src/main/res/values/styles.xml b/uhabits-android/src/main/res/values/styles.xml
index 829fef4f3..976ddf172 100644
--- a/uhabits-android/src/main/res/values/styles.xml
+++ b/uhabits-android/src/main/res/values/styles.xml
@@ -154,18 +154,6 @@
         <item name="widgetBackgroundAlpha">0.25</item>
     </style>
 
-    <style name="time_label">
-        <item name="android:textSize">@dimen/time_label_size</item>
-        <item name="android:textColor">@color/numbers_text_color</item>
-    </style>
-
-    <style name="ampm_label">
-        <item name="android:textSize">@dimen/ampm_label_size</item>
-        <item name="android:textAllCaps">true</item>
-        <item name="android:textColor">@color/ampm_text_color</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
     <style name="day_of_week_label_condensed"/>
 
     <style name="CardList">
@@ -253,10 +241,6 @@
         <item name="android:alpha">0.2</item>
     </style>
 
-    <style name="TimePickerDialog" parent="@style/Theme.AppCompat.Light.Dialog">
-        <item name="windowNoTitle">true</item>
-    </style>
-
     <style name="DialogWithTitle" parent="@style/Theme.AppCompat.Light.Dialog">
         <item name="windowNoTitle">false</item>
     </style>