diff --git a/RotationControl/build.gradle.kts b/RotationControl/build.gradle.kts
index 581ca0d..72a97fb 100644
--- a/RotationControl/build.gradle.kts
+++ b/RotationControl/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.buildlogic.android.application)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -9,6 +10,11 @@ android {
     defaultConfig {
         applicationId = packageName
         minSdk = 24
-        targetSdk = 33
+        targetSdk = 36
     }
 }
+
+dependencies {
+    implementation(libs.androidx.fragment.ktx)
+    implementation(libs.androidx.preference.ktx)
+}
diff --git a/RotationControl/src/main/AndroidManifest.xml b/RotationControl/src/main/AndroidManifest.xml
index f84483a..b8980a2 100644
--- a/RotationControl/src/main/AndroidManifest.xml
+++ b/RotationControl/src/main/AndroidManifest.xml
@@ -2,18 +2,31 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android">
     
-    <application android:label="RotationControl">
+    <application android:label="@string/app_name">
+        <activity
+            android:name=".SettingsActivity"
+            android:exported="true"
+            android:label="@string/title_activity_settings"
+            android:theme="@style/AppTheme"
+            android:excludeFromRecents="true"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="de.robv.android.xposed.category.MODULE_SETTINGS" />
+            </intent-filter>
+        </activity>
+        
         <meta-data
             android:name="xposedmodule"
             android:value="true"
             />
         <meta-data
             android:name="xposeddescription"
-            android:value="Force rotation for selected packages"
+            android:value="@string/description"
             />
         <meta-data
             android:name="xposedminversion"
-            android:value="82"
+            android:value="93"
             />
         <meta-data
             android:name="xposedscope"
diff --git a/RotationControl/src/main/java/com/programminghoch10/RotationControl/ROTATION_MODE.kt b/RotationControl/src/main/java/com/programminghoch10/RotationControl/ROTATION_MODE.kt
new file mode 100644
index 0000000..cff90f1
--- /dev/null
+++ b/RotationControl/src/main/java/com/programminghoch10/RotationControl/ROTATION_MODE.kt
@@ -0,0 +1,122 @@
+package com.programminghoch10.RotationControl
+
+import android.app.Application
+import android.content.pm.ActivityInfo
+
+val context = run {
+    val applicationContext = Class.forName("android.app.ActivityThread").getMethod("currentApplication").invoke(null) as Application?
+    if (applicationContext?.packageName == BuildConfig.APPLICATION_ID) return@run applicationContext.resources
+    return@run null
+}
+
+private fun getString(id: Int): String {
+    if (context == null) return ""
+    return context.getString(id)
+}
+
+enum class ROTATION_MODE(val key: String, val value: Int, val title: String, val summary: String) {
+    // yoinked from https://developer.android.com/reference/android/R.attr.html#screenOrientation
+    
+    SCREEN_ORIENTATION_UNSET(
+        "UNSET",
+        -2,
+        getString(R.string.screen_orientation_unset_title),
+        getString(R.string.screen_orientation_unset_summary),
+    ),
+    SCREEN_ORIENTATION_UNSPECIFIED(
+        "UNSPECIFIED",
+        ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED,
+        getString(R.string.screen_orientation_unspecified_title),
+        getString(R.string.screen_orientation_unspecified_summary),
+    ),
+    SCREEN_ORIENTATION_LANDSCAPE(
+        "LANDSCAPE",
+        ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE,
+        getString(R.string.screen_orientation_landscape_title),
+        getString(R.string.screen_orientation_landscape_summary),
+    ),
+    SCREEN_ORIENTATION_PORTRAIT(
+        "PORTRAIT",
+        ActivityInfo.SCREEN_ORIENTATION_PORTRAIT,
+        getString(R.string.screen_orientation_portrait_title),
+        getString(R.string.screen_orientation_portrait_summary),
+    ),
+    SCREEN_ORIENTATION_USER(
+        "USER",
+        ActivityInfo.SCREEN_ORIENTATION_USER,
+        getString(R.string.screen_orientation_user_title),
+        getString(R.string.screen_orientation_user_summary),
+    ),
+    SCREEN_ORIENTATION_BEHIND(
+        "BEHIND",
+        ActivityInfo.SCREEN_ORIENTATION_BEHIND,
+        getString(R.string.screen_orientation_behind_title),
+        getString(R.string.screen_orientation_behind_summary),
+    ),
+    SCREEN_ORIENTATION_SENSOR(
+        "SENSOR",
+        ActivityInfo.SCREEN_ORIENTATION_SENSOR,
+        getString(R.string.screen_orientation_sensor_title),
+        getString(R.string.screen_orientation_sensor_summary),
+    ),
+    SCREEN_ORIENTATION_NOSENSOR(
+        "NOSENSOR",
+        ActivityInfo.SCREEN_ORIENTATION_NOSENSOR,
+        getString(R.string.screen_orientation_nosensor_title),
+        getString(R.string.screen_orientation_nosensor_summary),
+    ),
+    SCREEN_ORIENTATION_SENSOR_LANDSCAPE(
+        "SENSOR_LANDSCAPE",
+        ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE,
+        getString(R.string.screen_orientation_sensor_landscape_title),
+        getString(R.string.screen_orientation_sensor_landscape_summary),
+    ),
+    SCREEN_ORIENTATION_SENSOR_PORTRAIT(
+        "SENSOR_PORTRAIT",
+        ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT,
+        getString(R.string.screen_orientation_sensor_portrait_title),
+        getString(R.string.screen_orientation_sensor_portrait_summary),
+    ),
+    SCREEN_ORIENTATION_REVERSE_LANDSCAPE(
+        "REVERSE_LANDSCAPE",
+        ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE,
+        getString(R.string.screen_orientation_reverse_landscape_title),
+        getString(R.string.screen_orientation_reverse_landscape_summary),
+    ),
+    SCREEN_ORIENTATION_REVERSE_PORTRAIT(
+        "REVERSE_PORTRAIT",
+        ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT,
+        getString(R.string.screen_orientation_reverse_portrait_title),
+        getString(R.string.screen_orientation_reverse_portrait_summary),
+    ),
+    SCREEN_ORIENTATION_FULL_SENSOR(
+        "FULL_SENSOR",
+        ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR,
+        getString(R.string.screen_orientation_full_sensor_title),
+        getString(R.string.screen_orientation_full_sensor_summary),
+    ),
+    SCREEN_ORIENTATION_USER_LANDSCAPE(
+        "USER_LANDSCAPE",
+        ActivityInfo.SCREEN_ORIENTATION_USER_LANDSCAPE,
+        getString(R.string.screen_orientation_user_landscape),
+        getString(R.string.screen_orientation_user_landscape_summary),
+    ),
+    SCREEN_ORIENTATION_USER_PORTRAIT(
+        "USER_PORTRAIT",
+        ActivityInfo.SCREEN_ORIENTATION_USER_PORTRAIT,
+        getString(R.string.screen_orientation_user_portrait_title),
+        getString(R.string.screen_orientation_user_portrait_summary),
+    ),
+    SCREEN_ORIENTATION_FULL_USER(
+        "FULL_USER",
+        ActivityInfo.SCREEN_ORIENTATION_FULL_USER,
+        getString(R.string.screen_orientation_full_user_title),
+        getString(R.string.screen_orientation_full_user_summary),
+    ),
+    SCREEN_ORIENTATION_LOCKED(
+        "LOCKED",
+        ActivityInfo.SCREEN_ORIENTATION_LOCKED,
+        getString(R.string.screen_orientation_locked_title),
+        getString(R.string.screen_orientation_locked_summary),
+    ),
+}
diff --git a/RotationControl/src/main/java/com/programminghoch10/RotationControl/RadioPreference.kt b/RotationControl/src/main/java/com/programminghoch10/RotationControl/RadioPreference.kt
new file mode 100644
index 0000000..6ff2802
--- /dev/null
+++ b/RotationControl/src/main/java/com/programminghoch10/RotationControl/RadioPreference.kt
@@ -0,0 +1,23 @@
+package com.programminghoch10.RotationControl
+
+import android.annotation.SuppressLint
+import android.content.Context
+import androidx.preference.CheckBoxPreference
+
+@SuppressLint("PrivateResource")
+class RadioPreference(context: Context) : CheckBoxPreference(context) {
+    
+    init {
+        widgetLayoutResource = R.layout.radio
+    }
+    
+    override fun setChecked(checked: Boolean) {
+        if (isChecked) return
+        super.setChecked(checked)
+    }
+    
+    fun onRadioPreferenceSelected(radioPreference: RadioPreference) {
+        if (radioPreference == this) return
+        super.setChecked(false)
+    }
+}
diff --git a/RotationControl/src/main/java/com/programminghoch10/RotationControl/RewriteOrientations.kt b/RotationControl/src/main/java/com/programminghoch10/RotationControl/RewriteOrientations.kt
new file mode 100644
index 0000000..3000a10
--- /dev/null
+++ b/RotationControl/src/main/java/com/programminghoch10/RotationControl/RewriteOrientations.kt
@@ -0,0 +1,14 @@
+package com.programminghoch10.RotationControl
+
+val rewriteLockedOrientation = mapOf(
+    ROTATION_MODE.SCREEN_ORIENTATION_LANDSCAPE to ROTATION_MODE.SCREEN_ORIENTATION_SENSOR_LANDSCAPE,
+    ROTATION_MODE.SCREEN_ORIENTATION_PORTRAIT to ROTATION_MODE.SCREEN_ORIENTATION_SENSOR_PORTRAIT,
+    ROTATION_MODE.SCREEN_ORIENTATION_REVERSE_LANDSCAPE to ROTATION_MODE.SCREEN_ORIENTATION_SENSOR_LANDSCAPE,
+    ROTATION_MODE.SCREEN_ORIENTATION_REVERSE_PORTRAIT to ROTATION_MODE.SCREEN_ORIENTATION_SENSOR_PORTRAIT,
+)
+
+val rewriteSensorOrientation = mapOf(
+    ROTATION_MODE.SCREEN_ORIENTATION_SENSOR to ROTATION_MODE.SCREEN_ORIENTATION_FULL_SENSOR,
+    ROTATION_MODE.SCREEN_ORIENTATION_USER to ROTATION_MODE.SCREEN_ORIENTATION_FULL_USER,
+)
+
diff --git a/RotationControl/src/main/java/com/programminghoch10/RotationControl/SettingsActivity.kt b/RotationControl/src/main/java/com/programminghoch10/RotationControl/SettingsActivity.kt
new file mode 100644
index 0000000..7c2d840
--- /dev/null
+++ b/RotationControl/src/main/java/com/programminghoch10/RotationControl/SettingsActivity.kt
@@ -0,0 +1,66 @@
+package com.programminghoch10.RotationControl
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import androidx.fragment.app.FragmentActivity
+import androidx.preference.Preference
+import androidx.preference.PreferenceCategory
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceGroup
+import androidx.preference.children
+
+val ROTATION_MODE_DEFAULT = ROTATION_MODE.SCREEN_ORIENTATION_SENSOR
+const val SHARED_PREFERENCES_NAME = "rotation_mode"
+
+class SettingsActivity : FragmentActivity() {
+    
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.settings_activity)
+        if (savedInstanceState == null) {
+            supportFragmentManager.beginTransaction().replace(R.id.settings, SettingsFragment()).commit()
+        }
+        actionBar?.setDisplayHomeAsUpEnabled(true)
+    }
+    
+    override fun onNavigateUp(): Boolean {
+        finishAndRemoveTask()
+        return true
+    }
+    
+    class SettingsFragment : PreferenceFragmentCompat() {
+        val radioPreferences: MutableList<RadioPreference> = mutableListOf()
+        
+        @SuppressLint("WorldReadableFiles")
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            preferenceManager.sharedPreferencesName = SHARED_PREFERENCES_NAME
+            preferenceManager.sharedPreferencesMode = MODE_WORLD_READABLE
+            setPreferencesFromResource(R.xml.root_preferences, rootKey)
+            val preferenceCategory = findPreference<PreferenceCategory>("category_rotation_mode")!!
+            val context = requireContext()
+            
+            for (rotationMode in ROTATION_MODE.entries) {
+                val preference = RadioPreference(context)
+                preference.key = rotationMode.key
+                preference.title = rotationMode.title
+                preference.summary = rotationMode.summary
+                preference.setDefaultValue(rotationMode == ROTATION_MODE_DEFAULT)
+                radioPreferences.add(preference)
+                preference.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { preference, newValue ->
+                    radioPreferences.forEach { it.onRadioPreferenceSelected(preference as RadioPreference) }
+                    true
+                }
+                preferenceCategory.addPreference(preference)
+                if (rotationMode in rewriteLockedOrientation.keys) preference.dependency = "rewrite_locked_orientations"
+                if (rotationMode in rewriteSensorOrientation.keys) preference.dependency = "rewrite_sensor_orientations"
+            }
+            
+            preferenceScreen.setIconSpaceReservedRecursive()
+        }
+        
+        private fun Preference.setIconSpaceReservedRecursive(iconSpaceReserved: Boolean = false) {
+            this.isIconSpaceReserved = iconSpaceReserved
+            if (this is PreferenceGroup) this.children.forEach { it.setIconSpaceReservedRecursive(iconSpaceReserved) }
+        }
+    }
+}
diff --git a/RotationControl/src/main/java/com/programminghoch10/RotationControl/XposedHook.java b/RotationControl/src/main/java/com/programminghoch10/RotationControl/XposedHook.java
deleted file mode 100644
index 05cdd98..0000000
--- a/RotationControl/src/main/java/com/programminghoch10/RotationControl/XposedHook.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.programminghoch10.RotationControl;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.pm.ActivityInfo;
-import android.view.Window;
-
-import de.robv.android.xposed.IXposedHookLoadPackage;
-import de.robv.android.xposed.XC_MethodHook;
-import de.robv.android.xposed.XposedHelpers;
-import de.robv.android.xposed.callbacks.XC_LoadPackage;
-
-public class XposedHook implements IXposedHookLoadPackage {
-    @Override
-    public void handleLoadPackage(XC_LoadPackage.LoadPackageParam lpparam) {
-        XposedHelpers.findAndHookMethod(
-            Activity.class, "setRequestedOrientation", int.class, new XC_MethodHook() {
-                @Override
-                protected void beforeHookedMethod(MethodHookParam param) {
-                    param.args[0] = ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR;
-                }
-            }
-        );
-        XposedHelpers.findAndHookMethod(
-            "com.android.internal.policy.PhoneWindow",
-            lpparam.classLoader,
-            "generateLayout",
-            "com.android.internal.policy.DecorView",
-            new XC_MethodHook() {
-                @Override
-                protected void beforeHookedMethod(MethodHookParam param) {
-                    Context context = ((Window) param.thisObject).getContext();
-                    
-                    while (context instanceof ContextWrapper) {
-                        if (context instanceof Activity activity) {
-                            activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR);
-                            return;
-                        }
-                        context = ((ContextWrapper) context).getBaseContext();
-                    }
-                }
-            }
-        );
-    }
-}
diff --git a/RotationControl/src/main/java/com/programminghoch10/RotationControl/XposedHook.kt b/RotationControl/src/main/java/com/programminghoch10/RotationControl/XposedHook.kt
new file mode 100644
index 0000000..03fde61
--- /dev/null
+++ b/RotationControl/src/main/java/com/programminghoch10/RotationControl/XposedHook.kt
@@ -0,0 +1,61 @@
+package com.programminghoch10.RotationControl
+
+import android.app.Activity
+import android.content.ContextWrapper
+import android.content.SharedPreferences
+import android.content.pm.ActivityInfo
+import android.view.Window
+import de.robv.android.xposed.IXposedHookLoadPackage
+import de.robv.android.xposed.XC_MethodHook
+import de.robv.android.xposed.XSharedPreferences
+import de.robv.android.xposed.XposedHelpers
+import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
+
+class XposedHook : IXposedHookLoadPackage {
+    override fun handleLoadPackage(lpparam: LoadPackageParam) {
+        if (lpparam.packageName == BuildConfig.APPLICATION_ID) return
+        
+        XposedHelpers.findAndHookMethod(
+            Activity::class.java,
+            "setRequestedOrientation",
+            Int::class.java,
+            object : XC_MethodHook() {
+                override fun beforeHookedMethod(param: MethodHookParam) {
+                    val originalRotationMode = ROTATION_MODE.entries.find { it.value == param.args[0] } ?: ROTATION_MODE.SCREEN_ORIENTATION_UNSET
+                    val sharedPreferences: SharedPreferences = XSharedPreferences(BuildConfig.APPLICATION_ID, SHARED_PREFERENCES_NAME)
+                    var selectedRotationMode = ROTATION_MODE.entries.find { sharedPreferences.getBoolean(it.key, false) } ?: ROTATION_MODE_DEFAULT
+                    if (selectedRotationMode == ROTATION_MODE.SCREEN_ORIENTATION_UNSET) selectedRotationMode = originalRotationMode
+                    if (sharedPreferences.getBoolean("rewrite_locked_orientations", false)) {
+                        selectedRotationMode = rewriteLockedOrientation.get(selectedRotationMode) ?: selectedRotationMode
+                    }
+                    if (sharedPreferences.getBoolean("rewrite_sensor_orientations", false)) {
+                        selectedRotationMode = rewriteSensorOrientation.get(selectedRotationMode) ?: selectedRotationMode
+                    }
+                    if (selectedRotationMode == ROTATION_MODE.SCREEN_ORIENTATION_UNSET) return
+                    param.args[0] = selectedRotationMode.value
+                }
+            },
+        )
+        
+        XposedHelpers.findAndHookMethod(
+            "com.android.internal.policy.PhoneWindow",
+            lpparam.classLoader,
+            "generateLayout",
+            "com.android.internal.policy.DecorView",
+            object : XC_MethodHook() {
+                override fun beforeHookedMethod(param: MethodHookParam) {
+                    var context = (param.thisObject as Window).context
+                    while (context is ContextWrapper) {
+                        if (context is Activity) {
+                            // we only need to call setRequestedOrientation
+                            // the value doesn't matter, since the hook above replaces it
+                            context.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
+                            return
+                        }
+                        context = context.baseContext
+                    }
+                }
+            },
+        )
+    }
+}
diff --git a/RotationControl/src/main/res/layout/radio.xml b/RotationControl/src/main/res/layout/radio.xml
new file mode 100644
index 0000000..41de0b3
--- /dev/null
+++ b/RotationControl/src/main/res/layout/radio.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/checkbox"
+    style="@style/Widget.AppCompat.CompoundButton.RadioButton"
+    android:background="@null"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:clickable="false"
+    android:focusable="false" />
diff --git a/RotationControl/src/main/res/layout/settings_activity.xml b/RotationControl/src/main/res/layout/settings_activity.xml
new file mode 100644
index 0000000..c716b52
--- /dev/null
+++ b/RotationControl/src/main/res/layout/settings_activity.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    style="@style/AppTheme.Edge2EdgeFix">
+
+    <FrameLayout
+        android:id="@+id/settings"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
diff --git a/RotationControl/src/main/res/values-v21/themes.xml b/RotationControl/src/main/res/values-v21/themes.xml
new file mode 100644
index 0000000..e15c2b9
--- /dev/null
+++ b/RotationControl/src/main/res/values-v21/themes.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme" parent="@android:style/Theme.DeviceDefault.Settings" />
+</resources>
diff --git a/RotationControl/src/main/res/values/strings.xml b/RotationControl/src/main/res/values/strings.xml
new file mode 100644
index 0000000..f7a4503
--- /dev/null
+++ b/RotationControl/src/main/res/values/strings.xml
@@ -0,0 +1,45 @@
+<resources>
+    <string name="app_name">RotationControl</string>
+    <string name="description">Force rotation for selected packages</string>
+    <string name="title_activity_settings">RotationControl Configuration</string>
+    <string name="category_rotation_mode">Forced Rotation Mode</string>
+    <string name="screen_orientation_unset_title">UNSET</string>
+    <string name="screen_orientation_unset_summary">Do not override screen orientation. Use this option if you only want to use the rewrite functionality above.</string>
+    <string name="screen_orientation_unspecified_title">UNSPECIFIED</string>
+    <string name="screen_orientation_unspecified_summary">No preference specified: let the system decide the best orientation. This will either be the orientation selected by the activity below, or the user\'s preferred orientation if this activity is the bottom of a task. If the user explicitly turned off sensor based orientation through settings sensor based device rotation will be ignored. If not by default sensor based orientation will be taken into account and the orientation will changed based on how the user rotates the device.</string>
+    <string name="screen_orientation_landscape_title">LANDSCAPE</string>
+    <string name="screen_orientation_landscape_summary">Would like to have the screen in a landscape orientation: that is, with the display wider than it is tall, ignoring sensor data.</string>
+    <string name="screen_orientation_portrait_title">PORTRAIT</string>
+    <string name="screen_orientation_portrait_summary">Would like to have the screen in a portrait orientation: that is, with the display taller than it is wide, ignoring sensor data.</string>
+    <string name="screen_orientation_user_title">USER</string>
+    <string name="screen_orientation_user_summary">Use the user\'s current preferred orientation of the handset.</string>
+    <string name="screen_orientation_behind_title">BEHIND</string>
+    <string name="screen_orientation_behind_summary">Keep the screen in the same orientation as whatever is behind this activity.</string>
+    <string name="screen_orientation_sensor_title">SENSOR</string>
+    <string name="screen_orientation_sensor_summary">Orientation is determined by a physical orientation sensor: the display will rotate based on how the user moves the device. Ignores user\'s setting to turn off sensor-based rotation.</string>
+    <string name="screen_orientation_nosensor_title">NOSENSOR</string>
+    <string name="screen_orientation_nosensor_summary">Always ignore orientation determined by orientation sensor: the display will not rotate when the user moves the device.</string>
+    <string name="screen_orientation_sensor_landscape_title">SENSOR_LANDSCAPE</string>
+    <string name="screen_orientation_sensor_landscape_summary">"Would like to have the screen in landscape orientation, but can use the sensor to change which direction the screen is facing. "</string>
+    <string name="screen_orientation_sensor_portrait_title">SENSOR_PORTRAIT</string>
+    <string name="screen_orientation_sensor_portrait_summary">Would like to have the screen in portrait orientation, but can use the sensor to change which direction the screen is facing.</string>
+    <string name="screen_orientation_reverse_landscape_title">REVERSE_LANDSCAPE</string>
+    <string name="screen_orientation_reverse_landscape_summary">Would like to have the screen in landscape orientation, turned in the opposite direction from normal landscape.</string>
+    <string name="screen_orientation_reverse_portrait_title">REVERSE_PORTRAIT</string>
+    <string name="screen_orientation_reverse_portrait_summary">Would like to have the screen in portrait orientation, turned in the opposite direction from normal portrait.</string>
+    <string name="screen_orientation_full_sensor_title">FULL_SENSOR</string>
+    <string name="screen_orientation_full_sensor_summary">Orientation is determined by a physical orientation sensor: the display will rotate based on how the user moves the device. This allows any of the 4 possible rotations, regardless of what the device will normally do (for example some devices won\'t normally use 180 degree rotation).</string>
+    <string name="screen_orientation_user_landscape">USER_LANDSCAPE</string>
+    <string name="screen_orientation_user_landscape_summary">Would like to have the screen in landscape orientation, but if the user has enabled sensor-based rotation then we can use the sensor to change which direction the screen is facing.</string>
+    <string name="screen_orientation_user_portrait_title">USER_PORTRAIT</string>
+    <string name="screen_orientation_user_portrait_summary">Would like to have the screen in portrait orientation, but if the user has enabled sensor-based rotation then we can use the sensor to change which direction the screen is facing.</string>
+    <string name="screen_orientation_full_user_title">FULL_USER</string>
+    <string name="screen_orientation_full_user_summary">Respect the user\'s sensor-based rotation preference, but if sensor-based rotation is enabled then allow the screen to rotate in all 4 possible directions regardless of what the device will normally do (for example some devices won\'t normally use 180 degree rotation).</string>
+    <string name="screen_orientation_locked_title">LOCKED</string>
+    <string name="screen_orientation_locked_summary">Screen is locked to its current rotation, whatever that is.</string>
+    <string name="rewrite_locked_orientations_title">Rewrite to sensor orientation</string>
+    <string name="rewrite_locked_orientations_summary">Rewrite locked orientations to sensor orientations.</string>
+    <string name="rewrite_sensor_orientation_title">Force full sensor rotation</string>
+    <string name="rewrite_sensor_orientations_summary">Rewrite sensor orientations to full sensor orientations.</string>
+    <string name="category_rewrite">Rewrite Options</string>
+</resources>
diff --git a/RotationControl/src/main/res/values/themes.xml b/RotationControl/src/main/res/values/themes.xml
new file mode 100644
index 0000000..7e8afbb
--- /dev/null
+++ b/RotationControl/src/main/res/values/themes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    
+    <style name="AppTheme" parent="@android:style/Theme.DeviceDefault" />
+    
+    <style name="AppTheme.Edge2EdgeFix">
+        <item name="android:fitsSystemWindows">true</item>
+    </style>
+</resources>
diff --git a/RotationControl/src/main/res/xml/root_preferences.xml b/RotationControl/src/main/res/xml/root_preferences.xml
new file mode 100644
index 0000000..d4e59b8
--- /dev/null
+++ b/RotationControl/src/main/res/xml/root_preferences.xml
@@ -0,0 +1,23 @@
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory app:title="@string/category_rewrite">
+        <SwitchPreference
+            app:key="rewrite_locked_orientations"
+            app:title="@string/rewrite_locked_orientations_title"
+            app:summary="@string/rewrite_locked_orientations_summary"
+            app:defaultValue="false"
+            app:disableDependentsState="true" />
+
+        <SwitchPreference
+            app:key="rewrite_sensor_orientations"
+            app:title="@string/rewrite_sensor_orientation_title"
+            app:summary="@string/rewrite_sensor_orientations_summary"
+            app:defaultValue="false"
+            app:disableDependentsState="true" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        app:title="@string/category_rotation_mode"
+        app:key="category_rotation_mode" />
+
+</PreferenceScreen>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c816fe7..6c57813 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,6 +5,7 @@ androidTools = "31.12.1"
 androidxAnnotation = "1.9.1"
 collection = "1.5.0"
 core = "1.17.0"
+fragment = "1.8.9"
 githubApi = "1.329"
 hiddenapibypass = "6.1"
 jebrainsAnnotations = "26.0.2"
@@ -20,7 +21,9 @@ android-tools-common = { module = "com.android.tools:common", version.ref = "and
 androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidxAnnotation" }
 androidx-collection-ktx = { module = "androidx.collection:collection-ktx", version.ref = "collection" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "core" }
+androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragment" }
 androidx-preference = { group = "androidx.preference", name = "preference", version.ref = "preference" }
+androidx-preference-ktx = { group = "androidx.preference", name = "preference-ktx", version.ref = "preference" }
 github-api = { module = "org.kohsuke:github-api", version.ref = "githubApi" }
 hiddenapibypass = { module = "org.lsposed.hiddenapibypass:hiddenapibypass", version.ref = "hiddenapibypass" }
 jebtrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jebrainsAnnotations" }