diff --git a/README.md b/README.md
index fa6933d..1e1f1f2 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+FORK COMPATIBLE FROM ANDROID 2.3 WITH MATERIAL DESIGN (maybe 2.1, i can't try it on 2.1 device)
+
 Official source:
 
 https://android.googlesource.com/platform/frameworks/opt/datetimepicker/
@@ -7,8 +9,6 @@ https://android.googlesource.com/platform/frameworks/opt/datetimepicker/
 
 DateTimePicker is a library which contains the beautiful DatePicker and TimePicker that can be seen in the new Google Agenda app.
 
-**This picker is available for 2.1+**
-
 You have a recurrence picker in the same style [here](https://github.com/Shusshu/Android-RecurrencePicker).
 
 ## WARNING
diff --git a/build.gradle b/build.gradle
index 1a9a22e..51f58c5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.2'
+        classpath 'com.android.tools.build:gradle:1.0.0-rc1'
     }
 }
 
diff --git a/datetimepicker-library/build.gradle b/datetimepicker-library/build.gradle
index 09c02e0..cf02542 100644
--- a/datetimepicker-library/build.gradle
+++ b/datetimepicker-library/build.gradle
@@ -6,7 +6,7 @@ repositories {
 
 dependencies {
     compile 'com.nineoldandroids:library:2.4.0'
-    compile 'com.android.support:support-v4:20.0.0'
+    compile 'com.android.support:support-v4:21.0.2'
 }
 
 android {
diff --git a/datetimepicker-library/res/drawable/list_item_background_pressed.xml b/datetimepicker-library/res/drawable/list_item_background_pressed.xml
new file mode 100644
index 0000000..99d3813
--- /dev/null
+++ b/datetimepicker-library/res/drawable/list_item_background_pressed.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"  >
+    <gradient
+        android:angle="270"
+        android:centerColor="@color/list_item_selected_color_light"
+        android:endColor="#FFFFDB99"
+        android:startColor="#FFFFDB99"  />
+</shape>
\ No newline at end of file
diff --git a/datetimepicker-library/res/drawable/list_item_background_standard.xml b/datetimepicker-library/res/drawable/list_item_background_standard.xml
new file mode 100644
index 0000000..a72d1f3
--- /dev/null
+++ b/datetimepicker-library/res/drawable/list_item_background_standard.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="90"
+        android:startColor="@color/list_item_selected_color_dark"
+        android:centerColor="@color/list_item_selected_color_light"
+        android:endColor="@color/list_item_selected_color_light" />
+</shape>
\ No newline at end of file
diff --git a/datetimepicker-library/res/drawable/list_selector_background_disabled.xml b/datetimepicker-library/res/drawable/list_selector_background_disabled.xml
new file mode 100644
index 0000000..a2285bc
--- /dev/null
+++ b/datetimepicker-library/res/drawable/list_selector_background_disabled.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"  >
+    <gradient
+        android:angle="90"
+        android:centerColor="@color/list_item_selected_color_light"
+        android:endColor="@color/list_item_selected_color_light"
+        android:startColor="@color/list_item_selected_color_dark"/>
+</shape>
\ No newline at end of file
diff --git a/datetimepicker-library/res/drawable/list_selector_background_focused.xml b/datetimepicker-library/res/drawable/list_selector_background_focused.xml
new file mode 100644
index 0000000..2c15736
--- /dev/null
+++ b/datetimepicker-library/res/drawable/list_selector_background_focused.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:angle="270"
+        android:centerColor="@color/list_item_selected_color_light"
+        android:endColor="#FFFFDB99"
+        android:startColor="#FFFFDB99" />
+</shape>
\ No newline at end of file
diff --git a/datetimepicker-library/res/drawable/list_selector_background_transition.xml b/datetimepicker-library/res/drawable/list_selector_background_transition.xml
new file mode 100644
index 0000000..acad8f9
--- /dev/null
+++ b/datetimepicker-library/res/drawable/list_selector_background_transition.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<transition xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/list_item_background_pressed"  />
+    <item android:drawable="@drawable/list_item_background_standard"  />
+</transition>
\ No newline at end of file
diff --git a/datetimepicker-library/res/drawable/material_button.xml b/datetimepicker-library/res/drawable/material_button.xml
new file mode 100644
index 0000000..07fe41b
--- /dev/null
+++ b/datetimepicker-library/res/drawable/material_button.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@color/material_gray" />
+    <!-- pressed -->
+    <item android:drawable="@android:color/transparent" />
+    <!-- default -->
+</selector>
\ No newline at end of file
diff --git a/datetimepicker-library/res/drawable/selected_item_background.xml b/datetimepicker-library/res/drawable/selected_item_background.xml
new file mode 100644
index 0000000..2e6d629
--- /dev/null
+++ b/datetimepicker-library/res/drawable/selected_item_background.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+
+    <item android:state_window_focused="false" android:drawable="@android:color/transparent" />
+
+    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
+    <item android:state_focused="true" android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/list_selector_background_disabled" />
+    <item android:state_focused="true" android:state_enabled="false" android:drawable="@drawable/list_selector_background_disabled" />
+    <item android:state_focused="true" android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition" />
+    <item android:state_focused="false" android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition" />
+    <item android:state_focused="true" android:drawable="@drawable/list_selector_background_focused" />
+    <item android:drawable="@android:color/transparent" />
+
+</selector>
\ No newline at end of file
diff --git a/datetimepicker-library/res/layout/date_picker_dialog.xml b/datetimepicker-library/res/layout/date_picker_dialog.xml
index a593630..05bc7f8 100644
--- a/datetimepicker-library/res/layout/date_picker_dialog.xml
+++ b/datetimepicker-library/res/layout/date_picker_dialog.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout android:gravity="center" android:orientation="vertical" android:background="@color/date_picker_view_animator" android:layout_width="@dimen/date_picker_component_width" android:layout_height="fill_parent"
-  xmlns:android="http://schemas.android.com/apk/res/android">
+  xmlns:android="http://schemas.android.com/apk/res/android" >
     <LinearLayout android:orientation="vertical" android:layout_width="wrap_content" android:layout_height="@dimen/selected_calendar_layout_height">
         <include layout="@layout/date_picker_selected_date" />
     </LinearLayout>
diff --git a/datetimepicker-library/res/layout/picker_done_button.xml b/datetimepicker-library/res/layout/picker_done_button.xml
index f43b1b2..7f1dbfc 100644
--- a/datetimepicker-library/res/layout/picker_done_button.xml
+++ b/datetimepicker-library/res/layout/picker_done_button.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="@dimen/date_picker_component_width"
     android:layout_height="wrap_content"
@@ -16,6 +15,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/view_margin_medium"
         android:text="@string/cancel_label"
+        android:background="@drawable/material_button"
         android:layout_toStartOf="@id/done_button"
         android:layout_toLeftOf="@id/done_button"
         style="@style/button_bar_button" />
@@ -28,6 +28,7 @@
         android:layout_alignParentRight="true"
         android:layout_margin="@dimen/view_margin_medium"
         android:layout_width="wrap_content"
+        android:background="@drawable/material_button"
         android:layout_height="wrap_content"
         android:text="@string/done_label"
         style="@style/button_bar_button" />
diff --git a/datetimepicker-library/res/layout/time_picker_dialog.xml b/datetimepicker-library/res/layout/time_picker_dialog.xml
index 10c91cd..b139714 100644
--- a/datetimepicker-library/res/layout/time_picker_dialog.xml
+++ b/datetimepicker-library/res/layout/time_picker_dialog.xml
@@ -39,7 +39,5 @@
         android:layout_gravity="center"
         android:focusable="true"
         android:focusableInTouchMode="true" />
-    <include layout="@layout/picker_done_button"
-             android:layout_height="wrap_content"
-             android:layout_width="match_parent" />
+    <include layout="@layout/picker_done_button" />
 </LinearLayout>
diff --git a/datetimepicker-library/res/values-v9/styles.xml b/datetimepicker-library/res/values-v9/styles.xml
new file mode 100644
index 0000000..cc5806a
--- /dev/null
+++ b/datetimepicker-library/res/values-v9/styles.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="button_bar_button">
+        <item name="android:background">@drawable/selected_item_background</item>
+        <item name="android:gravity">center</item>
+        <item name="android:minHeight">36dip</item>
+        <item name="android:minWidth">64dip</item>
+        <item name="android:paddingBottom">8dip</item>
+        <item name="android:paddingLeft">8dip</item>
+        <item name="android:paddingTop">8dip</item>
+        <item name="android:paddingRight">8dip</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/datetimepicker-library/res/values/colors.xml b/datetimepicker-library/res/values/colors.xml
index 8728710..27a8bd8 100644
--- a/datetimepicker-library/res/values/colors.xml
+++ b/datetimepicker-library/res/values/colors.xml
@@ -17,4 +17,21 @@
 
     <color name="transparent_white">#aaffffff</color>
     <color name="transparent_black">#7F000000</color>
+
+    <color name="color_foreground">#FFFFF8EB</color>
+    <color name="color_background">#FFFFF8EB</color>
+    <color name="color_foreground_inverse">#FF444444</color>
+
+    <color name="title_color_light">#FFFFA500</color>
+    <color name="title_color_dark">#FFCD8500</color>
+    <color name="title_border">#FF282828</color>
+
+    <color name="material_gray">#E0E0E0</color>
+    <color name="list_item_color_light">#FFEEEEEE</color>
+    <color name="list_item_color_dark">#FFBBBBBB</color>
+    <color name="list_item_selected_color_light">#FFFFFFFF</color>
+    <color name="list_item_selected_color_dark">#FFFFF3DF</color>
+    <color name="list_item_pressed_color_light">#FFFFFFFF</color>
+    <color name="list_item_pressed_color_dark">#FFDDDDDD</color>
+    <color name="list_item_color_disabled">#FFCCCCCC</color>
 </resources>
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0f7a012..382da59 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Sep 02 21:48:24 CEST 2014
+#Wed Dec 03 16:20:59 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip