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