diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index e5b8a7a4..5517f324 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,6 @@
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.2.1" />
-        <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -17,4 +16,5 @@
       </GradleProjectSettings>
     </option>
   </component>
-</project>
\ No newline at end of file
+</project>
+
diff --git a/Material.iml b/Material.iml
index 1200fd63..c5b5ba00 100644
--- a/Material.iml
+++ b/Material.iml
@@ -4,7 +4,6 @@
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>
@@ -16,4 +15,5 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
\ No newline at end of file
+</module>
+
diff --git a/app/app.iml b/app/app.iml
index bbf5cc5b..9f4d0375 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -12,9 +12,8 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -93,4 +92,5 @@
     <orderEntry type="library" exported="" name="cardview-v7-21.0.2" level="project" />
     <orderEntry type="module" module-name="lib" exported="" />
   </component>
-</module>
\ No newline at end of file
+</module>
+
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 3ae47d72..490c7d03 100644
--- a/app/src/main/java/com/rey/material/demo/ButtonFragment.java
+++ b/app/src/main/java/com/rey/material/demo/ButtonFragment.java
@@ -49,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);
@@ -61,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/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/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 e5212c08..260a9850 100644
--- a/app/src/main/res/layout/dialog_recurring.xml
+++ b/app/src/main/res/layout/dialog_recurring.xml
@@ -25,8 +25,6 @@
             app:spn_arrowColor="#FFFFFFFF"
             app:spn_dividerHeight="0dp"
             app:rd_style="@style/Material.Drawable.Ripple.Wave"
-            app:rd_enable="true"
-            app:rd_delayClick="true"
             android:layout_gravity="center_vertical"/>
 
     </FrameLayout>
@@ -128,9 +126,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:padding="8dp"
-                    app:rd_style="@style/Material.Drawable.Ripple.Wave.Light"
-                    app:rd_enable="true"
-                    app:rd_delayClick="true"/>
+                    app:rd_style="@style/Material.Drawable.Ripple.Wave.Light"/>
 
                 <com.rey.material.widget.EditText
                     style="@style/Material.Widget.EditText.Light"
@@ -160,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"
@@ -167,8 +164,8 @@
                     android:singleLine="true"
                     android:ellipsize="end"
                     android:layout_centerVertical="true"
-                    style="@style/Material.Drawable.Ripple.Wave.Light"
-                    app:rd_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 003bbb26..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"
-		        style="@style/FlatButtonRippleStyle"
-		        app:rd_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,7 +53,6 @@
 		        android:textColor="#FF2196F3"
 		        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
 		        android:text="BUTTON"
-		        style="@style/FlatColorButtonRippleStyle"
 		        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"
-		        style="@style/FlatWaveButtonRippleStyle"
-		        app:rd_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,7 +89,6 @@
 		        android:textColor="#FF2196F3"
 		        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
 		        android:text="BUTTON"
-		        style="@style/FlatWaveColorButtonRippleStyle"
 		        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"
-		        style="@style/RaiseButtonRippleStyle"
-		        app:rd_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,7 +133,6 @@
 		        android:textColor="#FFFFFFFF"
 		        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
 		        android:text="BUTTON"
-		        style="@style/RaiseColorButtonRippleStyle"
 		        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"
-		        style="@style/RaiseWaveButtonRippleStyle"
-		        app:rd_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,7 +169,6 @@
 		        android:textColor="#FFFFFFFF"
 		        android:textAppearance="@style/Base.TextAppearance.AppCompat.Button"
 		        android:text="BUTTON"
-		        style="@style/RaiseWaveColorButtonRippleStyle"
 		        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 7ea51955..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"
-                style="@style/RaiseButtonRippleStyle"
-                app:rd_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"
-                style="@style/RaiseButtonRippleStyle"
-                app:rd_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"
-                style="@style/RaiseButtonRippleStyle"
-                app:rd_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"
-                style="@style/RaiseButtonRippleStyle"
-                app:rd_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"
-                style="@style/RaiseButtonRippleStyle"
-                app:rd_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"
-                style="@style/RaiseButtonRippleStyle"
-                app:rd_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)"
-                style="@style/RaiseButtonRippleStyle"
-                app:rd_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)"
-                style="@style/RaiseButtonRippleStyle"
-                app:rd_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)"
-                style="@style/RaiseButtonRippleStyle"
-                app:rd_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)"
-                style="@style/RaiseButtonRippleStyle"
-                app:rd_delayClick="false"/>
+                android:text="DATE (DARK)"/>
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_snackbar.xml b/app/src/main/res/layout/fragment_snackbar.xml
index 6aee8a61..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"
-			    style="@style/RaiseButtonRippleStyle"
-			    app:rd_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"
-			    style="@style/RaiseButtonRippleStyle"
-			    app:rd_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"
-			    style="@style/RaiseButtonRippleStyle"
-			    app:rd_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"
-			    style="@style/RaiseButtonRippleStyle"
-			    app:rd_delayClick="false"
 			    android:layout_marginTop="8dp"/>
 	        	        	        
 	</LinearLayout>
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 3d140fc9..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"
-    style="@style/Material.Drawable.Ripple.Wave.Light"
-    app:rd_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 3d140fc9..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"
-    style="@style/Material.Drawable.Ripple.Wave.Light"
-    app:rd_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 54c946b3..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"
-	    style="@style/MenuItemRippleStyle"
 		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 ae4e8723..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"
-	    style="@style/MenuItemRippleStyle"
 		app:rd_delayClick="true"/>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2e7516b1..bf915131 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -284,6 +284,7 @@
 
     <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>
diff --git a/lib/lib.iml b/lib/lib.iml
index cb758c4b..4b37c4f3 100644
--- a/lib/lib.iml
+++ b/lib/lib.iml
@@ -12,9 +12,8 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
-        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
         <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -95,4 +94,5 @@
     <orderEntry type="library" exported="" name="appcompat-v7-21.0.2" level="project" />
     <orderEntry type="library" exported="" name="cardview-v7-21.0.2" level="project" />
   </component>
-</module>
\ No newline at end of file
+</module>
+
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/FloatingActionButton.java b/lib/src/main/java/com/rey/material/widget/FloatingActionButton.java
index acc3b880..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);
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/RippleManager.java b/lib/src/main/java/com/rey/material/widget/RippleManager.java
index 0255512c..8e76529d 100644
--- a/lib/src/main/java/com/rey/material/widget/RippleManager.java
+++ b/lib/src/main/java/com/rey/material/widget/RippleManager.java
@@ -72,7 +72,8 @@ else if(background instanceof ToolbarRippleDrawable)
 	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);
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 60b3d63c..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,6 +9,7 @@
 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;
@@ -24,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;
@@ -252,6 +254,15 @@ 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)
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 7e8950aa..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;
@@ -173,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)
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/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);
         }