diff --git a/Material.iml b/Material.iml
index 519ee41c..c5b5ba00 100644
--- a/Material.iml
+++ b/Material.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="Material" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
diff --git a/app/app.iml b/app/app.iml
index 72f2e45b..9f4d0375 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
diff --git a/app/build.gradle b/app/build.gradle
index d6b94325..cf22cec9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,6 +34,6 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:21.0.2'
     compile 'com.android.support:cardview-v7:21.0.2'
-    compile project(':lib')
     compile 'com.squareup.picasso:picasso:2.5.0'
+    compile project(':lib')
 }
diff --git a/app/src/main/java/com/rey/material/app/ContactEditText.java b/app/src/main/java/com/rey/material/app/ContactEditText.java
index b7d30a38..6c871398 100644
--- a/app/src/main/java/com/rey/material/app/ContactEditText.java
+++ b/app/src/main/java/com/rey/material/app/ContactEditText.java
@@ -24,6 +24,7 @@
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.util.AttributeSet;
+import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -581,7 +582,7 @@ public int getItemViewType(int position) {
         public View getView(int position, View convertView, ViewGroup parent) {
             ContactView v = (ContactView)convertView;
             if(v == null) {
-                v = new ContactView(getContext(), null, 0, position == 0 ? R.style.SelectedContactView : R.style.ReplacementContactView);
+                v = (ContactView)LayoutInflater.from(parent.getContext()).inflate(position == 0 ? R.layout.row_contact_selected : R.layout.row_contact_replace, parent, false);
                 v.setOnClickListener(this);
             }
 
diff --git a/app/src/main/java/com/rey/material/app/RecurringPickerDialog.java b/app/src/main/java/com/rey/material/app/RecurringPickerDialog.java
index c0db682e..db38c179 100644
--- a/app/src/main/java/com/rey/material/app/RecurringPickerDialog.java
+++ b/app/src/main/java/com/rey/material/app/RecurringPickerDialog.java
@@ -20,6 +20,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
 import android.widget.Adapter;
@@ -28,6 +29,7 @@
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
+import android.widget.ScrollView;
 
 import com.rey.material.demo.R;
 import com.rey.material.util.ThemeUtil;
@@ -86,7 +88,8 @@ protected void onCreate() {
         setContentView(v);
 
         FrameLayout fl_mode = (FrameLayout)v.findViewById(R.id.rd_fl_mode);
-        LinearLayout ll_repeat = (LinearLayout)v.findViewById(R.id.rd_ll_repeat);
+        final ScrollView sv_repeat = (ScrollView)v.findViewById(R.id.rd_sv_repeat);
+        final LinearLayout ll_repeat = (LinearLayout)v.findViewById(R.id.rd_ll_repeat);
         mModeSpinner = (Spinner)fl_mode.findViewById(R.id.rd_spn_mode);
         mEndSpinner = (Spinner)v.findViewById(R.id.rd_spn_end);
         mPeriodEditText = (EditText)v.findViewById(R.id.rd_et_period);
@@ -98,6 +101,13 @@ protected void onCreate() {
         mEndDateButton = (Button)v.findViewById(R.id.rd_bt_end_date);
         mWeekView = (WeekView)v.findViewById(R.id.rd_wv_week);
 
+        sv_repeat.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                showDivider(ll_repeat.getMeasuredHeight() > sv_repeat.getMeasuredHeight());
+            }
+        });
+
         mHeaderBackground = new HeaderDrawable(getContext());
 
         fl_mode.setPadding(mContentPadding, 0, mContentPadding, 0);
diff --git a/app/src/main/java/com/rey/material/demo/ButtonFragment.java b/app/src/main/java/com/rey/material/demo/ButtonFragment.java
index 6de9f773..490c7d03 100644
--- a/app/src/main/java/com/rey/material/demo/ButtonFragment.java
+++ b/app/src/main/java/com/rey/material/demo/ButtonFragment.java
@@ -1,6 +1,8 @@
 package com.rey.material.demo;
 
 import android.annotation.TargetApi;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -47,7 +49,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 			
 			@Override
 			public void onClick(View v) {
-				Toast.makeText(getActivity(), "Button Clicked!\nEvent's fired when in anim end.", Toast.LENGTH_SHORT).show();
                 if(v instanceof  FloatingActionButton){
                     FloatingActionButton bt = (FloatingActionButton)v;
                     bt.setLineMorphingState((bt.getLineMorphingState() + 1) % 2, true);
@@ -59,7 +60,6 @@ public void onClick(View v) {
 			
 			@Override
 			public void onClick(View v) {
-				Toast.makeText(getActivity(), "Button Clicked!\nEvent's fired when out anim end.", Toast.LENGTH_SHORT).show();
                 if(v instanceof  FloatingActionButton){
                     FloatingActionButton bt = (FloatingActionButton)v;
                     bt.setLineMorphingState((bt.getLineMorphingState() + 1) % 2, true);
diff --git a/app/src/main/java/com/rey/material/demo/DialogsFragment.java b/app/src/main/java/com/rey/material/demo/DialogsFragment.java
index 8575c1c7..5c8de021 100644
--- a/app/src/main/java/com/rey/material/demo/DialogsFragment.java
+++ b/app/src/main/java/com/rey/material/demo/DialogsFragment.java
@@ -77,13 +77,13 @@ public void onClick(View v) {
                     @Override
                     public void onPositiveActionClicked(DialogFragment fragment) {
                         Toast.makeText(fragment.getDialog().getContext(), "Discarded", Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onPositiveActionClicked(fragment);
                     }
 
                     @Override
                     public void onNegativeActionClicked(DialogFragment fragment) {
                         Toast.makeText(fragment.getDialog().getContext(), "Canceled", Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onNegativeActionClicked(fragment);
                     }
                 };
 
@@ -96,13 +96,13 @@ public void onNegativeActionClicked(DialogFragment fragment) {
                     @Override
                     public void onPositiveActionClicked(DialogFragment fragment) {
                         Toast.makeText(fragment.getDialog().getContext(), "Deleted", Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onPositiveActionClicked(fragment);
                     }
 
                     @Override
                     public void onNegativeActionClicked(DialogFragment fragment) {
                         Toast.makeText(fragment.getDialog().getContext(), "Cancelled", Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onNegativeActionClicked(fragment);
                     }
                 };
 
@@ -115,13 +115,13 @@ public void onNegativeActionClicked(DialogFragment fragment) {
                     @Override
                     public void onPositiveActionClicked(DialogFragment fragment) {
                         Toast.makeText(fragment.getDialog().getContext(), "Agreed", Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onPositiveActionClicked(fragment);
                     }
 
                     @Override
                     public void onNegativeActionClicked(DialogFragment fragment) {
                         Toast.makeText(fragment.getDialog().getContext(), "Disagreed", Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onNegativeActionClicked(fragment);
                     }
                 };
 
@@ -143,13 +143,13 @@ protected Dialog onBuild(Context context, int styleId) {
                     @Override
                     public void onPositiveActionClicked(DialogFragment fragment) {
                         Toast.makeText(fragment.getDialog().getContext(), "Connected", Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onPositiveActionClicked(fragment);
                     }
 
                     @Override
                     public void onNegativeActionClicked(DialogFragment fragment) {
                         Toast.makeText(fragment.getDialog().getContext(), "Cancelled", Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onNegativeActionClicked(fragment);
                     }
                 };
 
@@ -162,15 +162,14 @@ public void onNegativeActionClicked(DialogFragment fragment) {
                 builder = new SimpleDialog.Builder(R.style.SimpleDialogLight){
                     @Override
                     public void onPositiveActionClicked(DialogFragment fragment) {
-                        SimpleDialog dialog = (SimpleDialog)fragment.getDialog();
-                        Toast.makeText(fragment.getDialog().getContext(), "You have selected " + dialog.getSelectedValue() + " as phone ringtone.", Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        Toast.makeText(fragment.getDialog().getContext(), "You have selected " + getSelectedValue() + " as phone ringtone.", Toast.LENGTH_SHORT).show();
+                        super.onPositiveActionClicked(fragment);
                     }
 
                     @Override
                     public void onNegativeActionClicked(DialogFragment fragment) {
                         Toast.makeText(fragment.getDialog().getContext(), "Cancelled" , Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onNegativeActionClicked(fragment);
                     }
                 };
 
@@ -183,8 +182,7 @@ public void onNegativeActionClicked(DialogFragment fragment) {
                 builder = new SimpleDialog.Builder(R.style.SimpleDialog){
                     @Override
                     public void onPositiveActionClicked(DialogFragment fragment) {
-                        SimpleDialog dialog = (SimpleDialog)fragment.getDialog();
-                        CharSequence[] values = dialog.getSelectedValues();
+                        CharSequence[] values =  getSelectedValues();
                         if(values == null)
                             Toast.makeText(fragment.getDialog().getContext(), "You have selected nothing.", Toast.LENGTH_SHORT).show();
                         else{
@@ -194,13 +192,13 @@ public void onPositiveActionClicked(DialogFragment fragment) {
                                 sb.append(values[i]).append(i == values.length - 1? "." : ", ");
                             Toast.makeText(fragment.getDialog().getContext(), sb.toString(), Toast.LENGTH_SHORT).show();
                         }
-                        fragment.dismiss();
+                        super.onPositiveActionClicked(fragment);
                     }
 
                     @Override
                     public void onNegativeActionClicked(DialogFragment fragment) {
                         Toast.makeText(fragment.getDialog().getContext(), "Cancelled" , Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onNegativeActionClicked(fragment);
                     }
                 };
 
@@ -210,18 +208,18 @@ public void onNegativeActionClicked(DialogFragment fragment) {
                         .negativeAction("CANCEL");
                 break;
             case R.id.dialog_bt_time_light:
-                builder = new TimePickerDialog.Builder(R.style.Material_App_Dialog_TimePicker_Light, 6, 00){
+                builder = new TimePickerDialog.Builder(6, 00){
                     @Override
                     public void onPositiveActionClicked(DialogFragment fragment) {
                         TimePickerDialog dialog = (TimePickerDialog)fragment.getDialog();
                         Toast.makeText(fragment.getDialog().getContext(), "Time is " + dialog.getFormattedTime(SimpleDateFormat.getTimeInstance()), Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onPositiveActionClicked(fragment);
                     }
 
                     @Override
                     public void onNegativeActionClicked(DialogFragment fragment) {
                         Toast.makeText(fragment.getDialog().getContext(), "Cancelled" , Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onNegativeActionClicked(fragment);
                     }
                 };
 
@@ -229,19 +227,19 @@ public void onNegativeActionClicked(DialogFragment fragment) {
                         .negativeAction("CANCEL");
                 break;
             case R.id.dialog_bt_date_light:
-                builder = new DatePickerDialog.Builder(R.style.Material_App_Dialog_DatePicker_Light){
+                builder = new DatePickerDialog.Builder(){
                     @Override
                     public void onPositiveActionClicked(DialogFragment fragment) {
                         DatePickerDialog dialog = (DatePickerDialog)fragment.getDialog();
                         String date = dialog.getFormattedDate(SimpleDateFormat.getDateInstance());
                         Toast.makeText(fragment.getDialog().getContext(), "Date is " + date, Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onPositiveActionClicked(fragment);
                     }
 
                     @Override
                     public void onNegativeActionClicked(DialogFragment fragment) {
                         Toast.makeText(fragment.getDialog().getContext(), "Cancelled" , Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onNegativeActionClicked(fragment);
                     }
                 };
 
@@ -254,13 +252,13 @@ public void onNegativeActionClicked(DialogFragment fragment) {
                     public void onPositiveActionClicked(DialogFragment fragment) {
                         TimePickerDialog dialog = (TimePickerDialog)fragment.getDialog();
                         Toast.makeText(fragment.getDialog().getContext(), "Time is " + dialog.getFormattedTime(SimpleDateFormat.getTimeInstance()), Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onPositiveActionClicked(fragment);
                     }
 
                     @Override
                     public void onNegativeActionClicked(DialogFragment fragment) {
                         Toast.makeText(fragment.getDialog().getContext(), "Cancelled" , Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onNegativeActionClicked(fragment);
                     }
                 };
 
@@ -274,13 +272,13 @@ public void onPositiveActionClicked(DialogFragment fragment) {
                         DatePickerDialog dialog = (DatePickerDialog)fragment.getDialog();
                         String date = dialog.getFormattedDate(SimpleDateFormat.getDateInstance());
                         Toast.makeText(fragment.getDialog().getContext(), "Date is " + date, Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onPositiveActionClicked(fragment);
                     }
 
                     @Override
                     public void onNegativeActionClicked(DialogFragment fragment) {
                         Toast.makeText(fragment.getDialog().getContext(), "Cancelled" , Toast.LENGTH_SHORT).show();
-                        fragment.dismiss();
+                        super.onNegativeActionClicked(fragment);
                     }
                 };
 
diff --git a/app/src/main/java/com/rey/material/demo/MainActivity.java b/app/src/main/java/com/rey/material/demo/MainActivity.java
index 85931959..ca4ed6c9 100644
--- a/app/src/main/java/com/rey/material/demo/MainActivity.java
+++ b/app/src/main/java/com/rey/material/demo/MainActivity.java
@@ -32,7 +32,7 @@
 import java.util.Calendar;
 import java.util.Date;
 
-public class MainActivity extends ActionBarActivity implements AdapterView.OnItemClickListener, ToolbarManager.OnToolbarGroupChangedListener {
+public class MainActivity extends ActionBarActivity implements ToolbarManager.OnToolbarGroupChangedListener {
 
 	private DrawerLayout dl_navigator;
 	private FrameLayout fl_drawer;
@@ -87,8 +87,7 @@ protected boolean shouldSyncDrawerSlidingProgress() {
         mToolbarManager.registerOnToolbarGroupChangedListener(this);
 		
 		mDrawerAdapter = new DrawerAdapter();
-		lv_drawer.setAdapter(mDrawerAdapter);		
-		lv_drawer.setOnItemClickListener(this);
+		lv_drawer.setAdapter(mDrawerAdapter);
 		
 		mPagerAdapter = new PagerAdapter(getSupportFragmentManager(), mItems);
 		vp.setAdapter(mPagerAdapter);
@@ -109,6 +108,7 @@ public void onPageScrollStateChanged(int state) {}
 			
 		});
 
+        mDrawerAdapter.setSelected(Tab.PROGRESS);
 		vp.setCurrentItem(0);
 	}
 
@@ -143,12 +143,6 @@ public void onToolbarGroupChanged(int oldGroupId, int groupId) {
         mToolbarManager.notifyNavigationStateChanged();
     }
 
-    @Override
-	public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-		vp.setCurrentItem(position);
-		dl_navigator.closeDrawer(fl_drawer);
-	}
-
     public SnackBar getSnackBar(){
         return mSnackBar;
     }
@@ -179,7 +173,7 @@ public String toString(){
 
 	}
 	
-	class DrawerAdapter extends BaseAdapter{
+	class DrawerAdapter extends BaseAdapter implements View.OnClickListener {
 
 		private Tab mSelectedTab;
 		
@@ -212,21 +206,34 @@ public long getItemId(int position) {
 		@Override
 		public View getView(int position, View convertView, ViewGroup parent) {
 			View v = convertView;
-			if(v == null)
-				v = LayoutInflater.from(MainActivity.this).inflate(R.layout.row_drawer, null);
-			
+			if(v == null) {
+                v = LayoutInflater.from(MainActivity.this).inflate(R.layout.row_drawer, null);
+                v.setOnClickListener(this);
+            }
+
+            v.setTag(position);
 			Tab tab = (Tab)getItem(position);
 			((TextView)v).setText(tab.toString());
 			
-			if(tab == mSelectedTab)
-				v.setBackgroundColor(ThemeUtil.colorPrimary(MainActivity.this, 0));			
-			else
-				v.setBackgroundResource(0);
+			if(tab == mSelectedTab) {
+                v.setBackgroundColor(ThemeUtil.colorPrimary(MainActivity.this, 0));
+                ((TextView)v).setTextColor(0xFFFFFFFF);
+            }
+			else {
+                v.setBackgroundResource(0);
+                ((TextView)v).setTextColor(0xFF000000);
+            }
 			
 			return v;
 		}
-		
-	}
+
+        @Override
+        public void onClick(View v) {
+            int position = (Integer)v.getTag();
+            vp.setCurrentItem(position);
+            dl_navigator.closeDrawer(fl_drawer);
+        }
+    }
 	
 	private static class PagerAdapter extends FragmentStatePagerAdapter {
 		
diff --git a/app/src/main/java/com/rey/material/demo/SliderFragment.java b/app/src/main/java/com/rey/material/demo/SliderFragment.java
index 93a0256f..c9abe2ef 100644
--- a/app/src/main/java/com/rey/material/demo/SliderFragment.java
+++ b/app/src/main/java/com/rey/material/demo/SliderFragment.java
@@ -4,12 +4,15 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.transition.Slide;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
+import android.widget.TextView;
 
 import com.rey.material.widget.RadioButton;
+import com.rey.material.widget.Slider;
 
 public class SliderFragment extends Fragment{
 
@@ -25,6 +28,26 @@ public static SliderFragment newInstance(){
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View v = inflater.inflate(R.layout.fragment_slider, container, false);
 
+        Slider sl_continuous = (Slider)v.findViewById(R.id.slider_sl_continuous);
+        final TextView tv_continuous = (TextView)v.findViewById(R.id.slider_tv_continuous);
+        tv_continuous.setText(String.format("pos=%.1f value=%d", sl_continuous.getPosition(), sl_continuous.getValue()));
+        sl_continuous.setOnPositionChangeListener(new Slider.OnPositionChangeListener() {
+            @Override
+            public void onPositionChanged(Slider view, float oldPos, float newPos, int oldValue, int newValue) {
+                tv_continuous.setText(String.format("pos=%.1f value=%d", newPos, newValue));
+            }
+        });
+
+        Slider sl_discrete = (Slider)v.findViewById(R.id.slider_sl_discrete);
+        final TextView tv_discrete = (TextView)v.findViewById(R.id.slider_tv_discrete);
+        tv_discrete.setText(String.format("pos=%.1f value=%d", sl_discrete.getPosition(), sl_discrete.getValue()));
+        sl_discrete.setOnPositionChangeListener(new Slider.OnPositionChangeListener() {
+            @Override
+            public void onPositionChanged(Slider view, float oldPos, float newPos, int oldValue, int newValue) {
+                tv_discrete.setText(String.format("pos=%.1f value=%d", newPos, newValue));
+            }
+        });
+
 		return v;
 	}
 
diff --git a/lib/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from lib/src/main/res/drawable-xhdpi/ic_launcher.png
rename to app/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 80e44c19..662d0fc2 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -55,7 +55,7 @@
         android:layout_gravity="start"
         android:paddingTop="?attr/actionBarSize">
         
-        <ListView 
+        <com.rey.material.widget.ListView
             android:id="@+id/main_lv_drawer"
 	        android:layout_width="match_parent"
 	        android:layout_height="match_parent"	        
@@ -63,7 +63,7 @@
 	        android:divider="@null"
 	        android:dividerHeight="0dp"
 	        android:background="?android:attr/windowBackground"
-	        android:listSelector="?attr/colorPrimary"/>
+	        android:listSelector="@android:color/transparent"/>
         
     </FrameLayout>    
     
diff --git a/app/src/main/res/layout/dialog_recurring.xml b/app/src/main/res/layout/dialog_recurring.xml
index 279f1e5b..260a9850 100644
--- a/app/src/main/res/layout/dialog_recurring.xml
+++ b/app/src/main/res/layout/dialog_recurring.xml
@@ -24,8 +24,7 @@
             app:spn_label="@string/rd_repeat"
             app:spn_arrowColor="#FFFFFFFF"
             app:spn_dividerHeight="0dp"
-            app:ripple="@style/Material.Drawable.Ripple.Wave"
-            app:delayClick="true"
+            app:rd_style="@style/Material.Drawable.Ripple.Wave"
             android:layout_gravity="center_vertical"/>
 
     </FrameLayout>
@@ -127,8 +126,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:padding="8dp"
-                    app:ripple="@style/Material.Drawable.Ripple.Wave.Light"
-                    app:delayClick="true"/>
+                    app:rd_style="@style/Material.Drawable.Ripple.Wave.Light"/>
 
                 <com.rey.material.widget.EditText
                     style="@style/Material.Widget.EditText.Light"
@@ -158,6 +156,7 @@
                     tools:text="@string/rd_event"/>
 
                 <com.rey.material.widget.Button
+                    style="@style/Material.Drawable.Ripple.Wave.Light"
                     android:id="@+id/rd_bt_end_date"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -165,8 +164,8 @@
                     android:singleLine="true"
                     android:ellipsize="end"
                     android:layout_centerVertical="true"
-                    app:ripple="@style/Material.Drawable.Ripple.Wave.Light"
-                    app:delayClick="false"
+                    android:padding="8dp"
+                    android:background="@null"
                     tools:text="12/01/2015"/>
 
             </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_button.xml b/app/src/main/res/layout/fragment_button.xml
index a00c17de..cbc86fb5 100644
--- a/app/src/main/res/layout/fragment_button.xml
+++ b/app/src/main/res/layout/fragment_button.xml
@@ -30,15 +30,14 @@
 	        android:gravity="center">
 	        
 	        <com.rey.material.widget.Button
+                style="@style/FlatButtonRippleStyle"
 		        android:id="@+id/button_bt_flat"
 		        android:layout_width="0dp"
 		        android:layout_height="@dimen/bt_height"
 		        android:layout_weight="0.4"
 		        android:textColor="#FF000000"
 		        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
-		        android:text="BUTTON"
-		        app:ripple="@style/FlatButtonRippleStyle"
-		        app:delayClick="false"/>
+		        android:text="BUTTON"/>
 	        
 	        <View
 	            android:layout_width="0dp"
@@ -46,6 +45,7 @@
 		        android:layout_weight="0.1"/>
 	        
 	        <com.rey.material.widget.Button
+                style="@style/FlatColorButtonRippleStyle"
 		        android:id="@+id/button_bt_flat_color"
 		        android:layout_width="0dp"
 		        android:layout_height="@dimen/bt_height"
@@ -53,8 +53,7 @@
 		        android:textColor="#FF2196F3"
 		        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
 		        android:text="BUTTON"
-		        app:ripple="@style/FlatColorButtonRippleStyle"
-		        app:delayClick="true"/>
+		        app:rd_delayClick="true"/>
 	        
 	    </LinearLayout>
 	    
@@ -67,15 +66,14 @@
 	        android:paddingTop="8dp">
 	        
 	        <com.rey.material.widget.Button
+                style="@style/FlatWaveButtonRippleStyle"
 		        android:id="@+id/button_bt_flat_wave"
 		        android:layout_width="0dp"
 		        android:layout_height="@dimen/bt_height"
 		        android:layout_weight="0.4"
 		        android:textColor="#FF000000"
 		        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
-		        android:text="BUTTON"
-		        app:ripple="@style/FlatWaveButtonRippleStyle"
-		        app:delayClick="false"/>
+		        android:text="BUTTON"/>
 	        
 	        <View
 	            android:layout_width="0dp"
@@ -83,6 +81,7 @@
 		        android:layout_weight="0.1"/>
 	        
 	        <com.rey.material.widget.Button
+                style="@style/FlatWaveColorButtonRippleStyle"
 		        android:id="@+id/button_bt_flat_wave_color"
 		        android:layout_width="0dp"
 		        android:layout_height="@dimen/bt_height"
@@ -90,8 +89,7 @@
 		        android:textColor="#FF2196F3"
 		        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
 		        android:text="BUTTON"
-		        app:ripple="@style/FlatWaveColorButtonRippleStyle"
-		        app:delayClick="true"/>
+		        app:rd_delayClick="true"/>
 	        
 	    </LinearLayout>
 	    
@@ -112,15 +110,14 @@
 	        android:gravity="center">
 	        
 	        <com.rey.material.widget.Button
+                style="@style/RaiseButtonRippleStyle"
 		        android:id="@+id/button_bt_raise"
 		        android:layout_width="0dp"
 		        android:layout_height="@dimen/bt_height"
 		        android:layout_weight="0.4"
 		        android:textColor="#FF000000"
 		        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
-		        android:text="BUTTON"
-		        app:ripple="@style/RaiseButtonRippleStyle"
-		        app:delayClick="false"/>
+		        android:text="BUTTON"/>
 	        
 	        <View
 	            android:layout_width="0dp"
@@ -128,6 +125,7 @@
 		        android:layout_weight="0.1"/>
 	        
 	        <com.rey.material.widget.Button
+                style="@style/RaiseColorButtonRippleStyle"
 		        android:id="@+id/button_bt_raise_color"
 		        android:layout_width="0dp"
 		        android:layout_height="@dimen/bt_height"
@@ -135,8 +133,7 @@
 		        android:textColor="#FFFFFFFF"
 		        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
 		        android:text="BUTTON"
-		        app:ripple="@style/RaiseColorButtonRippleStyle"
-		        app:delayClick="true"/>
+		        app:rd_delayClick="true"/>
 	        
 	    </LinearLayout>
 	    
@@ -149,15 +146,14 @@
 	        android:paddingTop="8dp">
 	        
 	        <com.rey.material.widget.Button
+                style="@style/RaiseWaveButtonRippleStyle"
 		        android:id="@+id/button_bt_raise_wave"
 		        android:layout_width="0dp"
 		        android:layout_height="@dimen/bt_height"
 		        android:layout_weight="0.4"
 		        android:textColor="#FF000000"
 		        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
-		        android:text="BUTTON"
-		        app:ripple="@style/RaiseWaveButtonRippleStyle"
-		        app:delayClick="false"/>
+		        android:text="BUTTON"/>
 	        
 	        <View
 	            android:layout_width="0dp"
@@ -165,6 +161,7 @@
 		        android:layout_weight="0.1"/>
 	        
 	        <com.rey.material.widget.Button
+                style="@style/RaiseWaveColorButtonRippleStyle"
 		        android:id="@+id/button_bt_raise_wave_color"
 		        android:layout_width="0dp"
 		        android:layout_height="@dimen/bt_height"
@@ -172,8 +169,7 @@
 		        android:textColor="#FFFFFFFF"
 		        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
 		        android:text="BUTTON"
-		        app:ripple="@style/RaiseWaveColorButtonRippleStyle"
-		        app:delayClick="true"/>
+		        app:rd_delayClick="true"/>
 	        
 	    </LinearLayout>
 	    
diff --git a/app/src/main/res/layout/fragment_dialog.xml b/app/src/main/res/layout/fragment_dialog.xml
index 3b2ef1e0..89ce136b 100644
--- a/app/src/main/res/layout/fragment_dialog.xml
+++ b/app/src/main/res/layout/fragment_dialog.xml
@@ -30,6 +30,7 @@
             android:gravity="center">
 
             <com.rey.material.widget.Button
+                style="@style/RaiseButtonRippleStyle"
                 android:id="@+id/dialog_bt_title_only"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/bt_height"
@@ -37,9 +38,7 @@
                 android:textColor="#FF000000"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
                 android:gravity="center"
-                android:text="TITLE ONLY"
-                app:ripple="@style/RaiseButtonRippleStyle"
-                app:delayClick="false"/>
+                android:text="TITLE ONLY"/>
 
             <View
                 android:layout_width="0dp"
@@ -47,6 +46,7 @@
                 android:layout_weight="0.1"/>
 
             <com.rey.material.widget.Button
+                style="@style/RaiseButtonRippleStyle"
                 android:id="@+id/dialog_bt_msg_only"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/bt_height"
@@ -54,9 +54,7 @@
                 android:textColor="#FF000000"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
                 android:gravity="center"
-                android:text="MESSAGE ONLY"
-                app:ripple="@style/RaiseButtonRippleStyle"
-                app:delayClick="false"/>
+                android:text="MESSAGE ONLY"/>
 
         </LinearLayout>
 
@@ -69,6 +67,7 @@
             android:paddingTop="8dp">
 
             <com.rey.material.widget.Button
+                style="@style/RaiseButtonRippleStyle"
                 android:id="@+id/dialog_bt_title_msg"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/bt_height"
@@ -76,9 +75,7 @@
                 android:textColor="#FF000000"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
                 android:gravity="center"
-                android:text="TITLE &amp; MSG"
-                app:ripple="@style/RaiseButtonRippleStyle"
-                app:delayClick="false"/>
+                android:text="TITLE &amp; MSG"/>
 
             <View
                 android:layout_width="0dp"
@@ -86,6 +83,7 @@
                 android:layout_weight="0.1"/>
 
             <com.rey.material.widget.Button
+                style="@style/RaiseButtonRippleStyle"
                 android:id="@+id/dialog_bt_custom"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/bt_height"
@@ -93,9 +91,7 @@
                 android:textColor="#FF000000"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
                 android:gravity="center"
-                android:text="CUSTOM"
-                app:ripple="@style/RaiseButtonRippleStyle"
-                app:delayClick="false"/>
+                android:text="CUSTOM"/>
 
         </LinearLayout>
 
@@ -108,6 +104,7 @@
             android:paddingTop="8dp">
 
             <com.rey.material.widget.Button
+                style="@style/RaiseButtonRippleStyle"
                 android:id="@+id/dialog_bt_choice"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/bt_height"
@@ -115,9 +112,7 @@
                 android:textColor="#FF000000"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
                 android:gravity="center"
-                android:text="CHOICE"
-                app:ripple="@style/RaiseButtonRippleStyle"
-                app:delayClick="false"/>
+                android:text="CHOICE"/>
 
             <View
                 android:layout_width="0dp"
@@ -125,6 +120,7 @@
                 android:layout_weight="0.1"/>
 
             <com.rey.material.widget.Button
+                style="@style/RaiseButtonRippleStyle"
                 android:id="@+id/dialog_bt_multi_choice"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/bt_height"
@@ -132,9 +128,7 @@
                 android:textColor="#FF000000"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
                 android:gravity="center"
-                android:text="MULTI CHOICE"
-                app:ripple="@style/RaiseButtonRippleStyle"
-                app:delayClick="false"/>
+                android:text="MULTI CHOICE"/>
 
         </LinearLayout>
 
@@ -155,6 +149,7 @@
             android:gravity="center">
 
             <com.rey.material.widget.Button
+                style="@style/RaiseButtonRippleStyle"
                 android:id="@+id/dialog_bt_time_light"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/bt_height"
@@ -162,9 +157,7 @@
                 android:textColor="#FF000000"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
                 android:gravity="center"
-                android:text="TIME (LIGHT)"
-                app:ripple="@style/RaiseButtonRippleStyle"
-                app:delayClick="false"/>
+                android:text="TIME (LIGHT)"/>
 
             <View
                 android:layout_width="0dp"
@@ -172,6 +165,7 @@
                 android:layout_weight="0.1"/>
 
             <com.rey.material.widget.Button
+                style="@style/RaiseButtonRippleStyle"
                 android:id="@+id/dialog_bt_date_light"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/bt_height"
@@ -179,9 +173,7 @@
                 android:textColor="#FF000000"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
                 android:gravity="center"
-                android:text="DATE (LIGHT)"
-                app:ripple="@style/RaiseButtonRippleStyle"
-                app:delayClick="false"/>
+                android:text="DATE (LIGHT)"/>
 
         </LinearLayout>
 
@@ -194,6 +186,7 @@
             android:paddingTop="8dp">
 
             <com.rey.material.widget.Button
+                style="@style/RaiseButtonRippleStyle"
                 android:id="@+id/dialog_bt_time_dark"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/bt_height"
@@ -201,9 +194,7 @@
                 android:textColor="#FF000000"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
                 android:gravity="center"
-                android:text="TIME (DARK)"
-                app:ripple="@style/RaiseButtonRippleStyle"
-                app:delayClick="false"/>
+                android:text="TIME (DARK)"/>
 
             <View
                 android:layout_width="0dp"
@@ -211,6 +202,7 @@
                 android:layout_weight="0.1"/>
 
             <com.rey.material.widget.Button
+                style="@style/RaiseButtonRippleStyle"
                 android:id="@+id/dialog_bt_date_dark"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/bt_height"
@@ -218,9 +210,7 @@
                 android:textColor="#FF000000"
                 android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
                 android:gravity="center"
-                android:text="DATE (DARK)"
-                app:ripple="@style/RaiseButtonRippleStyle"
-                app:delayClick="false"/>
+                android:text="DATE (DARK)"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_slider.xml b/app/src/main/res/layout/fragment_slider.xml
index 47555ccf..675b1a40 100644
--- a/app/src/main/res/layout/fragment_slider.xml
+++ b/app/src/main/res/layout/fragment_slider.xml
@@ -31,6 +31,14 @@
             android:padding="16dp"
             app:sl_value="50"/>
 
+        <TextView
+            android:id="@+id/slider_tv_continuous"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="#FF000000"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1"
+            android:gravity="center"/>
+
         <com.rey.material.widget.Slider
             style="@style/Material.Widget.Slider"
             android:id="@+id/slider_sl_continuous_disable"
@@ -59,6 +67,14 @@
             app:sl_stepValue="10"
             app:sl_value="50"/>
 
+        <TextView
+            android:id="@+id/slider_tv_discrete"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="#FF000000"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1"
+            android:gravity="center"/>
+
         <com.rey.material.widget.Slider
             style="@style/Material.Widget.Slider"
             android:id="@+id/slider_sl_discrete_disable"
diff --git a/app/src/main/res/layout/fragment_snackbar.xml b/app/src/main/res/layout/fragment_snackbar.xml
index e857cefc..dd4a9717 100644
--- a/app/src/main/res/layout/fragment_snackbar.xml
+++ b/app/src/main/res/layout/fragment_snackbar.xml
@@ -23,17 +23,17 @@
 		    android:text="Mobile Snackbar"/>
 	    
 	        <com.rey.material.widget.Button
+                style="@style/RaiseButtonRippleStyle"
 				android:id="@+id/snackbar_bt_mobile_single"
 			    android:layout_width="128dp"
 			    android:layout_height="@dimen/bt_height"
 			    android:textColor="#FF000000"
 			    android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
 			    android:gravity="center"
-			    android:text="SINGLE LINE"
-			    app:ripple="@style/RaiseButtonRippleStyle"
-			    app:delayClick="false"/>
+			    android:text="SINGLE LINE"/>
 	        
 	        <com.rey.material.widget.Button
+                style="@style/RaiseButtonRippleStyle"
 				android:id="@+id/snackbar_bt_mobile_multi"
 			    android:layout_width="128dp"
 			    android:layout_height="@dimen/bt_height"
@@ -41,8 +41,6 @@
 			    android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
 			    android:gravity="center"
 			    android:text="MULTI LINE"
-			    app:ripple="@style/RaiseButtonRippleStyle"
-			    app:delayClick="false"
 			    android:layout_marginTop="8dp"/>
 
 		<TextView 
@@ -55,17 +53,17 @@
 		    android:text="Tablet Snackbar"/>
 	    
 	        <com.rey.material.widget.Button
+                style="@style/RaiseButtonRippleStyle"
 				android:id="@+id/snackbar_bt_tablet_single"
 			    android:layout_width="128dp"
 			    android:layout_height="@dimen/bt_height"
 			    android:textColor="#FF000000"
 			    android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
 			    android:gravity="center"
-			    android:text="SINGLE LINE"
-			    app:ripple="@style/RaiseButtonRippleStyle"
-			    app:delayClick="false"/>
+			    android:text="SINGLE LINE"/>
 	        
 	        <com.rey.material.widget.Button
+                style="@style/RaiseButtonRippleStyle"
 				android:id="@+id/snackbar_bt_tablet_multi"
 			    android:layout_width="128dp"
 			    android:layout_height="@dimen/bt_height"
@@ -73,8 +71,6 @@
 			    android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
 			    android:gravity="center"
 			    android:text="MULTI LINE"
-			    app:ripple="@style/RaiseButtonRippleStyle"
-			    app:delayClick="false"
 			    android:layout_marginTop="8dp"/>
 	        	        	        
 	</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_spinner.xml b/app/src/main/res/layout/fragment_spinner.xml
index 9da39856..758ccbb6 100644
--- a/app/src/main/res/layout/fragment_spinner.xml
+++ b/app/src/main/res/layout/fragment_spinner.xml
@@ -19,8 +19,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:minWidth="128dp"
-            app:ripple="@style/FlatWaveButtonRippleStyle"
-            app:delayClick="false"
+            app:rd_style="@style/Material.Drawable.Ripple.Wave.Light"
+            app:rd_enable="true"
+            app:rd_delayClick="false"
             app:spn_labelEnable="true"
             app:spn_label="Spinner with arrow"
             app:spn_arrowSwitchMode="true"
@@ -34,8 +35,9 @@
             android:layout_height="wrap_content"
             android:minWidth="128dp"
             android:layout_marginTop="16dp"
-            app:ripple="@style/FlatWaveButtonRippleStyle"
-            app:delayClick="false"
+            app:rd_style="@style/Material.Drawable.Ripple.Wave.Light"
+            app:rd_enable="true"
+            app:rd_delayClick="false"
             app:spn_labelEnable="true"
             app:spn_label="Spinner without arrow"
             app:spn_arrowSize="0dp"
diff --git a/app/src/main/res/layout/fragment_textfield.xml b/app/src/main/res/layout/fragment_textfield.xml
index ea0d4007..df726298 100644
--- a/app/src/main/res/layout/fragment_textfield.xml
+++ b/app/src/main/res/layout/fragment_textfield.xml
@@ -22,6 +22,7 @@
             android:inputType="textEmailSubject|textMultiLine"
             android:hint="Contact"
             android:imeOptions="actionNext|flagNoEnterAction|flagNoExtractUi"
+            android:dropDownSelector="@drawable/abc_list_selector_background_transition_holo_light"
             app:et_inputId="@+id/textfield_et_contact_input"
             app:et_supportMode="none"
             app:et_autoCompleteMode="multi"
diff --git a/app/src/main/res/layout/rd_item_dropdown_end.xml b/app/src/main/res/layout/rd_item_dropdown_end.xml
index 8bdd9e48..2489a9f4 100644
--- a/app/src/main/res/layout/rd_item_dropdown_end.xml
+++ b/app/src/main/res/layout/rd_item_dropdown_end.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.rey.material.widget.TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/Material.Drawable.Ripple.Wave.Light"
     android:layout_width="match_parent"
     android:layout_height="32dp"
     android:textAppearance="@style/TextAppearance.AppCompat.Body1"
     android:textColor="@color/abc_primary_text_material_light"
     android:paddingLeft="8dp"
     android:paddingRight="8dp"
-    android:gravity="center_vertical"
-    app:ripple="@style/Material.Drawable.Ripple.Wave.Light"
-    app:delayClick="false"/>
\ No newline at end of file
+    android:gravity="center_vertical"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/rd_item_dropdown_mode.xml b/app/src/main/res/layout/rd_item_dropdown_mode.xml
index 8bdd9e48..2489a9f4 100644
--- a/app/src/main/res/layout/rd_item_dropdown_mode.xml
+++ b/app/src/main/res/layout/rd_item_dropdown_mode.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.rey.material.widget.TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/Material.Drawable.Ripple.Wave.Light"
     android:layout_width="match_parent"
     android:layout_height="32dp"
     android:textAppearance="@style/TextAppearance.AppCompat.Body1"
     android:textColor="@color/abc_primary_text_material_light"
     android:paddingLeft="8dp"
     android:paddingRight="8dp"
-    android:gravity="center_vertical"
-    app:ripple="@style/Material.Drawable.Ripple.Wave.Light"
-    app:delayClick="false"/>
\ No newline at end of file
+    android:gravity="center_vertical"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_contact_replace.xml b/app/src/main/res/layout/row_contact_replace.xml
new file mode 100644
index 00000000..9f82bcbb
--- /dev/null
+++ b/app/src/main/res/layout/row_contact_replace.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.rey.material.app.ContactView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/ReplacementContactView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/row_contact_selected.xml b/app/src/main/res/layout/row_contact_selected.xml
new file mode 100644
index 00000000..94196a87
--- /dev/null
+++ b/app/src/main/res/layout/row_contact_selected.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.rey.material.app.ContactView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/SelectedContactView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"/>
diff --git a/app/src/main/res/layout/row_drawer.xml b/app/src/main/res/layout/row_drawer.xml
index ce8bfca9..150e1e6c 100644
--- a/app/src/main/res/layout/row_drawer.xml
+++ b/app/src/main/res/layout/row_drawer.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.rey.material.widget.TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/Material.Drawable.Ripple.Wave.Light"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content" 
+    android:layout_height="wrap_content"
     android:padding="16dp"
     android:textSize="20sp"
     android:textColor="#FF000000"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_spn.xml b/app/src/main/res/layout/row_spn.xml
index ac8e94f8..1b8364ba 100644
--- a/app/src/main/res/layout/row_spn.xml
+++ b/app/src/main/res/layout/row_spn.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>    
     <com.rey.material.widget.TextView xmlns:android="http://schemas.android.com/apk/res/android"
     	xmlns:app="http://schemas.android.com/apk/res-auto"
+        style="@style/MenuItemRippleStyle"
 	    android:id="@+id/row_spn_tv"
 	    android:layout_width="match_parent"
 	    android:layout_height="32dp"
@@ -9,6 +10,5 @@
 	    android:textColor="#FF000000"
 	    android:paddingLeft="16dp"
 	    android:paddingRight="16dp"
-	    app:ripple="@style/MenuItemRippleStyle"
-		app:delayClick="true"/>
+		app:rd_delayClick="true"/>
 
diff --git a/app/src/main/res/layout/row_spn_dropdown.xml b/app/src/main/res/layout/row_spn_dropdown.xml
index 2be7949c..27677bb9 100644
--- a/app/src/main/res/layout/row_spn_dropdown.xml
+++ b/app/src/main/res/layout/row_spn_dropdown.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>    
     <com.rey.material.widget.TextView xmlns:android="http://schemas.android.com/apk/res/android"
     	xmlns:app="http://schemas.android.com/apk/res-auto"
+        style="@style/MenuItemRippleStyle"
 	    android:id="@+id/row_spn_tv"
 	    android:layout_width="match_parent"
 	    android:layout_height="48dp"
@@ -9,6 +10,5 @@
 	    android:textColor="#FF000000"
 	    android:paddingLeft="16dp"
 	    android:paddingRight="16dp"
-	    app:ripple="@style/MenuItemRippleStyle"
-		app:delayClick="true"/>
+		app:rd_delayClick="true"/>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f4d57706..bf915131 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -46,7 +46,7 @@
     </style>
     
     <style name="TabRippleStyle" parent="Material.Drawable.Ripple.Wave">
-        <item name="rd_background">@null</item>
+        <item name="android:background">@null</item>
         <item name="rd_rippleColor">#90EAFB00</item>
         <item name="rd_rippleAnimDuration">300</item>
         <item name="rd_maskType">rectangle</item>
@@ -121,26 +121,30 @@
     
     
     <style name="FlatButtonRippleStyle" parent="Material.Drawable.Ripple.Touch.Light">
+        <item name="android:background">@null</item>
         <item name="rd_cornerRadius">4dp</item>
     </style>
     
     <style name="FlatWaveButtonRippleStyle" parent="Material.Drawable.Ripple.Wave.Light">
+        <item name="android:background">@null</item>
         <item name="rd_cornerRadius">4dp</item>
     </style>
     
     <style name="FlatColorButtonRippleStyle" parent="Material.Drawable.Ripple.Touch.Light">
+        <item name="android:background">@null</item>
         <item name="rd_backgroundColor">#33219AFF</item>
         <item name="rd_rippleColor">#33219AFF</item>
         <item name="rd_cornerRadius">4dp</item>
     </style>
     
     <style name="FlatWaveColorButtonRippleStyle" parent="Material.Drawable.Ripple.Wave.Light">
+        <item name="android:background">@null</item>
         <item name="rd_rippleColor">#902DA0FF</item>
         <item name="rd_cornerRadius">4dp</item>
     </style>
     
     <style name="RaiseButtonRippleStyle" parent="Material.Drawable.Ripple.Touch.Light">
-        <item name="rd_background">@drawable/bg_bt_raise</item>
+        <item name="android:background">@drawable/bg_bt_raise</item>
         <item name="rd_leftPadding">1dp</item>
         <item name="rd_topPadding">1dp</item>
         <item name="rd_rightPadding">1dp</item>
@@ -148,7 +152,7 @@
     </style>
     
     <style name="RaiseWaveButtonRippleStyle" parent="Material.Drawable.Ripple.Wave.Light">
-        <item name="rd_background">@drawable/bg_bt_raise</item>
+        <item name="android:background">@drawable/bg_bt_raise</item>
         <item name="rd_leftPadding">1dp</item>
         <item name="rd_topPadding">1dp</item>
         <item name="rd_rightPadding">1dp</item>
@@ -156,7 +160,7 @@
     </style>
     
     <style name="RaiseColorButtonRippleStyle" parent="Material.Drawable.Ripple.Touch.Light">
-        <item name="rd_background">@drawable/bg_bt_raise_color</item>
+        <item name="android:background">@drawable/bg_bt_raise_color</item>
         <item name="rd_rippleColor">#33000000</item>
         <item name="rd_leftPadding">1dp</item>
         <item name="rd_topPadding">1dp</item>
@@ -165,7 +169,7 @@
     </style>
     
     <style name="RaiseWaveColorButtonRippleStyle" parent="Material.Drawable.Ripple.Wave.Light">
-        <item name="rd_background">@drawable/bg_bt_raise_color</item>
+        <item name="android:background">@drawable/bg_bt_raise_color</item>
         <item name="rd_rippleColor">#33000000</item>
         <item name="rd_leftPadding">1dp</item>
         <item name="rd_topPadding">1dp</item>
@@ -195,44 +199,34 @@
 
     <!-- FloatingActionButton Style -->
 
-    <style name="FloatingActionButton" parent="Material.Widget.FloatingActionButton.Light">
+    <style name="FloatingActionButton" parent="Material.Drawable.Ripple.Touch.Light">
         <item name="fab_backgroundColor">#FFDFDFDF</item>
         <item name="fab_elevation">4dp</item>
         <item name="fab_iconLineMorphing">@style/FloatingActionButtonIcon.Light</item>
-        <item name="ripple">@style/Material.Drawable.Ripple.Touch.Light</item>
-        <item name="delayClick">false</item>
+        <item name="rd_delayClick">false</item>
     </style>
 
-    <style name="FloatingWaveActionButton" parent="Material.Widget.FloatingActionButton.Light">
+    <style name="FloatingWaveActionButton" parent="Material.Drawable.Ripple.Wave.Light">
         <item name="fab_backgroundColor">#FFDFDFDF</item>
         <item name="fab_elevation">4dp</item>
         <item name="fab_iconLineMorphing">@style/FloatingActionButtonIcon.Light</item>
-        <item name="ripple">@style/Material.Drawable.Ripple.Wave.Light</item>
-        <item name="delayClick">false</item>
+        <item name="rd_delayClick">false</item>
     </style>
 
-    <style name="FloatingColorActionButton" parent="Material.Widget.FloatingActionButton.Light">
+    <style name="FloatingColorActionButton" parent="Material.Drawable.Ripple.Touch.Light">
+        <item name="rd_rippleColor">#33000000</item>
         <item name="fab_backgroundColor">#FF2196F3</item>
         <item name="fab_elevation">4dp</item>
         <item name="fab_iconLineMorphing">@style/FloatingActionButtonIcon</item>
-        <item name="ripple">@style/FloatingColorButtonRippleStyle</item>
-        <item name="delayClick">true</item>
+        <item name="rd_delayClick">true</item>
     </style>
 
-    <style name="FloatingWaveColorActionButton" parent="Material.Widget.FloatingActionButton.Light">
+    <style name="FloatingWaveColorActionButton" parent="Material.Drawable.Ripple.Wave.Light">
+        <item name="rd_rippleColor">#33000000</item>
         <item name="fab_backgroundColor">#FF2196F3</item>
         <item name="fab_elevation">4dp</item>
         <item name="fab_iconLineMorphing">@style/FloatingActionButtonIcon</item>
-        <item name="ripple">@style/FloatingWaveColorButtonRippleStyle</item>
-        <item name="delayClick">true</item>
-    </style>
-
-    <style name="FloatingColorButtonRippleStyle" parent="Material.Drawable.Ripple.Touch.Light">
-        <item name="rd_rippleColor">#33000000</item>
-    </style>
-
-    <style name="FloatingWaveColorButtonRippleStyle" parent="Material.Drawable.Ripple.Wave.Light">
-        <item name="rd_rippleColor">#33000000</item>
+        <item name="rd_delayClick">true</item>
     </style>
 
     <style name="FloatingActionButtonIcon" >
@@ -274,27 +268,34 @@
         <item name="cv_addressTextColor">@color/abc_primary_text_material_light</item>
     </style>
 
-    <style name="ReplacementContactView" parent="ContactView">
-        <item name="ripple">@style/ContactViewRippleStyle</item>
-        <item name="delayClick">false</item>
+    <style name="ReplacementContactView" parent="Material.Drawable.Ripple.Wave.Light">
+        <item name="rd_cornerRadius">0dp</item>
+        <item name="rd_delayClick">false</item>
+
+        <item name="android:minHeight">56dp</item>
+        <item name="cv_buttonSize">0dp</item>
+        <item name="cv_avatarSize">40dp</item>
+        <item name="cv_spacing">8dp</item>
+        <item name="cv_nameTextAppearance">@style/TextAppearance.AppCompat.Subhead</item>
+        <item name="cv_nameTextColor">@color/abc_primary_text_material_light</item>
+        <item name="cv_addressTextAppearance">@style/TextAppearance.AppCompat.Body1</item>
+        <item name="cv_addressTextColor">@color/abc_primary_text_material_light</item>
     </style>
 
-    <style name="SelectedContactView" parent="ContactView">
+    <style name="SelectedContactView" parent="Material.Drawable.Ripple.Wave.Light">
+        <item name="android:background">#FF00B8D4</item>
+        <item name="rd_cornerRadius">0dp</item>
+        <item name="rd_delayClick">false</item>
+
         <item name="android:minHeight">72dp</item>
         <item name="cv_buttonSrc">@drawable/ic_cancel_white_24dp</item>
         <item name="cv_buttonSize">48dp</item>
         <item name="cv_nameTextColor">#FFFFFFFF</item>
         <item name="cv_addressTextColor">#FFFFFFFF</item>
-        <item name="ripple">@style/SelectedContactViewRippleStyle</item>
-        <item name="delayClick">false</item>
-    </style>
-
-    <style name="ContactViewRippleStyle" parent="Material.Drawable.Ripple.Wave.Light">
-        <item name="rd_cornerRadius">0dp</item>
-    </style>
-
-    <style name="SelectedContactViewRippleStyle" parent="ContactViewRippleStyle">
-        <item name="rd_background">#FF00B8D4</item>
+        <item name="cv_avatarSize">40dp</item>
+        <item name="cv_spacing">8dp</item>
+        <item name="cv_nameTextAppearance">@style/TextAppearance.AppCompat.Subhead</item>
+        <item name="cv_addressTextAppearance">@style/TextAppearance.AppCompat.Body1</item>
     </style>
 
     <style name="ContactEditText" parent="Material.Widget.EditText.Light">
diff --git a/gradle.properties b/gradle.properties
index b861e0fc..7b3df5fc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,8 +17,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=1.0.1
-VERSION_CODE=3
+VERSION_NAME=1.1.0
+VERSION_CODE=4
 GROUP=com.github.rey5137
 
 POM_DESCRIPTION= An Android library to bring Material Design UI to pre-Lolipop Android.
diff --git a/lib/lib.iml b/lib/lib.iml
index 3c0e7d07..4b37c4f3 100644
--- a/lib/lib.iml
+++ b/lib/lib.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.0.1" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":lib" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
diff --git a/lib/src/main/java/com/rey/material/app/DatePickerDialog.java b/lib/src/main/java/com/rey/material/app/DatePickerDialog.java
index 876ebf2b..04e415e4 100644
--- a/lib/src/main/java/com/rey/material/app/DatePickerDialog.java
+++ b/lib/src/main/java/com/rey/material/app/DatePickerDialog.java
@@ -8,6 +8,7 @@
 import android.graphics.Path;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.graphics.drawable.ColorDrawable;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.view.MotionEvent;
@@ -42,7 +43,7 @@ public interface OnDateChangedListener{
     private OnDateChangedListener mOnDateChangedListener;
 
     public DatePickerDialog(Context context) {
-        super(context);
+        super(context, R.style.Material_App_Dialog_DatePicker_Light);
     }
 
     public DatePickerDialog(Context context, int style) {
@@ -397,9 +398,10 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
                 else{
                     int height = Math.max(heightSize - mHeaderSecondaryHeight - mHeaderPrimaryHeight, mDatePicker.getMeasuredHeight());
                     int ws = MeasureSpec.makeMeasureSpec(widthSize, MeasureSpec.EXACTLY);
-                    int hs = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY);
-                    mDatePicker.measure(ws, hs);
-                    mYearPicker.measure(ws, hs);
+                    mDatePicker.measure(ws, MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));
+                    mYearPicker.measure(ws, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
+                    if(mYearPicker.getMeasuredHeight() != height)
+                        mYearPicker.measure(ws, MeasureSpec.makeMeasureSpec(Math.min(mYearPicker.getMeasuredHeight(), height), MeasureSpec.EXACTLY));
                 }
 
                 setMeasuredDimension(widthSize, heightSize);
@@ -414,9 +416,10 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
                 else{
                     int height = Math.max(heightSize, mDatePicker.getMeasuredHeight());
                     int ws = MeasureSpec.makeMeasureSpec(widthSize / 2, MeasureSpec.EXACTLY);
-                    int hs = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY);
-                    mDatePicker.measure(ws, hs);
-                    mYearPicker.measure(ws, hs);
+                    mDatePicker.measure(ws, MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY));
+                    mYearPicker.measure(ws, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
+                    if(mYearPicker.getMeasuredHeight() != height)
+                        mYearPicker.measure(ws, MeasureSpec.makeMeasureSpec(Math.min(mYearPicker.getMeasuredHeight(), height), MeasureSpec.EXACTLY));
                 }
 
                 setMeasuredDimension(widthSize, heightSize);
@@ -479,7 +482,9 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
                 childLeft += mHeaderRealWidth;
 
             mDatePicker.layout(childLeft, childTop, childRight, childBottom);
-            mYearPicker.layout(childLeft, childTop, childRight, childBottom);
+
+            childTop = (childBottom + childTop - mYearPicker.getMeasuredHeight()) / 2;
+            mYearPicker.layout(childLeft, childTop, childRight, childTop + mYearPicker.getMeasuredHeight());
         }
 
         private void measureHeaderText(){
@@ -610,20 +615,20 @@ public boolean onTouchEvent(MotionEvent event) {
 
     public static class Builder extends Dialog.Builder implements OnDateChangedListener {
 
-        private int mMinDay;
-        private int mMinMonth;
-        private int mMinYear;
-        private int mMaxDay;
-        private int mMaxMonth;
-        private int mMaxYear;
-        private int mDay;
-        private int mMonth;
-        private int mYear;
+        protected int mMinDay;
+        protected int mMinMonth;
+        protected int mMinYear;
+        protected int mMaxDay;
+        protected int mMaxMonth;
+        protected int mMaxYear;
+        protected int mDay;
+        protected int mMonth;
+        protected int mYear;
 
         private Calendar mCalendar;
 
         public Builder(){
-            this(0);
+            this(R.style.Material_App_Dialog_DatePicker_Light);
         }
 
         public Builder(int styleId){
@@ -640,6 +645,10 @@ public Builder(int styleId){
             mMaxYear = mYear + 12;
         }
 
+        public Builder(int minDay, int minMonth, int minYear, int maxDay, int maxMonth, int maxYear, int day, int month, int year){
+            this(R.style.Material_App_Dialog_DatePicker_Light, minDay, minMonth, minYear, maxDay, maxMonth, maxYear, day, month, year);
+        }
+
         public Builder(int styleId, int minDay, int minMonth, int minYear, int maxDay, int maxMonth, int maxYear, int day, int month, int year){
             super(styleId);
             mMinDay = minDay;
@@ -698,6 +707,18 @@ public Builder date(long time) {
             return date(day, month, year);
         }
 
+        public int getDay(){
+            return mDay;
+        }
+
+        public int getMonth(){
+            return mMonth;
+        }
+
+        public int getYear(){
+            return mYear;
+        }
+
         @Override
         public Dialog.Builder contentView(int layoutId) {
             return this;
diff --git a/lib/src/main/java/com/rey/material/app/Dialog.java b/lib/src/main/java/com/rey/material/app/Dialog.java
index b8910acf..4c9af514 100644
--- a/lib/src/main/java/com/rey/material/app/Dialog.java
+++ b/lib/src/main/java/com/rey/material/app/Dialog.java
@@ -65,7 +65,11 @@ public class Dialog extends android.app.Dialog{
     private final Handler mHandler = new Handler();
     private final Runnable mDismissAction = new Runnable() {
         public void run() {
-            Dialog.super.dismiss();
+            //dirty fix for java.lang.IllegalArgumentException: View not attached to window manager
+            try {
+                Dialog.super.dismiss();
+            }
+            catch(IllegalArgumentException ex){}
         }
     };
 
@@ -80,9 +84,10 @@ public void run() {
     public static final int ACTION_NEUTRAL = ViewUtil.generateViewId();
 
     public Dialog(Context context) {
-        this(context, 0);
+        this(context, R.style.Material_App_Dialog_Light);
     }
 
+
     public Dialog(Context context, int style) {
         super(context, style);
 
@@ -957,7 +962,9 @@ public static class Builder implements DialogFragment.Builder, Parcelable{
 
         protected Dialog mDialog;
 
-        public Builder(){}
+        public Builder(){
+            this(R.style.Material_App_Dialog_Light);
+        }
 
         public Builder(int styleId){
             mStyleId = styleId;
@@ -994,13 +1001,19 @@ public Builder neutralAction(CharSequence action){
         }
 
         @Override
-        public void onPositiveActionClicked(DialogFragment fragment) {}
+        public void onPositiveActionClicked(DialogFragment fragment) {
+            fragment.dismiss();
+        }
 
         @Override
-        public void onNegativeActionClicked(DialogFragment fragment) {}
+        public void onNegativeActionClicked(DialogFragment fragment) {
+            fragment.dismiss();
+        }
 
         @Override
-        public void onNeutralActionClicked(DialogFragment fragment) {}
+        public void onNeutralActionClicked(DialogFragment fragment) {
+            fragment.dismiss();
+        }
 
         @Override
         public Dialog build(Context context) {
diff --git a/lib/src/main/java/com/rey/material/app/SimpleDialog.java b/lib/src/main/java/com/rey/material/app/SimpleDialog.java
index e380450c..68787928 100644
--- a/lib/src/main/java/com/rey/material/app/SimpleDialog.java
+++ b/lib/src/main/java/com/rey/material/app/SimpleDialog.java
@@ -54,7 +54,7 @@ public interface OnSelectionChangedListener{
     private OnSelectionChangedListener mOnSelectionChangedListener;
 
     public SimpleDialog(Context context) {
-        super(context);
+        super(context, R.style.Material_App_Dialog_Simple_Light);
     }
 
     public SimpleDialog(Context context, int style) {
@@ -453,12 +453,14 @@ public void onCheckedChanged(android.widget.CompoundButton v, boolean isChecked)
 
     public static class Builder extends Dialog.Builder implements OnSelectionChangedListener {
 
-        private int mMode;
-        private CharSequence mMessage;
-        private CharSequence[] mItems;
-        private int[] mSelectedIndexes;
+        protected int mMode;
+        protected CharSequence mMessage;
+        protected CharSequence[] mItems;
+        protected int[] mSelectedIndexes;
 
-        public Builder(){}
+        public Builder(){
+            super(R.style.Material_App_Dialog_Simple_Light);
+        }
 
         public Builder(int styleId){
             super(styleId);
@@ -484,6 +486,37 @@ public Builder multiChoiceItems(CharSequence[] items, int... selectedIndexes){
             return this;
         }
 
+        public int getSelectedIndex(){
+            if(mMode == MODE_ITEMS || mMode == MODE_MULTI_ITEMS)
+                return mSelectedIndexes[0];
+
+            return -1;
+        }
+
+        public CharSequence getSelectedValue(){
+            int index = getSelectedIndex();
+            return index >= 0 ? mItems[index] : null;
+        }
+
+        public int[] getSelectedIndexes(){
+            if(mMode == MODE_ITEMS || mMode == MODE_MULTI_ITEMS)
+                return mSelectedIndexes;
+
+            return null;
+        }
+
+        public CharSequence[] getSelectedValues(){
+            int[] indexes = getSelectedIndexes();
+            if(indexes == null || indexes.length == 0)
+                return null;
+
+            CharSequence[] result = new CharSequence[indexes.length];
+            for(int i = 0; i < indexes.length; i++)
+                result[i] = mItems[indexes[i]];
+
+            return result;
+        }
+
         @Override
         protected Dialog onBuild(Context context, int styleId) {
             SimpleDialog dialog = new SimpleDialog(context, styleId);
diff --git a/lib/src/main/java/com/rey/material/app/TimePickerDialog.java b/lib/src/main/java/com/rey/material/app/TimePickerDialog.java
index e88904f9..1ab6a019 100644
--- a/lib/src/main/java/com/rey/material/app/TimePickerDialog.java
+++ b/lib/src/main/java/com/rey/material/app/TimePickerDialog.java
@@ -41,7 +41,7 @@ public interface OnTimeChangedListener{
     }
 
     public TimePickerDialog(Context context) {
-        super(context);
+        super(context, R.style.Material_App_Dialog_TimePicker_Light);
     }
 
     public TimePickerDialog(Context context, int style) {
@@ -550,16 +550,20 @@ public boolean onTouchEvent(MotionEvent event) {
 
     public static class Builder extends Dialog.Builder implements OnTimeChangedListener {
 
-        private int mHour;
-        private int mMinute;
+        protected int mHour;
+        protected int mMinute;
 
         public Builder(){
-            super();
+            super(R.style.Material_App_Dialog_TimePicker_Light);
             Calendar cal = Calendar.getInstance();
             mHour = cal.get(Calendar.HOUR_OF_DAY);
             mMinute = cal.get(Calendar.MINUTE);
         }
 
+        public Builder(int hourOfDay, int minute){
+            this(R.style.Material_App_Dialog_TimePicker_Light, hourOfDay, minute);
+        }
+
         public Builder(int styleId, int hourOfDay, int minute){
             super(styleId);
             hour(hourOfDay);
@@ -576,6 +580,14 @@ public Builder minute(int minute){
             return this;
         }
 
+        public int getHour(){
+            return mHour;
+        }
+
+        public int getMinute(){
+            return mMinute;
+        }
+
         @Override
         public Dialog.Builder contentView(int layoutId) {
             return this;
diff --git a/lib/src/main/java/com/rey/material/drawable/RippleDrawable.java b/lib/src/main/java/com/rey/material/drawable/RippleDrawable.java
index f8f1fa9a..a03da9c0 100644
--- a/lib/src/main/java/com/rey/material/drawable/RippleDrawable.java
+++ b/lib/src/main/java/com/rey/material/drawable/RippleDrawable.java
@@ -60,7 +60,8 @@ public class RippleDrawable extends Drawable implements Animatable,	OnTouchListe
 	private int mRippleAnimDuration;
 	private int mRippleColor;
 	private float mRippleAlphaPercent;
-			
+	private boolean mDelayClick;
+
 	private Interpolator mInInterpolator;
 	private Interpolator mOutInterpolator;
 	
@@ -81,12 +82,13 @@ public class RippleDrawable extends Drawable implements Animatable,	OnTouchListe
 	private static final float[] GRADIENT_STOPS = new float[]{0f, 0.99f, 1f};
 	private static final float GRADIENT_RADIUS = 16;
 		
-	private RippleDrawable(Drawable backgroundDrawable, int backgroundAnimDuration, int backgroundColor, int rippleType, int maxRippleRadius, int rippleAnimDuration, int rippleColor, Interpolator inInterpolator, Interpolator outInterpolator, int type, int topLeftCornerRadius, int topRightCornerRadius, int bottomRightCornerRadius, int bottomLeftCornerRadius, int left, int top, int right, int bottom){
-		mBackgroundDrawable = backgroundDrawable;
+	private RippleDrawable(Drawable backgroundDrawable, int backgroundAnimDuration, int backgroundColor, int rippleType, boolean delayClick,  int maxRippleRadius, int rippleAnimDuration, int rippleColor, Interpolator inInterpolator, Interpolator outInterpolator, int type, int topLeftCornerRadius, int topRightCornerRadius, int bottomRightCornerRadius, int bottomLeftCornerRadius, int left, int top, int right, int bottom){
+		setBackgroundDrawable(backgroundDrawable);
 		mBackgroundAnimDuration = backgroundAnimDuration;
 		mBackgroundColor = backgroundColor;
 		
 		mRippleType = rippleType;
+        setDelayClick(delayClick);
 		mMaxRippleRadius = maxRippleRadius;
 		mRippleAnimDuration = rippleAnimDuration;
 		mRippleColor = rippleColor;
@@ -97,7 +99,7 @@ private RippleDrawable(Drawable backgroundDrawable, int backgroundAnimDuration,
 		mInInterpolator = inInterpolator;
 		mOutInterpolator = outInterpolator;
 		
-		mMask = new Mask(type, topLeftCornerRadius, topRightCornerRadius, bottomRightCornerRadius, bottomLeftCornerRadius, left, top, right, bottom);
+		setMask(type, topLeftCornerRadius, topRightCornerRadius, bottomRightCornerRadius, bottomLeftCornerRadius, left, top, right, bottom);
 		
 		mFillPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
 		mFillPaint.setStyle(Paint.Style.FILL);		
@@ -116,7 +118,25 @@ private RippleDrawable(Drawable backgroundDrawable, int backgroundAnimDuration,
 		if(mRippleType == TYPE_WAVE)
 			mOutShader = new RadialGradient(0, 0, GRADIENT_RADIUS, new int[]{0, ColorUtil.getColor(mRippleColor, 0f), mRippleColor}, GRADIENT_STOPS, Shader.TileMode.CLAMP);		
 	}
-	
+
+    public void setBackgroundDrawable(Drawable backgroundDrawable){
+        mBackgroundDrawable = backgroundDrawable;
+        if(mBackgroundDrawable != null)
+            mBackgroundDrawable.setBounds(getBounds());
+    }
+
+    public boolean isDelayClick(){
+        return mDelayClick;
+    }
+
+    public void setDelayClick(boolean enable){
+        mDelayClick = enable;
+    }
+
+    public void setMask(int type, int topLeftCornerRadius, int topRightCornerRadius, int bottomRightCornerRadius, int bottomLeftCornerRadius, int left, int top, int right, int bottom){
+        mMask = new Mask(type, topLeftCornerRadius, topRightCornerRadius, bottomRightCornerRadius, bottomLeftCornerRadius, left, top, right, bottom);
+    }
+
 	@Override
 	public void setAlpha(int alpha) {
 		mAlpha = alpha;
@@ -133,11 +153,11 @@ public int getOpacity() {
 		return PixelFormat.TRANSLUCENT;
 	}
 		
-	public long getClickDelayTime(boolean waitToAnimEnd){
+	public long getClickDelayTime(){
 		if(mState == STATE_RELEASE_ON_HOLD)			
-			return (waitToAnimEnd ? 2 : 1) * Math.max(mBackgroundAnimDuration, mRippleAnimDuration) - (SystemClock.uptimeMillis() - mStartTime);
+			return (mDelayClick ? 2 : 1) * Math.max(mBackgroundAnimDuration, mRippleAnimDuration) - (SystemClock.uptimeMillis() - mStartTime);
 		else if(mState == STATE_RELEASE)
-			return (waitToAnimEnd ? Math.max(mBackgroundAnimDuration, mRippleAnimDuration) : 0) - (SystemClock.uptimeMillis() - mStartTime);
+			return (mDelayClick ? Math.max(mBackgroundAnimDuration, mRippleAnimDuration) : 0) - (SystemClock.uptimeMillis() - mStartTime);
 		
 		return -1;
 	}
@@ -465,7 +485,8 @@ public static class Builder{
 		private int mMaxRippleRadius;
 		private int mRippleAnimDuration = 400;
 		private int mRippleColor;
-		
+		private boolean mDelayClick;
+
 		private Interpolator mInInterpolator;
 		private Interpolator mOutInterpolator;
 				
@@ -487,17 +508,12 @@ public Builder(Context context, int defStyleRes){
 
 		public Builder(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes){
 			TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.RippleDrawable, defStyleAttr, defStyleRes);
-
-            int type = ThemeUtil.getType(a, R.styleable.RippleDrawable_rd_background);
-            int resId;
-            if(type >= TypedValue.TYPE_FIRST_COLOR_INT && type <= TypedValue.TYPE_LAST_COLOR_INT)
-                backgroundDrawable(new ColorDrawable(a.getColor(R.styleable.RippleDrawable_rd_background, 0)));
-            else if ((resId = a.getResourceId(R.styleable.RippleDrawable_rd_background, 0)) != 0)
-                backgroundDrawable(context.getResources().getDrawable(resId));
+            int type, resId;
 
 			backgroundColor(a.getColor(R.styleable.RippleDrawable_rd_backgroundColor, 0));
 			backgroundAnimDuration(a.getInteger(R.styleable.RippleDrawable_rd_backgroundAnimDuration, context.getResources().getInteger(android.R.integer.config_mediumAnimTime)));
 			rippleType(a.getInteger(R.styleable.RippleDrawable_rd_rippleType, RippleDrawable.TYPE_TOUCH));
+            delayClick(a.getBoolean(R.styleable.RippleDrawable_rd_delayClick, false));
             type = ThemeUtil.getType(a, R.styleable.RippleDrawable_rd_maxRippleRadius);
             if(type >= TypedValue.TYPE_FIRST_INT && type <= TypedValue.TYPE_LAST_INT)
                 maxRippleRadius(a.getInteger(R.styleable.RippleDrawable_rd_maxRippleRadius, -1));
@@ -531,7 +547,7 @@ public RippleDrawable build(){
 			if(mOutInterpolator == null)
 				mOutInterpolator = new DecelerateInterpolator();
 			
-			return new RippleDrawable(mBackgroundDrawable, mBackgroundAnimDuration, mBackgroundColor, mRippleType, mMaxRippleRadius, mRippleAnimDuration, mRippleColor, mInInterpolator, mOutInterpolator, mMaskType, mMaskTopLeftCornerRadius, mMaskTopRightCornerRadius, mMaskBottomRightCornerRadius, mMaskBottomLeftCornerRadius, mMaskLeft, mMaskTop, mMaskRight, mMaskBottom);
+			return new RippleDrawable(mBackgroundDrawable, mBackgroundAnimDuration, mBackgroundColor, mRippleType, mDelayClick, mMaxRippleRadius, mRippleAnimDuration, mRippleColor, mInInterpolator, mOutInterpolator, mMaskType, mMaskTopLeftCornerRadius, mMaskTopRightCornerRadius, mMaskBottomRightCornerRadius, mMaskBottomLeftCornerRadius, mMaskLeft, mMaskTop, mMaskRight, mMaskBottom);
 		}
 		
 		public Builder backgroundDrawable(Drawable drawable){
@@ -553,7 +569,12 @@ public Builder rippleType(int type){
 			mRippleType = type;
 			return this;
 		}
-		
+
+        public Builder delayClick(boolean enable){
+            mDelayClick = enable;
+            return this;
+        }
+
 		public Builder maxRippleRadius(int radius){
 			mMaxRippleRadius = radius;
 			return this;
diff --git a/lib/src/main/java/com/rey/material/drawable/ToolbarRippleDrawable.java b/lib/src/main/java/com/rey/material/drawable/ToolbarRippleDrawable.java
index 02b3f164..3e6e3b67 100644
--- a/lib/src/main/java/com/rey/material/drawable/ToolbarRippleDrawable.java
+++ b/lib/src/main/java/com/rey/material/drawable/ToolbarRippleDrawable.java
@@ -53,6 +53,7 @@ public class ToolbarRippleDrawable extends Drawable implements Animatable {
 	private int mRippleAnimDuration;
 	private int mRippleColor;
 	private float mRippleAlphaPercent;
+    private boolean mDelayClick;
 			
 	private Interpolator mInInterpolator;
 	private Interpolator mOutInterpolator;
@@ -67,15 +68,16 @@ public class ToolbarRippleDrawable extends Drawable implements Animatable {
 	private static final int STATE_PRESS = 1;
 	private static final int STATE_HOVER = 2;
 	private static final int STATE_RELEASE_ON_HOLD = 3;	
-	private static final int STATE_RELEASE = 4;	
-		
+	private static final int STATE_RELEASE = 4;
+
+    private static final int TYPE_TOUCH_MATCH_VIEW = -1;
 	private static final int TYPE_TOUCH = 0;
 	private static final int TYPE_WAVE = 1;
 	
 	private static final float[] GRADIENT_STOPS = new float[]{0f, 0.99f, 1f};
 	private static final float GRADIENT_RADIUS = 16;
 		
-	private ToolbarRippleDrawable(int backgroundAnimDuration, int backgroundColor, int rippleType, int maxTouchRadius, int touchAnimDuration, int touchColor, Interpolator inInterpolator, Interpolator outInterpolator){
+	private ToolbarRippleDrawable(int backgroundAnimDuration, int backgroundColor, int rippleType, boolean delayClick, int maxTouchRadius, int touchAnimDuration, int touchColor, Interpolator inInterpolator, Interpolator outInterpolator){
 		mBackgroundAnimDuration = backgroundAnimDuration;
 		mBackgroundColor = backgroundColor;
 		
@@ -83,6 +85,10 @@ private ToolbarRippleDrawable(int backgroundAnimDuration, int backgroundColor, i
 		mMaxRippleRadius = maxTouchRadius;
 		mRippleAnimDuration = touchAnimDuration;
 		mRippleColor = touchColor;
+        mDelayClick = delayClick;
+
+        if(mRippleType == TYPE_TOUCH && mMaxRippleRadius <= 0)
+            mRippleType = TYPE_TOUCH_MATCH_VIEW;
 		
 		mInInterpolator = inInterpolator;
 		mOutInterpolator = outInterpolator;
@@ -104,7 +110,15 @@ private ToolbarRippleDrawable(int backgroundAnimDuration, int backgroundColor, i
 		if(mRippleType == TYPE_WAVE)
 			mOutShader = new RadialGradient(0, 0, GRADIENT_RADIUS, new int[]{0, ColorUtil.getColor(mRippleColor, 0f), mRippleColor}, GRADIENT_STOPS, Shader.TileMode.CLAMP);
 	}
-	
+
+    public boolean isDelayClick(){
+        return mDelayClick;
+    }
+
+    public void setDelayClick(boolean enable){
+        mDelayClick = enable;
+    }
+
 	@Override
 	public void setAlpha(int alpha) {
 		mAlpha = alpha;
@@ -121,11 +135,11 @@ public int getOpacity() {
 		return PixelFormat.TRANSLUCENT;
 	}
 		
-	public long getClickDelayTime(boolean waitToAnimEnd){
+	public long getClickDelayTime(){
 		if(mState == STATE_RELEASE_ON_HOLD)			
-			return (waitToAnimEnd ? 2 : 1) * Math.max(mBackgroundAnimDuration, mRippleAnimDuration) - (SystemClock.uptimeMillis() - mStartTime);
+			return (mDelayClick ? 2 : 1) * Math.max(mBackgroundAnimDuration, mRippleAnimDuration) - (SystemClock.uptimeMillis() - mStartTime);
 		else if(mState == STATE_RELEASE)
-			return (waitToAnimEnd ? Math.max(mBackgroundAnimDuration, mRippleAnimDuration) : 0) - (SystemClock.uptimeMillis() - mStartTime);
+			return (mDelayClick ? Math.max(mBackgroundAnimDuration, mRippleAnimDuration) : 0) - (SystemClock.uptimeMillis() - mStartTime);
 		
 		return -1;
 	}
@@ -186,7 +200,7 @@ protected boolean onStateChange(int[] state) {
 				Rect bounds = getBounds();
 				
 				if(mState == STATE_OUT || mState == STATE_RELEASE){
-					if(mRippleType == TYPE_WAVE)
+					if(mRippleType == TYPE_WAVE || mRippleType == TYPE_TOUCH_MATCH_VIEW)
 						mMaxRippleRadius = getMaxRippleRadius(bounds.exactCenterX(), bounds.exactCenterY());
 					
 					setRippleEffect(bounds.exactCenterX(), bounds.exactCenterY(), 0);
@@ -198,7 +212,7 @@ else if(mRippleType == TYPE_TOUCH)
 			else{
 				if(mState != STATE_OUT){
 					if(mState == STATE_HOVER){
-						if(mRippleType == TYPE_WAVE)
+						if(mRippleType == TYPE_WAVE|| mRippleType == TYPE_TOUCH_MATCH_VIEW)
 							setRippleEffect(mRipplePoint.x, mRipplePoint.y, 0);
 						
 						setRippleState(STATE_RELEASE);
@@ -218,6 +232,7 @@ else if(mRippleType == TYPE_TOUCH)
 	public void draw(Canvas canvas) {		
 		switch (mRippleType) {
 			case TYPE_TOUCH:
+            case TYPE_TOUCH_MATCH_VIEW:
 				drawTouch(canvas);
 				break;
 			case TYPE_WAVE:
@@ -316,6 +331,7 @@ public void scheduleSelf(Runnable what, long when) {
 	    public void run() {
 	    	switch (mRippleType) {
 				case TYPE_TOUCH:
+                case TYPE_TOUCH_MATCH_VIEW:
 					updateTouch();
 					break;
 				case TYPE_WAVE:
@@ -399,6 +415,7 @@ public static class Builder{
 		private int mMaxRippleRadius;
 		private int mRippleAnimDuration = 400;
 		private int mRippleColor;
+        private boolean mDelayClick;
 		
 		private Interpolator mInInterpolator;
 		private Interpolator mOutInterpolator;
@@ -416,6 +433,7 @@ public Builder(Context context, AttributeSet attrs, int defStyleAttr, int defSty
 			backgroundColor(a.getColor(R.styleable.RippleDrawable_rd_backgroundColor, 0));
 			backgroundAnimDuration(a.getInteger(R.styleable.RippleDrawable_rd_backgroundAnimDuration, context.getResources().getInteger(android.R.integer.config_mediumAnimTime)));
 			rippleType(a.getInteger(R.styleable.RippleDrawable_rd_rippleType, ToolbarRippleDrawable.TYPE_TOUCH));
+            delayClick(a.getBoolean(R.styleable.RippleDrawable_rd_delayClick, false));
 			maxRippleRadius(a.getDimensionPixelSize(R.styleable.RippleDrawable_rd_maxRippleRadius, ThemeUtil.dpToPx(context, 48)));
 			rippleColor(a.getColor(R.styleable.RippleDrawable_rd_rippleColor, ThemeUtil.colorControlHighlight(context, 0)));
 			rippleAnimDuration(a.getInteger(R.styleable.RippleDrawable_rd_rippleAnimDuration, context.getResources().getInteger(android.R.integer.config_mediumAnimTime)));
@@ -434,7 +452,7 @@ public ToolbarRippleDrawable build(){
 			if(mOutInterpolator == null)
 				mOutInterpolator = new DecelerateInterpolator();
 			
-			return new ToolbarRippleDrawable(mBackgroundAnimDuration, mBackgroundColor, mRippleType, mMaxRippleRadius, mRippleAnimDuration, mRippleColor, mInInterpolator, mOutInterpolator);
+			return new ToolbarRippleDrawable(mBackgroundAnimDuration, mBackgroundColor, mRippleType, mDelayClick, mMaxRippleRadius, mRippleAnimDuration, mRippleColor, mInInterpolator, mOutInterpolator);
 		}
 		
 		public Builder backgroundAnimDuration(int duration){
@@ -451,7 +469,12 @@ public Builder rippleType(int type){
 			mRippleType = type;
 			return this;
 		}
-		
+
+        public Builder delayClick(boolean enable){
+            mDelayClick = enable;
+            return this;
+        }
+
 		public Builder maxRippleRadius(int radius){
 			mMaxRippleRadius = radius;
 			return this;
diff --git a/lib/src/main/java/com/rey/material/widget/Button.java b/lib/src/main/java/com/rey/material/widget/Button.java
index 5fbf4f11..b43a986a 100644
--- a/lib/src/main/java/com/rey/material/widget/Button.java
+++ b/lib/src/main/java/com/rey/material/widget/Button.java
@@ -1,11 +1,14 @@
 package com.rey.material.widget;
 
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;
 import android.support.v7.internal.widget.TintManager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
+import com.rey.material.drawable.RippleDrawable;
+
 import java.lang.reflect.Field;
 
 public class Button extends android.widget.Button {
@@ -48,6 +51,15 @@ private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, i
         mRippleManager.onCreate(this, context, attrs, defStyleAttr, defStyleRes);
     }
 
+    @Override
+    public void setBackgroundDrawable(Drawable drawable) {
+        Drawable background = getBackground();
+        if(background instanceof RippleDrawable && !(drawable instanceof RippleDrawable))
+            ((RippleDrawable) background).setBackgroundDrawable(drawable);
+        else
+            super.setBackgroundDrawable(drawable);
+    }
+
     @Override
 	public void setOnClickListener(OnClickListener l) {
 		if(l == mRippleManager)
diff --git a/lib/src/main/java/com/rey/material/widget/CheckedTextView.java b/lib/src/main/java/com/rey/material/widget/CheckedTextView.java
index 9340dfef..8a633589 100644
--- a/lib/src/main/java/com/rey/material/widget/CheckedTextView.java
+++ b/lib/src/main/java/com/rey/material/widget/CheckedTextView.java
@@ -1,10 +1,13 @@
 package com.rey.material.widget;
 
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
+import com.rey.material.drawable.RippleDrawable;
+
 public class CheckedTextView extends android.widget.CheckedTextView {
 
 	private RippleManager mRippleManager = new RippleManager();
@@ -44,7 +47,16 @@ public void applyStyle(int resId){
     private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes){
         mRippleManager.onCreate(this, context, attrs, defStyleAttr, defStyleRes);
     }
-	
+
+    @Override
+    public void setBackgroundDrawable(Drawable drawable) {
+        Drawable background = getBackground();
+        if(background instanceof RippleDrawable && !(drawable instanceof RippleDrawable))
+            ((RippleDrawable) background).setBackgroundDrawable(drawable);
+        else
+            super.setBackgroundDrawable(drawable);
+    }
+
 	@Override
 	public void setOnClickListener(OnClickListener l) {
 		if(l == mRippleManager)
diff --git a/lib/src/main/java/com/rey/material/widget/CompoundButton.java b/lib/src/main/java/com/rey/material/widget/CompoundButton.java
index 6dc3eb9d..305057f0 100644
--- a/lib/src/main/java/com/rey/material/widget/CompoundButton.java
+++ b/lib/src/main/java/com/rey/material/widget/CompoundButton.java
@@ -9,6 +9,8 @@
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
+import com.rey.material.drawable.RippleDrawable;
+
 public class CompoundButton extends android.widget.CompoundButton {
 
 	private RippleManager mRippleManager = new RippleManager();
@@ -61,7 +63,16 @@ public void applyStyle(int resId){
     private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes){
         mRippleManager.onCreate(this, context, attrs, defStyleAttr, defStyleRes);
     }
-	
+
+    @Override
+    public void setBackgroundDrawable(Drawable drawable) {
+        Drawable background = getBackground();
+        if(background instanceof RippleDrawable && !(drawable instanceof RippleDrawable))
+            ((RippleDrawable) background).setBackgroundDrawable(drawable);
+        else
+            super.setBackgroundDrawable(drawable);
+    }
+
 	@Override
 	public void setOnClickListener(OnClickListener l) {
 		if(l == mRippleManager)
diff --git a/lib/src/main/java/com/rey/material/widget/EditText.java b/lib/src/main/java/com/rey/material/widget/EditText.java
index 824284d9..e6b1b54d 100644
--- a/lib/src/main/java/com/rey/material/widget/EditText.java
+++ b/lib/src/main/java/com/rey/material/widget/EditText.java
@@ -148,6 +148,7 @@ private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, i
 
         int inputId = a.getResourceId(R.styleable.EditText_et_inputId, 0);
         mInputView.setId(inputId != 0 ? inputId : ViewUtil.generateViewId());
+        mInputView.setVisibility(View.VISIBLE);
         mInputView.setFocusableInTouchMode(true);
         mDividerColors = a.getColorStateList(R.styleable.EditText_et_dividerColor);
         mDividerErrorColors = a.getColorStateList(R.styleable.EditText_et_dividerErrorColor);
diff --git a/lib/src/main/java/com/rey/material/widget/FloatingActionButton.java b/lib/src/main/java/com/rey/material/widget/FloatingActionButton.java
index 054cc6c6..6c36cdd6 100644
--- a/lib/src/main/java/com/rey/material/widget/FloatingActionButton.java
+++ b/lib/src/main/java/com/rey/material/widget/FloatingActionButton.java
@@ -47,7 +47,6 @@ public class FloatingActionButton extends View {
 	private int mIconSize;
 		
 	private RippleManager mRippleManager = new RippleManager();
-	private RippleDrawable mRipple;
 			
 	public static FloatingActionButton make(Context context, int resId){
 		return new FloatingActionButton(context, null, resId);
@@ -96,8 +95,6 @@ private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, i
         int iconSrc = a.getResourceId(R.styleable.FloatingActionButton_fab_iconSrc, 0);
         int iconLineMorphing = a.getResourceId(R.styleable.FloatingActionButton_fab_iconLineMorphing, 0);
         mIconSize = a.getDimensionPixelSize(R.styleable.FloatingActionButton_fab_iconSize, ThemeUtil.dpToPx(context, 24));
-        int rippleId = a.getResourceId(R.styleable.FloatingActionButton_ripple, 0);
-        boolean delayClick = a.getBoolean(R.styleable.FloatingActionButton_delayClick, false);
         mAnimDuration = a.getInteger(R.styleable.FloatingActionButton_fab_animDuration, context.getResources().getInteger(android.R.integer.config_mediumAnimTime));
         int resId = a.getResourceId(R.styleable.FloatingActionButton_fab_interpolator, 0);
         if(resId != 0)
@@ -115,25 +112,12 @@ else if(mInterpolator == null)
         else if(iconSrc != 0)
             setIcon(context.getResources().getDrawable(iconSrc), false);
 
-        mRippleManager.onCreate(this, context, null, 0, 0);
-        mRippleManager.setDelayClick(delayClick);
-
-        if(rippleId != 0){
-            RippleDrawable.Builder builder = new RippleDrawable.Builder(context, rippleId);
-
-            builder.maskType(RippleDrawable.Mask.TYPE_OVAL)
-                    .backgroundDrawable(null)
-                    .left((int)mBackground.getPaddingLeft())
-                    .top((int)mBackground.getPaddingTop())
-                    .right((int)mBackground.getPaddingRight())
-                    .bottom((int)mBackground.getPaddingBottom());
-
-            mRipple = builder.build();
-
-            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
-                setBackground(mRipple);
-            else
-                setBackgroundDrawable(mRipple);
+        mRippleManager.onCreate(this, context, attrs, defStyleAttr, defStyleRes);
+        Drawable background = getBackground();
+        if(background != null && background instanceof RippleDrawable){
+            RippleDrawable drawable = (RippleDrawable)background;
+            drawable.setBackgroundDrawable(null);
+            drawable.setMask(RippleDrawable.Mask.TYPE_OVAL, 0, 0, 0, 0, (int)mBackground.getPaddingLeft(), (int)mBackground.getPaddingTop(), (int)mBackground.getPaddingRight(), (int)mBackground.getPaddingBottom());
         }
 
         setClickable(true);
diff --git a/lib/src/main/java/com/rey/material/widget/ImageButton.java b/lib/src/main/java/com/rey/material/widget/ImageButton.java
index 3b55644e..b2af1dee 100644
--- a/lib/src/main/java/com/rey/material/widget/ImageButton.java
+++ b/lib/src/main/java/com/rey/material/widget/ImageButton.java
@@ -1,10 +1,13 @@
 package com.rey.material.widget;
 
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
+import com.rey.material.drawable.RippleDrawable;
+
 public class ImageButton extends android.widget.ImageButton {
 
 	private RippleManager mRippleManager = new RippleManager();
@@ -44,6 +47,15 @@ public void applyStyle(int resId){
     private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes){
         mRippleManager.onCreate(this, context, attrs, defStyleAttr, defStyleRes);
     }
+
+    @Override
+    public void setBackgroundDrawable(Drawable drawable) {
+        Drawable background = getBackground();
+        if(background instanceof RippleDrawable && !(drawable instanceof RippleDrawable))
+            ((RippleDrawable) background).setBackgroundDrawable(drawable);
+        else
+            super.setBackgroundDrawable(drawable);
+    }
 	
 	@Override
 	public void setOnClickListener(OnClickListener l) {
diff --git a/lib/src/main/java/com/rey/material/widget/ProgressView.java b/lib/src/main/java/com/rey/material/widget/ProgressView.java
index 311fe1bf..f8b8a63c 100644
--- a/lib/src/main/java/com/rey/material/widget/ProgressView.java
+++ b/lib/src/main/java/com/rey/material/widget/ProgressView.java
@@ -63,17 +63,18 @@ private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, i
 
         a.recycle();
 
-        if(mProgressId > 0){
-            if(mCircular)
-                mProgressDrawable = new CircularProgressDrawable.Builder(context, mProgressId).build();
-            else
-                mProgressDrawable = new LinearProgressDrawable.Builder(context, mProgressId).build();
-
-            if(android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN)
-                setBackground(mProgressDrawable);
-            else
-                setBackgroundDrawable(mProgressDrawable);
-        }
+        if(mProgressId == 0)
+            mProgressId = mCircular ? R.style.Material_Drawable_CircularProgress : R.style.Material_Drawable_LinearProgress;
+
+        if(mCircular)
+            mProgressDrawable = new CircularProgressDrawable.Builder(context, mProgressId).build();
+        else
+            mProgressDrawable = new LinearProgressDrawable.Builder(context, mProgressId).build();
+
+        if(android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN)
+            setBackground(mProgressDrawable);
+        else
+            setBackgroundDrawable(mProgressDrawable);
     }
 	
 	@Override
diff --git a/lib/src/main/java/com/rey/material/widget/RippleManager.java b/lib/src/main/java/com/rey/material/widget/RippleManager.java
index e698616e..8e76529d 100644
--- a/lib/src/main/java/com/rey/material/widget/RippleManager.java
+++ b/lib/src/main/java/com/rey/material/widget/RippleManager.java
@@ -17,41 +17,63 @@
 public final class RippleManager implements View.OnClickListener, Runnable{
 
 	private View.OnClickListener mClickListener;
-	private boolean mDelayClick = false;
-	private View mView;	
+	private View mView;
 		
 	public RippleManager(){}
 	
 	@SuppressWarnings("deprecation")
 	@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
 	public void onCreate(View v, Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes){
+		if(v.isInEditMode())
+			return;
+
 		mView = v;
 		
 		TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.RippleView, defStyleAttr, defStyleRes);
-		int resId = a.getResourceId(R.styleable.RippleView_ripple, 0);		
-		mDelayClick = a.getBoolean(R.styleable.RippleView_delayClick, mDelayClick);
+        int rippleStyle = a.getResourceId(R.styleable.RippleView_rd_style, 0);
+		RippleDrawable drawable = null;
+
+		if(rippleStyle != 0)
+			drawable = new RippleDrawable.Builder(context, rippleStyle).backgroundDrawable(mView.getBackground()).build();
+		else{
+			boolean rippleEnable = a.getBoolean(R.styleable.RippleView_rd_enable, false);
+			if(rippleEnable)
+				drawable = new RippleDrawable.Builder(context, attrs, defStyleAttr, defStyleRes).backgroundDrawable(mView.getBackground()).build();
+		}
+
 		a.recycle();
-		
-		if(resId != 0 && !mView.isInEditMode()){
-			if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
-				mView.setBackground(new RippleDrawable.Builder(context, resId).build());
+
+		if(drawable != null) {
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
+				mView.setBackground(drawable);
 			else
-				mView.setBackgroundDrawable(new RippleDrawable.Builder(context, resId).build());
-		}		
+				mView.setBackgroundDrawable(drawable);
+		}
 	}
 	
 	public boolean isDelayClick(){
-		return mDelayClick;
+        Drawable background = mView.getBackground();
+        if(background instanceof RippleDrawable)
+            return ((RippleDrawable)background).isDelayClick();
+        else if(background instanceof ToolbarRippleDrawable)
+            return ((ToolbarRippleDrawable)background).isDelayClick();
+
+        return false;
 	}
 	
 	public void setDelayClick(boolean delay){
-		mDelayClick = delay;
+        Drawable background = mView.getBackground();
+        if(background instanceof RippleDrawable)
+            ((RippleDrawable)background).setDelayClick(delay);
+        else if(background instanceof ToolbarRippleDrawable)
+            ((ToolbarRippleDrawable)background).setDelayClick(delay);
 	}
 	
 	public void setOnClickListener(View.OnClickListener l) {
 		mClickListener = l;
 	}
-		
+
+
 	public boolean onTouchEvent(MotionEvent event){
 		Drawable background = mView.getBackground();
         return background instanceof RippleDrawable && ((RippleDrawable) background).onTouch(mView, event);
@@ -63,9 +85,9 @@ public void onClick(View v) {
 		long delay = 0;
 						
 		if(background instanceof RippleDrawable)
-			delay = ((RippleDrawable)background).getClickDelayTime(mDelayClick);
+			delay = ((RippleDrawable)background).getClickDelayTime();
 		else if(background instanceof ToolbarRippleDrawable)
-			delay = ((ToolbarRippleDrawable)background).getClickDelayTime(mDelayClick);
+			delay = ((ToolbarRippleDrawable)background).getClickDelayTime();
 			
 		if(delay > 0 && mView.getHandler() != null)
 			mView.getHandler().postDelayed(this, delay);
diff --git a/lib/src/main/java/com/rey/material/widget/Slider.java b/lib/src/main/java/com/rey/material/widget/Slider.java
index a3be4d11..cdb61119 100644
--- a/lib/src/main/java/com/rey/material/widget/Slider.java
+++ b/lib/src/main/java/com/rey/material/widget/Slider.java
@@ -9,10 +9,12 @@
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
 import android.support.annotation.NonNull;
+import android.transition.Slide;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.MotionEvent;
@@ -23,6 +25,7 @@
 import android.view.animation.Interpolator;
 
 import com.rey.material.R;
+import com.rey.material.drawable.RippleDrawable;
 import com.rey.material.util.ColorUtil;
 import com.rey.material.util.ThemeUtil;
 import com.rey.material.util.TypefaceUtil;
@@ -77,6 +80,12 @@ public class Slider extends View{
     private ThumbStrokeAnimator mThumbStrokeAnimator;
     private ThumbMoveAnimator mThumbMoveAnimator;
 
+    public interface OnPositionChangeListener{
+        public void onPositionChanged(Slider view, float oldPos, float newPos, int oldValue, int newValue);
+    }
+
+    private OnPositionChangeListener mOnPositionChangeListener;
+
     public Slider(Context context) {
         super(context);
 
@@ -206,19 +215,34 @@ public float getPosition(){
     }
 
     public void setPosition(float pos, boolean animation){
-        if(animation) {
-            if(!mThumbMoveAnimator.startAnimation(pos)){
+        setPosition(pos, animation, animation);
+    }
+
+    private void setPosition(float pos, boolean moveAnimation, boolean transformAnimation){
+        boolean change = getPosition() != pos;
+        int oldValue = getValue();
+        float oldPos = getPosition();
+
+        if(!moveAnimation || !mThumbMoveAnimator.startAnimation(pos)){
+            mThumbPosition = pos;
+
+            if(transformAnimation) {
                 if(!mIsDragging)
                     mThumbRadiusAnimator.startAnimation(mThumbRadius);
                 mThumbStrokeAnimator.startAnimation(pos == 0 ? 0 : 1);
             }
+            else{
+                mThumbCurrentRadius = mThumbRadius;
+                mThumbFillPercent = mThumbPosition == 0 ? 0 : 1;
+                invalidate();
+            }
         }
-        else {
-            mThumbPosition = pos;
-            mThumbCurrentRadius = mThumbRadius;
-            mThumbFillPercent = mThumbPosition == 0 ? 0 : 1;
-            invalidate();
-        }
+
+        int newValue = getValue();
+        float newPos = getPosition();
+
+        if(change && mOnPositionChangeListener != null)
+            mOnPositionChangeListener.onPositionChanged(this, oldPos, newPos, oldValue, newValue);
     }
 
     public void setValue(float value, boolean animation){
@@ -226,6 +250,19 @@ public void setValue(float value, boolean animation){
         setPosition((value - mMinValue) / (mMaxValue - mMinValue), animation);
     }
 
+    public void setOnPositionChangeListener(OnPositionChangeListener listener){
+        mOnPositionChangeListener = listener;
+    }
+
+    @Override
+    public void setBackgroundDrawable(Drawable drawable) {
+        Drawable background = getBackground();
+        if(background instanceof RippleDrawable && !(drawable instanceof RippleDrawable))
+            ((RippleDrawable) background).setBackgroundDrawable(drawable);
+        else
+            super.setBackgroundDrawable(drawable);
+    }
+
     @Override
     public void setOnClickListener(OnClickListener l) {
         if(l == mRippleManager)
@@ -371,9 +408,9 @@ public boolean onTouchEvent(@NonNull MotionEvent event) {
                     }
                     else{
                         float offset = (event.getX() - mMemoPoint.x) / mDrawRect.width();
-                        mThumbPosition = Math.min(1f, Math.max(0f, mThumbPosition + offset));
+                        float position = Math.min(1f, Math.max(0f, mThumbPosition + offset));
+                        setPosition(position, false, true);
                         mMemoPoint.x = event.getX();
-                        mThumbStrokeAnimator.startAnimation(mThumbPosition == 0 ? 0 : 1);
                         invalidate();
                     }
                 }
@@ -617,12 +654,14 @@ public boolean startAnimation(int radius) {
                 resetAnimation();
                 mRunning = true;
                 getHandler().postAtTime(this, SystemClock.uptimeMillis() + ViewUtil.FRAME_DURATION);
+                invalidate();
+                return true;
             }
-            else
+            else {
                 mThumbCurrentRadius = mRadius;
-
-            invalidate();
-            return true;
+                invalidate();
+                return false;
+            }
         }
 
         public void stopAnimation() {
@@ -678,12 +717,14 @@ public boolean startAnimation(int fillPercent) {
                 resetAnimation();
                 mRunning = true;
                 getHandler().postAtTime(this, SystemClock.uptimeMillis() + ViewUtil.FRAME_DURATION);
+                invalidate();
+                return true;
             }
-            else
+            else {
                 mThumbFillPercent = mFillPercent;
-
-            invalidate();
-            return true;
+                invalidate();
+                return false;
+            }
         }
 
         public void stopAnimation() {
@@ -755,16 +796,14 @@ public boolean startAnimation(float position) {
                 resetAnimation();
                 mRunning = true;
                 getHandler().postAtTime(this, SystemClock.uptimeMillis() + ViewUtil.FRAME_DURATION);
+                invalidate();
+                return true;
             }
             else {
                 mThumbPosition = position;
-                mThumbCurrentRadius = mThumbRadius;
-                mThumbFillPercent = mThumbPosition == 0 ? 0 : 1;
+                invalidate();
+                return false;
             }
-
-            invalidate();
-
-            return true;
         }
 
         public void stopAnimation() {
diff --git a/lib/src/main/java/com/rey/material/widget/Spinner.java b/lib/src/main/java/com/rey/material/widget/Spinner.java
index 3504fd49..ff703bbb 100644
--- a/lib/src/main/java/com/rey/material/widget/Spinner.java
+++ b/lib/src/main/java/com/rey/material/widget/Spinner.java
@@ -39,6 +39,7 @@
 import com.rey.material.R;
 import com.rey.material.drawable.ArrowDrawable;
 import com.rey.material.drawable.DividerDrawable;
+import com.rey.material.drawable.RippleDrawable;
 import com.rey.material.util.ThemeUtil;
 
 import java.lang.reflect.Field;
@@ -386,6 +387,15 @@ protected void onDetachedFromWindow() {
             mPopup.dismiss();        
     }
 
+    @Override
+    public void setBackgroundDrawable(Drawable drawable) {
+        Drawable background = getBackground();
+        if(background instanceof RippleDrawable && !(drawable instanceof RippleDrawable))
+            ((RippleDrawable) background).setBackgroundDrawable(drawable);
+        else
+            super.setBackgroundDrawable(drawable);
+    }
+
     @Override
 	public void setOnClickListener(OnClickListener l) {
 		if(l == mRippleManager)
diff --git a/lib/src/main/java/com/rey/material/widget/Switch.java b/lib/src/main/java/com/rey/material/widget/Switch.java
index 0d7240d4..b7a8111a 100644
--- a/lib/src/main/java/com/rey/material/widget/Switch.java
+++ b/lib/src/main/java/com/rey/material/widget/Switch.java
@@ -9,6 +9,7 @@
 import android.graphics.RadialGradient;
 import android.graphics.RectF;
 import android.graphics.Shader;
+import android.graphics.drawable.Drawable;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
@@ -24,6 +25,7 @@
 import android.widget.Checkable;
 
 import com.rey.material.R;
+import com.rey.material.drawable.RippleDrawable;
 import com.rey.material.util.ColorUtil;
 import com.rey.material.util.ThemeUtil;
 import com.rey.material.util.ViewUtil;
@@ -69,6 +71,11 @@ public class Switch extends View implements Checkable {
     private static final int COLOR_SHADOW_START = 0x4C000000;
     private static final int COLOR_SHADOW_END = 0x00000000;
 
+    public interface OnCheckedChangeListener{
+        public void onCheckedChanged(Switch view, boolean checked);
+    }
+
+    private OnCheckedChangeListener mOnCheckedChangeListener;
 
     public Switch(Context context) {
         super(context);
@@ -168,6 +175,15 @@ else if(cap == 1)
         buildShadow();
     }
 
+    @Override
+    public void setBackgroundDrawable(Drawable drawable) {
+        Drawable background = getBackground();
+        if(background instanceof RippleDrawable && !(drawable instanceof RippleDrawable))
+            ((RippleDrawable) background).setBackgroundDrawable(drawable);
+        else
+            super.setBackgroundDrawable(drawable);
+    }
+
 	@Override
 	public void setOnClickListener(OnClickListener l) {
 		if(l == mRippleManager)
@@ -177,11 +193,18 @@ public void setOnClickListener(OnClickListener l) {
 			setOnClickListener(mRippleManager);
 		}
 	}
-		
+
+    public void setOnCheckedChangeListener(OnCheckedChangeListener listener){
+        mOnCheckedChangeListener = listener;
+    }
+
 	@Override
 	public void setChecked(boolean checked) {		
-		if(mChecked != checked)
-			mChecked = checked;
+		if(mChecked != checked) {
+            mChecked = checked;
+            if(mOnCheckedChangeListener != null)
+                mOnCheckedChangeListener.onCheckedChanged(this, mChecked);
+        }
 		
 		float desPos = mChecked ? 1f : 0f;
 		
diff --git a/lib/src/main/java/com/rey/material/widget/TextView.java b/lib/src/main/java/com/rey/material/widget/TextView.java
index ac1298f6..4a882b2a 100644
--- a/lib/src/main/java/com/rey/material/widget/TextView.java
+++ b/lib/src/main/java/com/rey/material/widget/TextView.java
@@ -1,11 +1,14 @@
 package com.rey.material.widget;
 
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
+import com.rey.material.drawable.RippleDrawable;
+
 public class TextView extends android.widget.TextView {
 
 	private RippleManager mRippleManager = new RippleManager();
@@ -51,7 +54,16 @@ public void applyStyle(int resId){
     private void applyStyle(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes){
         mRippleManager.onCreate(this, context, attrs, defStyleAttr, defStyleRes);
     }
-	
+
+    @Override
+    public void setBackgroundDrawable(Drawable drawable) {
+        Drawable background = getBackground();
+        if(background instanceof RippleDrawable && !(drawable instanceof RippleDrawable))
+            ((RippleDrawable) background).setBackgroundDrawable(drawable);
+        else
+            super.setBackgroundDrawable(drawable);
+    }
+
 	@Override
 	public void setOnClickListener(OnClickListener l) {
 		if(l == mRippleManager)
diff --git a/lib/src/main/java/com/rey/material/widget/TimePicker.java b/lib/src/main/java/com/rey/material/widget/TimePicker.java
index e0ce2b01..659e6521 100644
--- a/lib/src/main/java/com/rey/material/widget/TimePicker.java
+++ b/lib/src/main/java/com/rey/material/widget/TimePicker.java
@@ -110,6 +110,7 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr, int def
         mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
         mRect = new Rect();
 
+        setWillNotDraw(false);
         applyStyle(context, attrs, defStyleAttr, defStyleRes);
     }
 
@@ -657,7 +658,8 @@ private void update(){
         if(mRunning) {
             if(getHandler() != null)
                 getHandler().postAtTime(mUpdater, SystemClock.uptimeMillis() + ViewUtil.FRAME_DURATION);
-            stopAnimation();
+            else
+                stopAnimation();
         }
 
         invalidate();
diff --git a/lib/src/main/java/com/rey/material/widget/YearPicker.java b/lib/src/main/java/com/rey/material/widget/YearPicker.java
index 3334e931..9f530c90 100644
--- a/lib/src/main/java/com/rey/material/widget/YearPicker.java
+++ b/lib/src/main/java/com/rey/material/widget/YearPicker.java
@@ -208,7 +208,13 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         measureItemHeight();
 
         if(heightMode != MeasureSpec.EXACTLY){
-            heightSize = heightMode == MeasureSpec.AT_MOST ? Math.min(heightSize, mItemRealHeight * 3) : mItemRealHeight * 3;
+            if(heightMode == MeasureSpec.AT_MOST){
+                int num = Math.min(mAdapter.getCount(), heightSize / mItemRealHeight);
+                if(num >= 3)
+                    heightSize = mItemRealHeight * (num % 2 == 0 ? num - 1 : num);
+            }
+            else
+                heightSize = mItemRealHeight * mAdapter.getCount();
             heightMeasureSpec = MeasureSpec.makeMeasureSpec(heightSize + getPaddingTop() + getPaddingBottom(), MeasureSpec.EXACTLY);
         }
 
diff --git a/lib/src/main/res/drawable-hdpi/ic_launcher.png b/lib/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 96a442e5..00000000
Binary files a/lib/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/lib/src/main/res/drawable-mdpi/ic_launcher.png b/lib/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index 359047df..00000000
Binary files a/lib/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/lib/src/main/res/drawable-xxhdpi/ic_launcher.png b/lib/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index 4df18946..00000000
Binary files a/lib/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/lib/src/main/res/values/attrs.xml b/lib/src/main/res/values/attrs.xml
index 83ef62ac..c30d8e2a 100644
--- a/lib/src/main/res/values/attrs.xml
+++ b/lib/src/main/res/values/attrs.xml
@@ -9,10 +9,10 @@
     </attr>
     
     <attr name="pv_progress" format="float"/>   
-    <attr name="pv_secondaryProgress" format="float"/>   
-    
-    <attr name="ripple" format="reference"/> 
-    <attr name="delayClick" format="boolean"/>
+    <attr name="pv_secondaryProgress" format="float"/>
+
+    <attr name="rd_style" format="reference"/>
+    <attr name="rd_enable" format="boolean"/>
 
     <declare-styleable name="CircularProgressDrawable">        
         <attr name="cpd_padding" format="reference|dimension"/> 
@@ -67,13 +67,12 @@
         <attr name="pv_progressStyle" format="reference"/>
     </declare-styleable>
         
-    <declare-styleable name="RippleView">        
-        <attr name="ripple" /> 
-        <attr name="delayClick" /> 
+    <declare-styleable name="RippleView">
+        <attr name="rd_style" />
+        <attr name="rd_enable" />
     </declare-styleable> 
     
-    <declare-styleable name="RippleDrawable">       
-        <attr name="rd_background" format="reference|color"/>
+    <declare-styleable name="RippleDrawable">
         <attr name="rd_backgroundColor" format="reference|color"/>
         <attr name="rd_backgroundAnimDuration" format="reference|integer"/>        
         <attr name="rd_maxRippleRadius" format="reference|dimension|integer">
@@ -100,7 +99,8 @@
         <attr name="rd_leftPadding" format="reference|dimension"/>
         <attr name="rd_topPadding" format="reference|dimension"/>
         <attr name="rd_rightPadding" format="reference|dimension"/>
-        <attr name="rd_bottomPadding" format="reference|dimension"/>        
+        <attr name="rd_bottomPadding" format="reference|dimension"/>
+        <attr name="rd_delayClick" format="boolean"/>
     </declare-styleable>
     
     <declare-styleable name="LineMorphingDrawable">
@@ -319,8 +319,6 @@
         <attr name="fab_iconSize" format="reference|dimension"/>
         <attr name="fab_interpolator" format="reference"/>
         <attr name="fab_animDuration" format="reference|integer"/>
-        <attr name="ripple" /> 
-        <attr name="delayClick" /> 
     </declare-styleable>
     
     <declare-styleable name="Spinner">  
diff --git a/lib/src/main/res/values/styles.xml b/lib/src/main/res/values/styles.xml
index 61892644..7558aade 100644
--- a/lib/src/main/res/values/styles.xml
+++ b/lib/src/main/res/values/styles.xml
@@ -101,11 +101,13 @@
     </style>
 
     <style name="Material.Drawable.Ripple">
+        <item name="rd_enable">true</item>
         <item name="rd_inInterpolator">@android:anim/decelerate_interpolator</item>
         <item name="rd_outInterpolator">@android:anim/decelerate_interpolator</item>
         <item name="rd_maskType">rectangle</item>
         <item name="rd_cornerRadius">2dp</item>
         <item name="rd_padding">0dp</item>
+        <item name="rd_delayClick">false</item>
     </style>
 
     <style name="Material.Drawable.Ripple.Touch" parent="Material.Drawable.Ripple">
@@ -239,18 +241,20 @@
         <item name="tpi_mode">fixed</item>
     </style>
 
-    <style name="Material.Widget.FloatingActionButton">
+    <style name="Material.Widget.FloatingActionButton" parent="Material.Drawable.Ripple.Touch">
         <item name="fab_radius">28dp</item>
         <item name="fab_elevation">4dp</item>
         <item name="fab_iconSize">24dp</item>
         <item name="fab_interpolator">@android:anim/decelerate_interpolator</item>
         <item name="fab_animDuration">@android:integer/config_mediumAnimTime</item>
-        <item name="ripple">@style/Material.Drawable.Ripple.Touch</item>
-        <item name="delayClick">false</item>
     </style>
 
-    <style name="Material.Widget.FloatingActionButton.Light" parent="Material.Widget.FloatingActionButton">
-        <item name="ripple">@style/Material.Drawable.Ripple.Touch.Light</item>
+    <style name="Material.Widget.FloatingActionButton.Light" parent="Material.Drawable.Ripple.Touch.Light">
+        <item name="fab_radius">28dp</item>
+        <item name="fab_elevation">4dp</item>
+        <item name="fab_iconSize">24dp</item>
+        <item name="fab_interpolator">@android:anim/decelerate_interpolator</item>
+        <item name="fab_animDuration">@android:integer/config_mediumAnimTime</item>
     </style>
 
     <style name="Material.Widget.SnackBar">