diff --git a/build.gradle b/build.gradle
index 74b2ab0..1ea4bd0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 04e285f..0f682e8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Mon Mar 27 15:43:23 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/sample/build.gradle b/sample/build.gradle
index d6f8949..c8d5d4a 100644
--- a/sample/build.gradle
+++ b/sample/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.1.1'
+    compile 'com.android.support:appcompat-v7:25.3.1'
     testCompile 'junit:junit:4.12'
     compile project(path: ':switchdatetime')
 }
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index af2ede6..6242e00 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:label="@string/switch_datetime_picker_name"
         android:theme="@style/AppTheme.NoActionbar"
         android:supportsRtl="true">
         <activity
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
index 4d74b6a..c1269d3 100644
--- a/sample/src/main/res/values/strings.xml
+++ b/sample/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
 <resources>
-    <string name="app_name">Switch DateTime Picker</string>
+    <string name="switch_datetime_picker_name">Switch DateTime Picker</string>
     <string name="open_datetime_dialog">Open DateTime Dialog</string>
 </resources>
diff --git a/switchdatetime/build.gradle b/switchdatetime/build.gradle
index 6997d35..e8e80f3 100644
--- a/switchdatetime/build.gradle
+++ b/switchdatetime/build.gradle
@@ -25,8 +25,8 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.1.1'
-    compile 'com.android.support:recyclerview-v7:25.1.1'
-    compile 'com.prolificinteractive:material-calendarview:1.4.2'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile 'com.prolificinteractive:material-calendarview:1.4.3'
     testCompile 'junit:junit:4.12'
 }
diff --git a/switchdatetime/src/main/AndroidManifest.xml b/switchdatetime/src/main/AndroidManifest.xml
index 40503df..aaaa886 100644
--- a/switchdatetime/src/main/AndroidManifest.xml
+++ b/switchdatetime/src/main/AndroidManifest.xml
@@ -3,7 +3,6 @@
 
     <application
         android:allowBackup="true"
-        android:label="@string/app_name"
         android:supportsRtl="true">
     </application>
 
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 7952918..cf6e6b7 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
@@ -129,20 +129,19 @@
             </RelativeLayout>
         </RelativeLayout>
 
-        <com.prolificinteractive.materialcalendarview.MaterialCalendarView
-            xmlns:app="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/datePicker"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginTop="@dimen/calendar_margin_top_land"
-            android:layout_marginLeft="@dimen/calendar_margin_start_land"
-            android:layout_marginStart="@dimen/calendar_margin_start_land"
-            android:layout_marginRight="@dimen/calendar_margin_end_land"
-            android:layout_marginEnd="@dimen/calendar_margin_end_land"
-            android:layout_marginBottom="@dimen/calendar_margin_bottom_land"
-            app:mcv_showOtherDates="all"
-            style="@style/Theme.SwitchDateTime.Date"
-            />
+        <FrameLayout
+            android:layout_width="@dimen/calendar_width_land"
+            android:layout_height="@dimen/calendar_height_land"
+            android:layout_gravity="center">
+            <com.prolificinteractive.materialcalendarview.MaterialCalendarView
+                xmlns:calendar="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/datePicker"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                calendar:mcv_showOtherDates="all"
+                style="@style/Theme.SwitchDateTime.Date"
+                />
+        </FrameLayout>
 
         <com.kunzisoft.switchdatetime.date.widget.ListPickerYearView
             xmlns:year="http://schemas.android.com/apk/res-auto"
diff --git a/switchdatetime/src/main/res/layout-ldrtl-land-v17/dialog_switch_datetime_picker.xml b/switchdatetime/src/main/res/layout-ldrtl-land-v17/dialog_switch_datetime_picker.xml
new file mode 100644
index 0000000..90e9e92
--- /dev/null
+++ b/switchdatetime/src/main/res/layout-ldrtl-land-v17/dialog_switch_datetime_picker.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/datetime_picker"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    style="@style/Theme.SwitchDateTime" >
+
+    <LinearLayout
+        android:id="@+id/section_add"
+        style="@style/Theme.SwitchDateTime.HeaderBackground"
+        android:layout_width="@dimen/header_width"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/label_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="10dp"
+            android:paddingStart="10dp"
+            android:paddingRight="10dp"
+            android:paddingEnd="10dp">
+
+            <android.support.v7.widget.AppCompatImageButton
+                android:id="@+id/button_switch"
+                style="@style/Theme.SwitchDateTime.IconDateTimeSwitch"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/img_datetime"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentEnd="true" />
+
+            <android.support.v7.widget.AppCompatTextView
+                android:id="@+id/label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/label_datetime_dialog"
+                style="@style/Theme.SwitchDateTime.TitleDateTimeLabelText"
+                android:padding="5dp"
+                android:gravity="end"
+                android:layout_centerVertical="true"
+                android:layout_alignParentStart="true"
+                android:layout_toStartOf="@+id/button_switch" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/value_dateTime"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginBottom="16dp" >
+
+            <include
+                android:id="@+id/time_header_values"
+                layout="@layout/time_header_label"
+                android:layout_marginBottom="22dp"
+                android:layout_width="@dimen/time_label_width"
+                android:layout_height="@dimen/time_label_height"
+                android:layout_gravity="center_vertical"
+                android:layout_alignParentEnd="true" />
+
+            <TextView
+                android:id="@+id/date_picker_year"
+                style="@style/Theme.SwitchDateTime.DateLabelYear"
+                android:gravity="top|start"
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:includeFontPadding="false"
+                android:layout_below="@id/time_header_values" />
+
+            <TextView
+                android:id="@+id/date_picker_month_and_day"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                style="@style/Theme.SwitchDateTime.DateLabelMonthAndDay"
+                android:layout_below="@id/date_picker_year"
+                android:layout_alignParentStart="true"
+                android:layout_marginStart="6dp"
+                android:clickable="true" />
+        </RelativeLayout>
+    </LinearLayout>
+
+    <ViewFlipper
+        android:id="@+id/dateSwitcher"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        style="@style/Theme.SwitchDateTime.ContentBackground"
+        android:inAnimation="@anim/dialog_enter_from_top"
+        android:outAnimation="@anim/dialog_leave_to_bottom"
+        android:layout_alignParentEnd="true"
+        android:layout_toEndOf="@+id/section_add"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true">
+        <RelativeLayout
+            android:id="@+id/timePicker"
+            android:layout_height="match_parent"
+            android:layout_width="match_parent"
+            android:orientation="horizontal"
+            android:layout_gravity="top"
+            android:focusable="true" >
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center">
+                <com.kunzisoft.switchdatetime.time.RadialPickerLayout
+                    android:id="@+id/time_picker"
+                    style="@style/Theme.SwitchDateTime.Time"
+                    android:layout_width="@dimen/time_circle_width"
+                    android:layout_height="@dimen/time_circle_width"
+                    android:layout_gravity="center"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:layout_alignParentEnd="true"/>
+            </RelativeLayout>
+        </RelativeLayout>
+
+        <FrameLayout
+            android:layout_width="@dimen/calendar_width_land"
+            android:layout_height="@dimen/calendar_height_land"
+            android:layout_gravity="center">
+            <com.prolificinteractive.materialcalendarview.MaterialCalendarView
+                xmlns:calendar="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/datePicker"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                calendar:mcv_showOtherDates="all"
+                style="@style/Theme.SwitchDateTime.Date"
+                />
+        </FrameLayout>
+
+        <com.kunzisoft.switchdatetime.date.widget.ListPickerYearView
+            xmlns:year="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/yearPicker"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            year:minYear="1970"
+            year:maxYear="2200"
+            year:defaultYear="2016"
+            />
+    </ViewFlipper>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/switchdatetime/src/main/res/layout-ldrtl-v17/dialog_switch_datetime_picker.xml b/switchdatetime/src/main/res/layout-ldrtl-v17/dialog_switch_datetime_picker.xml
new file mode 100644
index 0000000..c276bc8
--- /dev/null
+++ b/switchdatetime/src/main/res/layout-ldrtl-v17/dialog_switch_datetime_picker.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/datetime_picker"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    style="@style/Theme.SwitchDateTime"
+    android:orientation="vertical"
+    android:baselineAligned="false">
+    <LinearLayout
+        android:id="@+id/section_add"
+        style="@style/Theme.SwitchDateTime.HeaderBackground"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/label_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingEnd="10dp"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:paddingStart="10dp">
+
+            <android.support.v7.widget.AppCompatImageButton
+                android:id="@+id/button_switch"
+                style="@style/Theme.SwitchDateTime.IconDateTimeSwitch"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/img_datetime"
+                android:src="@drawable/ic_view_carousel_black_32dp"
+                android:layout_alignParentTop="true"
+                android:layout_alignParentEnd="true" />
+
+            <android.support.v7.widget.AppCompatTextView
+                android:id="@+id/label"
+                style="@style/Theme.SwitchDateTime.TitleDateTimeLabelText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:gravity="end"
+                android:padding="5dp"
+                android:text="@string/label_datetime_dialog"
+                android:layout_toEndOf="@+id/button_switch"
+                android:layout_alignParentStart="true" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/value_dateTime"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp" >
+
+            <include
+                android:id="@+id/time_header_values"
+                layout="@layout/time_header_label"
+                android:layout_width="@dimen/time_label_width"
+                android:layout_height="@dimen/time_label_height"
+                android:layout_gravity="center_vertical"
+                android:layout_alignParentStart="true" />
+
+            <TextView
+                android:id="@+id/date_picker_year"
+                style="@style/Theme.SwitchDateTime.DateLabelYear"
+                android:gravity="top|end"
+                android:layout_gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:includeFontPadding="false"
+                android:layout_above="@+id/date_picker_month_and_day" />
+
+            <TextView
+                android:id="@+id/date_picker_month_and_day"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                style="@style/Theme.SwitchDateTime.DateLabelMonthAndDay"
+                android:layout_below="@id/time_header_values"
+                android:layout_alignParentEnd="true"
+                android:layout_marginEnd="6dp"
+                android:clickable="true" />
+
+        </RelativeLayout>
+
+    </LinearLayout>
+    <ViewFlipper
+        android:id="@+id/dateSwitcher"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/Theme.SwitchDateTime.ContentBackground"
+        android:inAnimation="@anim/dialog_enter_from_right"
+        android:outAnimation="@anim/dialog_leave_to_left"
+        android:layout_gravity="center">
+        <LinearLayout
+            android:id="@+id/timePicker"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:focusable="true" >
+            <com.kunzisoft.switchdatetime.time.RadialPickerLayout
+                android:id="@+id/time_picker"
+                android:layout_height="@dimen/time_circle_width"
+                android:layout_width="@dimen/time_circle_width"
+                android:layout_gravity="center"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                style="@style/Theme.SwitchDateTime.Time" />
+        </LinearLayout>
+
+        <FrameLayout
+            android:layout_width="@dimen/calendar_width_portrait"
+            android:layout_height="@dimen/calendar_height_portrait"
+            android:layout_gravity="center">
+            <com.prolificinteractive.materialcalendarview.MaterialCalendarView
+                xmlns:calendar="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/datePicker"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                calendar:mcv_showOtherDates="all"
+                style="@style/Theme.SwitchDateTime.Date"
+                />
+        </FrameLayout>
+
+
+        <com.kunzisoft.switchdatetime.date.widget.ListPickerYearView
+            xmlns:year="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/yearPicker"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            year:minYear="1970"
+            year:maxYear="2200"
+            year:defaultYear="2016"
+            />
+    </ViewFlipper>
+</LinearLayout>
\ No newline at end of file
diff --git a/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml b/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml
new file mode 100644
index 0000000..d9b44a7
--- /dev/null
+++ b/switchdatetime/src/main/res/layout-ldrtl-v17/time_header_label.xml
@@ -0,0 +1,117 @@
+<?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
+  -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:minWidth="@dimen/time_label_min_width"
+    android:layout_gravity="center">
+    <View
+        android:id="@+id/center_view"
+        android:layout_width="1dp"
+        android:layout_height="1dp"
+        android:background="#00000000"
+        android:layout_centerInParent="true"
+        android:visibility="invisible"
+        android:importantForAccessibility="no" />
+
+    <TextView
+        android:id="@+id/hour_space"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/time_placeholder"
+        android:layout_toStartOf="@+id/separator"
+        android:layout_centerVertical="true"
+        android:visibility="invisible"
+        style="@style/Theme.SwitchDateTime.TimeLabelText"
+        android:importantForAccessibility="no" />
+    <FrameLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_alignEnd="@+id/hour_space"
+        android:layout_alignStart="@+id/hour_space"
+        android:layout_marginLeft="@dimen/extra_time_label_margin"
+        android:layout_marginRight="@dimen/extra_time_label_margin"
+        android:layout_centerVertical="true" >
+        <com.kunzisoft.switchdatetime.time.widget.AccessibleTextView
+            android:id="@+id/hours"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/time_placeholder"
+            android:gravity="center_horizontal"
+            android:layout_gravity="center"
+            style="@style/Theme.SwitchDateTime.TimeLabelText" />
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/separator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/time_separator"
+        android:paddingLeft="@dimen/separator_padding"
+        android:paddingRight="@dimen/separator_padding"
+        android:layout_alignEnd="@+id/center_view"
+        android:layout_centerVertical="true"
+        style="@style/Theme.SwitchDateTime.TimeLabelText"
+        android:importantForAccessibility="no" />
+
+    <TextView
+        android:id="@+id/minutes_space"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/time_placeholder"
+        android:layout_toEndOf="@+id/separator"
+        android:layout_centerVertical="true"
+        android:visibility="invisible"
+        style="@style/Theme.SwitchDateTime.TimeLabelText"
+        android:importantForAccessibility="no" />
+    <FrameLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_alignEnd="@+id/minutes_space"
+        android:layout_alignStart="@+id/minutes_space"
+        android:layout_marginLeft="@dimen/extra_time_label_margin"
+        android:layout_marginRight="@dimen/extra_time_label_margin"
+        android:layout_centerVertical="true" >
+        <com.kunzisoft.switchdatetime.time.widget.AccessibleTextView
+            android:id="@+id/minutes"
+            style="@style/Theme.SwitchDateTime.TimeLabelText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/time_placeholder"
+            android:layout_gravity="center" />
+    </FrameLayout>
+    <com.kunzisoft.switchdatetime.time.widget.AccessibleTextView
+        android:id="@+id/ampm_hitspace"
+        android:layout_width="@dimen/ampm_label_size"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
+        android:layout_alignStart="@+id/ampm_label"
+        android:layout_alignEnd="@+id/ampm_label" />
+    <TextView
+        android:id="@+id/ampm_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/time_placeholder"
+        android:paddingLeft="@dimen/ampm_left_padding"
+        android:paddingRight="@dimen/ampm_left_padding"
+        android:layout_toEndOf="@+id/minutes_space"
+        android:layout_alignBaseline="@+id/separator"
+        style="@style/Theme.SwitchDateTime.TimeLabelAmPm"
+        android:importantForAccessibility="no" />
+</RelativeLayout>
\ No newline at end of file
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 1249560..1d3dc92 100644
--- a/switchdatetime/src/main/res/layout/dialog_switch_datetime_picker.xml
+++ b/switchdatetime/src/main/res/layout/dialog_switch_datetime_picker.xml
@@ -119,20 +119,20 @@
                 style="@style/Theme.SwitchDateTime.Time" />
         </LinearLayout>
 
-        <com.prolificinteractive.materialcalendarview.MaterialCalendarView
-            xmlns:calendar="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/datePicker"
-            android:layout_marginTop="@dimen/calendar_margin_top_portrait"
-            android:layout_marginLeft="@dimen/calendar_margin_start_portrait"
-            android:layout_marginStart="@dimen/calendar_margin_start_portrait"
-            android:layout_marginRight="@dimen/calendar_margin_end_portrait"
-            android:layout_marginEnd="@dimen/calendar_margin_end_portrait"
-            android:layout_marginBottom="@dimen/calendar_margin_bottom_portrait"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            calendar:mcv_showOtherDates="all"
-            style="@style/Theme.SwitchDateTime.Date"
-            />
+        <FrameLayout
+            android:layout_width="@dimen/calendar_width_portrait"
+            android:layout_height="@dimen/calendar_height_portrait"
+            android:layout_gravity="center">
+            <com.prolificinteractive.materialcalendarview.MaterialCalendarView
+                xmlns:calendar="http://schemas.android.com/apk/res-auto"
+                android:id="@+id/datePicker"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                calendar:mcv_showOtherDates="all"
+                style="@style/Theme.SwitchDateTime.Date"
+                />
+        </FrameLayout>
+
 
         <com.kunzisoft.switchdatetime.date.widget.ListPickerYearView
             xmlns:year="http://schemas.android.com/apk/res-auto"
diff --git a/switchdatetime/src/main/res/layout/year_text.xml b/switchdatetime/src/main/res/layout/year_text.xml
index e258646..214c2d7 100644
--- a/switchdatetime/src/main/res/layout/year_text.xml
+++ b/switchdatetime/src/main/res/layout/year_text.xml
@@ -8,7 +8,7 @@
         android:id="@+id/year_textView"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/year_padding"
+        android:layout_margin="@dimen/year_item_padding"
         android:textSize="16sp"
         android:gravity="center"
         android:layout_gravity="center"/>
diff --git a/switchdatetime/src/main/res/layout/year_text_indicator.xml b/switchdatetime/src/main/res/layout/year_text_indicator.xml
index 0823fcf..510eda2 100644
--- a/switchdatetime/src/main/res/layout/year_text_indicator.xml
+++ b/switchdatetime/src/main/res/layout/year_text_indicator.xml
@@ -9,7 +9,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:textSize="16sp"
-        android:padding="@dimen/year_padding"
+        android:padding="@dimen/year_item_padding"
         style="@style/Theme.SwitchDateTime.Year"
         android:gravity="center"
         android:layout_gravity="center"/>
diff --git a/switchdatetime/src/main/res/values-hdpi/dimens.xml b/switchdatetime/src/main/res/values-hdpi/dimens.xml
index 8baa0d4..46d2352 100644
--- a/switchdatetime/src/main/res/values-hdpi/dimens.xml
+++ b/switchdatetime/src/main/res/values-hdpi/dimens.xml
@@ -3,17 +3,21 @@
     <!-- header -->
     <dimen name="header_width">160dp</dimen>
 
+    <dimen name="title_date_time_label_text">14sp</dimen>
+
+    <dimen name="time_label_text">24sp</dimen>
+
+    <dimen name="date_label_year">16sp</dimen>
+    <dimen name="date_label_month_and_day">22sp</dimen>
+
     <!-- Content -->
     <dimen name="time_circle_width">240dp</dimen>
+    <!-- Portrait -->
+    <dimen name="calendar_width_portrait">230dp</dimen>
+    <dimen name="calendar_height_portrait">264dp</dimen>
+    <!-- Landscape -->
+    <dimen name="calendar_width_land">140dp</dimen>
+    <dimen name="calendar_height_land">160dp</dimen>
 
-    <dimen name="calendar_margin_top_portrait">12dp</dimen>
-    <dimen name="calendar_margin_start_portrait">32dp</dimen>
-    <dimen name="calendar_margin_end_portrait">32dp</dimen>
-    <dimen name="calendar_margin_bottom_portrait">8dp</dimen>
-    <dimen name="calendar_margin_top_land">26dp</dimen>
-    <dimen name="calendar_margin_start_land">12dp</dimen>
-    <dimen name="calendar_margin_end_land">12dp</dimen>
-    <dimen name="calendar_margin_bottom_land">28dp</dimen>
-
-    <dimen name="year_padding">16dp</dimen>
+    <dimen name="year_item_padding">16dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/switchdatetime/src/main/res/values-ldpi/dimens.xml b/switchdatetime/src/main/res/values-ldpi/dimens.xml
index f1c642d..4dd9a79 100644
--- a/switchdatetime/src/main/res/values-ldpi/dimens.xml
+++ b/switchdatetime/src/main/res/values-ldpi/dimens.xml
@@ -1,19 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- header -->
-    <dimen name="header_width">160dp</dimen>
+    <dimen name="header_width">146dp</dimen>
+
+    <dimen name="title_date_time_label_text">14sp</dimen>
+
+    <dimen name="time_label_text">14sp</dimen>
+    <dimen name="date_label_year">14sp</dimen>
+    <dimen name="date_label_month_and_day">14sp</dimen>
 
     <!-- Content -->
-    <dimen name="time_circle_width">240dp</dimen>
+    <dimen name="time_circle_width">160dp</dimen>
+
 
-    <dimen name="calendar_margin_top_portrait">12dp</dimen>
-    <dimen name="calendar_margin_start_portrait">32dp</dimen>
-    <dimen name="calendar_margin_end_portrait">32dp</dimen>
-    <dimen name="calendar_margin_bottom_portrait">8dp</dimen>
-    <dimen name="calendar_margin_top_land">22dp</dimen>
-    <dimen name="calendar_margin_start_land">6dp</dimen>
-    <dimen name="calendar_margin_end_land">4dp</dimen>
-    <dimen name="calendar_margin_bottom_land">22dp</dimen>
+    <!-- Calendar width and height -->
+    <!-- Portrait -->
+    <dimen name="calendar_width_portrait">168dp</dimen>
+    <dimen name="calendar_height_portrait">194dp</dimen>
+    <!--
+    <dimen name="calendar_margin_top_portrait">0dp</dimen>
+    <dimen name="calendar_margin_start_portrait">58dp</dimen>
+    <dimen name="calendar_margin_end_portrait">58dp</dimen>
+    <dimen name="calendar_margin_bottom_portrait">0dp</dimen>
+    -->
+    <!-- Landscape -->
+    <dimen name="calendar_width_land">140dp</dimen>
+    <dimen name="calendar_height_land">162dp</dimen>
+    <!--
+    <dimen name="calendar_margin_top_land">38dp</dimen>
+    <dimen name="calendar_margin_start_land">8dp</dimen>
+    <dimen name="calendar_margin_end_land">8dp</dimen>
+    <dimen name="calendar_margin_bottom_land">30dp</dimen>
+    -->
 
-    <dimen name="year_padding">6dp</dimen>
+    <dimen name="year_item_padding">16dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/switchdatetime/src/main/res/values-small/dimens.xml b/switchdatetime/src/main/res/values-small/dimens.xml
deleted file mode 100644
index ba97edb..0000000
--- a/switchdatetime/src/main/res/values-small/dimens.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- header -->
-    <dimen name="header_width">150dp</dimen>
-
-    <dimen name="time_label_text">8sp</dimen>
-
-    <!-- Content -->
-    <dimen name="time_circle_width">160dp</dimen>
-
-    <dimen name="calendar_margin_top_portrait">0dp</dimen>
-    <dimen name="calendar_margin_start_portrait">58dp</dimen>
-    <dimen name="calendar_margin_end_portrait">58dp</dimen>
-    <dimen name="calendar_margin_bottom_portrait">0dp</dimen>
-    <dimen name="calendar_margin_top_land">38dp</dimen>
-    <dimen name="calendar_margin_start_land">8dp</dimen>
-    <dimen name="calendar_margin_end_land">8dp</dimen>
-    <dimen name="calendar_margin_bottom_land">30dp</dimen>
-
-    <dimen name="year_padding">16dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/switchdatetime/src/main/res/values-sw600dp/dimens.xml b/switchdatetime/src/main/res/values-sw600dp/dimens.xml
index 5ea89bd..09c9853 100644
--- a/switchdatetime/src/main/res/values-sw600dp/dimens.xml
+++ b/switchdatetime/src/main/res/values-sw600dp/dimens.xml
@@ -5,15 +5,12 @@
 
     <!-- Content -->
     <dimen name="time_circle_width">380dp</dimen>
+    <!-- Portrait -->
+    <dimen name="calendar_width_portrait">410dp</dimen>
+    <dimen name="calendar_height_portrait">468dp</dimen>
+    <!-- Landscape -->
+    <dimen name="calendar_width_land">272dp</dimen>
+    <dimen name="calendar_height_land">310dp</dimen>
 
-    <dimen name="calendar_margin_top_portrait">54dp</dimen>
-    <dimen name="calendar_margin_start_portrait">32dp</dimen>
-    <dimen name="calendar_margin_end_portrait">32dp</dimen>
-    <dimen name="calendar_margin_bottom_portrait">54dp</dimen>
-    <dimen name="calendar_margin_top_land">38dp</dimen>
-    <dimen name="calendar_margin_start_land">12dp</dimen>
-    <dimen name="calendar_margin_end_land">12dp</dimen>
-    <dimen name="calendar_margin_bottom_land">38dp</dimen>
-
-    <dimen name="year_padding">28dp</dimen>
+    <dimen name="year_item_padding">28dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/switchdatetime/src/main/res/values-sw720dp/dimens.xml b/switchdatetime/src/main/res/values-sw720dp/dimens.xml
index a50b50f..99ecf59 100644
--- a/switchdatetime/src/main/res/values-sw720dp/dimens.xml
+++ b/switchdatetime/src/main/res/values-sw720dp/dimens.xml
@@ -6,14 +6,12 @@
     <!-- Content -->
     <dimen name="time_circle_width">420dp</dimen>
 
-    <dimen name="calendar_margin_top_portrait">220dp</dimen>
-    <dimen name="calendar_margin_start_portrait">22dp</dimen>
-    <dimen name="calendar_margin_end_portrait">22dp</dimen>
-    <dimen name="calendar_margin_bottom_portrait">220dp</dimen>
-    <dimen name="calendar_margin_top_land">120dp</dimen>
-    <dimen name="calendar_margin_start_land">0dp</dimen>
-    <dimen name="calendar_margin_end_land">0dp</dimen>
-    <dimen name="calendar_margin_bottom_land">120dp</dimen>
+    <!-- Portrait -->
+    <dimen name="calendar_width_portrait">416dp</dimen>
+    <dimen name="calendar_height_portrait">476dp</dimen>
+    <!-- Landscape -->
+    <dimen name="calendar_width_land">272dp</dimen>
+    <dimen name="calendar_height_land">310dp</dimen>
 
-    <dimen name="year_padding">48dp</dimen>
+    <dimen name="year_item_padding">48dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/switchdatetime/src/main/res/values-v21/styles.xml b/switchdatetime/src/main/res/values-v21/styles.xml
index 52b2e77..ca970da 100644
--- a/switchdatetime/src/main/res/values-v21/styles.xml
+++ b/switchdatetime/src/main/res/values-v21/styles.xml
@@ -15,7 +15,7 @@
 
     <!-- Title -->
     <style name="Theme.SwitchDateTime.TitleDateTimeLabelText">
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">@dimen/title_date_time_label_text</item>
         <item name="android:textColor">?android:textColorPrimaryInverse</item>
         <item name="android:textStyle">bold</item>
     </style>
@@ -38,7 +38,7 @@
     </style>
 
     <style name="Theme.SwitchDateTime.TimeLabelAmPm">
-        <item name="android:textSize">12sp</item>
+        <item name="android:textSize">@dimen/time_label_AmPm</item>
         <item name="android:textColor">?android:textColorSecondaryInverse</item>
         <item name="android:textStyle">bold</item>
     </style>
@@ -50,7 +50,7 @@
 
     <!-- Date Label -->
     <style name="Theme.SwitchDateTime.DateLabelMonthAndDay">
-        <item name="android:textSize">26sp</item>
+        <item name="android:textSize">@dimen/date_label_month_and_day</item>
         <item name="android:textColor">?android:textColorSecondaryInverse</item>
     </style>
 
@@ -62,7 +62,7 @@
 
     <!-- Year Label -->
     <style name="Theme.SwitchDateTime.DateLabelYear">
-        <item name="android:textSize">16sp</item>
+        <item name="android:textSize">@dimen/date_label_year</item>
         <item name="android:textColor">?android:textColorSecondaryInverse</item>
         <item name="android:textStyle">bold</item>
     </style>
diff --git a/switchdatetime/src/main/res/values-xhdpi/dimens.xml b/switchdatetime/src/main/res/values-xhdpi/dimens.xml
index 92ff557..500467e 100644
--- a/switchdatetime/src/main/res/values-xhdpi/dimens.xml
+++ b/switchdatetime/src/main/res/values-xhdpi/dimens.xml
@@ -2,15 +2,12 @@
 <resources>
     <!-- Content -->
     <dimen name="time_circle_width">300dp</dimen>
+    <!-- Portrait -->
+    <dimen name="calendar_width_portrait">264dp</dimen>
+    <dimen name="calendar_height_portrait">302dp</dimen>
+    <!-- Landscape -->
+    <dimen name="calendar_width_land">192dp</dimen>
+    <dimen name="calendar_height_land">220dp</dimen>
 
-    <dimen name="calendar_margin_top_portrait">38dp</dimen>
-    <dimen name="calendar_margin_start_portrait">16dp</dimen>
-    <dimen name="calendar_margin_end_portrait">16dp</dimen>
-    <dimen name="calendar_margin_bottom_portrait">32dp</dimen>
-    <dimen name="calendar_margin_top_land">32dp</dimen>
-    <dimen name="calendar_margin_start_land">22dp</dimen>
-    <dimen name="calendar_margin_end_land">22dp</dimen>
-    <dimen name="calendar_margin_bottom_land">24dp</dimen>
-
-    <dimen name="year_padding">28dp</dimen>
+    <dimen name="year_item_padding">28dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/switchdatetime/src/main/res/values/dimens.xml b/switchdatetime/src/main/res/values/dimens.xml
index 0089996..3138efb 100644
--- a/switchdatetime/src/main/res/values/dimens.xml
+++ b/switchdatetime/src/main/res/values/dimens.xml
@@ -3,7 +3,10 @@
     <!-- header -->
     <dimen name="header_width">200dp</dimen>
 
+    <dimen name="title_date_time_label_text">18sp</dimen>
+
     <dimen name="time_label_text">24sp</dimen>
+    <dimen name="time_label_AmPm">12sp</dimen>
     <dimen name="time_label_height">32dip</dimen>
     <dimen name="time_label_width">128dip</dimen>
     <dimen name="time_label_min_width">170dp</dimen>
@@ -12,21 +15,23 @@
     <dimen name="extra_time_label_margin">-30dp</dimen>
     <dimen name="separator_padding">4dip</dimen>
 
+    <dimen name="date_label_year">16sp</dimen>
+    <dimen name="date_label_month_and_day">26sp</dimen>
+
     <dimen name="year_label_height">64dip</dimen>
 
     <!-- Content -->
     <dimen name="time_circle_width">320dp</dimen>
 
-    <dimen name="calendar_margin_top_portrait">54dp</dimen>
-    <dimen name="calendar_margin_start_portrait">18dp</dimen>
-    <dimen name="calendar_margin_end_portrait">18dp</dimen>
-    <dimen name="calendar_margin_bottom_portrait">54dp</dimen>
-    <dimen name="calendar_margin_top_land">62dp</dimen>
-    <dimen name="calendar_margin_start_land">0dp</dimen>
-    <dimen name="calendar_margin_end_land">0dp</dimen>
-    <dimen name="calendar_margin_bottom_land">62dp</dimen>
+    <!-- Calendar width and height -->
+    <!-- Portrait -->
+    <dimen name="calendar_width_portrait">340dp</dimen>
+    <dimen name="calendar_height_portrait">390dp</dimen>
+    <!-- Landscape -->
+    <dimen name="calendar_width_land">190dp</dimen>
+    <dimen name="calendar_height_land">220dp</dimen>
 
-    <dimen name="year_padding">24dp</dimen>
+    <dimen name="year_item_padding">24dp</dimen>
 
     <dimen name="date_picker_view_animator_height">270dip</dimen>
 
diff --git a/switchdatetime/src/main/res/values/strings.xml b/switchdatetime/src/main/res/values/strings.xml
index 8b6032e..99965a0 100644
--- a/switchdatetime/src/main/res/values/strings.xml
+++ b/switchdatetime/src/main/res/values/strings.xml
@@ -1,6 +1,4 @@
 <resources xmlns:xliff="http://schemas.android.com/tools">
-    <string name="app_name">Switch DateTime Picker</string>
-
     <!-- Default simple date format -->
     <string name="simple_date_format" translatable="false">yyyy-MM-dd \'at\' HH:mm</string>
 
@@ -13,7 +11,6 @@
     <!-- Image description -->
     <string name="img_datetime">Image datetime</string>
 
-
     <string name="hour_picker_description">Hours circular slider</string>
     <string name="select_hours">Select hours</string>
     <string name="minute_picker_description">Minutes circular slider</string>
diff --git a/switchdatetime/src/main/res/values/styles.xml b/switchdatetime/src/main/res/values/styles.xml
index 18941fc..0483596 100644
--- a/switchdatetime/src/main/res/values/styles.xml
+++ b/switchdatetime/src/main/res/values/styles.xml
@@ -15,7 +15,7 @@
 
     <!-- Title -->
     <style name="Theme.SwitchDateTime.TitleDateTimeLabelText">
-        <item name="android:textSize">18sp</item>
+        <item name="android:textSize">@dimen/title_date_time_label_text</item>
         <item name="android:textColor">#fff</item>
         <item name="android:textStyle">bold</item>
     </style>
@@ -44,7 +44,7 @@
     </style>
 
     <style name="Theme.SwitchDateTime.TimeLabelAmPm">
-        <item name="android:textSize">12sp</item>
+        <item name="android:textSize">@dimen/time_label_AmPm</item>
         <item name="android:textColor">#e1e1e1</item>
         <item name="android:textStyle">bold</item>
     </style>
@@ -56,7 +56,7 @@
 
     <!-- Date Label -->
     <style name="Theme.SwitchDateTime.DateLabelMonthAndDay">
-        <item name="android:textSize">26sp</item>
+        <item name="android:textSize">@dimen/date_label_month_and_day</item>
         <item name="android:textColor">#e1e1e1</item>
     </style>
 
@@ -68,7 +68,7 @@
 
     <!-- Year Label -->
     <style name="Theme.SwitchDateTime.DateLabelYear">
-        <item name="android:textSize">16sp</item>
+        <item name="android:textSize">@dimen/date_label_year</item>
         <item name="android:textColor">#e1e1e1</item>
         <item name="android:textStyle">bold</item>
     </style>