diff --git a/1-Base/build.gradle b/1-Base/build.gradle
index 2ff3fb8..af31836 100644
--- a/1-Base/build.gradle
+++ b/1-Base/build.gradle
@@ -17,19 +17,19 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.3"
 
     defaultConfig {
         applicationId "com.example.android.materialdesigncodelab"
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:design:24.2.1'
 }
diff --git a/1-Base/src/main/res/menu/menu_main.xml b/1-Base/src/main/res/menu/menu_main.xml
index d577760..419a40f 100644
--- a/1-Base/src/main/res/menu/menu_main.xml
+++ b/1-Base/src/main/res/menu/menu_main.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/1-Base/src/main/res/values-w820dp/dimens.xml b/1-Base/src/main/res/values-w820dp/dimens.xml
index f305e55..a3ec367 100644
--- a/1-Base/src/main/res/values-w820dp/dimens.xml
+++ b/1-Base/src/main/res/values-w820dp/dimens.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/1-Base/src/main/res/values/dimens.xml b/1-Base/src/main/res/values/dimens.xml
index 2d6a0cb..192632f 100644
--- a/1-Base/src/main/res/values/dimens.xml
+++ b/1-Base/src/main/res/values/dimens.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/1-Base/src/main/res/values/strings.xml b/1-Base/src/main/res/values/strings.xml
index 333bed2..3e82b95 100644
--- a/1-Base/src/main/res/values/strings.xml
+++ b/1-Base/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/1-Base/src/main/res/values/styles.xml b/1-Base/src/main/res/values/styles.xml
index 881cee2..a8b3109 100644
--- a/1-Base/src/main/res/values/styles.xml
+++ b/1-Base/src/main/res/values/styles.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
@@ -18,5 +19,5 @@
     <style name="AppTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
     </style>
-    <style name="AppTheme" parent="AppTheme.Base"></style>
+    <style name="AppTheme" parent="AppTheme.Base"/>
 </resources>
diff --git a/2-Color/build.gradle b/2-Color/build.gradle
index 2ff3fb8..af31836 100644
--- a/2-Color/build.gradle
+++ b/2-Color/build.gradle
@@ -17,19 +17,19 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.3"
 
     defaultConfig {
         applicationId "com.example.android.materialdesigncodelab"
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:design:24.2.1'
 }
diff --git a/2-Color/src/main/res/menu/menu_main.xml b/2-Color/src/main/res/menu/menu_main.xml
index d577760..419a40f 100644
--- a/2-Color/src/main/res/menu/menu_main.xml
+++ b/2-Color/src/main/res/menu/menu_main.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/2-Color/src/main/res/values-w820dp/dimens.xml b/2-Color/src/main/res/values-w820dp/dimens.xml
index f305e55..a3ec367 100644
--- a/2-Color/src/main/res/values-w820dp/dimens.xml
+++ b/2-Color/src/main/res/values-w820dp/dimens.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/2-Color/src/main/res/values/dimens.xml b/2-Color/src/main/res/values/dimens.xml
index 2d6a0cb..192632f 100644
--- a/2-Color/src/main/res/values/dimens.xml
+++ b/2-Color/src/main/res/values/dimens.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/2-Color/src/main/res/values/strings.xml b/2-Color/src/main/res/values/strings.xml
index 333bed2..3e82b95 100644
--- a/2-Color/src/main/res/values/strings.xml
+++ b/2-Color/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/2-Color/src/main/res/values/styles.xml b/2-Color/src/main/res/values/styles.xml
index 68f9d5f..15d2cd1 100644
--- a/2-Color/src/main/res/values/styles.xml
+++ b/2-Color/src/main/res/values/styles.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
@@ -24,5 +25,5 @@
         <item name="colorAccent">#00B0FF</item>
         <!-- Blue -->
     </style>
-    <style name="AppTheme" parent="AppTheme.Base"></style>
-</resources>
\ No newline at end of file
+    <style name="AppTheme" parent="AppTheme.Base"/>
+</resources>
diff --git a/3-Layout/build.gradle b/3-Layout/build.gradle
index f330932..fcdcc48 100644
--- a/3-Layout/build.gradle
+++ b/3-Layout/build.gradle
@@ -17,20 +17,20 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.3"
 
     defaultConfig {
         applicationId "com.example.android.materialdesigncodelab"
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
-    compile 'com.android.support:recyclerview-v7:23.4.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:design:24.2.1'
+    compile 'com.android.support:recyclerview-v7:24.2.1'
 }
diff --git a/3-Layout/src/main/res/menu/menu_main.xml b/3-Layout/src/main/res/menu/menu_main.xml
index d577760..419a40f 100644
--- a/3-Layout/src/main/res/menu/menu_main.xml
+++ b/3-Layout/src/main/res/menu/menu_main.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/3-Layout/src/main/res/values-w820dp/dimens.xml b/3-Layout/src/main/res/values-w820dp/dimens.xml
index f305e55..a3ec367 100644
--- a/3-Layout/src/main/res/values-w820dp/dimens.xml
+++ b/3-Layout/src/main/res/values-w820dp/dimens.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/3-Layout/src/main/res/values/dimens.xml b/3-Layout/src/main/res/values/dimens.xml
index 2d6a0cb..192632f 100644
--- a/3-Layout/src/main/res/values/dimens.xml
+++ b/3-Layout/src/main/res/values/dimens.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/3-Layout/src/main/res/values/strings.xml b/3-Layout/src/main/res/values/strings.xml
index 333bed2..3e82b95 100644
--- a/3-Layout/src/main/res/values/strings.xml
+++ b/3-Layout/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/3-Layout/src/main/res/values/styles.xml b/3-Layout/src/main/res/values/styles.xml
index 68f9d5f..15d2cd1 100644
--- a/3-Layout/src/main/res/values/styles.xml
+++ b/3-Layout/src/main/res/values/styles.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
@@ -24,5 +25,5 @@
         <item name="colorAccent">#00B0FF</item>
         <!-- Blue -->
     </style>
-    <style name="AppTheme" parent="AppTheme.Base"></style>
-</resources>
\ No newline at end of file
+    <style name="AppTheme" parent="AppTheme.Base"/>
+</resources>
diff --git a/4-RecyclerView/build.gradle b/4-RecyclerView/build.gradle
index fdee7a6..83dc288 100644
--- a/4-RecyclerView/build.gradle
+++ b/4-RecyclerView/build.gradle
@@ -17,21 +17,21 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.3"
 
     defaultConfig {
         applicationId "com.example.android.materialdesigncodelab"
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
     }
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
-    compile 'com.android.support:cardview-v7:23.4.0'
-    compile 'com.android.support:recyclerview-v7:23.4.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:design:24.2.1'
+    compile 'com.android.support:cardview-v7:24.2.1'
+    compile 'com.android.support:recyclerview-v7:24.2.1'
 }
diff --git a/4-RecyclerView/src/main/res/layout/item_card.xml b/4-RecyclerView/src/main/res/layout/item_card.xml
index c0e4bf6..33153d2 100644
--- a/4-RecyclerView/src/main/res/layout/item_card.xml
+++ b/4-RecyclerView/src/main/res/layout/item_card.xml
@@ -41,8 +41,9 @@
             android:id="@+id/card_title"
             android:layout_width="match_parent"
             android:layout_height="@dimen/card_title_height"
-            android:layout_alignBottom="@+id/card_image"
+            android:layout_alignBottom="@id/card_image"
             android:layout_marginLeft="@dimen/md_keylines"
+            android:layout_marginStart="@dimen/md_keylines"
             tools:text="@string/item_title"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
             android:textColor="@color/white" />
@@ -51,14 +52,14 @@
             android:id="@+id/card_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/card_image"
+            android:layout_below="@id/card_image"
             android:layout_marginLeft="@dimen/md_keylines"
             android:layout_marginTop="@dimen/md_keylines"
             android:layout_marginBottom="@dimen/md_keylines"
             android:layout_marginRight="@dimen/md_keylines"
             tools:text="@string/item_desc"
             android:ellipsize="end"
-            android:singleLine="true"
+            android:maxLines="1"
             android:textColor="@color/dark_grey"
             android:textSize="@dimen/article_subheading" />
 
@@ -66,7 +67,7 @@
             android:id="@+id/action_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/card_text"
+            android:layout_below="@id/card_text"
             style="?android:attr/borderlessButtonStyle"
             android:textColor="?attr/colorPrimary"
             android:text="Action" />
diff --git a/4-RecyclerView/src/main/res/layout/item_list.xml b/4-RecyclerView/src/main/res/layout/item_list.xml
index d7f9547..6fcb596 100644
--- a/4-RecyclerView/src/main/res/layout/item_list.xml
+++ b/4-RecyclerView/src/main/res/layout/item_list.xml
@@ -33,7 +33,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/md_keylines"
-        android:layout_toRightOf="@+id/list_avatar"
+        android:layout_marginStart="@dimen/md_keylines"
+        android:layout_toRightOf="@id/list_avatar"
+        android:layout_toEndOf="@id/list_avatar"
         tools:text="@string/item_title"
         android:textAppearance="?attr/textAppearanceListItem"
         android:textSize="@dimen/article_subheading" />
@@ -42,12 +44,14 @@
         android:id="@+id/list_desc"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/list_title"
+        android:layout_below="@id/list_title"
         android:layout_marginLeft="@dimen/md_keylines"
-        android:layout_toRightOf="@+id/list_avatar"
+        android:layout_marginStart="@dimen/md_keylines"
+        android:layout_toRightOf="@id/list_avatar"
+        android:layout_toEndOf="@id/list_avatar"
         android:textColor="@color/medium_grey"
         android:ellipsize="end"
-        android:singleLine="true"
+        android:maxLines="1"
         tools:text="@string/item_desc"
         android:textAppearance="?attr/textAppearanceListItem"
         android:textSize="@dimen/list_body" />
diff --git a/4-RecyclerView/src/main/res/menu/menu_main.xml b/4-RecyclerView/src/main/res/menu/menu_main.xml
index d577760..419a40f 100644
--- a/4-RecyclerView/src/main/res/menu/menu_main.xml
+++ b/4-RecyclerView/src/main/res/menu/menu_main.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/4-RecyclerView/src/main/res/values-w820dp/dimens.xml b/4-RecyclerView/src/main/res/values-w820dp/dimens.xml
index f305e55..a3ec367 100644
--- a/4-RecyclerView/src/main/res/values-w820dp/dimens.xml
+++ b/4-RecyclerView/src/main/res/values-w820dp/dimens.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/4-RecyclerView/src/main/res/values/dimens.xml b/4-RecyclerView/src/main/res/values/dimens.xml
index 2d6a0cb..192632f 100644
--- a/4-RecyclerView/src/main/res/values/dimens.xml
+++ b/4-RecyclerView/src/main/res/values/dimens.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/4-RecyclerView/src/main/res/values/strings.xml b/4-RecyclerView/src/main/res/values/strings.xml
index 333bed2..3e82b95 100644
--- a/4-RecyclerView/src/main/res/values/strings.xml
+++ b/4-RecyclerView/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/4-RecyclerView/src/main/res/values/styles.xml b/4-RecyclerView/src/main/res/values/styles.xml
index 68f9d5f..15d2cd1 100644
--- a/4-RecyclerView/src/main/res/values/styles.xml
+++ b/4-RecyclerView/src/main/res/values/styles.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
@@ -24,5 +25,5 @@
         <item name="colorAccent">#00B0FF</item>
         <!-- Blue -->
     </style>
-    <style name="AppTheme" parent="AppTheme.Base"></style>
-</resources>
\ No newline at end of file
+    <style name="AppTheme" parent="AppTheme.Base"/>
+</resources>
diff --git a/5-VectorAssets/build.gradle b/5-VectorAssets/build.gradle
index 01ce851..4991c2a 100644
--- a/5-VectorAssets/build.gradle
+++ b/5-VectorAssets/build.gradle
@@ -17,13 +17,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.3"
 
     defaultConfig {
         applicationId "com.example.android.materialdesigncodelab"
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
         vectorDrawables.useSupportLibrary = true
@@ -31,8 +31,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
-    compile 'com.android.support:cardview-v7:23.4.0'
-    compile 'com.android.support:recyclerview-v7:23.4.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:design:24.2.1'
+    compile 'com.android.support:cardview-v7:24.2.1'
+    compile 'com.android.support:recyclerview-v7:24.2.1'
 }
diff --git a/5-VectorAssets/src/main/res/drawable/ic_add.xml b/5-VectorAssets/src/main/res/drawable/ic_add.xml
index 0258249..df011ec 100644
--- a/5-VectorAssets/src/main/res/drawable/ic_add.xml
+++ b/5-VectorAssets/src/main/res/drawable/ic_add.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/5-VectorAssets/src/main/res/drawable/ic_favorite.xml b/5-VectorAssets/src/main/res/drawable/ic_favorite.xml
index cfba5d8..70db10c 100644
--- a/5-VectorAssets/src/main/res/drawable/ic_favorite.xml
+++ b/5-VectorAssets/src/main/res/drawable/ic_favorite.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/5-VectorAssets/src/main/res/drawable/ic_menu.xml b/5-VectorAssets/src/main/res/drawable/ic_menu.xml
index 6d9343b..a6abd74 100644
--- a/5-VectorAssets/src/main/res/drawable/ic_menu.xml
+++ b/5-VectorAssets/src/main/res/drawable/ic_menu.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/5-VectorAssets/src/main/res/drawable/ic_share.xml b/5-VectorAssets/src/main/res/drawable/ic_share.xml
index e3fe874..eb0275a 100644
--- a/5-VectorAssets/src/main/res/drawable/ic_share.xml
+++ b/5-VectorAssets/src/main/res/drawable/ic_share.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/5-VectorAssets/src/main/res/layout/item_card.xml b/5-VectorAssets/src/main/res/layout/item_card.xml
index 9f488c1..e3cad94 100644
--- a/5-VectorAssets/src/main/res/layout/item_card.xml
+++ b/5-VectorAssets/src/main/res/layout/item_card.xml
@@ -41,8 +41,9 @@
             android:id="@+id/card_title"
             android:layout_width="match_parent"
             android:layout_height="@dimen/card_title_height"
-            android:layout_alignBottom="@+id/card_image"
+            android:layout_alignBottom="@id/card_image"
             android:layout_marginLeft="@dimen/md_keylines"
+            android:layout_marginStart="@dimen/md_keylines"
             tools:text="@string/item_title"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
             android:textColor="@color/white" />
@@ -51,14 +52,14 @@
             android:id="@+id/card_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/card_image"
+            android:layout_below="@id/card_image"
             android:layout_marginLeft="@dimen/md_keylines"
             android:layout_marginTop="@dimen/md_keylines"
             android:layout_marginBottom="@dimen/md_keylines"
             android:layout_marginRight="@dimen/md_keylines"
             tools:text="@string/item_desc"
             android:ellipsize="end"
-            android:singleLine="true"
+            android:maxLines="1"
             android:textColor="@color/dark_grey"
             android:textSize="@dimen/article_subheading" />
 
@@ -66,7 +67,7 @@
             android:id="@+id/action_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/card_text"
+            android:layout_below="@id/card_text"
             style="?android:attr/borderlessButtonStyle"
             android:textColor="?attr/colorPrimary"
             android:text="Action" />
@@ -76,9 +77,11 @@
             android:layout_width="@dimen/cards_button_width"
             android:layout_height="@dimen/cards_button_height"
             android:layout_marginRight="@dimen/md_keylines"
+            android:layout_marginEnd="@dimen/md_keylines"
             app:srcCompat="@drawable/ic_share"
-            android:layout_below="@+id/card_text"
+            android:layout_below="@id/card_text"
             android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             style="?android:attr/borderlessButtonStyle"
             android:tint="@color/button_grey" />
 
@@ -87,9 +90,11 @@
             android:layout_width="@dimen/cards_button_width"
             android:layout_height="@dimen/cards_button_height"
             android:layout_marginRight="@dimen/md_keylines"
+            android:layout_marginEnd="@dimen/md_keylines"
             app:srcCompat="@drawable/ic_favorite"
-            android:layout_below="@+id/card_text"
+            android:layout_below="@id/card_text"
             android:layout_toLeftOf="@id/share_button"
+            android:layout_toStartOf="@id/share_button"
             style="?android:attr/borderlessButtonStyle"
             android:tint="@color/button_grey" />
     </RelativeLayout>
diff --git a/5-VectorAssets/src/main/res/layout/item_list.xml b/5-VectorAssets/src/main/res/layout/item_list.xml
index f743e80..e686ffb 100644
--- a/5-VectorAssets/src/main/res/layout/item_list.xml
+++ b/5-VectorAssets/src/main/res/layout/item_list.xml
@@ -34,7 +34,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/md_keylines"
-        android:layout_toRightOf="@+id/list_avatar"
+        android:layout_marginStart="@dimen/md_keylines"
+        android:layout_toRightOf="@id/list_avatar"
+        android:layout_toEndOf="@id/list_avatar"
         tools:text="@string/item_title"
         android:textAppearance="?attr/textAppearanceListItem"
         android:textSize="@dimen/article_subheading" />
@@ -45,10 +47,12 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/list_title"
         android:layout_marginLeft="@dimen/md_keylines"
-        android:layout_toRightOf="@+id/list_avatar"
+        android:layout_marginStart="@dimen/md_keylines"
+        android:layout_toRightOf="@id/list_avatar"
+        android:layout_toEndOf="@id/list_avatar"
         android:textColor="@color/medium_grey"
         android:ellipsize="end"
-        android:singleLine="true"
+        android:maxLines="1"
         tools:text="@string/item_desc"
         android:textAppearance="?attr/textAppearanceListItem"
         android:textSize="@dimen/list_body" />
diff --git a/5-VectorAssets/src/main/res/menu/menu_main.xml b/5-VectorAssets/src/main/res/menu/menu_main.xml
index d577760..419a40f 100644
--- a/5-VectorAssets/src/main/res/menu/menu_main.xml
+++ b/5-VectorAssets/src/main/res/menu/menu_main.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/5-VectorAssets/src/main/res/values-w820dp/dimens.xml b/5-VectorAssets/src/main/res/values-w820dp/dimens.xml
index f305e55..a3ec367 100644
--- a/5-VectorAssets/src/main/res/values-w820dp/dimens.xml
+++ b/5-VectorAssets/src/main/res/values-w820dp/dimens.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/5-VectorAssets/src/main/res/values/dimens.xml b/5-VectorAssets/src/main/res/values/dimens.xml
index 2d6a0cb..192632f 100644
--- a/5-VectorAssets/src/main/res/values/dimens.xml
+++ b/5-VectorAssets/src/main/res/values/dimens.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/5-VectorAssets/src/main/res/values/strings.xml b/5-VectorAssets/src/main/res/values/strings.xml
index 333bed2..3e82b95 100644
--- a/5-VectorAssets/src/main/res/values/strings.xml
+++ b/5-VectorAssets/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/5-VectorAssets/src/main/res/values/styles.xml b/5-VectorAssets/src/main/res/values/styles.xml
index 68f9d5f..15d2cd1 100644
--- a/5-VectorAssets/src/main/res/values/styles.xml
+++ b/5-VectorAssets/src/main/res/values/styles.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
@@ -24,5 +25,5 @@
         <item name="colorAccent">#00B0FF</item>
         <!-- Blue -->
     </style>
-    <style name="AppTheme" parent="AppTheme.Base"></style>
-</resources>
\ No newline at end of file
+    <style name="AppTheme" parent="AppTheme.Base"/>
+</resources>
diff --git a/6-PageElement/build.gradle b/6-PageElement/build.gradle
index 01ce851..4991c2a 100644
--- a/6-PageElement/build.gradle
+++ b/6-PageElement/build.gradle
@@ -17,13 +17,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.3"
 
     defaultConfig {
         applicationId "com.example.android.materialdesigncodelab"
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
         vectorDrawables.useSupportLibrary = true
@@ -31,8 +31,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
-    compile 'com.android.support:cardview-v7:23.4.0'
-    compile 'com.android.support:recyclerview-v7:23.4.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:design:24.2.1'
+    compile 'com.android.support:cardview-v7:24.2.1'
+    compile 'com.android.support:recyclerview-v7:24.2.1'
 }
diff --git a/6-PageElement/src/main/res/drawable/ic_add.xml b/6-PageElement/src/main/res/drawable/ic_add.xml
index 0258249..df011ec 100644
--- a/6-PageElement/src/main/res/drawable/ic_add.xml
+++ b/6-PageElement/src/main/res/drawable/ic_add.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/6-PageElement/src/main/res/drawable/ic_favorite.xml b/6-PageElement/src/main/res/drawable/ic_favorite.xml
index cfba5d8..70db10c 100644
--- a/6-PageElement/src/main/res/drawable/ic_favorite.xml
+++ b/6-PageElement/src/main/res/drawable/ic_favorite.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/6-PageElement/src/main/res/drawable/ic_menu.xml b/6-PageElement/src/main/res/drawable/ic_menu.xml
index 6d9343b..a6abd74 100644
--- a/6-PageElement/src/main/res/drawable/ic_menu.xml
+++ b/6-PageElement/src/main/res/drawable/ic_menu.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/6-PageElement/src/main/res/drawable/ic_share.xml b/6-PageElement/src/main/res/drawable/ic_share.xml
index e3fe874..eb0275a 100644
--- a/6-PageElement/src/main/res/drawable/ic_share.xml
+++ b/6-PageElement/src/main/res/drawable/ic_share.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/6-PageElement/src/main/res/layout/activity_main.xml b/6-PageElement/src/main/res/layout/activity_main.xml
index d7af6a3..dab7bc7 100644
--- a/6-PageElement/src/main/res/layout/activity_main.xml
+++ b/6-PageElement/src/main/res/layout/activity_main.xml
@@ -54,9 +54,10 @@
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="right|bottom"
+            android:layout_gravity="end|bottom"
             android:layout_marginBottom="@dimen/md_keylines"
             android:layout_marginRight="@dimen/md_keylines"
+            android:layout_marginEnd="@dimen/md_keylines"
             app:srcCompat="@drawable/ic_add"
             android:tint="@color/white"/>
     </android.support.design.widget.CoordinatorLayout>
@@ -68,4 +69,4 @@
         android:fitsSystemWindows="true"
         app:headerLayout="@layout/navheader"
         app:menu="@menu/menu_navigation" />
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
diff --git a/6-PageElement/src/main/res/layout/item_card.xml b/6-PageElement/src/main/res/layout/item_card.xml
index 9f488c1..e3cad94 100644
--- a/6-PageElement/src/main/res/layout/item_card.xml
+++ b/6-PageElement/src/main/res/layout/item_card.xml
@@ -41,8 +41,9 @@
             android:id="@+id/card_title"
             android:layout_width="match_parent"
             android:layout_height="@dimen/card_title_height"
-            android:layout_alignBottom="@+id/card_image"
+            android:layout_alignBottom="@id/card_image"
             android:layout_marginLeft="@dimen/md_keylines"
+            android:layout_marginStart="@dimen/md_keylines"
             tools:text="@string/item_title"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
             android:textColor="@color/white" />
@@ -51,14 +52,14 @@
             android:id="@+id/card_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/card_image"
+            android:layout_below="@id/card_image"
             android:layout_marginLeft="@dimen/md_keylines"
             android:layout_marginTop="@dimen/md_keylines"
             android:layout_marginBottom="@dimen/md_keylines"
             android:layout_marginRight="@dimen/md_keylines"
             tools:text="@string/item_desc"
             android:ellipsize="end"
-            android:singleLine="true"
+            android:maxLines="1"
             android:textColor="@color/dark_grey"
             android:textSize="@dimen/article_subheading" />
 
@@ -66,7 +67,7 @@
             android:id="@+id/action_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/card_text"
+            android:layout_below="@id/card_text"
             style="?android:attr/borderlessButtonStyle"
             android:textColor="?attr/colorPrimary"
             android:text="Action" />
@@ -76,9 +77,11 @@
             android:layout_width="@dimen/cards_button_width"
             android:layout_height="@dimen/cards_button_height"
             android:layout_marginRight="@dimen/md_keylines"
+            android:layout_marginEnd="@dimen/md_keylines"
             app:srcCompat="@drawable/ic_share"
-            android:layout_below="@+id/card_text"
+            android:layout_below="@id/card_text"
             android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             style="?android:attr/borderlessButtonStyle"
             android:tint="@color/button_grey" />
 
@@ -87,9 +90,11 @@
             android:layout_width="@dimen/cards_button_width"
             android:layout_height="@dimen/cards_button_height"
             android:layout_marginRight="@dimen/md_keylines"
+            android:layout_marginEnd="@dimen/md_keylines"
             app:srcCompat="@drawable/ic_favorite"
-            android:layout_below="@+id/card_text"
+            android:layout_below="@id/card_text"
             android:layout_toLeftOf="@id/share_button"
+            android:layout_toStartOf="@id/share_button"
             style="?android:attr/borderlessButtonStyle"
             android:tint="@color/button_grey" />
     </RelativeLayout>
diff --git a/6-PageElement/src/main/res/layout/item_list.xml b/6-PageElement/src/main/res/layout/item_list.xml
index d7f9547..6fcb596 100644
--- a/6-PageElement/src/main/res/layout/item_list.xml
+++ b/6-PageElement/src/main/res/layout/item_list.xml
@@ -33,7 +33,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/md_keylines"
-        android:layout_toRightOf="@+id/list_avatar"
+        android:layout_marginStart="@dimen/md_keylines"
+        android:layout_toRightOf="@id/list_avatar"
+        android:layout_toEndOf="@id/list_avatar"
         tools:text="@string/item_title"
         android:textAppearance="?attr/textAppearanceListItem"
         android:textSize="@dimen/article_subheading" />
@@ -42,12 +44,14 @@
         android:id="@+id/list_desc"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/list_title"
+        android:layout_below="@id/list_title"
         android:layout_marginLeft="@dimen/md_keylines"
-        android:layout_toRightOf="@+id/list_avatar"
+        android:layout_marginStart="@dimen/md_keylines"
+        android:layout_toRightOf="@id/list_avatar"
+        android:layout_toEndOf="@id/list_avatar"
         android:textColor="@color/medium_grey"
         android:ellipsize="end"
-        android:singleLine="true"
+        android:maxLines="1"
         tools:text="@string/item_desc"
         android:textAppearance="?attr/textAppearanceListItem"
         android:textSize="@dimen/list_body" />
diff --git a/6-PageElement/src/main/res/layout/navheader.xml b/6-PageElement/src/main/res/layout/navheader.xml
index 064a9eb..386bb8d 100644
--- a/6-PageElement/src/main/res/layout/navheader.xml
+++ b/6-PageElement/src/main/res/layout/navheader.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/6-PageElement/src/main/res/menu/menu_main.xml b/6-PageElement/src/main/res/menu/menu_main.xml
index d577760..419a40f 100644
--- a/6-PageElement/src/main/res/menu/menu_main.xml
+++ b/6-PageElement/src/main/res/menu/menu_main.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/6-PageElement/src/main/res/menu/menu_navigation.xml b/6-PageElement/src/main/res/menu/menu_navigation.xml
index 5b68783..bf7ba97 100644
--- a/6-PageElement/src/main/res/menu/menu_navigation.xml
+++ b/6-PageElement/src/main/res/menu/menu_navigation.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/6-PageElement/src/main/res/values-w820dp/dimens.xml b/6-PageElement/src/main/res/values-w820dp/dimens.xml
index f305e55..a3ec367 100644
--- a/6-PageElement/src/main/res/values-w820dp/dimens.xml
+++ b/6-PageElement/src/main/res/values-w820dp/dimens.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/6-PageElement/src/main/res/values/dimens.xml b/6-PageElement/src/main/res/values/dimens.xml
index 2d6a0cb..192632f 100644
--- a/6-PageElement/src/main/res/values/dimens.xml
+++ b/6-PageElement/src/main/res/values/dimens.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/6-PageElement/src/main/res/values/strings.xml b/6-PageElement/src/main/res/values/strings.xml
index 333bed2..3e82b95 100644
--- a/6-PageElement/src/main/res/values/strings.xml
+++ b/6-PageElement/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/6-PageElement/src/main/res/values/styles.xml b/6-PageElement/src/main/res/values/styles.xml
index 68f9d5f..15d2cd1 100644
--- a/6-PageElement/src/main/res/values/styles.xml
+++ b/6-PageElement/src/main/res/values/styles.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
@@ -24,5 +25,5 @@
         <item name="colorAccent">#00B0FF</item>
         <!-- Blue -->
     </style>
-    <style name="AppTheme" parent="AppTheme.Base"></style>
-</resources>
\ No newline at end of file
+    <style name="AppTheme" parent="AppTheme.Base"/>
+</resources>
diff --git a/app/build.gradle b/app/build.gradle
index 01ce851..4991c2a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,13 +17,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.3"
 
     defaultConfig {
         applicationId "com.example.android.materialdesigncodelab"
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
         vectorDrawables.useSupportLibrary = true
@@ -31,8 +31,8 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile 'com.android.support:design:23.4.0'
-    compile 'com.android.support:cardview-v7:23.4.0'
-    compile 'com.android.support:recyclerview-v7:23.4.0'
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:design:24.2.1'
+    compile 'com.android.support:cardview-v7:24.2.1'
+    compile 'com.android.support:recyclerview-v7:24.2.1'
 }
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
index 0258249..df011ec 100644
--- a/app/src/main/res/drawable/ic_add.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/app/src/main/res/drawable/ic_favorite.xml b/app/src/main/res/drawable/ic_favorite.xml
index cfba5d8..70db10c 100644
--- a/app/src/main/res/drawable/ic_favorite.xml
+++ b/app/src/main/res/drawable/ic_favorite.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml
index 6d9343b..a6abd74 100644
--- a/app/src/main/res/drawable/ic_menu.xml
+++ b/app/src/main/res/drawable/ic_menu.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index e3fe874..eb0275a 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml
index 89b9ae3..c44edef 100644
--- a/app/src/main/res/layout/activity_detail.xml
+++ b/app/src/main/res/layout/activity_detail.xml
@@ -69,7 +69,9 @@
             android:layout_height="match_parent"
             android:orientation="vertical"
             android:paddingLeft="@dimen/article_keylines"
+            android:paddingStart="@dimen/article_keylines"
             android:paddingRight="@dimen/md_keylines"
+            android:paddingEnd="@dimen/md_keylines"
             android:paddingTop="@dimen/md_keylines">
 
             <TextView
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 86ab240..a0421dc 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -56,9 +56,10 @@
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="right|bottom"
+            android:layout_gravity="end|bottom"
             android:layout_marginBottom="@dimen/md_keylines"
             android:layout_marginRight="@dimen/md_keylines"
+            android:layout_marginEnd="@dimen/md_keylines"
             app:srcCompat="@drawable/ic_add"
             android:tint="@color/white"/>
     </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/item_card.xml b/app/src/main/res/layout/item_card.xml
index 9f488c1..e3cad94 100644
--- a/app/src/main/res/layout/item_card.xml
+++ b/app/src/main/res/layout/item_card.xml
@@ -41,8 +41,9 @@
             android:id="@+id/card_title"
             android:layout_width="match_parent"
             android:layout_height="@dimen/card_title_height"
-            android:layout_alignBottom="@+id/card_image"
+            android:layout_alignBottom="@id/card_image"
             android:layout_marginLeft="@dimen/md_keylines"
+            android:layout_marginStart="@dimen/md_keylines"
             tools:text="@string/item_title"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
             android:textColor="@color/white" />
@@ -51,14 +52,14 @@
             android:id="@+id/card_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/card_image"
+            android:layout_below="@id/card_image"
             android:layout_marginLeft="@dimen/md_keylines"
             android:layout_marginTop="@dimen/md_keylines"
             android:layout_marginBottom="@dimen/md_keylines"
             android:layout_marginRight="@dimen/md_keylines"
             tools:text="@string/item_desc"
             android:ellipsize="end"
-            android:singleLine="true"
+            android:maxLines="1"
             android:textColor="@color/dark_grey"
             android:textSize="@dimen/article_subheading" />
 
@@ -66,7 +67,7 @@
             android:id="@+id/action_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/card_text"
+            android:layout_below="@id/card_text"
             style="?android:attr/borderlessButtonStyle"
             android:textColor="?attr/colorPrimary"
             android:text="Action" />
@@ -76,9 +77,11 @@
             android:layout_width="@dimen/cards_button_width"
             android:layout_height="@dimen/cards_button_height"
             android:layout_marginRight="@dimen/md_keylines"
+            android:layout_marginEnd="@dimen/md_keylines"
             app:srcCompat="@drawable/ic_share"
-            android:layout_below="@+id/card_text"
+            android:layout_below="@id/card_text"
             android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             style="?android:attr/borderlessButtonStyle"
             android:tint="@color/button_grey" />
 
@@ -87,9 +90,11 @@
             android:layout_width="@dimen/cards_button_width"
             android:layout_height="@dimen/cards_button_height"
             android:layout_marginRight="@dimen/md_keylines"
+            android:layout_marginEnd="@dimen/md_keylines"
             app:srcCompat="@drawable/ic_favorite"
-            android:layout_below="@+id/card_text"
+            android:layout_below="@id/card_text"
             android:layout_toLeftOf="@id/share_button"
+            android:layout_toStartOf="@id/share_button"
             style="?android:attr/borderlessButtonStyle"
             android:tint="@color/button_grey" />
     </RelativeLayout>
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index d7f9547..6fcb596 100644
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -33,7 +33,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/md_keylines"
-        android:layout_toRightOf="@+id/list_avatar"
+        android:layout_marginStart="@dimen/md_keylines"
+        android:layout_toRightOf="@id/list_avatar"
+        android:layout_toEndOf="@id/list_avatar"
         tools:text="@string/item_title"
         android:textAppearance="?attr/textAppearanceListItem"
         android:textSize="@dimen/article_subheading" />
@@ -42,12 +44,14 @@
         android:id="@+id/list_desc"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/list_title"
+        android:layout_below="@id/list_title"
         android:layout_marginLeft="@dimen/md_keylines"
-        android:layout_toRightOf="@+id/list_avatar"
+        android:layout_marginStart="@dimen/md_keylines"
+        android:layout_toRightOf="@id/list_avatar"
+        android:layout_toEndOf="@id/list_avatar"
         android:textColor="@color/medium_grey"
         android:ellipsize="end"
-        android:singleLine="true"
+        android:maxLines="1"
         tools:text="@string/item_desc"
         android:textAppearance="?attr/textAppearanceListItem"
         android:textSize="@dimen/list_body" />
diff --git a/app/src/main/res/layout/navheader.xml b/app/src/main/res/layout/navheader.xml
index 064a9eb..386bb8d 100644
--- a/app/src/main/res/layout/navheader.xml
+++ b/app/src/main/res/layout/navheader.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index d577760..419a40f 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
index f305e55..a3ec367 100644
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 2d6a0cb..192632f 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 333bed2..3e82b95 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9ec9632..15d2cd1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
@@ -24,5 +25,5 @@
         <item name="colorAccent">#00B0FF</item>
         <!-- Blue -->
     </style>
-    <style name="AppTheme" parent="AppTheme.Base"></style>
+    <style name="AppTheme" parent="AppTheme.Base"/>
 </resources>
diff --git a/build.gradle b/build.gradle
index f6e9073..b193299 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.android.tools.build:gradle:2.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 89e8d54..9315604 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed May 11 15:57:31 JST 2016
+#Sun Oct 09 16:43:11 BST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip