diff --git a/res/xml/cherish_settings_pulse.xml b/res/xml/cherish_settings_pulse.xml
index c036590..42c13b6 100644
--- a/res/xml/cherish_settings_pulse.xml
+++ b/res/xml/cherish_settings_pulse.xml
@@ -55,12 +55,12 @@
             android:entryValues="@array/pulse_color_mode_values"
             android:defaultValue="1"/>
 
-        <com.cherish.settings.preferences.ColorSelectPreference
+        <net.margaritov.preference.colorpicker.ColorPickerPreference
             android:key="pulse_color_user"
             android:title="@string/pulse_color_chooser"
             android:persistent="false" />
 
-        <com.cherish.settings.preferences.SimpleCustomSecureSeekBarPreference
+        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
             android:key="pulse_lavalamp_speed"
             android:title="@string/lavamp_speed_title"
             android:max="30000"
@@ -74,7 +74,7 @@
         android:key="pulse_fading_bars_category"
         android:title="@string/pulse_legacy_mode_advanced_category">
 
-        <com.cherish.settings.preferences.SimpleCustomSecureSeekBarPreference
+        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
             android:key="pulse_custom_dimen"
             android:title="@string/pulse_custom_dimen"
             android:max="30"
@@ -82,7 +82,7 @@
             android:min="1"
             settings:units="dp"/>
 
-        <com.cherish.settings.preferences.SimpleCustomSecureSeekBarPreference
+        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
             android:key="pulse_custom_div"
             android:title="@string/pulse_custom_div"
             android:max="44"
@@ -91,7 +91,7 @@
             settings:interval="2"
             settings:units="dp"/>
 
-        <com.cherish.settings.preferences.SimpleCustomSecureSeekBarPreference
+        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
             android:key="pulse_filled_block_size"
             android:title="@string/pulse_filled_block_size"
             android:max="8"
@@ -99,7 +99,7 @@
             android:min="4"
             settings:units="dp"/>
 
-        <com.cherish.settings.preferences.SimpleCustomSecureSeekBarPreference
+        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
             android:key="pulse_empty_block_size"
             android:title="@string/pulse_empty_block_size"
             android:max="4"
@@ -107,7 +107,7 @@
             android:min="0"
             settings:units="dp"/>
 
-        <com.cherish.settings.preferences.SimpleCustomSecureSeekBarPreference
+        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
             android:key="pulse_custom_fudge_factor"
             android:title="@string/pulse_custom_fudge_factor"
             android:max="6"
@@ -119,14 +119,14 @@
         android:key="pulse_2"
         android:title="@string/pulse_solid_dimen_category">
 
-        <com.cherish.settings.preferences.SimpleCustomSecureSeekBarPreference
+        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
             android:key="pulse_solid_units_opacity"
             android:title="@string/pulse_solid_units_opacity"
             android:max="255"
             android:defaultValue="200"
             android:min="0"/>
 
-        <com.cherish.settings.preferences.SimpleCustomSecureSeekBarPreference
+        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
             android:key="pulse_solid_units_count"
             android:title="@string/pulse_solid_units_count"
             android:max="128"
@@ -134,7 +134,7 @@
             settings:interval="16"
             android:min="32"/>
 
-        <com.cherish.settings.preferences.SimpleCustomSecureSeekBarPreference
+        <com.cherish.settings.preferences.SecureSettingSeekBarPreference
             android:key="pulse_solid_fudge_factor"
             android:title="@string/pulse_custom_fudge_factor"
             android:max="7"
diff --git a/src/com/cherish/settings/fragments/PulseSettings.java b/src/com/cherish/settings/fragments/PulseSettings.java
index 11c572a..e6e15f8 100644
--- a/src/com/cherish/settings/fragments/PulseSettings.java
+++ b/src/com/cherish/settings/fragments/PulseSettings.java
@@ -26,6 +26,8 @@ import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settingslib.search.SearchIndexable;
 import net.margaritov.preference.colorpicker.ColorPickerPreference;
+import com.cherish.settings.preferences.SecureSettingListPreference;
+import com.cherish.settings.preferences.SecureSettingSeekBarPreference;
 import com.android.internal.util.cherish.CherishUtils;
 
 import android.content.Context;