diff --git a/res/layout/color_blend_preference_dialog.xml b/res/layout/color_blend_preference_dialog.xml
deleted file mode 100644
index 8f08107..0000000
--- a/res/layout/color_blend_preference_dialog.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 Android Ice Cold 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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:theme="?android:attr/dialogPreferenceStyle"
-    android:padding="?android:attr/dialogPreferredPadding">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
-        <View
-            android:id="@+id/color_start"
-            android:layout_width="@dimen/color_blend_preview_size"
-            android:layout_height="@dimen/color_blend_preview_size" />
-
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="2" />
-
-        <View
-            android:id="@+id/color_between"
-            android:layout_width="@dimen/color_blend_preview_size"
-            android:layout_height="@dimen/color_blend_preview_size" />
-
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="2" />
-
-        <View
-            android:id="@+id/color_end"
-            android:layout_width="@dimen/color_blend_preview_size"
-            android:layout_height="@dimen/color_blend_preview_size" />
-
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/color_preview_start_text"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"/>
-
-        <TextView
-            android:id="@+id/color_preview_between_text"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"/>
-
-        <TextView
-            android:id="@+id/color_preview_end_text"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"/>
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/color_preview_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-    <SeekBar
-        android:id="@+id/color_preview_slider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:min="0"
-        android:max="100"
-        android:progress="50" />
-
-</LinearLayout>
diff --git a/res/layout/color_blend_preview.xml b/res/layout/color_blend_preview.xml
deleted file mode 100644
index f07c73b..0000000
--- a/res/layout/color_blend_preview.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 Android Ice Cold 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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="36dp"
-    android:layout_height="12dp"
-    android:layout_margin="8dp"
-    android:orientation="horizontal">
-
-    <View
-        android:id="@+id/color_preview_start"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1" />
-
-    <View
-        android:id="@+id/color_preview_between"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1" />
-
-    <View
-        android:id="@+id/color_preview_end"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1" />
-
-</LinearLayout>
diff --git a/src/com/bliss/support/colorpicker/ColorPickerDialog.java b/src/com/bliss/support/colorpicker/ColorPickerDialog.java
index 6b479aa..953a8ff 100644
--- a/src/com/bliss/support/colorpicker/ColorPickerDialog.java
+++ b/src/com/bliss/support/colorpicker/ColorPickerDialog.java
@@ -44,7 +44,7 @@
         void onColorChanged(int color);
     }
 
-    public ColorPickerDialog(Context context, int initialColor) {
+    ColorPickerDialog(Context context, int initialColor) {
         super(context);
 
         init(initialColor);
@@ -120,7 +120,7 @@
      *
      * @param listener
      */
-    public void setOnColorChangedListener(OnColorChangedListener listener) {
+    void setOnColorChangedListener(OnColorChangedListener listener) {
         mListener = listener;
     }
 
diff --git a/src/com/bliss/support/preferences/ColorBlendPreference.java b/src/com/bliss/support/preferences/ColorBlendPreference.java
deleted file mode 100644
index cae8773..0000000
--- a/src/com/bliss/support/preferences/ColorBlendPreference.java
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Copyright (C) 2018 Android Ice Cold Project
- * Author: SpiritCroc <dev@spiritcroc.de>
- *
- * 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.
- */
-
-package com.bliss.support.preferences;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.res.TypedArray;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceDataStore;
-import androidx.preference.PreferenceViewHolder;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.View;
-import android.widget.SeekBar;
-import android.widget.TextView;
-
-import com.android.internal.util.bliss.BlissUtils;
-
-import com.bliss.support.R;
-import com.bliss.support.colorpicker.ColorPickerDialog;
-
-public class ColorBlendPreference extends Preference
-        implements Preference.OnPreferenceClickListener {
-
-    private static final String TAG = "ColorBlendPreference";
-
-    private String mColorStartKey;
-    private String mColorEndKey;
-    private String mBlendReverseKey;
-
-    private String mPreviewStartText;
-    private String mPreviewEndText;
-    private String mPreviewBetweenText;
-
-    private int mDefaultColorStart = 0xffff0000;
-    private int mDefaultColorEnd = 0xff00ff00;
-    private boolean mDefaultBlendReverse = false;
-
-    private int mColorStart = mDefaultColorStart;
-    private int mColorEnd = mDefaultColorEnd;
-    private boolean mBlendReverse = mDefaultBlendReverse;
-
-    // Preview values for the dialog before persisting settings
-    private int mPreviewColorStart;
-    private int mPreviewColorEnd;
-    private boolean mPreviewBlendReverse;
-
-    // Preview views
-    private View mViewColorStart;
-    private View mViewColorEnd;
-    private View mViewColorBetween;
-
-    private AlertDialog mDialog;
-
-    // Dialog views
-    private View mDialogPreviewColorStart;
-    private View mDialogPreviewColorEnd;
-    private View mDialogPreviewColorBetween;
-    private SeekBar mDialogColorPreviewSlider;
-    private TextView mDialogColorPreviewText;
-    private TextView mDialogColorPreviewStartText;
-    private TextView mDialogColorPreviewEndText;
-    private TextView mDialogColorPreviewBetweenText;
-
-    public ColorBlendPreference(Context context, AttributeSet attrs,
-                               int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        init(context, attrs);
-    }
-
-    public ColorBlendPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init(context, attrs);
-    }
-
-    public ColorBlendPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init(context, attrs);
-    }
-
-    public ColorBlendPreference(Context context) {
-        super(context);
-        init(context, null);
-    }
-
-    private void init(Context context, AttributeSet attrs) {
-        setOnPreferenceClickListener(this);
-        if (attrs != null) {
-            final TypedArray a = context.obtainStyledAttributes(attrs,
-                    R.styleable.ColorBlendPreference);
-            mDefaultColorStart =
-                    a.getColor(R.styleable.ColorBlendPreference_defaultValueColorStart,
-                            mDefaultColorStart);
-            mDefaultColorEnd =
-                    a.getColor(R.styleable.ColorBlendPreference_defaultValueColorEnd,
-                            mDefaultColorEnd);
-            mDefaultBlendReverse =
-                    a.getBoolean(R.styleable.ColorBlendPreference_defaultValueBlendReverse,
-                            mDefaultBlendReverse);
-            mColorStartKey = a.getString(R.styleable.ColorBlendPreference_keyColorStart);
-            mColorEndKey = a.getString(R.styleable.ColorBlendPreference_keyColorEnd);
-            mBlendReverseKey = a.getString(R.styleable.ColorBlendPreference_keyBlendReverse);
-
-            mPreviewStartText = a.getString(R.styleable.ColorBlendPreference_previewStartText);
-            if (mPreviewStartText == null) {
-                mPreviewStartText = getContext().getString(R.string.color_preview_start);
-            }
-
-            mPreviewEndText = a.getString(R.styleable.ColorBlendPreference_previewEndText);
-            if (mPreviewEndText == null) {
-                mPreviewEndText = getContext().getString(R.string.color_preview_end);
-            }
-
-            mPreviewBetweenText = a.getString(R.styleable.ColorBlendPreference_previewBetweenText);
-            if (mPreviewBetweenText == null) {
-                mPreviewBetweenText = getContext().getString(R.string.color_preview_between);
-            }
-
-            a.recycle();
-            loadPreferences();
-        }
-        setWidgetLayoutResource(R.layout.color_blend_preview);
-    }
-
-    @Override
-    public void setPreferenceDataStore(PreferenceDataStore dataStore) {
-        super.setPreferenceDataStore(dataStore);
-        loadPreferences();
-    }
-
-    private ColorPickerDialog.OnColorChangedListener mStartColorChangedListener =
-            new ColorPickerDialog.OnColorChangedListener() {
-                @Override
-                public void onColorChanged(int color) {
-                    mPreviewColorStart = color;
-                    updateDialogPreview();
-                }
-            };
-    private ColorPickerDialog.OnColorChangedListener mEndColorChangedListener =
-            new ColorPickerDialog.OnColorChangedListener() {
-                @Override
-                public void onColorChanged(int color) {
-                    mPreviewColorEnd = color;
-                    updateDialogPreview();
-                }
-            };
-
-    private void loadPreferences() {
-        PreferenceDataStore preferenceStore = getPreferenceDataStore();
-        if (preferenceStore == null) {
-            Log.i(TAG, "No preference data store available, not using persisted values");
-            mColorStart = mDefaultColorStart;
-            mColorEnd = mDefaultColorEnd;
-            mBlendReverse = mDefaultBlendReverse;
-        } else {
-            if (mColorStartKey != null) {
-                mColorStart = preferenceStore.getInt(mColorStartKey, mDefaultColorStart);
-            }
-            if (mColorEndKey != null) {
-                mColorEnd = preferenceStore.getInt(mColorEndKey, mDefaultColorEnd);
-            }
-            if (mBlendReverseKey != null) {
-                mBlendReverse = preferenceStore.getBoolean(mBlendReverseKey, mDefaultBlendReverse);
-            }
-        }
-        mPreviewColorStart = mColorStart;
-        mPreviewColorEnd = mColorEnd;
-        mPreviewBlendReverse = mBlendReverse;
-    }
-
-    private void setValues(int colorStart, int colorEnd, boolean blendReverse) {
-        mColorStart = colorStart;
-        mColorEnd = colorEnd;
-        mBlendReverse = blendReverse;
-        mPreviewColorStart = mColorStart;
-        mPreviewColorEnd = mColorEnd;
-        mPreviewBlendReverse = mBlendReverse;
-        PreferenceDataStore preferenceStore = getPreferenceDataStore();
-        if (preferenceStore != null) {
-            preferenceStore.putInt(mColorStartKey, mColorStart);
-            preferenceStore.putInt(mColorEndKey, mColorEnd);
-            preferenceStore.putBoolean(mBlendReverseKey, mBlendReverse);
-        } else {
-            Log.i(TAG, "No preference data store available, not persisting values");
-        }
-        updatePreview();
-    }
-
-    private void persistValues() {
-        if (mDialog == null) {
-            Log.e(TAG, "persistValues() called without open dialog");
-            return;
-        }
-        setValues(mPreviewColorStart, mPreviewColorEnd, mPreviewBlendReverse);
-        Log.d(TAG, "Persisting values");
-        PreferenceDataStore preferenceStore = getPreferenceDataStore();
-        if (preferenceStore == null) {
-            return;
-        }
-        if (mColorStartKey == null) {
-            Log.e(TAG, "Missing color start key");
-        } else {
-            preferenceStore.putInt(mColorStartKey, mPreviewColorStart);
-        }
-        if (mColorEndKey == null) {
-            Log.e(TAG, "Missing color end key");
-        } else {
-            preferenceStore.putInt(mColorEndKey, mPreviewColorEnd);
-        }
-        if (mBlendReverseKey == null) {
-            Log.e(TAG, "Missing blend reverse key");
-        } else {
-            preferenceStore.putBoolean(mBlendReverseKey, mPreviewBlendReverse);
-        }
-        // Reload persisted values
-        loadPreferences();
-    }
-
-    @Override
-    public boolean onPreferenceClick(Preference preference) {
-        showDialog();
-        return true;
-    }
-
-    private void showDialog() {
-        mPreviewColorStart = mColorStart;
-        mPreviewColorEnd = mColorEnd;
-        mPreviewBlendReverse = mBlendReverse;
-        mDialog = new AlertDialog.Builder(getContext())
-                .setTitle(getTitle())
-                .setView(R.layout.color_blend_preference_dialog)
-                .setPositiveButton(R.string.color_blend_ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        persistValues();
-                        mDialog = null;
-                    }
-                })
-                .setNegativeButton(R.string.color_blend_cancel, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        // Only close dialog
-                        mDialog = null;
-                    }
-                })
-                .setNeutralButton(R.string.color_blend_reset, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        // Restore default settings
-                        setValues(mDefaultColorStart, mDefaultColorEnd, mDefaultBlendReverse);
-                        persistValues();
-                        mDialog = null;
-                    }
-                })
-                .setOnCancelListener(new DialogInterface.OnCancelListener() {
-                    @Override
-                    public void onCancel(DialogInterface dialog) {
-                        mDialog = null;
-                    }
-                })
-                .setOnDismissListener(new DialogInterface.OnDismissListener() {
-                    @Override
-                    public void onDismiss(DialogInterface dialog) {
-                        mDialog = null;
-                    }
-                })
-                .show();
-        mDialogPreviewColorStart = mDialog.findViewById(R.id.color_start);
-        mDialogPreviewColorEnd = mDialog.findViewById(R.id.color_end);
-        mDialogPreviewColorBetween = mDialog.findViewById(R.id.color_between);
-        mDialogColorPreviewSlider = mDialog.findViewById(R.id.color_preview_slider);
-        mDialogColorPreviewText = mDialog.findViewById(R.id.color_preview_text);
-        mDialogColorPreviewStartText = mDialog.findViewById(R.id.color_preview_start_text);
-        mDialogColorPreviewEndText = mDialog.findViewById(R.id.color_preview_end_text);
-        mDialogColorPreviewBetweenText = mDialog.findViewById(R.id.color_preview_between_text);
-        mDialogPreviewColorStart.setOnClickListener(mDialogPreviewClickListener);
-        mDialogPreviewColorEnd.setOnClickListener(mDialogPreviewClickListener);
-        mDialogPreviewColorBetween.setOnClickListener(mDialogPreviewClickListener);
-        mDialogColorPreviewText.setOnClickListener(mDialogPreviewClickListener);
-        mDialogColorPreviewSlider.setOnSeekBarChangeListener(mDialogPreviewSliderChangeListener);
-        mDialogColorPreviewStartText.setText(mPreviewStartText);
-        mDialogColorPreviewEndText.setText(mPreviewEndText);
-        mDialogColorPreviewBetweenText.setText(mPreviewBetweenText);
-        updateDialogPreview();
-    }
-
-    private void updateDialogPreview() {
-        if (mDialog == null) {
-            Log.e(TAG, "updateDialogPreview() called without open dialog");
-            return;
-        }
-        mDialogPreviewColorStart.setBackgroundColor(mPreviewColorStart);
-        mDialogPreviewColorEnd.setBackgroundColor(mPreviewColorEnd);
-        updateDialogSliderPreview();
-    }
-
-    private void updateDialogSliderPreview() {
-        int currentPreview = mDialogColorPreviewSlider.getProgress();
-        mDialogPreviewColorBetween.setBackgroundColor(
-                BlissUtils.getBlendColorForPercent(mPreviewColorEnd, mPreviewColorStart,
-                        mPreviewBlendReverse, currentPreview));
-        mDialogColorPreviewText.setText(
-                getContext().getString(R.string.color_blend_preview, currentPreview));
-    }
-
-    private View.OnClickListener mDialogPreviewClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            if (v == mDialogPreviewColorStart) {
-                ColorPickerDialog pickerDialog =
-                        new ColorPickerDialog(getContext(), mPreviewColorStart);
-                pickerDialog.setOnColorChangedListener(mStartColorChangedListener);
-                pickerDialog.show();
-            } else if (v == mDialogPreviewColorEnd) {
-                ColorPickerDialog pickerDialog =
-                        new ColorPickerDialog(getContext(), mPreviewColorEnd);
-                pickerDialog.setOnColorChangedListener(mEndColorChangedListener);
-                pickerDialog.show();
-            } else if (v == mDialogPreviewColorBetween) {
-                mPreviewBlendReverse = !mPreviewBlendReverse;
-                int currentPreview = mDialogColorPreviewSlider.getProgress();
-                if (currentPreview < 25 || currentPreview > 75) {
-                    // Reset preview slider so change becomes apparent
-                    mDialogColorPreviewSlider.setProgress(50);
-                }
-                updateDialogSliderPreview();
-            } else if (v == mDialogColorPreviewText) {
-                // Reset preview slider
-                mDialogColorPreviewSlider.setProgress(50);
-                updateDialogSliderPreview();
-            } else {
-                Log.e(TAG, "DialogPreviewClickListener not prepared for " + v);
-            }
-        }
-    };
-
-    private SeekBar.OnSeekBarChangeListener mDialogPreviewSliderChangeListener =
-            new SeekBar.OnSeekBarChangeListener() {
-                @Override
-                public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-                    updateDialogSliderPreview();
-                }
-
-                @Override
-                public void onStartTrackingTouch(SeekBar seekBar) {}
-
-                @Override
-                public void onStopTrackingTouch(SeekBar seekBar) {}
-            };
-
-    private void updatePreview() {
-        if (mViewColorStart != null) {
-            mViewColorStart.setBackgroundColor(mColorStart);
-        }
-        if (mViewColorEnd != null) {
-            mViewColorEnd.setBackgroundColor(mColorEnd);
-        }
-        if (mViewColorBetween != null) {
-            mViewColorBetween.setBackgroundColor(
-                    BlissUtils.getBlendColorForPercent(mColorEnd, mColorStart, mBlendReverse, 50));
-        }
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        super.onBindViewHolder(holder);
-        mViewColorStart = holder.findViewById(R.id.color_preview_start);
-        mViewColorEnd = holder.findViewById(R.id.color_preview_end);
-        mViewColorBetween = holder.findViewById(R.id.color_preview_between);
-        updatePreview();
-    }
-
-}
diff --git a/src/com/bliss/support/preferences/SystemSettingColorBlendPreference.java b/src/com/bliss/support/preferences/SystemSettingColorBlendPreference.java
deleted file mode 100644
index 03177ec..0000000
--- a/src/com/bliss/support/preferences/SystemSettingColorBlendPreference.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2018 Android Ice Cold 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.
- */
-
-package com.bliss.support.preferences;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-public class SystemSettingColorBlendPreference extends ColorBlendPreference {
-
-    public SystemSettingColorBlendPreference(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        setPreferenceDataStore(new SystemSettingsStore(context.getContentResolver()));
-    }
-
-    public SystemSettingColorBlendPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        setPreferenceDataStore(new SystemSettingsStore(context.getContentResolver()));
-    }
-
-    public SystemSettingColorBlendPreference(Context context) {
-        super(context);
-        setPreferenceDataStore(new SystemSettingsStore(context.getContentResolver()));
-    }
-}