diff --git a/DeviceSettings/AndroidManifest.xml b/DeviceSettings/AndroidManifest.xml
index 361dacb..b2bb563 100644
--- a/DeviceSettings/AndroidManifest.xml
+++ b/DeviceSettings/AndroidManifest.xml
@@ -35,7 +35,7 @@
         android:label="@string/device_title"
         android:defaultToDeviceProtectedStorage="true"
         android:directBootAware="true"
-        android:theme="@style/Theme.SubSettingsBase"
+        android:theme="@style/Theme.SubSettingsBase.Expressive"
         android:exported="true">
 
         <!-- Device Settings -->
diff --git a/DeviceSettings/src/org/lineageos/device/DeviceSettings/DeviceSettings.java b/DeviceSettings/src/org/lineageos/device/DeviceSettings/DeviceSettings.java
index 1ea3800..3ae9ab6 100644
--- a/DeviceSettings/src/org/lineageos/device/DeviceSettings/DeviceSettings.java
+++ b/DeviceSettings/src/org/lineageos/device/DeviceSettings/DeviceSettings.java
@@ -29,17 +29,18 @@ import android.util.Log;
 import android.view.MenuItem;
 import androidx.preference.ListPreference;
 import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceFragment;
 import androidx.preference.PreferenceManager;
 import androidx.preference.Preference;
 import androidx.preference.SwitchPreferenceCompat;
 
+import com.android.settingslib.widget.SettingsBasePreferenceFragment;
+
 import java.util.Arrays;
 
 import org.lineageos.device.DeviceSettings.Constants;
 import org.lineageos.internal.util.FileUtils;
 
-public class DeviceSettings extends PreferenceFragment
+public class DeviceSettings extends SettingsBasePreferenceFragment
         implements Preference.OnPreferenceChangeListener {
     private static final String TAG = DeviceSettings.class.getSimpleName();
 
diff --git a/DeviceSettings/src/org/lineageos/device/DeviceSettings/DeviceSettingsActivity.java b/DeviceSettings/src/org/lineageos/device/DeviceSettings/DeviceSettingsActivity.java
index 871c861..8967fe9 100644
--- a/DeviceSettings/src/org/lineageos/device/DeviceSettings/DeviceSettingsActivity.java
+++ b/DeviceSettings/src/org/lineageos/device/DeviceSettings/DeviceSettingsActivity.java
@@ -33,14 +33,12 @@ import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
 
 public class DeviceSettingsActivity extends CollapsingToolbarBaseActivity {
 
-    private static final String TAG = "DeviceSettings";
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        getFragmentManager().beginTransaction().replace(
+        getSupportFragmentManager().beginTransaction().replace(
                 com.android.settingslib.collapsingtoolbar.R.id.content_frame,
-                new DeviceSettings(), TAG).commit();
+                new DeviceSettings()).commit();
     }
 }