diff --git a/res/layout/preference_color_picker.xml b/res/layout/preference_color_picker.xml
index b944dd0..3f5dd0d 100644
--- a/res/layout/preference_color_picker.xml
+++ b/res/layout/preference_color_picker.xml
@@ -1,38 +1,4 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:background="?android:attr/selectableItemBackground" >
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp">
-
-        <TextView android:id="@+android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceListItem"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal" />
-
-        <TextView android:id="@+android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@android:id/title"
-            android:layout_alignStart="@android:id/title"
-            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
-            android:textColor="?android:attr/textColorSecondary"
-            android:maxLines="1" />
-    </RelativeLayout>
-
-    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp">
@@ -42,5 +8,4 @@
             android:layout_width="@dimen/color_preference_width"
             android:layout_height="@dimen/color_preference_height"
             android:layout_gravity="center" />
-    </LinearLayout>
 </LinearLayout>
diff --git a/src/org/omnirom/omnigears/preference/ColorPickerPreference.java b/src/org/omnirom/omnigears/preference/ColorPickerPreference.java
index f2c2dff..b5376b8 100644
--- a/src/org/omnirom/omnigears/preference/ColorPickerPreference.java
+++ b/src/org/omnirom/omnigears/preference/ColorPickerPreference.java
@@ -29,7 +29,8 @@
 import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.shapes.RectShape;
 import android.os.Bundle;
-import android.preference.Preference;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
@@ -67,7 +68,7 @@
     }
 
     private void init() {
-        setLayoutResource(R.layout.preference_color_picker);
+        setWidgetLayoutResource(R.layout.preference_color_picker);
         mResources = getContext().getResources();
     }
 
@@ -81,11 +82,9 @@
     }
 
     @Override
-    protected void onBindView(View view) {
-        super.onBindView(view);
-
-        mLightColorView = (ImageView) view.findViewById(R.id.light_color);
-
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+        mLightColorView = (ImageView) holder.findViewById(R.id.light_color);
         updatePreferenceViews();
     }
 
diff --git a/src/org/omnirom/omnigears/preference/GlobalCheckBoxPreference.java b/src/org/omnirom/omnigears/preference/GlobalCheckBoxPreference.java
index 0ba460f..2523ff4 100644
--- a/src/org/omnirom/omnigears/preference/GlobalCheckBoxPreference.java
+++ b/src/org/omnirom/omnigears/preference/GlobalCheckBoxPreference.java
@@ -17,7 +17,7 @@
 package org.omnirom.omnigears.preference;
 
 import android.content.Context;
-import android.preference.CheckBoxPreference;
+import android.support.v7.preference.CheckBoxPreference;
 import android.provider.Settings;
 import android.util.AttributeSet;
 
diff --git a/src/org/omnirom/omnigears/preference/GlobalSettingSwitchPreference.java b/src/org/omnirom/omnigears/preference/GlobalSettingSwitchPreference.java
index 501de87..ceae4a5 100644
--- a/src/org/omnirom/omnigears/preference/GlobalSettingSwitchPreference.java
+++ b/src/org/omnirom/omnigears/preference/GlobalSettingSwitchPreference.java
@@ -17,7 +17,7 @@
 package org.omnirom.omnigears.preference;
 
 import android.content.Context;
-import android.preference.SwitchPreference;
+import android.support.v14.preference.SwitchPreference;
 import android.provider.Settings;
 import android.util.AttributeSet;
 
diff --git a/src/org/omnirom/omnigears/preference/SecureCheckBoxPreference.java b/src/org/omnirom/omnigears/preference/SecureCheckBoxPreference.java
index 8f4e3f9..189e73d 100644
--- a/src/org/omnirom/omnigears/preference/SecureCheckBoxPreference.java
+++ b/src/org/omnirom/omnigears/preference/SecureCheckBoxPreference.java
@@ -17,7 +17,7 @@
 package org.omnirom.omnigears.preference;
 
 import android.content.Context;
-import android.preference.CheckBoxPreference;
+import android.support.v7.preference.CheckBoxPreference;
 import android.provider.Settings;
 import android.util.AttributeSet;
 
diff --git a/src/org/omnirom/omnigears/preference/SystemCheckBoxPreference.java b/src/org/omnirom/omnigears/preference/SystemCheckBoxPreference.java
index 8a099e7..088f28c 100644
--- a/src/org/omnirom/omnigears/preference/SystemCheckBoxPreference.java
+++ b/src/org/omnirom/omnigears/preference/SystemCheckBoxPreference.java
@@ -17,7 +17,7 @@
 package org.omnirom.omnigears.preference;
 
 import android.content.Context;
-import android.preference.CheckBoxPreference;
+import android.support.v7.preference.CheckBoxPreference;
 import android.provider.Settings;
 import android.util.AttributeSet;