diff --git a/Android.bp b/Android.bp
index 21f057e..9732785 100644
--- a/Android.bp
+++ b/Android.bp
@@ -9,6 +9,7 @@
         "androidx.preference_preference",
         "androidx.appcompat_appcompat",
         "androidx.lifecycle_lifecycle-runtime",
+        "org.lineageos.platform.internal",
     ],
 
     resource_dirs: ["res"],
diff --git a/src/com/bliss/support/preferences/LineageSecureSettingSeekBarPreference.java b/src/com/bliss/support/preferences/LineageSecureSettingSeekBarPreference.java
new file mode 100644
index 0000000..a47575f
--- /dev/null
+++ b/src/com/bliss/support/preferences/LineageSecureSettingSeekBarPreference.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2016-2019 crDroid Android 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 LineageSecureSettingSeekBarPreference extends CustomSeekBarPreference {
+
+    public LineageSecureSettingSeekBarPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        setPreferenceDataStore(new LineageSecureSettingsStore(context.getContentResolver()));
+    }
+
+    public LineageSecureSettingSeekBarPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setPreferenceDataStore(new LineageSecureSettingsStore(context.getContentResolver()));
+    }
+
+    public LineageSecureSettingSeekBarPreference(Context context) {
+        super(context, null);
+        setPreferenceDataStore(new LineageSecureSettingsStore(context.getContentResolver()));
+    }
+}
diff --git a/src/com/bliss/support/preferences/LineageSecureSettingsStore.java b/src/com/bliss/support/preferences/LineageSecureSettingsStore.java
new file mode 100644
index 0000000..a0819b4
--- /dev/null
+++ b/src/com/bliss/support/preferences/LineageSecureSettingsStore.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2016-2019 crDroid Android 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.ContentResolver;
+import android.preference.PreferenceDataStore;
+import android.os.UserHandle;
+
+import lineageos.providers.LineageSettings;
+
+
+public class LineageSecureSettingsStore extends androidx.preference.PreferenceDataStore
+        implements PreferenceDataStore {
+
+    private ContentResolver mContentResolver;
+
+    public LineageSecureSettingsStore(ContentResolver contentResolver) {
+        mContentResolver = contentResolver;
+    }
+
+    public boolean getBoolean(String key, boolean defValue) {
+        return LineageSettings.Secure.getIntForUser(mContentResolver, key, defValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
+    }
+
+    public float getFloat(String key, float defValue) {
+        return LineageSettings.Secure.getFloatForUser(mContentResolver, key, defValue, UserHandle.USER_CURRENT);
+    }
+
+    public int getInt(String key, int defValue) {
+        return LineageSettings.Secure.getIntForUser(mContentResolver, key, defValue, UserHandle.USER_CURRENT);
+    }
+
+    public long getLong(String key, long defValue) {
+        return LineageSettings.Secure.getLongForUser(mContentResolver, key, defValue, UserHandle.USER_CURRENT);
+    }
+
+    public String getString(String key, String defValue) {
+        String result = LineageSettings.Secure.getString(mContentResolver, key);
+        return result == null ? defValue : result;
+    }
+
+    public void putBoolean(String key, boolean value) {
+        putInt(key, value ? 1 : 0);
+    }
+
+    public void putFloat(String key, float value) {
+        LineageSettings.Secure.putFloatForUser(mContentResolver, key, value, UserHandle.USER_CURRENT);
+    }
+
+    public void putInt(String key, int value) {
+        LineageSettings.Secure.putIntForUser(mContentResolver, key, value, UserHandle.USER_CURRENT);
+    }
+
+    public void putLong(String key, long value) {
+        LineageSettings.Secure.putLongForUser(mContentResolver, key, value, UserHandle.USER_CURRENT);
+    }
+
+    public void putString(String key, String value) {
+        LineageSettings.Secure.putString(mContentResolver, key, value);
+    }
+}
diff --git a/src/com/bliss/support/preferences/LineageSystemSettingSeekBarPreference.java b/src/com/bliss/support/preferences/LineageSystemSettingSeekBarPreference.java
new file mode 100644
index 0000000..18ff1bc
--- /dev/null
+++ b/src/com/bliss/support/preferences/LineageSystemSettingSeekBarPreference.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2016-2019 crDroid Android 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 LineageSystemSettingSeekBarPreference extends CustomSeekBarPreference {
+
+    public LineageSystemSettingSeekBarPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        setPreferenceDataStore(new LineageSystemSettingsStore(context.getContentResolver()));
+    }
+
+    public LineageSystemSettingSeekBarPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setPreferenceDataStore(new LineageSystemSettingsStore(context.getContentResolver()));
+    }
+
+    public LineageSystemSettingSeekBarPreference(Context context) {
+        super(context, null);
+        setPreferenceDataStore(new LineageSystemSettingsStore(context.getContentResolver()));
+    }
+}
diff --git a/src/com/bliss/support/preferences/LineageSystemSettingsStore.java b/src/com/bliss/support/preferences/LineageSystemSettingsStore.java
new file mode 100644
index 0000000..02d52ab
--- /dev/null
+++ b/src/com/bliss/support/preferences/LineageSystemSettingsStore.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2016-2019 crDroid Android 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.ContentResolver;
+import android.preference.PreferenceDataStore;
+import android.os.UserHandle;
+
+import lineageos.providers.LineageSettings;
+
+
+public class LineageSystemSettingsStore extends androidx.preference.PreferenceDataStore
+        implements PreferenceDataStore {
+
+    private ContentResolver mContentResolver;
+
+    public LineageSystemSettingsStore(ContentResolver contentResolver) {
+        mContentResolver = contentResolver;
+    }
+
+    public boolean getBoolean(String key, boolean defValue) {
+        return LineageSettings.System.getIntForUser(mContentResolver, key, defValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
+    }
+
+    public float getFloat(String key, float defValue) {
+        return LineageSettings.System.getFloatForUser(mContentResolver, key, defValue, UserHandle.USER_CURRENT);
+    }
+
+    public int getInt(String key, int defValue) {
+        return LineageSettings.System.getIntForUser(mContentResolver, key, defValue, UserHandle.USER_CURRENT);
+    }
+
+    public long getLong(String key, long defValue) {
+        return LineageSettings.System.getLongForUser(mContentResolver, key, defValue, UserHandle.USER_CURRENT);
+    }
+
+    public String getString(String key, String defValue) {
+        String result = LineageSettings.System.getString(mContentResolver, key);
+        return result == null ? defValue : result;
+    }
+
+    public void putBoolean(String key, boolean value) {
+        putInt(key, value ? 1 : 0);
+    }
+
+    public void putFloat(String key, float value) {
+        LineageSettings.System.putFloatForUser(mContentResolver, key, value, UserHandle.USER_CURRENT);
+    }
+
+    public void putInt(String key, int value) {
+        LineageSettings.System.putIntForUser(mContentResolver, key, value, UserHandle.USER_CURRENT);
+    }
+
+    public void putLong(String key, long value) {
+        LineageSettings.System.putLongForUser(mContentResolver, key, value, UserHandle.USER_CURRENT);
+    }
+
+    public void putString(String key, String value) {
+        LineageSettings.System.putString(mContentResolver, key, value);
+    }
+}
diff --git a/src/com/bliss/support/preferences/SystemSettingListPreference.java b/src/com/bliss/support/preferences/SystemSettingListPreference.java
new file mode 100644
index 0000000..c535af0
--- /dev/null
+++ b/src/com/bliss/support/preferences/SystemSettingListPreference.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2016-2018 crDroid Android 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 androidx.preference.ListPreference;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.provider.Settings;
+
+public class SystemSettingListPreference extends ListPreference {
+
+    private boolean mAutoSummary = false;
+
+    public SystemSettingListPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        setPreferenceDataStore(new SystemSettingsStore(context.getContentResolver()));
+    }
+
+    public SystemSettingListPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setPreferenceDataStore(new SystemSettingsStore(context.getContentResolver()));
+    }
+
+    public SystemSettingListPreference(Context context) {
+        super(context);
+        setPreferenceDataStore(new SystemSettingsStore(context.getContentResolver()));
+    }
+
+    @Override
+    public void setValue(String value) {
+        super.setValue(value);
+        if (mAutoSummary || TextUtils.isEmpty(getSummary())) {
+            setSummary(getEntry(), true);
+        }
+    }
+
+    @Override
+    public void setSummary(CharSequence summary) {
+        setSummary(summary, false);
+    }
+
+    private void setSummary(CharSequence summary, boolean autoSummary) {
+        mAutoSummary = autoSummary;
+        super.setSummary(summary);
+    }
+
+    @Override
+    protected void onSetInitialValue(boolean restoreValue, Object defaultValue) {
+        // This is what default ListPreference implementation is doing without respecting
+        // real default value:
+        //setValue(restoreValue ? getPersistedString(mValue) : (String) defaultValue);
+        // Instead, we better do
+        setValue(restoreValue ? getPersistedString((String) defaultValue) : (String) defaultValue);
+    }
+
+    public int getIntValue(int defValue) {
+        return getValue() == null ? defValue : Integer.valueOf(getValue());
+    }
+}
diff --git a/src/com/bliss/support/preferences/SystemSettingsStore.java b/src/com/bliss/support/preferences/SystemSettingsStore.java
new file mode 100644
index 0000000..47cc97e
--- /dev/null
+++ b/src/com/bliss/support/preferences/SystemSettingsStore.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2016-2018 crDroid Android 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.ContentResolver;
+import android.preference.PreferenceDataStore;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+public class SystemSettingsStore extends androidx.preference.PreferenceDataStore
+        implements PreferenceDataStore {
+
+    private ContentResolver mContentResolver;
+
+    public SystemSettingsStore(ContentResolver contentResolver) {
+        mContentResolver = contentResolver;
+    }
+
+    public boolean getBoolean(String key, boolean defValue) {
+        return Settings.System.getIntForUser(mContentResolver, key, defValue ? 1 : 0, UserHandle.USER_CURRENT) != 0;
+    }
+
+    public float getFloat(String key, float defValue) {
+        return Settings.System.getFloatForUser(mContentResolver, key, defValue, UserHandle.USER_CURRENT);
+    }
+
+    public int getInt(String key, int defValue) {
+        return Settings.System.getIntForUser(mContentResolver, key, defValue, UserHandle.USER_CURRENT);
+    }
+
+    public long getLong(String key, long defValue) {
+        return Settings.System.getLongForUser(mContentResolver, key, defValue, UserHandle.USER_CURRENT);
+    }
+
+    public String getString(String key, String defValue) {
+        String result = Settings.System.getString(mContentResolver, key);
+        return result == null ? defValue : result;
+    }
+
+    public void putBoolean(String key, boolean value) {
+        putInt(key, value ? 1 : 0);
+    }
+
+    public void putFloat(String key, float value) {
+        Settings.System.putFloatForUser(mContentResolver, key, value, UserHandle.USER_CURRENT);
+    }
+
+    public void putInt(String key, int value) {
+        Settings.System.putIntForUser(mContentResolver, key, value, UserHandle.USER_CURRENT);
+    }
+
+    public void putLong(String key, long value) {
+        Settings.System.putLongForUser(mContentResolver, key, value, UserHandle.USER_CURRENT);
+    }
+
+    public void putString(String key, String value) {
+        Settings.System.putString(mContentResolver, key, value);
+    }
+}