diff --git a/ReadMe.md b/ReadMe.md
index 2145be5..617a1ec 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -50,84 +50,32 @@ before the "show"
 
 ### Style
 You can customize the style to change color, bold, etc... of each element.
-In your *styles.xml*, for example
+You need to use a Theme.AppCompat theme (or descendant) with SwitchDateTime's activity. (`compile 'com.android.support:appcompat-v7:25.0.1'` in gradle)
+
+<img src="https://raw.githubusercontent.com/J-Jamet/Android-SwitchDateTimePicker/master/art/screen1.jpg">
+
+In your *styles.xml*, you can redefine each style separately, but you must keep each item, for example : change size of "year label"
 ```
 <resources>
     <!-- Base application theme. -->
-    <style name="SwitchDateTimeThemeCustom" parent="AlertDialog.AppCompat.Light">
+    <style name="MyAppCustomTheme" parent="Theme.AppCompat.Light">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
-    <!-- Custom SwitchDateTime style, each element is optional-->
-		<!-- Theme for SwitchDateTime -->
-		    <style name="Theme.SwitchDateTime" parent="Theme.AppCompat.Light.DarkActionBar">
-		        <!-- DateTime -->
-		        <item name="dateTimeColorBackground">#c94545</item>
-		        <item name="dateTimeColorLabelBackground">#c94545</item>
-		        <item name="dateTimeColorLabel">#cacaca</item>
-		        <item name="dateTimeColorValue">#fff</item>
-		        <item name="dateTimeColorIcon">#fff</item>
-
-		        <!-- Time -->
-		        <item name="timeLabelColorBackground">#c94545</item>
-		        <item name="timeLabelColorAccent">#fff</item>
-		        <item name="timeLabelColor">#fff</item>
-
-		        <item name="timeColorBackground">#fff</item>
-		        <item name="timeColorCircle">#e1e1e1</item>
-		        <item name="timeColorCenter">#000</item>
-		        <item name="timeColorNumbers">#494949</item>
-		        <item name="timeColorSelector">#c94545</item>
-
-		        <item name="timeAmPmColorBackground">#c94545</item>
-		        <item name="timeAmPmColorSelectBackground">#c94545</item> <!-- Alpha is apply-->
-		        <item name="timeAmPmColorText">#fff</item>
-
-		        <!-- Date -->
-		        <item name="dateLabelColorBackground">#c94545</item>
-		        <item name="dateSelectDayColor">#c94545</item>
-
-		        <!-- Year -->
-		        <item name="dateSelectYearBackgroundColor">#c94545</item>
-		        <item name="dateSelectYearTextColor">#fff</item>
-		    </style>
-
-		    <style name="Theme.SwitchDateTime.TitleDateTimeLabelText">
-		        <item name="android:textSize">18sp</item>
-		        <item name="android:textColor">#fff</item>
-		        <item name="android:textStyle">bold</item>
-		    </style>
-
-		    <!-- Time precise -->
-		    <style name="Theme.SwitchDateTime.TimeLabelText">
-		        <item name="android:textSize">26sp</item>
-		        <item name="android:textColor">#fff</item>
-		    </style>
-
-		    <style name="Theme.SwitchDateTime.TimeLabelAmPm">
-		        <item name="android:textSize">12sp</item>
-		        <item name="android:textColor">#fff</item>
-		        <item name="android:textStyle">bold</item>
-		    </style>
-
-		    <!-- Date Precise -->
-		    <style name="Theme.SwitchDateTime.DateLabelMonthAndDay">
-		        <item name="android:textSize">26sp</item>
-		        <item name="android:textColor">#fff</item>
-		    </style>
-
-		    <!-- Year Precise -->
-		    <style name="Theme.SwitchDateTime.DateLabelYear">
-		        <item name="android:textSize">16sp</item>
-		        <item name="android:textColor">#fff</item>
-		        <item name="android:textStyle">bold</item>
-		    </style>
+    <!-- SwitchDateTime style is independent, each element is optional-->
+    <!-- Year Precise -->
+    <style name="Theme.SwitchDateTime.DateLabelYear">
+        <item name="android:textSize">58sp</item>
+        <item name="android:textColor">#fff</item>
+        <item name="android:textStyle">bold</item>
+    </style>
 </resources>
 
 ```
+Styles elements : https://github.com/Kunzisoft/Android-SwitchDateTimePicker/blob/master/switchdatetime/src/main/res/values/styles.xml
 
 ### Sample
 You can see
diff --git a/art/screen1.jpg b/art/screen1.jpg
new file mode 100644
index 0000000..6bee40d
Binary files /dev/null and b/art/screen1.jpg differ
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index 251f789..8efba52 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -7,10 +7,10 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:theme="@style/MyAppCustomTheme"
         android:supportsRtl="true">
         <activity
-            android:name="com.kunzisoft.switchdatetimesample.Sample"
-            android:theme="@style/Theme.SwitchDateTime" >
+            android:name="com.kunzisoft.switchdatetimesample.Sample" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/sample/src/main/res/values/styles.xml b/sample/src/main/res/values/styles.xml
index 2c0ef90..5400e62 100644
--- a/sample/src/main/res/values/styles.xml
+++ b/sample/src/main/res/values/styles.xml
@@ -1,15 +1,17 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="SwitchDateTimeThemeCustom" parent="AlertDialog.AppCompat.Light">
+    <style name="MyAppCustomTheme" parent="Theme.AppCompat">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
-    <!-- Custom SwitchDateTime style -->
-    <style name="Theme.SwitchDateTime.TitleDateTimeLabelText">
-        <item name="android:textSize">18sp</item>
+
+    <!-- SwitchDateTime style is independent, each element is optional-->
+    <!-- Year Precise -->
+    <style name="Theme.SwitchDateTime.DateLabelYear">
+        <item name="android:textSize">32sp</item>
         <item name="android:textColor">#fff</item>
         <item name="android:textStyle">bold</item>
     </style>
diff --git a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
index bc21284..5037d61 100644
--- a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
+++ b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java
@@ -101,8 +101,6 @@ public void setOnButtonClickListener(OnButtonClickListener onButtonClickListener
         this.mListener = onButtonClickListener;
     }
 
-
-
     @Override
     public void onSaveInstanceState(Bundle savedInstanceState) {
         // Save the current datetime
@@ -143,6 +141,8 @@ public void onSaveInstanceState(Bundle savedInstanceState) {
         assignAllValuesToCalendar();
 
         LayoutInflater inflater = LayoutInflater.from(getActivity());
+        getActivity().getTheme().applyStyle(R.style.Theme_SwitchDateTime, false);
+        //getActivity().setTheme(R.style.Theme_SwitchDateTime);
         View dateTimeLayout = inflater.inflate(R.layout.dialog_switch_datetime_picker,
                 (ViewGroup) getActivity().findViewById(R.id.datetime_picker));
 
@@ -240,7 +240,6 @@ public void onTimeSelected(int hourOfDayTime, int minuteTime) {
             timePicker = new SwitchTimePicker(getContext(), onTimeSelectedListener);
         else
             timePicker = new SwitchTimePicker(getContext(), onTimeSelectedListener, savedInstanceState);
-            timePicker = new SwitchTimePicker(getContext(), onTimeSelectedListener, savedInstanceState);
         timePicker.setIs24HourMode(is24HoursMode);
         timePicker.setHourOfDay(hourOfDay);
         timePicker.setMinute(minute);
@@ -290,7 +289,7 @@ public void onYearSelected(View view, int yearPicker) {
         });
 
         // Assign buttons
-        AlertDialog.Builder db = new AlertDialog.Builder(getActivity());
+        AlertDialog.Builder db = new AlertDialog.Builder(getContext());
         db.setView(dateTimeLayout);
         if(mPositiveButton == null)
             mPositiveButton = getString(R.string.positive_button_datetime_picker);
diff --git a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/time/SwitchTimePicker.java b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/time/SwitchTimePicker.java
index ed5a97c..207e8e7 100644
--- a/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/time/SwitchTimePicker.java
+++ b/switchdatetime/src/main/java/com/kunzisoft/switchdatetime/time/SwitchTimePicker.java
@@ -78,8 +78,8 @@ public class SwitchTimePicker implements RadialPickerLayout.OnValueSelectedListe
     private View mAmPmHitspace;
     private RadialPickerLayout mTimePicker;
 
-    private int mColorAccent;
-    private int mColor;
+    //private int mColorAccent;
+    //private int mColor;
     private String mAmText;
     private String mPmText;
 
@@ -107,8 +107,6 @@ public class SwitchTimePicker implements RadialPickerLayout.OnValueSelectedListe
 
     // Enable/Disable Vibrations
     private boolean mVibrate = true;
-    private boolean mCloseOnSingleTapMinute;
-
 
     public SwitchTimePicker(Context context, OnTimeSelectedListener callback) {
         mContext = context;
@@ -167,10 +165,6 @@ public void setVibrate(boolean vibrate) {
             mTimePicker.setVibrate(vibrate);
     }
 
-    public void setCloseOnSingleTapMinute(boolean closeOnSingleTapMinute) {
-        mCloseOnSingleTapMinute = closeOnSingleTapMinute;
-    }
-
     public View onCreateView(final View view,
                              Bundle savedInstanceState) {
         KeyboardListener keyboardListener = new KeyboardListener();
@@ -194,10 +188,10 @@ public View onCreateView(final View view,
         TypedValue typedValueColorAccent = new TypedValue();
         TypedValue typedValueColor = new TypedValue();
         Resources.Theme theme = mContext.getTheme();
-        theme.resolveAttribute(com.kunzisoft.switchdatetime.R.attr.timeLabelColorAccent, typedValueColorAccent, true);
-        theme.resolveAttribute(com.kunzisoft.switchdatetime.R.attr.timeLabelColor, typedValueColor, true);
-        mColorAccent = typedValueColorAccent.data;
-        mColor = typedValueColor.data;
+        theme.resolveAttribute(R.attr.dateTimeLabelAccentColor, typedValueColorAccent, true);
+        theme.resolveAttribute(R.attr.dateTimeLabelColor, typedValueColor, true);
+        //mColorAccent = typedValueColorAccent.data;
+        //mColor = typedValueColor.data;
 
         if (Build.VERSION.SDK_INT <= 14) {
 
@@ -419,10 +413,12 @@ private void setCurrentItemShowing(int index, boolean animateCircle, boolean del
             labelToAnimate = mMinuteView;
         }
 
+        /*
         int hourColor = (index == HOUR_INDEX) ? mColorAccent : mColor;
         int minuteColor = (index == MINUTE_INDEX) ? mColorAccent : mColor;
         mHourView.setTextColor(hourColor);
         mMinuteView.setTextColor(minuteColor);
+        */
 
         ObjectAnimator pulseAnimator = Utils.getPulseAnimator(labelToAnimate, 0.85f, 1.1f);
         if (delayLabelAnimate) {
@@ -639,10 +635,10 @@ private void updateDisplay(boolean allowEmptyDisplay) {
                     String.format(minuteFormat, values[1]).replace(' ', mPlaceholderText);
             mHourView.setText(hourStr);
             mHourSpaceView.setText(hourStr);
-            mHourView.setTextColor(mColor);
+            //mHourView.setTextColor(mColor);
             mMinuteView.setText(minuteStr);
             mMinuteSpaceView.setText(minuteStr);
-            mMinuteView.setTextColor(mColor);
+            //mMinuteView.setTextColor(mColor);
             if (!mIs24HourMode) {
                 updateAmPmDisplay(values[2]);
             }
diff --git a/switchdatetime/src/main/res/layout-land/dialog_switch_datetime_picker.xml b/switchdatetime/src/main/res/layout-land/dialog_switch_datetime_picker.xml
index 83d2a69..e4418ae 100644
--- a/switchdatetime/src/main/res/layout-land/dialog_switch_datetime_picker.xml
+++ b/switchdatetime/src/main/res/layout-land/dialog_switch_datetime_picker.xml
@@ -7,14 +7,14 @@
 
     <LinearLayout
         android:id="@+id/section_add"
-        android:background="?attr/dateTimeColorBackground"
+        android:background="?attr/dateTimeBackgroundColor"
         android:layout_width="@dimen/header_width"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
         <RelativeLayout
             android:id="@+id/label_header"
-            android:background="?attr/dateTimeColorLabelBackground"
+            android:background="?attr/dateTimeLabelBackgroundColor"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingLeft="10dp"
@@ -27,7 +27,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:src="@drawable/ic_view_carousel_black_32dp"
-                android:tint="?attr/dateTimeColorIcon"
+                android:tint="?attr/dateTimeIconColor"
                 android:contentDescription="@string/img_datetime"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentRight="true"
@@ -116,7 +116,6 @@
             <RelativeLayout
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:background="?attr/timeColorBackground"
                 android:gravity="center">
                 <com.kunzisoft.switchdatetime.time.RadialPickerLayout
                     android:id="@+id/time_picker"
@@ -127,13 +126,13 @@
                     android:focusableInTouchMode="true"
                     android:layout_alignParentRight="true"
                     android:layout_alignParentEnd="true"
-                    switch:timeCircleColor="?attr/timeColorCircle"
-                    switch:timeCenterColor="?attr/timeColorNumbers"
-                    switch:timeSelectorColor="?attr/timeColorSelector"
-                    switch:timeCircularNumbersColor="?attr/timeColorNumbers"
-                    switch:amPmBackgroundColor="?attr/timeAmPmColorBackground"
-                    switch:amPmSelectBackgroundColor="?attr/timeAmPmColorSelectBackground"
-                    switch:amPmTextColor="?attr/timeAmPmColorText"/>
+                    switch:timeCircleColor="?attr/timeCircleColor"
+                    switch:timeCenterColor="?attr/timeSelectorColor"
+                    switch:timeSelectorColor="?attr/timeSelectorColor"
+                    switch:timeCircularNumbersColor="?attr/timeCircularNumbersColor"
+                    switch:amPmBackgroundColor="?attr/timeAmPmBackgroundColor"
+                    switch:amPmSelectBackgroundColor="?attr/timeAmPmSelectBackgroundColor"
+                    switch:amPmTextColor="?attr/timeAmPmTextColor"/>
             </RelativeLayout>
         </RelativeLayout>
 
diff --git a/switchdatetime/src/main/res/layout/dialog_switch_datetime_picker.xml b/switchdatetime/src/main/res/layout/dialog_switch_datetime_picker.xml
index e603eca..bcef2b3 100644
--- a/switchdatetime/src/main/res/layout/dialog_switch_datetime_picker.xml
+++ b/switchdatetime/src/main/res/layout/dialog_switch_datetime_picker.xml
@@ -7,14 +7,14 @@
     android:orientation="vertical">
     <LinearLayout
         android:id="@+id/section_add"
-        android:background="?attr/dateTimeColorBackground"
+        android:background="?attr/dateTimeBackgroundColor"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <RelativeLayout
             android:id="@+id/label_header"
-            android:background="?attr/dateTimeColorLabelBackground"
+            android:background="?attr/dateTimeLabelBackgroundColor"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingLeft="10dp"
@@ -27,7 +27,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:src="@drawable/ic_view_carousel_black_32dp"
-                android:tint="?attr/dateTimeColorIcon"
+                android:tint="?attr/dateTimeIconColor"
                 android:contentDescription="@string/img_datetime"
                 android:layout_alignParentTop="true"
                 android:layout_alignParentRight="true"
@@ -98,13 +98,11 @@
         android:id="@+id/dateSwitcher"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-
         android:inAnimation="@anim/dialog_enter_from_right"
         android:outAnimation="@anim/dialog_leave_to_left"
         android:layout_gravity="center">
         <LinearLayout
             android:id="@+id/timePicker"
-            android:background="?attr/timeColorBackground"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
@@ -118,13 +116,13 @@
                 android:layout_gravity="center"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
-                switch:timeCircleColor="?attr/timeColorCircle"
-                switch:timeCenterColor="?attr/timeColorNumbers"
-                switch:timeSelectorColor="?attr/timeColorSelector"
-                switch:timeCircularNumbersColor="?attr/timeColorNumbers"
-                switch:amPmBackgroundColor="?attr/timeAmPmColorBackground"
-                switch:amPmSelectBackgroundColor="?attr/timeAmPmColorSelectBackground"
-                switch:amPmTextColor="?attr/timeAmPmColorText"/>
+                switch:timeCircleColor="?attr/timeCircleColor"
+                switch:timeCenterColor="?attr/timeSelectorColor"
+                switch:timeSelectorColor="?attr/timeSelectorColor"
+                switch:timeCircularNumbersColor="?attr/timeCircularNumbersColor"
+                switch:amPmBackgroundColor="?attr/timeAmPmBackgroundColor"
+                switch:amPmSelectBackgroundColor="?attr/timeAmPmSelectBackgroundColor"
+                switch:amPmTextColor="?attr/timeAmPmTextColor"/>
         </LinearLayout>
 
         <com.prolificinteractive.materialcalendarview.MaterialCalendarView
diff --git a/switchdatetime/src/main/res/values/attrs.xml b/switchdatetime/src/main/res/values/attrs.xml
index 48f097f..bcbdc50 100644
--- a/switchdatetime/src/main/res/values/attrs.xml
+++ b/switchdatetime/src/main/res/values/attrs.xml
@@ -1,28 +1,18 @@
 <resources>
-    <attr name="dateTimeColorBackground" format="reference|color" />
-    <attr name="dateTimeColorLabelBackground" format="reference|color" />
-    <attr name="dateTimeColorLabel" format="reference|color" />
-    <attr name="dateTimeColorValue" format="reference|color" />
-    <attr name="dateTimeColorIcon" format="reference|color" />
-
-    <!-- Time -->
-    <attr name="timeLabelColorBackground" format="reference|color" />
-    <attr name="timeLabelColor" format="reference|color" />
-    <attr name="timeLabelColorAccent" format="reference|color" />
-
-    <attr name="timeColorBackground" format="reference|color" />
-    <attr name="timeColorCircle" format="reference|color" />
-    <attr name="timeColorCenter" format="reference|color" />
-    <attr name="timeColorNumbers" format="reference|color" />
-    <attr name="timeColorSelector" format="reference|color" />
-
-    <attr name="timeAmPmColorBackground" format="reference|color" />
-    <attr name="timeAmPmColorSelectBackground" format="reference|color" />
-    <attr name="timeAmPmColorText" format="reference|color" />
+    <attr name="dateTimeBackgroundColor" format="reference|color" />
+    <attr name="dateTimeLabelBackgroundColor" format="reference|color" />
+    <attr name="dateTimeIconColor" format="reference|color" />
+    <attr name="dateTimeLabelAccentColor" format="reference|color" />
+    <attr name="dateTimeLabelColor" format="reference|color" />
+
+    <attr name="timeAmPmBackgroundColor" format="reference|color" />
+    <attr name="timeAmPmSelectBackgroundColor" format="reference|color" />
+    <attr name="timeAmPmTextColor" format="reference|color" />
 
     <!-- Date -->
-    <attr name="dateLabelColorBackground" format="reference|color" />
     <attr name="dateSelectDayColor" format="reference|color" />
+
+    <!-- Year -->
     <attr name="dateSelectYearBackgroundColor" format="reference|color" />
     <attr name="dateSelectYearTextColor" format="reference|color" />
 
@@ -54,7 +44,7 @@
     </declare-styleable>
 
     <declare-styleable name="TextCircularIndicatorView">
-        <!-- Change color of circle background -->
+        <!-- Change color of circle background TODO javadoc-->
         <attr name="colorCircleIndicator" format="reference|color" />
     </declare-styleable>
 
diff --git a/switchdatetime/src/main/res/values/styles.xml b/switchdatetime/src/main/res/values/styles.xml
index 96660a1..f3565b6 100644
--- a/switchdatetime/src/main/res/values/styles.xml
+++ b/switchdatetime/src/main/res/values/styles.xml
@@ -1,65 +1,59 @@
 <resources>
     <!-- Theme for SwitchDateTime -->
     <style name="Theme.SwitchDateTime" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- DateTime -->
-        <item name="dateTimeColorBackground">#c94545</item>
-        <item name="dateTimeColorLabelBackground">#c94545</item>
-        <item name="dateTimeColorLabel">#cacaca</item>
-        <item name="dateTimeColorValue">#fff</item>
-        <item name="dateTimeColorIcon">#fff</item>
+        <!-- DateTime Header color -->
+        <item name="dateTimeBackgroundColor">?android:colorPrimary</item>
+        <item name="dateTimeLabelBackgroundColor">?android:colorPrimary</item>
+        <item name="dateTimeIconColor">?android:textColorPrimary</item>
+        <!-- Text header color -->
+        <item name="dateTimeLabelAccentColor">?android:textColorPrimary</item>
+        <item name="dateTimeLabelColor">?android:textColorSecondary</item>
 
         <!-- Time -->
-        <item name="timeLabelColorBackground">#c94545</item>
-        <item name="timeLabelColorAccent">#fff</item>
-        <item name="timeLabelColor">#fff</item>
-
-        <item name="timeColorBackground">#fff</item>
-        <item name="timeColorCircle">#e1e1e1</item>
-        <item name="timeColorCenter">#000</item>
-        <item name="timeColorNumbers">#494949</item>
-        <item name="timeColorSelector">#c94545</item>
-
-        <item name="timeAmPmColorBackground">#c94545</item>
-        <item name="timeAmPmColorSelectBackground">#c94545</item> <!-- Alpha is apply-->
-        <item name="timeAmPmColorText">#fff</item>
+        <item name="timeCircleColor">#e1e1e1</item>
+        <item name="timeCircularNumbersColor">#494949</item>
+        <item name="timeSelectorColor">?android:colorPrimary</item>
+        <item name="timeAmPmBackgroundColor">?android:colorPrimary</item>
+        <item name="timeAmPmSelectBackgroundColor">?android:colorPrimary</item> <!-- Alpha is apply-->
+        <item name="timeAmPmTextColor">?android:textColorSecondary</item>
 
         <!-- Date -->
-        <item name="dateLabelColorBackground">#c94545</item>
-        <item name="dateSelectDayColor">#c94545</item>
+        <item name="dateSelectDayColor">?android:colorPrimary</item>
 
         <!-- Year -->
-        <item name="dateSelectYearBackgroundColor">#c94545</item>
-        <item name="dateSelectYearTextColor">#fff</item>
+        <item name="dateSelectYearBackgroundColor">?android:colorPrimary</item>
+        <item name="dateSelectYearTextColor">?android:textColorSecondary</item>
     </style>
 
+    <!-- Title -->
     <style name="Theme.SwitchDateTime.TitleDateTimeLabelText">
         <item name="android:textSize">18sp</item>
-        <item name="android:textColor">#fff</item>
+        <item name="android:textColor">?android:textColorPrimary</item>
         <item name="android:textStyle">bold</item>
     </style>
 
-    <!-- Time precise -->
+    <!-- Time Label -->
     <style name="Theme.SwitchDateTime.TimeLabelText">
         <item name="android:textSize">26sp</item>
-        <item name="android:textColor">#fff</item>
+        <item name="android:textColor">?attr/dateTimeLabelColor</item>
     </style>
 
     <style name="Theme.SwitchDateTime.TimeLabelAmPm">
         <item name="android:textSize">12sp</item>
-        <item name="android:textColor">#fff</item>
+        <item name="android:textColor">?attr/dateTimeLabelColor</item>
         <item name="android:textStyle">bold</item>
     </style>
 
-    <!-- Date Precise -->
+    <!-- Date Label -->
     <style name="Theme.SwitchDateTime.DateLabelMonthAndDay">
         <item name="android:textSize">26sp</item>
-        <item name="android:textColor">#fff</item>
+        <item name="android:textColor">?attr/dateTimeLabelColor</item>
     </style>
 
-    <!-- Year Precise -->
+    <!-- Year Label -->
     <style name="Theme.SwitchDateTime.DateLabelYear">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">#fff</item>
+        <item name="android:textColor">?attr/dateTimeLabelColor</item>
         <item name="android:textStyle">bold</item>
     </style>
 </resources>