diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
index 294e85834..3e2a63aa6 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsGeneralController.kt
@@ -50,8 +50,8 @@ class SettingsGeneralController : SettingsController() {
         intListPreference {
             key = Keys.theme
             titleRes = R.string.pref_theme
-            entriesRes = arrayOf(R.string.light_theme, R.string.dark_theme)
-            entryValues = arrayOf("1", "2")
+            entriesRes = arrayOf(R.string.light_theme, R.string.dark_theme, R.string.amoled_theme)
+            entryValues = arrayOf("1", "2", "3")
             defaultValue = "1"
             summary = "%s"
 
diff --git a/app/src/main/res/layout/fragment_recently_read.xml b/app/src/main/res/layout/fragment_recently_read.xml
index da0200c18..aa201e3ee 100644
--- a/app/src/main/res/layout/fragment_recently_read.xml
+++ b/app/src/main/res/layout/fragment_recently_read.xml
@@ -9,10 +9,8 @@
         android:id="@+id/recycler"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingBottom="4dp"
-        android:paddingTop="4dp"
-        android:paddingStart="2dp"
-        android:paddingEnd="2dp"
+        android:layout_marginBottom="4dp"
+        android:layout_marginTop="4dp"
         tools:listitem="@layout/item_recently_read">
 
     </android.support.v7.widget.RecyclerView>
diff --git a/app/src/main/res/layout/fragment_track.xml b/app/src/main/res/layout/fragment_track.xml
index 7a776a10d..29e0b84a4 100644
--- a/app/src/main/res/layout/fragment_track.xml
+++ b/app/src/main/res/layout/fragment_track.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <android.support.v4.widget.SwipeRefreshLayout
@@ -8,12 +10,15 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginBottom="4dp"
+        android:layout_marginTop="4dp"
         android:orientation="vertical">
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/track_recycler"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            tools:listitem="@layout/item_track"/>
 
    </android.support.v4.widget.SwipeRefreshLayout>
 
diff --git a/app/src/main/res/layout/item_recently_read.xml b/app/src/main/res/layout/item_recently_read.xml
index ac0c1e0a2..25c2a45c9 100644
--- a/app/src/main/res/layout/item_recently_read.xml
+++ b/app/src/main/res/layout/item_recently_read.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/cv_manga"
-    style="@style/Theme.Widget.CardView"
-    >
+    style="@style/Theme.Widget.CardView.Item"
+    android:padding="0dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -16,7 +15,7 @@
             android:layout_height="match_parent"
             android:clickable="true"
             android:contentDescription="@string/description_cover"
-            android:scaleType="centerCrop"/>
+            android:scaleType="centerCrop" />
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -27,28 +26,28 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical"
-                android:padding="@dimen/card_margin">
+                android:padding="@dimen/material_component_cards_primary_title_top_padding">
 
                 <TextView
                     android:id="@+id/manga_title"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:maxLines="2"
-                    android:textAppearance="@style/TextAppearance.Medium.Title"/>
+                    android:textAppearance="@style/TextAppearance.Medium.Title" />
 
                 <TextView
                     android:id="@+id/manga_source"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/manga_title"
-                    android:textAppearance="@style/TextAppearance.Medium.Body2"/>
+                    android:textAppearance="@style/TextAppearance.Medium.Body2" />
 
                 <TextView
                     android:id="@+id/last_read"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/manga_source"
-                    android:textAppearance="@style/TextAppearance.Medium.Body2.Hint"/>
+                    android:textAppearance="@style/TextAppearance.Medium.Body2.Hint" />
             </RelativeLayout>
 
             <TextView
@@ -62,7 +61,7 @@
                 android:clickable="true"
                 android:padding="8dp"
                 android:text="@string/action_remove"
-                android:textAppearance="@style/TextAppearance.Medium.Button.Negative"/>
+                android:textAppearance="@style/TextAppearance.Medium.Button.Negative" />
 
             <TextView
                 android:id="@+id/resume"
@@ -74,7 +73,7 @@
                 android:background="?attr/selectable_list_drawable"
                 android:padding="8dp"
                 android:text="@string/action_resume"
-                android:textAppearance="@style/TextAppearance.Medium.Button"/>
+                android:textAppearance="@style/TextAppearance.Medium.Button" />
         </RelativeLayout>
     </LinearLayout>
 </android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_track.xml b/app/src/main/res/layout/item_track.xml
index d05955c75..49484a42e 100644
--- a/app/src/main/res/layout/item_track.xml
+++ b/app/src/main/res/layout/item_track.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/track"
-    style="@style/Theme.Widget.CardView">
+    style="@style/Theme.Widget.CardView.Item"
+    android:padding="0dp">
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
@@ -14,10 +14,10 @@
             android:id="@+id/logo"
             android:layout_width="48dp"
             android:layout_height="0dp"
-            tools:background="#2E51A2"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
+            tools:background="#2E51A2">
 
             <ImageView
                 android:id="@+id/track_logo"
@@ -32,29 +32,29 @@
             android:id="@+id/title_container"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="16dp"
             android:background="?attr/selectable_list_drawable"
             android:clickable="true"
-            app:layout_constraintTop_toTopOf="parent"
+            android:padding="16dp"
             app:layout_constraintLeft_toRightOf="@+id/logo"
-            app:layout_constraintRight_toRightOf="parent">
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
             <TextView
                 style="@style/TextAppearance.Regular.Body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/title"/>
+                android:text="@string/title" />
 
             <TextView
                 android:id="@+id/track_title"
                 style="@style/TextAppearance.Medium.Button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
                 android:layout_marginLeft="4dp"
+                android:layout_marginStart="4dp"
+                android:ellipsize="middle"
                 android:gravity="end"
                 android:maxLines="1"
-                android:ellipsize="middle"
                 android:text="@string/action_edit" />
 
         </LinearLayout>
@@ -63,25 +63,25 @@
             android:id="@+id/divider1"
             android:layout_width="0dp"
             android:layout_height="1dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginStart="16dp"
             android:background="?android:attr/divider"
-            app:layout_constraintTop_toBottomOf="@+id/title_container"
             app:layout_constraintLeft_toRightOf="@+id/logo"
             app:layout_constraintRight_toRightOf="parent"
-            android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp" />
+            app:layout_constraintTop_toBottomOf="@+id/title_container" />
 
         <LinearLayout
             android:id="@+id/status_container"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="16dp"
             android:background="?attr/selectable_list_drawable"
             android:clickable="true"
-            app:layout_constraintTop_toBottomOf="@+id/divider1"
+            android:padding="16dp"
             app:layout_constraintLeft_toRightOf="@+id/logo"
-            app:layout_constraintRight_toRightOf="parent">
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/divider1">
 
             <TextView
                 style="@style/TextAppearance.Regular.Body1"
@@ -94,8 +94,8 @@
                 style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
                 android:layout_marginLeft="4dp"
+                android:layout_marginStart="4dp"
                 android:gravity="end"
                 tools:text="Reading" />
 
@@ -105,25 +105,25 @@
             android:id="@+id/divider2"
             android:layout_width="0dp"
             android:layout_height="1dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginStart="16dp"
             android:background="?android:attr/divider"
-            app:layout_constraintTop_toBottomOf="@+id/status_container"
             app:layout_constraintLeft_toRightOf="@+id/logo"
             app:layout_constraintRight_toRightOf="parent"
-            android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp" />
+            app:layout_constraintTop_toBottomOf="@+id/status_container" />
 
         <LinearLayout
             android:id="@+id/chapters_container"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="16dp"
             android:background="?attr/selectable_list_drawable"
             android:clickable="true"
-            app:layout_constraintTop_toBottomOf="@+id/divider2"
+            android:padding="16dp"
             app:layout_constraintLeft_toRightOf="@+id/logo"
-            app:layout_constraintRight_toRightOf="parent">
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/divider2">
 
             <TextView
                 style="@style/TextAppearance.Regular.Body1"
@@ -136,8 +136,8 @@
                 style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
                 android:layout_marginLeft="4dp"
+                android:layout_marginStart="4dp"
                 android:gravity="end"
                 tools:text="12/24" />
 
@@ -147,25 +147,25 @@
             android:id="@+id/divider3"
             android:layout_width="0dp"
             android:layout_height="1dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginStart="16dp"
             android:background="?android:attr/divider"
-            app:layout_constraintTop_toBottomOf="@+id/chapters_container"
             app:layout_constraintLeft_toRightOf="@+id/logo"
             app:layout_constraintRight_toRightOf="parent"
-            android:layout_marginStart="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp" />
+            app:layout_constraintTop_toBottomOf="@+id/chapters_container" />
 
         <LinearLayout
             android:id="@+id/score_container"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="16dp"
             android:background="?attr/selectable_list_drawable"
             android:clickable="true"
-            app:layout_constraintTop_toBottomOf="@+id/divider3"
+            android:padding="16dp"
             app:layout_constraintLeft_toRightOf="@+id/logo"
-            app:layout_constraintRight_toRightOf="parent">
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/divider3">
 
             <TextView
                 style="@style/TextAppearance.Regular.Body1"
@@ -178,8 +178,8 @@
                 style="@style/TextAppearance.Regular.Body1.Secondary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
                 android:layout_marginLeft="4dp"
+                android:layout_marginStart="4dp"
                 android:gravity="end"
                 tools:text="10" />
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 28bfe2212..bf8d56155 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -7,7 +7,7 @@
     <dimen name="margin_left">16dp</dimen>
     <dimen name="margin_right">16dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
-    <dimen name="card_margin">16dp</dimen>
+    <dimen name="space_between_cards">4dp</dimen>
     <dimen name="fab_size">56dp</dimen>
 
     <dimen name="dialog_content_padding">24dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a77a7ce1a..66e4210d4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -146,12 +146,18 @@
     <style name="Theme.Widget.CardView" parent="CardView">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
+        <item name="android:padding">@dimen/material_component_cards_top_and_bottom_padding</item>
+        <item name="android:layout_marginTop">@dimen/material_component_cards_space_between_cards</item>
+        <item name="android:layout_marginBottom">@dimen/material_component_cards_space_between_cards</item>
+        <item name="android:layout_marginStart">@dimen/material_component_cards_space_between_cards</item>
+        <item name="android:layout_marginEnd">@dimen/material_component_cards_space_between_cards</item>
         <item name="cardBackgroundColor">?attr/background_card</item>
-        <item name="cardElevation">3dp</item>
-        <item name="cardUseCompatPadding">true</item>
-        <item name="cardCornerRadius">2dp</item>
-        <item name="android:layout_marginLeft">2dp</item>
-        <item name="android:layout_marginRight">2dp</item>
+        <item name="cardElevation">2dp</item>
+    </style>
+
+    <style name="Theme.Widget.CardView.Item">
+        <item name="android:layout_marginTop">@dimen/space_between_cards</item>
+        <item name="android:layout_marginBottom">@dimen/space_between_cards</item>
     </style>
 
     <style name="Theme.Widget.GridView">