diff --git a/current/android.jar b/current/android.jar
index 9a4031b..bc30cad 100644
--- a/current/android.jar
+++ b/current/android.jar
Binary files differ
diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar
index d194c2c..61e8774 100644
--- a/current/support/annotations/android-support-annotations.jar
+++ b/current/support/annotations/android-support-annotations.jar
Binary files differ
diff --git a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
index 106dc77..884a024 100644
--- a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
+++ b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar
Binary files differ
diff --git a/current/support/multidex/library/libs/android-support-multidex.jar b/current/support/multidex/library/libs/android-support-multidex.jar
index e7d3ff2..df6bfb5 100644
--- a/current/support/multidex/library/libs/android-support-multidex.jar
+++ b/current/support/multidex/library/libs/android-support-multidex.jar
Binary files differ
diff --git a/current/support/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar
index af94826..25d526f 100644
--- a/current/support/v13/android-support-v13.jar
+++ b/current/support/v13/android-support-v13.jar
Binary files differ
diff --git a/current/support/v17/leanback/libs/android-support-v17-leanback.jar b/current/support/v17/leanback/libs/android-support-v17-leanback.jar
index 54022e1..56f7110 100644
--- a/current/support/v17/leanback/libs/android-support-v17-leanback.jar
+++ b/current/support/v17/leanback/libs/android-support-v17-leanback.jar
Binary files differ
diff --git a/current/support/v17/leanback/res/drawable-v21/lb_card_foreground.xml b/current/support/v17/leanback/res/drawable-v21/lb_card_foreground.xml
new file mode 100644
index 0000000..3cd9699
--- /dev/null
+++ b/current/support/v17/leanback/res/drawable-v21/lb_card_foreground.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight" >
+</ripple>
\ No newline at end of file
diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_loop.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_loop.png
index 1676892..988f572 100644
--- a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_loop.png
+++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_loop.png
Binary files differ
diff --git a/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_loop_one.png b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_loop_one.png
new file mode 100644
index 0000000..4ae9faa
--- /dev/null
+++ b/current/support/v17/leanback/res/drawable-xhdpi/lb_ic_loop_one.png
Binary files differ
diff --git a/current/support/v17/leanback/res/drawable/lb_card_foreground.xml b/current/support/v17/leanback/res/drawable/lb_card_foreground.xml
new file mode 100644
index 0000000..894a3eb
--- /dev/null
+++ b/current/support/v17/leanback/res/drawable/lb_card_foreground.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+</shape>
diff --git a/current/support/v17/leanback/res/layout/lb_control_bar.xml b/current/support/v17/leanback/res/layout/lb_control_bar.xml
index 4b82dcc..b7ad3a3 100644
--- a/current/support/v17/leanback/res/layout/lb_control_bar.xml
+++ b/current/support/v17/leanback/res/layout/lb_control_bar.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v17.leanback.widget.ControlBar xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/control_bar"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/current/support/v17/leanback/res/transition-v21/lb_enter_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_enter_transition.xml
new file mode 100644
index 0000000..1572934
--- /dev/null
+++ b/current/support/v17/leanback/res/transition-v21/lb_enter_transition.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<transitionSet xmlns:android="http://schemas.android.com/apk/res/android" >
+  <fade
+      android:interpolator="@android:interpolator/linear_out_slow_in"
+      android:startDelay="175"
+      android:duration="400"/>
+</transitionSet>
\ No newline at end of file
diff --git a/current/support/v17/leanback/res/transition-v21/lb_return_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_return_transition.xml
new file mode 100644
index 0000000..0165a18
--- /dev/null
+++ b/current/support/v17/leanback/res/transition-v21/lb_return_transition.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<transitionSet xmlns:android="http://schemas.android.com/apk/res/android" >
+  <fade
+      android:interpolator="@android:interpolator/linear_out_slow_in"
+      android:startDelay="75"
+      android:duration="250"/>
+</transitionSet>
diff --git a/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml
new file mode 100644
index 0000000..0ba4125
--- /dev/null
+++ b/current/support/v17/leanback/res/transition-v21/lb_shared_element_enter_transition.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<transitionSet xmlns:android="http://schemas.android.com/apk/res/android"
+  android:duration="500" >
+  <fade
+      android:interpolator="@android:interpolator/linear_out_slow_in"
+      android:startDelay="325"
+      android:duration="150"/>
+  <changeBounds
+      android:interpolator="@android:interpolator/linear_out_slow_in">
+  </changeBounds>
+  <changeTransform
+      android:interpolator="@android:interpolator/linear_out_slow_in" />
+  <changeImageTransform
+      android:interpolator="@android:interpolator/linear_out_slow_in"/>
+</transitionSet>
\ No newline at end of file
diff --git a/current/support/v17/leanback/res/transition-v21/lb_shared_element_return_transition.xml b/current/support/v17/leanback/res/transition-v21/lb_shared_element_return_transition.xml
new file mode 100644
index 0000000..f97bb6d
--- /dev/null
+++ b/current/support/v17/leanback/res/transition-v21/lb_shared_element_return_transition.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<transitionSet xmlns:android="http://schemas.android.com/apk/res/android" >
+  <fade
+      android:interpolator="@android:interpolator/linear_out_slow_in"
+      android:duration="75"/>
+  <changeBounds
+      android:interpolator="@android:interpolator/linear_out_slow_in"
+      android:duration="450">
+  </changeBounds>
+  <changeTransform
+      android:interpolator="@android:interpolator/linear_out_slow_in" 
+      android:duration="450"/>
+  <changeImageTransform
+      android:interpolator="@android:interpolator/linear_out_slow_in"
+      android:duration="450"/>
+</transitionSet>
\ No newline at end of file
diff --git a/current/support/v17/leanback/res/values-v21/themes.xml b/current/support/v17/leanback/res/values-v21/themes.xml
index f44a890..e8934a0 100644
--- a/current/support/v17/leanback/res/values-v21/themes.xml
+++ b/current/support/v17/leanback/res/values-v21/themes.xml
@@ -18,5 +18,6 @@
 <resources>
     <style name="Theme.LeanbackBase" parent="android:Theme.Material.NoActionBar">
         <item name="playbackProgressPrimaryColor">?android:attr/colorAccent</item>
+        <item name="playbackControlsIconHighlightColor">?android:attr/colorAccent</item>
     </style>
 </resources>
diff --git a/current/support/v17/leanback/res/values/attrs.xml b/current/support/v17/leanback/res/values/attrs.xml
index 09e7df4..02510cb 100644
--- a/current/support/v17/leanback/res/values/attrs.xml
+++ b/current/support/v17/leanback/res/values/attrs.xml
@@ -126,6 +126,24 @@
         <attr name="searchOrbBrightColor" format="reference|color" />
     </declare-styleable>
 
+    <declare-styleable name="lbPlaybackControlsActionIcons">
+        <attr name="play" format="reference"/>
+        <attr name="pause" format="reference"/>
+        <attr name="fast_forward" format="reference"/>
+        <attr name="rewind" format="reference"/>
+        <attr name="skip_next" format="reference"/>
+        <attr name="skip_previous" format="reference"/>
+        <attr name="thumb_up_outline" format="reference"/>
+        <attr name="thumb_up" format="reference"/>
+        <attr name="thumb_down_outline" format="reference"/>
+        <attr name="thumb_down" format="reference"/>
+        <attr name="repeat" format="reference"/>
+        <attr name="repeat_one" format="reference"/>
+        <attr name="shuffle" format="reference"/>
+        <attr name="high_quality" format="reference"/>
+        <attr name="closed_captioning" format="reference"/>
+    </declare-styleable>
+
     <declare-styleable name="LeanbackTheme">
 
         <!-- left padding of BrowseFragment, RowsFragment, DetailsFragment -->
@@ -201,6 +219,8 @@
         <attr name="defaultSearchIcon" format="reference" />
 
         <attr name="playbackProgressPrimaryColor" format="reference|color" />
+        <attr name="playbackControlsIconHighlightColor" format="reference|color" />
+        <attr name="playbackControlsActionIcons" format="reference" />
 
     </declare-styleable>
 
diff --git a/current/support/v17/leanback/res/values/colors.xml b/current/support/v17/leanback/res/values/colors.xml
index de5ad8d..9869359 100644
--- a/current/support/v17/leanback/res/values/colors.xml
+++ b/current/support/v17/leanback/res/values/colors.xml
@@ -55,7 +55,8 @@
     <color name="lb_default_search_color">#FFFFAA3F</color>
 
     <color name="lb_control_button_color">#66EEEEEE</color>
-    <color name="lb_playback_progress_color_no_theme">#CCFFFFFF</color>
+    <color name="lb_playback_progress_color_no_theme">#ff40c4ff</color>
+    <color name="lb_playback_icon_highlight_no_theme">#ff40c4ff</color>
     <color name="lb_playback_secondary_progress_color">#33FFFFFF</color>
     <color name="lb_playback_background_progress_color">#19FFFFFF</color>
     <color name="lb_playback_controls_background_light">#80000000</color>
diff --git a/current/support/v17/leanback/res/values/dimens.xml b/current/support/v17/leanback/res/values/dimens.xml
index 363f598..b433a2e 100644
--- a/current/support/v17/leanback/res/values/dimens.xml
+++ b/current/support/v17/leanback/res/values/dimens.xml
@@ -117,8 +117,11 @@
     <dimen name="lb_playback_total_time_margin_end">16dp</dimen>
     <dimen name="lb_playback_time_padding_top">8dp</dimen>
     <dimen name="lb_secondary_controls_margin_top">12dp</dimen>
+    <dimen name="lb_playback_controls_child_margin_default">48dp</dimen>
+    <dimen name="lb_playback_controls_child_margin_bigger">64dp</dimen>
+    <dimen name="lb_playback_controls_child_margin_biggest">88dp</dimen>
 
-    <dimen name="lb_control_button_diameter">76dp</dimen>
+    <dimen name="lb_control_button_diameter">90dp</dimen>
     <dimen name="lb_control_button_height">64dp</dimen>
     <dimen name="lb_control_button_secondary_diameter">48dp</dimen>
     <dimen name="lb_control_button_secondary_height">48dp</dimen>
diff --git a/current/support/v17/leanback/res/values/ids.xml b/current/support/v17/leanback/res/values/ids.xml
index 6bcff36..32dcbf7 100644
--- a/current/support/v17/leanback/res/values/ids.xml
+++ b/current/support/v17/leanback/res/values/ids.xml
@@ -28,5 +28,7 @@
      <item type="id" name="lb_control_thumbs_down" />
      <item type="id" name="lb_control_repeat" />
      <item type="id" name="lb_control_shuffle" />
+     <item type="id" name="lb_control_high_quality" />
+     <item type="id" name="lb_control_closed_captioning" />
 
  </resources>
diff --git a/current/support/v17/leanback/res/values/integers.xml b/current/support/v17/leanback/res/values/integers.xml
index ff2cf89..689afdf 100644
--- a/current/support/v17/leanback/res/values/integers.xml
+++ b/current/support/v17/leanback/res/values/integers.xml
@@ -19,4 +19,7 @@
     <integer name="lb_card_activated_animation_duration">150</integer>
     <integer name="lb_search_bar_text_mode_background_alpha">51</integer>
     <integer name="lb_search_bar_speech_mode_background_alpha">179</integer>
+    <integer name="lb_playback_controls_fade_in_duration_ms">150</integer>
+    <integer name="lb_playback_controls_fade_out_duration_ms">1000</integer>
+    <integer name="lb_playback_controls_show_time_ms">3000</integer>
 </resources>
diff --git a/current/support/v17/leanback/res/values/styles.xml b/current/support/v17/leanback/res/values/styles.xml
index 8055ef4..ba1ba01 100644
--- a/current/support/v17/leanback/res/values/styles.xml
+++ b/current/support/v17/leanback/res/values/styles.xml
@@ -78,7 +78,9 @@
 
     <style name="Widget.Leanback" parent="android:Widget.Holo" />
 
-    <style name="Widget.Leanback.BaseCardViewStyle" />
+    <style name="Widget.Leanback.BaseCardViewStyle">
+        <item name="android:foreground">@drawable/lb_card_foreground</item>
+    </style>
 
     <style name="Widget.Leanback.ImageCardViewStyle" parent="Widget.Leanback.BaseCardViewStyle">
         <item name="cardType">infoUnder</item>
@@ -249,4 +251,23 @@
         <item name="searchOrbColor">?attr/defaultSearchColor</item>
         <item name="searchOrbBrightColor">?attr/defaultSearchBrightColor</item>
     </style>
+
+    <style name="Widget.Leanback.PlaybackControlsActionIconsStyle">
+        <item name="play">@drawable/lb_ic_play</item>
+        <item name="pause">@drawable/lb_ic_pause</item>
+        <item name="fast_forward">@drawable/lb_ic_fast_forward</item>
+        <item name="rewind">@drawable/lb_ic_fast_rewind</item>
+        <item name="skip_next">@drawable/lb_ic_skip_next</item>
+        <item name="skip_previous">@drawable/lb_ic_skip_previous</item>
+        <item name="thumb_up_outline">@drawable/lb_ic_thumb_up_outline</item>
+        <item name="thumb_up">@drawable/lb_ic_thumb_up</item>
+        <item name="thumb_down_outline">@drawable/lb_ic_thumb_down_outline</item>
+        <item name="thumb_down">@drawable/lb_ic_thumb_down</item>
+        <item name="repeat">@drawable/lb_ic_loop</item>
+        <item name="repeat_one">@drawable/lb_ic_loop_one</item>
+        <item name="shuffle">@drawable/lb_ic_shuffle</item>
+        <item name="high_quality">@drawable/lb_ic_hq</item>
+        <item name="closed_captioning">@drawable/lb_ic_cc</item>
+    </style>
+
 </resources>
diff --git a/current/support/v17/leanback/res/values/themes.xml b/current/support/v17/leanback/res/values/themes.xml
index 386afef..5fa12d7 100644
--- a/current/support/v17/leanback/res/values/themes.xml
+++ b/current/support/v17/leanback/res/values/themes.xml
@@ -20,6 +20,7 @@
     <!-- LeanbackBase may be overridden for specific api levels -->
     <style name="Theme.LeanbackBase" parent="android:Theme.Holo.NoActionBar">
         <item name="playbackProgressPrimaryColor">@color/lb_playback_progress_color_no_theme</item>
+        <item name="playbackControlsIconHighlightColor">@color/lb_playback_icon_highlight_no_theme</item>
     </style>
 
     <style name="Theme.Leanback" parent="Theme.LeanbackBase">
@@ -60,6 +61,7 @@
         <item name="detailsActionButtonStyle">@style/Widget.Leanback.DetailsActionButtonStyle</item>
         <item name="playbackControlsButtonStyle">@style/Widget.Leanback.PlaybackControlsButtonStyle</item>
         <item name="playbackControlsTimeStyle">@style/Widget.Leanback.PlaybackControlsTimeStyle</item>
+        <item name="playbackControlsActionIcons">@style/Widget.Leanback.PlaybackControlsActionIconsStyle</item>
 
         <item name="errorMessageStyle">@style/Widget.Leanback.ErrorMessageStyle</item>
 
@@ -69,6 +71,10 @@
         <item name="defaultSearchBrightColor">@null</item>
         <item name="defaultSearchIcon">@null</item>
 
-    </style>
+        <item name="android:windowSharedElementEnterTransition">@transition/lb_shared_element_enter_transition</item>
+        <item name="android:windowEnterTransition">@transition/lb_enter_transition</item>
+        <item name="android:windowSharedElementReturnTransition">@transition/lb_shared_element_return_transition</item>
+        <item name="android:windowReturnTransition">@transition/lb_return_transition</item>
+        </style>
 
 </resources>
diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar
index e524f14..d2aa8f2 100644
--- a/current/support/v4/android-support-v4.jar
+++ b/current/support/v4/android-support-v4.jar
Binary files differ
diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
index a16ee49..41f4ff8 100644
--- a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
+++ b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_search_api_material_dark.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_search_api_material_dark.png
index eba2b11..d85e3b3 100644
--- a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_search_api_material_dark.png
+++ b/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_search_api_material_dark.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_search_api_material_light.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_search_api_material_light.png
index 920a402..18fdfdd 100644
--- a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_search_api_material_light.png
+++ b/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_search_api_material_light.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_search_api_mtrl_alpha.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_search_api_mtrl_alpha.png
index cac32b5..f7382d3 100644
--- a/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_search_api_mtrl_alpha.png
+++ b/current/support/v7/appcompat/res/drawable-hdpi/abc_ic_search_api_mtrl_alpha.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_activated_material_dark.9.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_activated_material_dark.9.png
new file mode 100644
index 0000000..6ab810a
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_activated_material_dark.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_activated_material_light.9.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_activated_material_light.9.png
new file mode 100644
index 0000000..6ab810a
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_activated_material_light.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_activated_mtrl_alpha.9.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_activated_mtrl_alpha.9.png
new file mode 100644
index 0000000..b9a81be
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_activated_mtrl_alpha.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_default_disabled_material_dark.9.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_default_disabled_material_dark.9.png
new file mode 100644
index 0000000..94d335d
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_default_disabled_material_dark.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_default_disabled_material_light.9.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_default_disabled_material_light.9.png
new file mode 100644
index 0000000..51d2346
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_default_disabled_material_light.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_default_material_dark.9.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_default_material_dark.9.png
new file mode 100644
index 0000000..5cceeb2
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_default_material_dark.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_default_material_light.9.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_default_material_light.9.png
new file mode 100644
index 0000000..d71493c
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_default_material_light.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_default_mtrl_alpha.9.png b/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_default_mtrl_alpha.9.png
new file mode 100644
index 0000000..3682629
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-hdpi/abc_textfield_default_mtrl_alpha.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_search_api_material_dark.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_search_api_material_dark.png
index 634faa7..663978a 100644
--- a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_search_api_material_dark.png
+++ b/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_search_api_material_dark.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_search_api_material_light.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_search_api_material_light.png
index e10b63f..00b99ea 100644
--- a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_search_api_material_light.png
+++ b/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_search_api_material_light.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_search_api_mtrl_alpha.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_search_api_mtrl_alpha.png
index 9137fea..0fb57b2 100644
--- a/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_search_api_mtrl_alpha.png
+++ b/current/support/v7/appcompat/res/drawable-mdpi/abc_ic_search_api_mtrl_alpha.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_activated_material_dark.9.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_activated_material_dark.9.png
new file mode 100644
index 0000000..c0a5006
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_activated_material_dark.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_activated_material_light.9.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_activated_material_light.9.png
new file mode 100644
index 0000000..c0a5006
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_activated_material_light.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_activated_mtrl_alpha.9.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_activated_mtrl_alpha.9.png
new file mode 100644
index 0000000..f3d06fe
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_activated_mtrl_alpha.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_default_disabled_material_dark.9.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_default_disabled_material_dark.9.png
new file mode 100644
index 0000000..2e38325
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_default_disabled_material_dark.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_default_disabled_material_light.9.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_default_disabled_material_light.9.png
new file mode 100644
index 0000000..15e0316
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_default_disabled_material_light.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_default_material_dark.9.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_default_material_dark.9.png
new file mode 100644
index 0000000..93a0405
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_default_material_dark.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_default_material_light.9.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_default_material_light.9.png
new file mode 100644
index 0000000..80a11bd
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_default_material_light.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_default_mtrl_alpha.9.png b/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_default_mtrl_alpha.9.png
new file mode 100644
index 0000000..f0e7db8
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-mdpi/abc_textfield_default_mtrl_alpha.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_search_api_material_dark.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_search_api_material_dark.png
index 4fc0aa3..ce36f97 100644
--- a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_search_api_material_dark.png
+++ b/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_search_api_material_dark.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_search_api_material_light.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_search_api_material_light.png
index d3d52f4..b5086b0 100644
--- a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_search_api_material_light.png
+++ b/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_search_api_material_light.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_search_api_mtrl_alpha.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_search_api_mtrl_alpha.png
index 513ee8b..05cfab7 100644
--- a/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_search_api_mtrl_alpha.png
+++ b/current/support/v7/appcompat/res/drawable-xhdpi/abc_ic_search_api_mtrl_alpha.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_activated_material_dark.9.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_activated_material_dark.9.png
new file mode 100644
index 0000000..81c4ea6
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_activated_material_dark.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_activated_material_light.9.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_activated_material_light.9.png
new file mode 100644
index 0000000..81c4ea6
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_activated_material_light.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_activated_mtrl_alpha.9.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_activated_mtrl_alpha.9.png
new file mode 100644
index 0000000..7174b67
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_activated_mtrl_alpha.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_default_disabled_material_dark.9.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_default_disabled_material_dark.9.png
new file mode 100644
index 0000000..d5b4a90
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_default_disabled_material_dark.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_default_disabled_material_light.9.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_default_disabled_material_light.9.png
new file mode 100644
index 0000000..71b228f
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_default_disabled_material_light.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_default_material_dark.9.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_default_material_dark.9.png
new file mode 100644
index 0000000..4e6a943
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_default_material_dark.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_default_material_light.9.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_default_material_light.9.png
new file mode 100644
index 0000000..7ff4cb9
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_default_material_light.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_default_mtrl_alpha.9.png b/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_default_mtrl_alpha.9.png
new file mode 100644
index 0000000..46dad22
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-xhdpi/abc_textfield_default_mtrl_alpha.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_search_api_material_dark.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_search_api_material_dark.png
index 12ed308..63c0a81 100644
--- a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_search_api_material_dark.png
+++ b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_search_api_material_dark.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_search_api_material_light.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_search_api_material_light.png
index 3b5d65c..25c34c2 100644
--- a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_search_api_material_light.png
+++ b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_search_api_material_light.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_search_api_mtrl_alpha.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_search_api_mtrl_alpha.png
index 81b13aa..6f60bd3 100644
--- a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_search_api_mtrl_alpha.png
+++ b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_ic_search_api_mtrl_alpha.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_activated_material_dark.9.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_activated_material_dark.9.png
new file mode 100644
index 0000000..40b913a
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_activated_material_dark.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_activated_material_light.9.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_activated_material_light.9.png
new file mode 100644
index 0000000..40b913a
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_activated_material_light.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_activated_mtrl_alpha.9.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_activated_mtrl_alpha.9.png
new file mode 100644
index 0000000..661d5f0
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_activated_mtrl_alpha.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_default_disabled_material_dark.9.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_default_disabled_material_dark.9.png
new file mode 100644
index 0000000..e60f79d
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_default_disabled_material_dark.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_default_disabled_material_light.9.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_default_disabled_material_light.9.png
new file mode 100644
index 0000000..dc74b89
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_default_disabled_material_light.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_default_material_dark.9.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_default_material_dark.9.png
new file mode 100644
index 0000000..62b9b62
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_default_material_dark.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_default_material_light.9.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_default_material_light.9.png
new file mode 100644
index 0000000..02b299b
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_default_material_light.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_default_mtrl_alpha.9.png b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_default_mtrl_alpha.9.png
new file mode 100644
index 0000000..d7696c3
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable-xxhdpi/abc_textfield_default_mtrl_alpha.9.png
Binary files differ
diff --git a/current/support/v7/appcompat/res/drawable/abc_edit_text_material_dark.xml b/current/support/v7/appcompat/res/drawable/abc_edit_text_material_dark.xml
new file mode 100644
index 0000000..d222d8e
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable/abc_edit_text_material_dark.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       android:insetLeft="@dimen/abc_control_inset_material"
+       android:insetTop="@dimen/abc_control_inset_material"
+       android:insetBottom="@dimen/abc_control_inset_material"
+       android:insetRight="@dimen/abc_control_inset_material">
+
+    <selector>
+        <item android:state_enabled="true" android:state_focused="true" android:drawable="@drawable/abc_textfield_activated_material_dark"/>
+        <item android:state_enabled="true" android:state_activated="true" android:drawable="@drawable/abc_textfield_activated_material_dark"/>
+        <item android:state_enabled="true" android:drawable="@drawable/abc_textfield_default_material_dark"/>
+        <item android:drawable="@drawable/abc_textfield_default_disabled_material_dark"/>
+    </selector>
+
+</inset>
diff --git a/current/support/v7/appcompat/res/drawable/abc_edit_text_material_light.xml b/current/support/v7/appcompat/res/drawable/abc_edit_text_material_light.xml
new file mode 100644
index 0000000..e55990f
--- /dev/null
+++ b/current/support/v7/appcompat/res/drawable/abc_edit_text_material_light.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       android:insetLeft="@dimen/abc_control_inset_material"
+       android:insetTop="@dimen/abc_control_inset_material"
+       android:insetBottom="@dimen/abc_control_inset_material"
+       android:insetRight="@dimen/abc_control_inset_material">
+
+    <selector>
+        <item android:state_enabled="true" android:state_focused="true" android:drawable="@drawable/abc_textfield_activated_material_light"/>
+        <item android:state_enabled="true" android:state_activated="true" android:drawable="@drawable/abc_textfield_activated_material_light"/>
+        <item android:state_enabled="true" android:drawable="@drawable/abc_textfield_default_material_light"/>
+        <item android:drawable="@drawable/abc_textfield_default_disabled_material_light"/>
+    </selector>
+
+</inset>
diff --git a/current/support/v7/appcompat/res/values-v21/themes_base.xml b/current/support/v7/appcompat/res/values-v21/themes_base.xml
index e9a4bdf..2426f01 100644
--- a/current/support/v7/appcompat/res/values-v21/themes_base.xml
+++ b/current/support/v7/appcompat/res/values-v21/themes_base.xml
@@ -83,6 +83,8 @@
         <item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
         <item name="dividerHorizontal">?android:attr/dividerHorizontal</item>
         <item name="dividerVertical">?android:attr/dividerVertical</item>
+        <item name="editTextBackground">?android:attr/editTextBackground</item>
+        <item name="editTextColor">?android:attr/editTextColor</item>
 
         <!-- Copy our color theme attributes to the framework -->
         <item name="android:colorPrimary">?attr/colorPrimary</item>
@@ -92,6 +94,8 @@
         <item name="android:colorControlActivated">?attr/colorControlActivated</item>
         <item name="android:colorControlHighlight">?attr/colorControlHighlight</item>
         <!-- TODO: <item name="android:colorButtonNormal">?attr/colorButtonNormal</item>-->
+
+
     </style>
 
     <style name="Base.V21.Theme.AppCompat.Light" parent="Base.V7.Theme.AppCompat.Light">
@@ -112,6 +116,10 @@
 
         <!-- General view attributes -->
         <item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
+        <item name="dividerHorizontal">?android:attr/dividerHorizontal</item>
+        <item name="dividerVertical">?android:attr/dividerVertical</item>
+        <item name="editTextBackground">?android:attr/editTextBackground</item>
+        <item name="editTextColor">?android:attr/editTextColor</item>
 
         <!-- Copy our color theme attributes to the framework -->
         <item name="android:colorPrimary">?attr/colorPrimary</item>
@@ -168,28 +176,23 @@
     </style>
 
     <style name="Base.ThemeOverlay.AppCompat" parent="android:ThemeOverlay.Material">
-        <item name="colorControlNormal">?android:attr/colorControlNormal</item>
-        <item name="colorControlHighlight">?android:attr/colorControlHighlight</item>
+        <!-- TODO: Need to check if we need to modify anything here -->
     </style>
 
     <style name="Base.ThemeOverlay.AppCompat.Dark" parent="android:ThemeOverlay.Material.Dark">
-        <item name="colorControlNormal">?android:attr/colorControlNormal</item>
-        <item name="colorControlHighlight">?android:attr/colorControlHighlight</item>
+        <!-- TODO: Need to check if we need to modify anything here -->
     </style>
 
     <style name="Base.ThemeOverlay.AppCompat.Light" parent="android:ThemeOverlay.Material.Light">
-        <item name="colorControlNormal">?android:attr/colorControlNormal</item>
-        <item name="colorControlHighlight">?android:attr/colorControlHighlight</item>
+        <!-- TODO: Need to check if we need to modify anything here -->
     </style>
 
     <style name="Base.ThemeOverlay.AppCompat.ActionBar" parent="android:ThemeOverlay.Material.ActionBar">
-        <item name="colorControlNormal">?android:attr/colorControlNormal</item>
-        <item name="colorControlHighlight">?android:attr/colorControlHighlight</item>
+        <!-- TODO: Need to check if we need to modify anything here -->
     </style>
 
     <style name="Base.ThemeOverlay.AppCompat.Dark.ActionBar" parent="android:ThemeOverlay.Material.Dark.ActionBar">
-        <item name="colorControlNormal">?android:attr/colorControlNormal</item>
-        <item name="colorControlHighlight">?android:attr/colorControlHighlight</item>
+        <!-- TODO: Need to check if we need to modify anything here -->
     </style>
 
 </resources>
diff --git a/current/support/v7/appcompat/res/values/attrs.xml b/current/support/v7/appcompat/res/values/attrs.xml
index 46feecb..b5fdf4c 100644
--- a/current/support/v7/appcompat/res/values/attrs.xml
+++ b/current/support/v7/appcompat/res/values/attrs.xml
@@ -204,6 +204,11 @@
         <!-- Default PopupWindow style. -->
         <attr name="popupWindowStyle" format="reference" />
 
+        <!-- EditText text foreground color. -->
+        <attr name="editTextColor" format="reference|color" />
+        <!-- EditText background drawable. -->
+        <attr name="editTextBackground" format="reference" />
+
         <!-- ============================ -->
         <!-- SearchView styles and assets -->
         <!-- ============================ -->
diff --git a/current/support/v7/appcompat/res/values/colors_material.xml b/current/support/v7/appcompat/res/values/colors_material.xml
index bdbfc8e..110093d 100644
--- a/current/support/v7/appcompat/res/values/colors_material.xml
+++ b/current/support/v7/appcompat/res/values/colors_material.xml
@@ -94,8 +94,8 @@
     <color name="material_teal_A200">#ff18ffff</color>
     <color name="material_teal_A400">#ff00e5ff</color>
 
-    <!-- Accent color used by Settings -->
-    <color name="material_dark_teal_A400">#ff009688</color>
+    <color name="material_deep_teal_A200">#ff80cbc4</color>
+    <color name="material_deep_teal_A500">#ff009688</color>
 
     <color name="material_green_100">#ffb7e1cd</color>
     <color name="material_green_300">#ff57bb8a</color>
diff --git a/current/support/v7/appcompat/res/values/dimens.xml b/current/support/v7/appcompat/res/values/dimens.xml
index 2672afd..75a84bd 100644
--- a/current/support/v7/appcompat/res/values/dimens.xml
+++ b/current/support/v7/appcompat/res/values/dimens.xml
@@ -70,4 +70,9 @@
          (the screen is in landscape). This may be either a fraction or a dimension.-->
     <item type="dimen" name="dialog_fixed_height_minor">100%</item>
 
+    <!-- Default insets (outer padding) around controls -->
+    <dimen name="abc_control_inset_material">4dp</dimen>
+    <!-- Default inner padding within controls -->
+    <dimen name="abc_control_padding_material">4dp</dimen>
+
 </resources>
diff --git a/current/support/v7/appcompat/res/values/styles.xml b/current/support/v7/appcompat/res/values/styles.xml
index b2b79c0..bade768 100644
--- a/current/support/v7/appcompat/res/values/styles.xml
+++ b/current/support/v7/appcompat/res/values/styles.xml
@@ -140,9 +140,12 @@
            parent="Base.TextAppearance.AppCompat.Widget.DropDownItem">
     </style>
 
-    <style name="Widget.AppCompat.Spinner.DropDown.ActionBar"
-           parent="Base.Widget.AppCompat.Spinner">
-    </style>
+    <style name="Widget.AppCompat.Spinner"
+           parent="Base.Widget.AppCompat.Spinner" />
+
+    <style name="Widget.AppCompat.Spinner.DropDown" />
+
+    <style name="Widget.AppCompat.Spinner.DropDown.ActionBar" />
 
     <style name="Widget.AppCompat.Light.Spinner.DropDown.ActionBar"
            parent="Base.Widget.AppCompat.Light.Spinner">
@@ -250,6 +253,10 @@
     <style name="Widget.AppCompat.Light.SearchView" parent="Base.Widget.AppCompat.Light.SearchView">
     </style>
 
+    <style name="Widget.AppCompat.EditText"
+           parent="Base.Widget.AppCompat.EditText">
+    </style>
+
     <!-- Toolbar -->
 
     <style name="Widget.AppCompat.Toolbar" parent="Base.Widget.AppCompat.Toolbar" />
diff --git a/current/support/v7/appcompat/res/values/styles_base.xml b/current/support/v7/appcompat/res/values/styles_base.xml
index bd13d79..94c0c03 100644
--- a/current/support/v7/appcompat/res/values/styles_base.xml
+++ b/current/support/v7/appcompat/res/values/styles_base.xml
@@ -407,4 +407,10 @@
         <item name="suggestionRowLayout">@layout/abc_search_dropdown_item_icons_2line</item>
     </style>
 
+    <style name="Base.Widget.AppCompat.EditText" parent="android:Widget.EditText">
+        <item name="android:background">?attr/editTextBackground</item>
+        <item name="android:textColor">?attr/editTextColor</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceMediumInverse</item>
+    </style>
+
 </resources>
diff --git a/current/support/v7/appcompat/res/values/themes_base.xml b/current/support/v7/appcompat/res/values/themes_base.xml
index df81dab..f6a2b66 100644
--- a/current/support/v7/appcompat/res/values/themes_base.xml
+++ b/current/support/v7/appcompat/res/values/themes_base.xml
@@ -193,6 +193,10 @@
         <item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item>
         <item name="toolbarNavigationButtonStyle">@style/Widget.AppCompat.Toolbar.Button.Navigation</item>
 
+        <item name="android:editTextStyle">@style/Widget.AppCompat.EditText</item>
+        <item name="editTextBackground">@drawable/abc_edit_text_material_dark</item>
+        <item name="editTextColor">?android:attr/textColorPrimary</item>
+
         <!-- Color palette -->
         <item name="colorPrimaryDark">@color/material_blue_grey_900</item>
         <item name="colorPrimary">@color/material_blue_grey_800</item>
@@ -288,6 +292,10 @@
         <item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item>
         <item name="toolbarNavigationButtonStyle">@style/Widget.AppCompat.Toolbar.Button.Navigation</item>
 
+        <item name="android:editTextStyle">@style/Widget.AppCompat.EditText</item>
+        <item name="editTextBackground">@drawable/abc_edit_text_material_light</item>
+        <item name="editTextColor">?android:attr/textColorPrimary</item>
+
         <!-- Color palette -->
         <item name="colorPrimaryDark">@color/material_blue_grey_600</item>
         <item name="colorPrimary">@color/material_blue_grey_400</item>
diff --git a/current/support/v7/cardview/libs/android-support-v7-cardview.jar b/current/support/v7/cardview/libs/android-support-v7-cardview.jar
index b984a49..1f664a0 100644
--- a/current/support/v7/cardview/libs/android-support-v7-cardview.jar
+++ b/current/support/v7/cardview/libs/android-support-v7-cardview.jar
Binary files differ
diff --git a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
index 00c0de8..85000ad 100644
--- a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
+++ b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar
Binary files differ
diff --git a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
index 6ba931b..b64f9f0 100644
--- a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
+++ b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar
Binary files differ
diff --git a/current/support/v7/palette/libs/android-support-v7-palette.jar b/current/support/v7/palette/libs/android-support-v7-palette.jar
index 06c7a6a..186550f 100644
--- a/current/support/v7/palette/libs/android-support-v7-palette.jar
+++ b/current/support/v7/palette/libs/android-support-v7-palette.jar
Binary files differ
diff --git a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
index 26423dc..0de88e6 100644
--- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
+++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar
Binary files differ
diff --git a/current/uiautomator.jar b/current/uiautomator.jar
index 1e0a385..2efcf24 100644
--- a/current/uiautomator.jar
+++ b/current/uiautomator.jar
Binary files differ