diff --git a/.idea/navEditor.xml b/.idea/navEditor.xml
index 8a0e2b0..74443cb 100644
--- a/.idea/navEditor.xml
+++ b/.idea/navEditor.xml
@@ -75,6 +75,28 @@
             </LayoutPositions>
           </value>
         </entry>
+        <entry key="nav_graph_root.xml">
+          <value>
+            <LayoutPositions>
+              <option name="myPositions">
+                <map>
+                  <entry key="settingsRootFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="40" />
+                            <option name="y" value="40" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </LayoutPositions>
+          </value>
+        </entry>
         <entry key="nav_graph_settings.xml">
           <value>
             <LayoutPositions>
@@ -245,7 +267,7 @@
                                 <LayoutPositions />
                               </value>
                             </entry>
-                            <entry key="action_settingsContainerFragment_to_settingsQuickAccessWalletChangeDefaultPaymentMethod">
+                            <entry key="action_settingsContainerFragment_to_settingsQuickAccessWalletAutoSwitchServiceFragment">
                               <value>
                                 <LayoutPositions />
                               </value>
@@ -272,13 +294,13 @@
                       </LayoutPositions>
                     </value>
                   </entry>
-                  <entry key="settingsQuickAccessWalletChangeDefaultPaymentMethod">
+                  <entry key="settingsQuickAccessWalletAutoSwitchServiceFragment">
                     <value>
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="764" />
-                            <option name="y" value="99" />
+                            <option name="x" value="12" />
+                            <option name="y" value="12" />
                           </Point>
                         </option>
                       </LayoutPositions>
@@ -301,8 +323,8 @@
                       <LayoutPositions>
                         <option name="myPosition">
                           <Point>
-                            <option name="x" value="12" />
-                            <option name="y" value="97" />
+                            <option name="x" value="-310" />
+                            <option name="y" value="145" />
                           </Point>
                         </option>
                         <option name="myPositions">
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Controls/build.gradle b/Controls/build.gradle
index ae478c2..18b8b58 100644
--- a/Controls/build.gradle
+++ b/Controls/build.gradle
@@ -8,7 +8,7 @@ android {
 
     defaultConfig {
         minSdk 30
-        targetSdk 34
+        targetSdk 35
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -31,13 +31,13 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.12.0'
-    implementation "androidx.lifecycle:lifecycle-common-java8:2.7.0"
+    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation "androidx.lifecycle:lifecycle-common-java8:2.8.4"
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.fragment:fragment-ktx:1.6.2'
+    implementation 'androidx.fragment:fragment-ktx:1.8.2'
     implementation 'androidx.preference:preference-ktx:1.2.1'
-    implementation 'androidx.viewpager2:viewpager2:1.0.0'
+    implementation 'androidx.viewpager2:viewpager2:1.1.0'
     implementation "io.insert-koin:koin-android:$koin_version"
     compileOnly project(path: ':systemstubs')
 }
\ No newline at end of file
diff --git a/Controls/src/main/java/com/android/systemui/controls/controller/StatefulControlSubscriber.kt b/Controls/src/main/java/com/android/systemui/controls/controller/StatefulControlSubscriber.kt
index f8dd0d3..e213106 100644
--- a/Controls/src/main/java/com/android/systemui/controls/controller/StatefulControlSubscriber.kt
+++ b/Controls/src/main/java/com/android/systemui/controls/controller/StatefulControlSubscriber.kt
@@ -56,10 +56,8 @@ class StatefulControlSubscriber(
     }
 
     override fun onNext(token: IBinder, control: Control) {
-        Log.d("SCS", "onNext ${control.title}")
         run(token) {
             if (!subscriptionOpen) {
-                Log.w(TAG, "Refresh outside of window for token:$token")
             } else {
                 controller.refreshStatus(provider.componentName, control)
             }
diff --git a/Controls/src/main/java/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt b/Controls/src/main/java/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt
index 390c7dd..6be971e 100644
--- a/Controls/src/main/java/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt
+++ b/Controls/src/main/java/com/android/systemui/controls/ui/ControlActionCoordinatorImpl.kt
@@ -173,7 +173,6 @@ class ControlActionCoordinatorImpl constructor(
                         it.show()
                     }*/
                     activityStarter.dismissKeyguardThenExecute({
-                        Log.d("CACI", "startActivity")
                         activityStarter.dismissPowerMenu()
                         serviceRunner.startActivity(context, intent.createLaunchIntent()){
                             serviceRunner.overridePendingTransition(R.anim.bottomsheet_in, R.anim.bottomsheet_out)
diff --git a/QuickAccessWallet/build.gradle b/QuickAccessWallet/build.gradle
index 37ce5ed..bdb4aa3 100644
--- a/QuickAccessWallet/build.gradle
+++ b/QuickAccessWallet/build.gradle
@@ -8,7 +8,7 @@ android {
 
     defaultConfig {
         minSdk 30
-        targetSdk 34
+        targetSdk 35
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
diff --git a/app/build.gradle b/app/build.gradle
index 7c281f7..7650e83 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id 'com.google.android.gms.oss-licenses-plugin'
 }
 
-def version = '1.7.2'
+def version = '1.8'
 
 android {
     compileSdk 34
@@ -15,8 +15,8 @@ android {
     defaultConfig {
         applicationId "com.kieronquinn.app.classicpowermenu"
         minSdk 30
-        targetSdk 34
-        versionCode 172
+        targetSdk 35
+        versionCode 180
         versionName version
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -70,22 +70,24 @@ dependencies {
     implementation 'androidx.recyclerview:recyclerview:1.3.2'
 
     //AndroidX
-    def lifecycle_version = "2.7.0"
-    implementation 'androidx.core:core-ktx:1.12.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def lifecycle_version = "2.8.4"
+    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation "androidx.activity:activity-ktx:1.9.1"
+    implementation "androidx.fragment:fragment-ktx:1.8.2"
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-process:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-service:$lifecycle_version"
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.work:work-runtime-ktx:2.9.0'
+    implementation 'androidx.work:work-runtime-ktx:2.9.1'
     implementation "androidx.core:core-splashscreen:1.0.1"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
     //Material
-    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'com.google.android.material:material:1.12.0'
 
     //Monet
     implementation 'com.github.KieronQuinn:MonetCompat:0.4.1'
@@ -97,7 +99,7 @@ dependencies {
     implementation "com.google.protobuf:protobuf-javalite:3.25.2"
 
     //Guava for hashing code (to match what Gpay uses)
-    implementation 'com.google.guava:guava:30.1.1-android'
+    implementation 'com.google.guava:guava:31.1-android'
 
     //Stubs for hidden APIs. Shouldn't be included in APK.
     compileOnly project(':systemstubs')
@@ -129,7 +131,7 @@ dependencies {
     compileOnly 'de.robv.android.xposed:api:82'
 
     //OSS libraries activity
-    implementation 'com.google.android.gms:play-services-oss-licenses:17.0.1'
+    implementation 'com.google.android.gms:play-services-oss-licenses:17.1.0'
 
     //Retrofit for update checking
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
@@ -144,6 +146,6 @@ dependencies {
 
     //Test
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }
\ No newline at end of file
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 2b6740e..80d5700 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 171,
-      "versionName": "1.7.1",
+      "versionCode": 172,
+      "versionName": "1.7.2",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 56af4f3..a7675a1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"
+        tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ClassicPowerMenu.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ClassicPowerMenu.kt
index b417ce0..f8a2f74 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ClassicPowerMenu.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ClassicPowerMenu.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.os.HandlerThread
 import android.os.Looper
 import androidx.lifecycle.lifecycleScope
+import androidx.navigation.Navigation
 import com.android.systemui.broadcast.BroadcastDispatcher
 import com.android.systemui.broadcast.logging.BroadcastDispatcherLogger
 import com.android.systemui.controls.CustomIconCache
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/activities/MainActivity.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/activities/MainActivity.kt
index 50dd822..53431f1 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/activities/MainActivity.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/activities/MainActivity.kt
@@ -6,6 +6,7 @@ import android.content.Intent
 import android.graphics.drawable.ColorDrawable
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.view.ViewTreeObserver
 import android.view.animation.AnticipateInterpolator
@@ -19,6 +20,8 @@ import com.kieronquinn.app.classicpowermenu.components.settings.Settings
 import com.kieronquinn.app.classicpowermenu.service.accessibility.CPMAccessibilityService
 import com.kieronquinn.app.classicpowermenu.utils.TransitionUtils
 import com.kieronquinn.app.classicpowermenu.utils.extensions.broadcastReceiverAsFlow
+import com.kieronquinn.app.classicpowermenu.utils.extensions.delayPreDrawUntilFlow
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenCreated
 import com.kieronquinn.app.classicpowermenu.workers.UpdateCheckWorker
 import com.kieronquinn.monetcompat.app.MonetCompatActivity
 import kotlinx.coroutines.flow.collect
@@ -34,21 +37,22 @@ class MainActivity : MonetCompatActivity() {
         super.onCreate(savedInstanceState)
         installSplashScreen()
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            //TODO move when android.core:splashscreen supports it
             setupSplashScreen()
-            setupSplashDelay()
         }
-        setupTransition()
         setupBringToFront()
         setupInsets()
         WindowCompat.setDecorFitsSystemWindows(window, false)
         UpdateCheckWorker.queueCheckWorker(this)
-        lifecycleScope.launchWhenCreated {
+        whenCreated {
             monet.awaitMonetReady()
             window.setBackgroundDrawable(ColorDrawable(monet.getBackgroundColor(this@MainActivity)))
             setContentView(R.layout.activity_main)
             setupStatusNav()
         }
+        findViewById<View>(android.R.id.content).delayPreDrawUntilFlow(
+            viewModel.appReady,
+            lifecycle
+        )
     }
 
     private fun setupInsets(){
@@ -67,22 +71,6 @@ class MainActivity : MonetCompatActivity() {
         }
     }
 
-    private fun setupSplashDelay(){
-        val content: View = findViewById(android.R.id.content)
-        content.viewTreeObserver.addOnPreDrawListener(
-            object : ViewTreeObserver.OnPreDrawListener {
-                override fun onPreDraw(): Boolean {
-                    return if (viewModel.appReady.value) {
-                        content.viewTreeObserver.removeOnPreDrawListener(this)
-                        true
-                    } else {
-                        false
-                    }
-                }
-            }
-        )
-    }
-
     @RequiresApi(Build.VERSION_CODES.S)
     private fun setupSplashScreen() {
         //Use the default animation when not loading setup where there's a shared element
@@ -102,7 +90,7 @@ class MainActivity : MonetCompatActivity() {
         }
     }
 
-    private fun setupBringToFront() = lifecycleScope.launchWhenCreated {
+    private fun setupBringToFront() = whenCreated {
         broadcastReceiverAsFlow(CPMAccessibilityService.INTENT_ACTION_BRING_TO_FRONT, oneShot = true).collect {
             startActivity(Intent(this@MainActivity, MainActivity::class.java).apply {
                 flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT
@@ -110,9 +98,4 @@ class MainActivity : MonetCompatActivity() {
         }
     }
 
-    private fun setupTransition() = with(window) {
-        exitTransition = TransitionUtils.getMaterialSharedAxis(this@MainActivity, true)
-        reenterTransition = TransitionUtils.getMaterialSharedAxis(this@MainActivity, false)
-    }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/activities/MainActivityViewModel.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/activities/MainActivityViewModel.kt
index 8bab56c..843132f 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/activities/MainActivityViewModel.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/activities/MainActivityViewModel.kt
@@ -42,7 +42,7 @@ class MainActivityViewModelImpl(context: Context, private val updateChecker: Upd
         emit(true)
     }
 
-    private val _appReady = combine(splashDelay, decisionMade){ requirements, _ ->
+    private val _appReady = combine(splashDelay, decisionMade){ requirements, decision ->
         requirements
     }
 
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/activities/PowerMenuActivity.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/activities/PowerMenuActivity.kt
index 192ac62..d3b4e6a 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/activities/PowerMenuActivity.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/activities/PowerMenuActivity.kt
@@ -16,6 +16,8 @@ import com.kieronquinn.app.classicpowermenu.components.starter.PowerMenuStarter
 import com.kieronquinn.app.classicpowermenu.service.container.CPMServiceContainer
 import com.kieronquinn.app.classicpowermenu.utils.extensions.awaitPost
 import com.kieronquinn.app.classicpowermenu.utils.extensions.sendDismissIntent
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenCreated
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import com.kieronquinn.monetcompat.app.MonetCompatActivity
 import kotlinx.coroutines.flow.collect
 import org.koin.android.ext.android.inject
@@ -39,7 +41,7 @@ class PowerMenuActivity : MonetCompatActivity(), PowerMenuStarter.PowerMenuStart
         super.onCreate(savedInstanceState)
         requestedOrientation = viewModel.getRequestedOrientation()
         hideStatusBar()
-        lifecycleScope.launchWhenCreated {
+        whenCreated {
             setContentView(R.layout.activity_power_menu)
             WindowCompat.setDecorFitsSystemWindows(window, false)
             window.setupLayout()
@@ -57,7 +59,7 @@ class PowerMenuActivity : MonetCompatActivity(), PowerMenuStarter.PowerMenuStart
         }
     }
 
-    private fun sendDismiss(runAfter: () -> Unit) = lifecycleScope.launchWhenResumed {
+    private fun sendDismiss(runAfter: () -> Unit) = whenResumed {
         serviceContainer.runWithService {
             it.sendDismissIntent(this@PowerMenuActivity)
             runAfter()
@@ -67,7 +69,7 @@ class PowerMenuActivity : MonetCompatActivity(), PowerMenuStarter.PowerMenuStart
     override fun onResume() {
         super.onResume()
         starter.setEventListener(this)
-        lifecycleScope.launchWhenResumed {
+        whenResumed {
             window.decorView.awaitPost()
             if(!viewModel.useSolidBackground){
                 blurProvider.applyBlurToWindow(window, 1.5f)
@@ -80,13 +82,13 @@ class PowerMenuActivity : MonetCompatActivity(), PowerMenuStarter.PowerMenuStart
         starter.setEventListener(null)
     }
 
-    private fun setupClose() = lifecycleScope.launchWhenCreated {
+    private fun setupClose() = whenCreated {
         navigation.closePowerMenuBus.collect {
             closePowerMenu()
         }
     }
 
-    private fun setupCloseBroadcast() = lifecycleScope.launchWhenCreated {
+    private fun setupCloseBroadcast() = whenCreated {
         viewModel.closeBroadcast.collect {
             closePowerMenu()
         }
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/base/BaseBottomSheetFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/base/BaseBottomSheetFragment.kt
index cc27d81..45a77a8 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/base/BaseBottomSheetFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/base/BaseBottomSheetFragment.kt
@@ -19,6 +19,7 @@ import com.kieronquinn.app.classicpowermenu.R
 import com.kieronquinn.app.classicpowermenu.components.blur.BlurProvider
 import com.kieronquinn.app.classicpowermenu.utils.extensions.awaitPost
 import com.kieronquinn.app.classicpowermenu.utils.extensions.isDarkMode
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import com.kieronquinn.monetcompat.core.MonetCompat
 import org.koin.android.ext.android.inject
 
@@ -136,7 +137,7 @@ abstract class BaseBottomSheetFragment<T: ViewBinding>(private val inflate: (Lay
     private fun applyBlur(ratio: Float){
         val dialogWindow = dialog?.window ?: return
         val appWindow = activity?.window ?: return
-        lifecycleScope.launchWhenResumed {
+        whenResumed {
             dialogWindow.decorView.awaitPost()
             blurProvider.applyDialogBlur(dialogWindow, appWindow, ratio)
         }
@@ -145,7 +146,7 @@ abstract class BaseBottomSheetFragment<T: ViewBinding>(private val inflate: (Lay
     override fun onResume() {
         super.onResume()
         if(isBlurShowing){
-            lifecycleScope.launchWhenResumed {
+            whenResumed {
                 view?.awaitPost()
                 applyBlur(1f)
             }
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/base/BaseDialogFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/base/BaseDialogFragment.kt
index 30e81ad..1fabe31 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/base/BaseDialogFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/base/BaseDialogFragment.kt
@@ -12,6 +12,7 @@ import androidx.viewbinding.ViewBinding
 import autoCleared
 import com.kieronquinn.app.classicpowermenu.components.blur.BlurProvider
 import com.kieronquinn.app.classicpowermenu.utils.extensions.awaitPost
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import com.kieronquinn.monetcompat.core.MonetCompat
 import org.koin.android.ext.android.inject
 
@@ -39,7 +40,7 @@ abstract class BaseDialogFragment<T: ViewBinding>(private val inflate: (LayoutIn
     private var showBlurAnimation: ValueAnimator? = null
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        lifecycleScope.launchWhenResumed {
+        whenResumed {
             view.awaitPost()
             showBlurAnimation = ValueAnimator.ofFloat(0f, 1.25f).apply {
                 duration = 250L
@@ -74,7 +75,7 @@ abstract class BaseDialogFragment<T: ViewBinding>(private val inflate: (LayoutIn
     private fun applyBlur(ratio: Float){
         val dialogWindow = dialog?.window ?: return
         val appWindow = activity?.window ?: return
-        lifecycleScope.launchWhenResumed {
+        whenResumed {
             dialogWindow.decorView.awaitPost()
             blurProvider.applyDialogBlur(dialogWindow, appWindow, ratio)
         }
@@ -83,7 +84,7 @@ abstract class BaseDialogFragment<T: ViewBinding>(private val inflate: (LayoutIn
     override fun onResume() {
         super.onResume()
         if(isBlurShowing){
-            lifecycleScope.launchWhenResumed {
+            whenResumed {
                 view?.awaitPost()
                 applyBlur(1.25f)
             }
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/base/BoundFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/base/BoundFragment.kt
index efee4c7..1802b3b 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/base/BoundFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/base/BoundFragment.kt
@@ -39,19 +39,4 @@ abstract class BoundFragment<T: ViewBinding>(private val inflate: (LayoutInflate
         return binding.root
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        if(this is StandaloneFragment){
-            setupStandaloneFragment()
-        }
-    }
-
-    private fun setupStandaloneFragment(){
-        requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, object: OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                (this@BoundFragment as StandaloneFragment).onBackPressed()
-            }
-        })
-    }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/decision/DecisionFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/decision/DecisionFragment.kt
index fcdd787..e7e3af0 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/decision/DecisionFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/decision/DecisionFragment.kt
@@ -8,6 +8,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import com.kieronquinn.app.classicpowermenu.ui.activities.MainActivityViewModel
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import kotlinx.coroutines.flow.collect
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -26,7 +27,7 @@ class DecisionFragment: Fragment() {
         return View(context)
     }
 
-    private fun setupAppReady() = viewLifecycleOwner.lifecycleScope.launchWhenResumed {
+    private fun setupAppReady() = whenResumed {
         viewModel.decisionMade.collect {
             appViewModel.onDecisionMade()
         }
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/container/PowerMenuContainerFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/container/PowerMenuContainerFragment.kt
index e326c2a..35c5e4c 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/container/PowerMenuContainerFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/container/PowerMenuContainerFragment.kt
@@ -11,6 +11,7 @@ import com.kieronquinn.app.classicpowermenu.components.navigation.PowerMenuNavig
 import com.kieronquinn.app.classicpowermenu.databinding.FragmentPowerMenuContainerBinding
 import com.kieronquinn.app.classicpowermenu.ui.base.BoundFragment
 import com.kieronquinn.app.classicpowermenu.utils.extensions.navigateSafely
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import kotlinx.coroutines.flow.collect
 import org.koin.android.ext.android.inject
 
@@ -31,7 +32,7 @@ class PowerMenuContainerFragment: BoundFragment<FragmentPowerMenuContainerBindin
         setupNavigation()
     }
 
-    private fun setupNavigation() = lifecycleScope.launchWhenResumed {
+    private fun setupNavigation() = whenResumed {
         navigation.navigationBus.collect {
             handleNavigationEvent(it)
         }
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/main/PowerMenuButtonsAdapter.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/main/PowerMenuButtonsAdapter.kt
index a8eed4e..7766f8e 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/main/PowerMenuButtonsAdapter.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/main/PowerMenuButtonsAdapter.kt
@@ -23,6 +23,8 @@ import androidx.core.view.doOnNextLayout
 import androidx.core.view.doOnPreDraw
 import androidx.core.view.updateLayoutParams
 import androidx.lifecycle.LifecycleCoroutineScope
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
 import com.kieronquinn.app.classicpowermenu.R
@@ -32,6 +34,7 @@ import com.kieronquinn.app.classicpowermenu.databinding.ItemPowerMenuButtonEmpty
 import com.kieronquinn.app.classicpowermenu.model.power.PowerMenuButton
 import com.kieronquinn.app.classicpowermenu.model.power.PowerMenuButtonId
 import com.kieronquinn.app.classicpowermenu.model.power.PowerMenuButtonType
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import com.kieronquinn.monetcompat.core.MonetCompat
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
@@ -186,7 +189,8 @@ class PowerMenuButtonsAdapter(context: Context, var items: MutableList<PowerMenu
         }
     }
 
-    fun setupDrag(recyclerView: RecyclerView, lifecycle: LifecycleCoroutineScope){
+    fun setupDrag(recyclerView: RecyclerView, lifecycleOwner: LifecycleOwner){
+        val lifecycle = lifecycleOwner.lifecycleScope
         this.lifecycle = lifecycle
         registerAdapterDataObserver(object: RecyclerView.AdapterDataObserver() {
 
@@ -234,7 +238,7 @@ class PowerMenuButtonsAdapter(context: Context, var items: MutableList<PowerMenu
             }
             dragEvent.action == android.view.DragEvent.ACTION_DRAG_STARTED
         }
-        lifecycle.launchWhenResumed {
+        lifecycleOwner.whenResumed {
             launch {
                 dragEventCallback.debounce(100).collect { dragEvent ->
                     onDragEvent(dragEvent)
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/main/PowerMenuFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/main/PowerMenuFragment.kt
index 99f5e3f..1e957db 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/main/PowerMenuFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/main/PowerMenuFragment.kt
@@ -39,6 +39,7 @@ import com.kieronquinn.app.classicpowermenu.utils.extensions.isScrolled
 import com.kieronquinn.app.classicpowermenu.utils.extensions.scrollPercentage
 import com.kieronquinn.app.classicpowermenu.utils.extensions.sendDismissIntent
 import com.kieronquinn.app.classicpowermenu.utils.extensions.setSecondaryAlpha
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.launch
@@ -189,7 +190,7 @@ class PowerMenuFragment :
         }
     }
 
-    private fun setupService() = lifecycleScope.launchWhenResumed {
+    private fun setupService() = whenResumed {
         serviceContainer.runWithService {
             setupWallet(it)
             setupControls()
@@ -197,7 +198,7 @@ class PowerMenuFragment :
     }
 
     private var appBarBackgroundAnimation: ValueAnimator? = null
-    private fun setupAppbar() = lifecycleScope.launchWhenResumed {
+    private fun setupAppbar() = whenResumed {
         //Start alpha is 0
         binding.powerMenuAppbar.background.alpha = 0
         binding.powerMenuAppbar.backgroundTintList = ColorStateList.valueOf(monet.getBackgroundColor(requireContext()))
@@ -226,7 +227,7 @@ class PowerMenuFragment :
         return roundToInt()
     }
 
-    private fun setupSecondaryAlpha() = lifecycleScope.launchWhenResumed {
+    private fun setupSecondaryAlpha() = whenResumed {
         binding.powerMenuAppbar.scrollPercentage.collect {
             buttonsLayoutManager.setSecondaryAlpha(1 - it)
         }
@@ -251,7 +252,7 @@ class PowerMenuFragment :
         contentAdapter.notifyItemChangeOfType(PowerMenuContentItem.Controls)
     }
 
-    private fun setupButtons() = lifecycleScope.launchWhenResumed {
+    private fun setupButtons() = whenResumed {
         buttonsAdapter.items = powerMenuButtons.filter { it.shouldShow() }.toMutableList()
         buttonsAdapter.notifyDataSetChanged()
     }
@@ -260,7 +261,7 @@ class PowerMenuFragment :
         sendDismiss()
     }
 
-    private fun sendDismiss() = lifecycleScope.launchWhenResumed {
+    private fun sendDismiss() = whenResumed {
         serviceContainer.runWithService {
             it.sendDismissIntent(requireContext())
         }
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/walletcode/WalletCodeDialogFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/walletcode/WalletCodeDialogFragment.kt
index db0afe0..7082b91 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/walletcode/WalletCodeDialogFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/powermenu/walletcode/WalletCodeDialogFragment.kt
@@ -31,6 +31,7 @@ import org.koin.android.ext.android.inject
 import com.google.zxing.BarcodeFormat
 import com.kieronquinn.app.classicpowermenu.components.settings.Settings
 import com.kieronquinn.app.classicpowermenu.utils.extensions.awaitPost
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 
 class WalletCodeDialogFragment: BaseDialogFragment<FragmentDialogWalletCodeBinding>(FragmentDialogWalletCodeBinding::inflate) {
 
@@ -165,7 +166,7 @@ class WalletCodeDialogFragment: BaseDialogFragment<FragmentDialogWalletCodeBindi
     }
 
     private fun setupCode() = with(binding.walletCodeCodeImage) {
-        lifecycleScope.launchWhenResumed {
+        whenResumed {
             awaitPost()
             generateCode(measuredWidth, measuredHeight)?.let {
                 setImageBitmap(it)
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/colorpicker/ColorPickerBottomSheetFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/colorpicker/ColorPickerBottomSheetFragment.kt
index 6cc5978..45d4bff 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/colorpicker/ColorPickerBottomSheetFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/colorpicker/ColorPickerBottomSheetFragment.kt
@@ -14,6 +14,7 @@ import com.kieronquinn.app.classicpowermenu.R
 import com.kieronquinn.app.classicpowermenu.components.settings.Settings
 import com.kieronquinn.app.classicpowermenu.databinding.FragmentBottomSheetColorPickerBinding
 import com.kieronquinn.app.classicpowermenu.ui.base.BaseBottomSheetFragment
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
@@ -29,14 +30,14 @@ class ColorPickerBottomSheetFragment : BaseBottomSheetFragment<FragmentBottomShe
             view.updatePadding(left = navigationInsets.left, right = navigationInsets.right, bottom = navigationInsets.bottom + extraPadding)
             insets
         }
-        lifecycleScope.launchWhenResumed {
+        whenResumed {
             with(binding){
                 val availableColors = monet.getAvailableWallpaperColors() ?: emptyList()
                 //No available colors = likely using a live wallpaper, show a toast and dismiss
                 if(availableColors.isEmpty()){
                     Toast.makeText(requireContext(), getString(R.string.color_picker_unavailable), Toast.LENGTH_LONG).show()
                     dismiss()
-                    return@launchWhenResumed
+                    return@whenResumed
                 }
                 root.backgroundTintList = ColorStateList.valueOf(monet.getBackgroundColor(requireContext()))
                 colorPickerList.layoutManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false)
@@ -51,7 +52,7 @@ class ColorPickerBottomSheetFragment : BaseBottomSheetFragment<FragmentBottomShe
         }
     }
 
-    private fun onColorPicked(color: Int) = lifecycleScope.launchWhenResumed {
+    private fun onColorPicked(color: Int) = whenResumed {
         settings.monetColor = color
         //Trigger a manual update
         monet.updateMonetColors()
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/container/SettingsContainerFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/container/SettingsContainerFragment.kt
index 001c45c..d81b98a 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/container/SettingsContainerFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/container/SettingsContainerFragment.kt
@@ -1,5 +1,6 @@
 package com.kieronquinn.app.classicpowermenu.ui.screens.settings.container
 
+import android.annotation.SuppressLint
 import android.os.Bundle
 import android.util.Log
 import android.util.TypedValue
@@ -35,6 +36,8 @@ import com.kieronquinn.app.classicpowermenu.utils.extensions.isLandscape
 import com.kieronquinn.app.classicpowermenu.utils.extensions.navigateSafely
 import com.kieronquinn.app.classicpowermenu.utils.extensions.onApplyInsets
 import com.kieronquinn.app.classicpowermenu.utils.extensions.onDestinationChanged
+import com.kieronquinn.app.classicpowermenu.utils.extensions.setOnBackPressedCallback
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import kotlinx.coroutines.flow.collect
 import org.koin.android.ext.android.inject
 import kotlin.math.roundToInt
@@ -107,7 +110,7 @@ class SettingsContainerFragment: BoundFragment<FragmentSettingsContainerBinding>
             collapsingToolbar.title = getString(R.string.app_name)
             appBar.setExpanded(!requireContext().isLandscape && getTopFragment() is AutoExpandOnRotate)
             toolbar.setNavigationOnClickListener {
-                lifecycleScope.launchWhenResumed {
+                whenResumed {
                     navigation.navigateBack()
                 }
             }
@@ -118,7 +121,7 @@ class SettingsContainerFragment: BoundFragment<FragmentSettingsContainerBinding>
         }
     }
 
-    private fun setupNavigation() = viewLifecycleOwner.lifecycleScope.launchWhenResumed {
+    private fun setupNavigation() = viewLifecycleOwner.whenResumed {
         navigation.navigationBus.collect {
             handleNavigationEvent(it)
         }
@@ -126,19 +129,28 @@ class SettingsContainerFragment: BoundFragment<FragmentSettingsContainerBinding>
 
     private fun shouldBackDispatcherBeEnabled(): Boolean {
         val top = navHostFragment.getTopFragment()
-        return top is StandaloneFragment || top !is Root
+        return top is StandaloneFragment
     }
 
+    @SuppressLint("RestrictedApi")
     private fun setupBack() {
-        val callback = requireActivity().onBackPressedDispatcher.addCallback(
-            this,
-            shouldBackDispatcherBeEnabled()
-        ) {
-            if(!navController.navigateUp()) requireActivity().finish()
+        val callback = object: OnBackPressedCallback(true) {
+            override fun handleOnBackPressed() {
+                (navHostFragment.getTopFragment() as? StandaloneFragment)?.let {
+                    it.onBackPressed()
+                    return
+                }
+                if(!navController.popBackStack()) {
+                    requireActivity().finish()
+                }
+            }
         }
-        viewLifecycleOwner.lifecycleScope.launchWhenResumed {
+        navController.setOnBackPressedCallback(callback)
+        navController.enableOnBackPressed(shouldBackDispatcherBeEnabled())
+        navController.setOnBackPressedDispatcher(requireActivity().onBackPressedDispatcher)
+        whenResumed {
             navController.onDestinationChanged().collect {
-                callback.isEnabled = shouldBackDispatcherBeEnabled()
+                navController.enableOnBackPressed(shouldBackDispatcherBeEnabled())
             }
         }
     }
@@ -148,15 +160,10 @@ class SettingsContainerFragment: BoundFragment<FragmentSettingsContainerBinding>
         return navHostFragment.childFragmentManager.fragments.firstOrNull()
     }
 
-    private fun setupFragmentListener(){
-        navHostFragment.childFragmentManager.addOnBackStackChangedListener {
-            getTopFragment()?.let {
-                onTopFragmentChanged(it)
-            }
-        }
-        lifecycleScope.launchWhenResumed {
-            binding.navHostFragment.awaitPost()
-            onTopFragmentChanged(getTopFragment() ?: return@launchWhenResumed)
+    private fun setupFragmentListener() = whenResumed {
+        navController.onDestinationChanged().collect {
+            binding.root.awaitPost()
+            onTopFragmentChanged(navHostFragment.getTopFragment() ?: return@collect)
         }
     }
 
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/generic/SettingsGenericAdapter.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/generic/SettingsGenericAdapter.kt
index 9b891de..e029310 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/generic/SettingsGenericAdapter.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/generic/SettingsGenericAdapter.kt
@@ -19,6 +19,7 @@ import com.kieronquinn.app.classicpowermenu.utils.extensions.applyMonet
 import com.kieronquinn.app.classicpowermenu.utils.openLink
 import com.kieronquinn.monetcompat.core.MonetCompat
 import com.kieronquinn.monetcompat.extensions.views.applyMonet
+import com.kieronquinn.monetcompat.extensions.views.applyMonetLight
 
 class SettingsGenericAdapter(context: Context, private var items: List<SettingsItem>, var isAdapterEnabled: Boolean): RecyclerView.Adapter<SettingsGenericAdapter.ViewHolder>() {
 
@@ -202,7 +203,7 @@ class SettingsGenericAdapter(context: Context, private var items: List<SettingsI
         val isEnabled = isAdapterEnabled && item.enabled()
         root.alpha = if(isEnabled) 1f else 0.5f
         itemSettingSwitchTitle.text = item.title
-        itemSettingSwitchSwitch.applyMonet(monet)
+        itemSettingSwitchSwitch.applyMonetLight()
         if(item.content.isNullOrEmpty()){
             itemSettingSwitchContent.isVisible = false
         }else{
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/generic/SettingsGenericFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/generic/SettingsGenericFragment.kt
index 717b2f7..ef0b66d 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/generic/SettingsGenericFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/generic/SettingsGenericFragment.kt
@@ -17,6 +17,7 @@ import com.kieronquinn.app.classicpowermenu.databinding.FragmentSettingsGenericB
 import com.kieronquinn.app.classicpowermenu.model.settings.SettingsItem
 import com.kieronquinn.app.classicpowermenu.ui.base.BoundFragment
 import com.kieronquinn.app.classicpowermenu.utils.extensions.onApplyInsets
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import com.kieronquinn.monetcompat.extensions.views.enableStretchOverscroll
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
@@ -52,7 +53,7 @@ abstract class SettingsGenericBaseFragment<T: ViewBinding>(private val inflate:
     }
 
     private fun SettingsGenericAdapter.setup() = adapterEnabled?.let {
-        lifecycleScope.launchWhenResumed {
+        whenResumed {
             it.collect { enabled ->
                 isAdapterEnabled = enabled
                 notifyDataSetChanged()
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/main/SettingsMainFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/main/SettingsMainFragment.kt
index ce9f5ab..3c9b1a2 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/main/SettingsMainFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/main/SettingsMainFragment.kt
@@ -14,6 +14,7 @@ import com.kieronquinn.app.classicpowermenu.ui.base.AutoExpandOnRotate
 import com.kieronquinn.app.classicpowermenu.ui.base.ProvidesOverflow
 import com.kieronquinn.app.classicpowermenu.ui.base.Root
 import com.kieronquinn.app.classicpowermenu.ui.screens.settings.switched.SettingsSwitchedFragment
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -120,13 +121,13 @@ class SettingsMainFragment : SettingsSwitchedFragment(), AutoExpandOnRotate, Pro
         viewModel.onResume()
     }
 
-    private fun setupDeveloperOptions() = lifecycleScope.launchWhenResumed {
+    private fun setupDeveloperOptions() = whenResumed {
         viewModel.developerOptionsEnabled.collect {
             recyclerView().adapter?.notifyDataSetChanged()
         }
     }
 
-    private fun setupAccessibilityWarning() = lifecycleScope.launchWhenResumed {
+    private fun setupAccessibilityWarning() = whenResumed {
         viewModel.accessibilityServiceDisabledFlow.collect {
             recyclerView().adapter?.notifyDataSetChanged()
         }
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/poweroptions/rearrange/SettingsPowerOptionsRearrangeFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/poweroptions/rearrange/SettingsPowerOptionsRearrangeFragment.kt
index 8bf1302..bdea6fe 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/poweroptions/rearrange/SettingsPowerOptionsRearrangeFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/poweroptions/rearrange/SettingsPowerOptionsRearrangeFragment.kt
@@ -117,7 +117,7 @@ class SettingsPowerOptionsRearrangeFragment: BoundFragment<FragmentSettingsPower
         adapter = workspaceAdapter
         background = ColorDrawable(monet.getBackgroundColor(context))
         binding.monetBackgroundFix.setBackgroundColor(monet.getBackgroundColor(context))
-        lifecycleScope.launchWhenResumed {
+        whenResumed {
             workspaceAdapter.changed.debounce(100).collect {
                 viewModel.savePowerMenuButtons(it)
             }
@@ -138,8 +138,8 @@ class SettingsPowerOptionsRearrangeFragment: BoundFragment<FragmentSettingsPower
     }
 
     private fun setupDragListener(){
-        workspaceAdapter.setupDrag(binding.powerOptionsRearrangeWorkspace, viewLifecycleOwner.lifecycleScope)
-        optionsAdapter.setupDrag(binding.powerOptionsRearrangeOptions, viewLifecycleOwner.lifecycleScope)
+        workspaceAdapter.setupDrag(binding.powerOptionsRearrangeWorkspace, viewLifecycleOwner)
+        optionsAdapter.setupDrag(binding.powerOptionsRearrangeOptions, viewLifecycleOwner)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/quickaccesswallet/SettingsQuickAccessWalletFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/quickaccesswallet/SettingsQuickAccessWalletFragment.kt
index 386659e..3bee295 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/quickaccesswallet/SettingsQuickAccessWalletFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/quickaccesswallet/SettingsQuickAccessWalletFragment.kt
@@ -8,6 +8,7 @@ import com.kieronquinn.app.classicpowermenu.model.settings.SettingsItem
 import com.kieronquinn.app.classicpowermenu.ui.base.AutoExpandOnRotate
 import com.kieronquinn.app.classicpowermenu.ui.base.BackAvailable
 import com.kieronquinn.app.classicpowermenu.ui.screens.settings.switched.SettingsSwitchedFragment
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class SettingsQuickAccessWalletFragment: SettingsSwitchedFragment(), BackAvailable, AutoExpandOnRotate {
@@ -137,7 +138,7 @@ class SettingsQuickAccessWalletFragment: SettingsSwitchedFragment(), BackAvailab
 
     private fun setupLoyaltyCardsListener(){
         val recyclerView = recyclerView.invoke()
-        lifecycleScope.launchWhenResumed {
+        whenResumed {
             viewModel.showLoyaltyCardsChanged.collect {
                 recyclerView.adapter?.notifyDataSetChanged()
             }
@@ -145,7 +146,7 @@ class SettingsQuickAccessWalletFragment: SettingsSwitchedFragment(), BackAvailab
     }
     private fun setupAutoSwitchServiceListener(){
         val recyclerView = recyclerView.invoke()
-        lifecycleScope.launchWhenResumed {
+        whenResumed {
             viewModel.autoSwitchServiceChanged.collect {
                 recyclerView.adapter?.notifyDataSetChanged()
             }
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/quickaccesswallet/autoswitchservice/SettingsQuickAccessWalletAutoSwitchServiceFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/quickaccesswallet/autoswitchservice/SettingsQuickAccessWalletAutoSwitchServiceFragment.kt
index 87251d1..0878e44 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/quickaccesswallet/autoswitchservice/SettingsQuickAccessWalletAutoSwitchServiceFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/quickaccesswallet/autoswitchservice/SettingsQuickAccessWalletAutoSwitchServiceFragment.kt
@@ -12,6 +12,7 @@ import com.kieronquinn.app.classicpowermenu.databinding.FragmentSettingsQuickAcc
 import com.kieronquinn.app.classicpowermenu.ui.base.BoundFragment
 import com.kieronquinn.app.classicpowermenu.ui.base.StandaloneFragment
 import com.kieronquinn.app.classicpowermenu.utils.extensions.onApplyInsets
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import com.kieronquinn.monetcompat.extensions.views.applyMonet
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
@@ -36,7 +37,7 @@ class SettingsQuickAccessWalletAutoSwitchServiceFragment: BoundFragment<Fragment
         setupInsets()
     }
 
-    private fun setupState() = lifecycleScope.launchWhenResumed {
+    private fun setupState() = whenResumed {
         viewModel.state.collect {
             handleState(it)
         }
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/quickaccesswallet/rearrange/SettingsQuickAccessWalletRearrangeFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/quickaccesswallet/rearrange/SettingsQuickAccessWalletRearrangeFragment.kt
index 43f4cc1..e9c5dc7 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/quickaccesswallet/rearrange/SettingsQuickAccessWalletRearrangeFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/quickaccesswallet/rearrange/SettingsQuickAccessWalletRearrangeFragment.kt
@@ -14,6 +14,7 @@ import com.kieronquinn.app.classicpowermenu.databinding.FragmentSettingsQuickAcc
 import com.kieronquinn.app.classicpowermenu.ui.base.BoundFragment
 import com.kieronquinn.app.classicpowermenu.ui.base.StandaloneFragment
 import com.kieronquinn.app.classicpowermenu.utils.extensions.onApplyInsets
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import com.kieronquinn.monetcompat.extensions.views.applyMonet
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import java.util.*
@@ -50,7 +51,7 @@ class SettingsQuickAccessWalletRearrangeFragment: BoundFragment<FragmentSettings
         binding.quickAccessWalletRearrangeLoadingBar.applyMonet()
     }
 
-    private fun setupState() = lifecycleScope.launchWhenResumed {
+    private fun setupState() = whenResumed {
         viewModel.state.collect {
             handleState(it)
         }
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/root/SettingsRootFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/root/SettingsRootFragment.kt
index 5052291..696b752 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/root/SettingsRootFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/root/SettingsRootFragment.kt
@@ -13,6 +13,7 @@ import com.kieronquinn.app.classicpowermenu.ui.activities.MainActivityViewModel
 import com.kieronquinn.app.classicpowermenu.ui.base.BoundFragment
 import com.kieronquinn.app.classicpowermenu.ui.screens.settings.rootcheck.SettingsRootCheckFragmentDirections
 import com.kieronquinn.app.classicpowermenu.utils.extensions.navigateSafely
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import kotlinx.coroutines.flow.collect
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
@@ -36,7 +37,7 @@ class SettingsRootFragment: BoundFragment<FragmentSettingsRootBinding>(FragmentS
         setupUpdateChecker()
     }
 
-    private fun setupNavigation() = viewLifecycleOwner.lifecycleScope.launchWhenResumed {
+    private fun setupNavigation() = whenResumed {
         navigation.navigationBus.collect {
             handleNavigationEvent(it)
         }
@@ -53,7 +54,8 @@ class SettingsRootFragment: BoundFragment<FragmentSettingsRootBinding>(FragmentS
     }
 
     private fun setupUpdateChecker(){
-        lifecycleScope.launchWhenResumed {
+        return
+        whenResumed {
             sharedViewModel.update.collect {
                 if(it != null) {
                     navigation.navigate(SettingsRootCheckFragmentDirections.actionGlobalUpdateAvailableBottomSheetFragment())
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/rootcheck/SettingsRootCheckFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/rootcheck/SettingsRootCheckFragment.kt
index 4413401..4cb802e 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/rootcheck/SettingsRootCheckFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/rootcheck/SettingsRootCheckFragment.kt
@@ -5,6 +5,7 @@ import android.view.View
 import androidx.lifecycle.lifecycleScope
 import com.kieronquinn.app.classicpowermenu.databinding.FragmentSettingsRootCheckBinding
 import com.kieronquinn.app.classicpowermenu.ui.base.BoundFragment
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import com.kieronquinn.monetcompat.extensions.views.applyMonet
 import kotlinx.coroutines.flow.collect
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -27,7 +28,7 @@ class SettingsRootCheckFragment: BoundFragment<FragmentSettingsRootCheckBinding>
     }
 
     private fun setupState() {
-        viewLifecycleOwner.lifecycleScope.launchWhenResumed {
+        whenResumed {
             viewModel.state.collect {
                 handleState(it)
             }
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/switched/SettingsSwitchedFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/switched/SettingsSwitchedFragment.kt
index 6cfc3bd..08966b9 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/switched/SettingsSwitchedFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/settings/switched/SettingsSwitchedFragment.kt
@@ -5,6 +5,7 @@ import android.view.View
 import androidx.lifecycle.lifecycleScope
 import com.kieronquinn.app.classicpowermenu.databinding.FragmentSettingsSwitchedBinding
 import com.kieronquinn.app.classicpowermenu.ui.screens.settings.generic.SettingsGenericBaseFragment
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collect
 
@@ -33,7 +34,7 @@ abstract class SettingsSwitchedFragment: SettingsGenericBaseFragment<FragmentSet
             onSwitchClicked()
         }
         isChecked = switchStartState
-        lifecycleScope.launchWhenResumed {
+        whenResumed {
             switchChecked.collect {
                 isChecked = it
             }
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/setup/controls/SetupControlsFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/setup/controls/SetupControlsFragment.kt
index b3c54ab..4aef8c0 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/setup/controls/SetupControlsFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/setup/controls/SetupControlsFragment.kt
@@ -10,6 +10,7 @@ import com.kieronquinn.app.classicpowermenu.databinding.FragmentSetupControlsBin
 import com.kieronquinn.app.classicpowermenu.ui.base.BoundFragment
 import com.kieronquinn.app.classicpowermenu.ui.base.StandaloneFragment
 import com.kieronquinn.app.classicpowermenu.utils.extensions.onApplyInsets
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import com.kieronquinn.monetcompat.extensions.views.overrideRippleColor
 import kotlinx.coroutines.flow.collect
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -63,7 +64,7 @@ class SetupControlsFragment: BoundFragment<FragmentSetupControlsBinding>(Fragmen
             setOnClickListener {
                 viewModel.onControlsSwitchClicked()
             }
-            lifecycleScope.launchWhenResumed {
+            whenResumed {
                 viewModel.controlsEnabledFlow.collect {
                     isChecked = it
                 }
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/setup/rootcheck/SetupRootCheckFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/setup/rootcheck/SetupRootCheckFragment.kt
index 4af3525..82b6463 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/setup/rootcheck/SetupRootCheckFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/setup/rootcheck/SetupRootCheckFragment.kt
@@ -5,6 +5,7 @@ import android.view.View
 import androidx.lifecycle.lifecycleScope
 import com.kieronquinn.app.classicpowermenu.databinding.FragmentSetupRootcheckBinding
 import com.kieronquinn.app.classicpowermenu.ui.base.BoundFragment
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import com.kieronquinn.monetcompat.extensions.views.applyMonet
 import kotlinx.coroutines.flow.collect
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -25,7 +26,7 @@ class SetupRootCheckFragment: BoundFragment<FragmentSetupRootcheckBinding>(Fragm
     }
 
     private fun setupState() {
-        viewLifecycleOwner.lifecycleScope.launchWhenResumed {
+        whenResumed {
             viewModel.state.collect {
                 handleState(it)
             }
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/setup/wallet/SetupWalletFragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/setup/wallet/SetupWalletFragment.kt
index 3852ed8..ffcc818 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/setup/wallet/SetupWalletFragment.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/screens/setup/wallet/SetupWalletFragment.kt
@@ -10,6 +10,7 @@ import com.kieronquinn.app.classicpowermenu.databinding.FragmentSetupWalletBindi
 import com.kieronquinn.app.classicpowermenu.ui.base.BoundFragment
 import com.kieronquinn.app.classicpowermenu.ui.base.StandaloneFragment
 import com.kieronquinn.app.classicpowermenu.utils.extensions.onApplyInsets
+import com.kieronquinn.app.classicpowermenu.utils.extensions.whenResumed
 import com.kieronquinn.monetcompat.extensions.views.overrideRippleColor
 import kotlinx.coroutines.flow.collect
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -63,7 +64,7 @@ class SetupWalletFragment: BoundFragment<FragmentSetupWalletBinding>(FragmentSet
             setOnClickListener {
                 viewModel.onWalletSwitchClicked()
             }
-            lifecycleScope.launchWhenResumed {
+            whenResumed {
                 viewModel.walletEnabledFlow.collect {
                     isChecked = it
                 }
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/views/MonetSwitch.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/views/MonetSwitch.kt
new file mode 100644
index 0000000..af19b7f
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/ui/views/MonetSwitch.kt
@@ -0,0 +1,166 @@
+package com.kieronquinn.app.classicpowermenu.ui.views
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.graphics.PorterDuff
+import android.os.Build
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.FrameLayout
+import android.widget.LinearLayout
+import android.widget.Switch
+import android.widget.TextView
+import androidx.annotation.ColorInt
+import com.google.android.material.materialswitch.MaterialSwitch
+import com.kieronquinn.app.classicpowermenu.R
+import com.kieronquinn.monetcompat.core.MonetCompat
+import com.kieronquinn.monetcompat.extensions.views.applyMonet
+import com.kieronquinn.monetcompat.extensions.views.overrideRippleColor
+import com.kieronquinn.monetcompat.interfaces.MonetColorsChangedListener
+import dev.kdrag0n.monet.theme.ColorScheme
+
+/**
+ *  A full-width Switch designed to look like the primary ones in Android 12's Settings app. It has
+ *  its own background, tinted to Monet's colors, with the [Switch] thumb set to the same color,
+ *  and the track a darker color. The background/track color changes depending on the switch state.
+ */
+open class MonetSwitch: FrameLayout, MonetColorsChangedListener {
+
+    constructor(context: Context): super(context, null)
+
+    constructor(context: Context, attributeSet: AttributeSet?) : super(context, attributeSet, R.attr.switchStyle) {
+        readAttributes(attributeSet)
+    }
+
+    constructor(context: Context, attributeSet: AttributeSet?, styleResId: Int): super(context, attributeSet, styleResId){
+        readAttributes(attributeSet)
+    }
+
+    private val layoutInflater = LayoutInflater.from(context)
+    private var suppressCheckChange = false
+
+    private val layout by lazy {
+        layoutInflater.inflate(R.layout.view_monet_switch, this, false)
+    }
+
+    private val label by lazy {
+        layout.findViewById<TextView>(R.id.view_monet_switch_text)
+    }
+
+    private val switch by lazy {
+        layout.findViewById<MaterialSwitch>(R.id.view_monet_switch_switch)
+    }
+
+    private val root by lazy {
+        layout.findViewById<LinearLayout>(R.id.view_monet_switch_root)
+    }
+
+    var isChecked: Boolean
+        get() = switch.isChecked
+        set(value) {
+            suppressCheckChange = true
+            switch.isChecked = value
+            suppressCheckChange = false
+        }
+
+    var text: CharSequence
+        get() = label.text
+        set(value) {
+            label.text = value
+        }
+
+    @SuppressLint("PrivateResource", "CustomViewStyleable")
+    private fun readAttributes(attributeSet: AttributeSet?){
+        if(attributeSet == null || isInEditMode) return
+        addView(layout)
+        val typedArray = context.obtainStyledAttributes(attributeSet, R.styleable.MonetSwitch)
+        var textAppearance = typedArray.getResourceId(R.styleable.MonetSwitch_android_textAppearance, R.style.TextAppearance_AppCompat_Medium)
+        //Sometimes the field will default to TextAppearance.Material so we need to counter that
+        if(textAppearance == android.R.style.TextAppearance_Material) textAppearance = R.style.TextAppearance_AppCompat_Medium
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            label.setTextAppearance(textAppearance)
+        }else{
+            label.setTextAppearance(context, textAppearance)
+        }
+        val materialTypedArray = context.obtainStyledAttributes(attributeSet, com.google.android.material.R.styleable.MaterialSwitch)
+        val thumbIcon = materialTypedArray.getResourceId(com.google.android.material.R.styleable.MaterialSwitch_thumbIcon, 0)
+        val thumbTint = materialTypedArray.getColor(com.google.android.material.R.styleable.MaterialSwitch_thumbIconTint, 0)
+        val thumbTintMode = materialTypedArray.getInt(com.google.android.material.R.styleable.MaterialSwitch_thumbIconTintMode, 0)
+        if(thumbIcon != 0){
+            switch.setThumbIconResource(thumbIcon)
+        }
+        if(thumbTint != 0){
+            switch.thumbIconTintList = ColorStateList.valueOf(thumbTint)
+        }
+        if(thumbTintMode != 0){
+            switch.thumbIconTintMode = PorterDuff.Mode.values()[thumbTintMode]
+        }
+        val textColor = typedArray.getColor(R.styleable.MonetSwitch_android_textColor, Color.BLACK)
+        label.setTextColor(textColor)
+        val switchText = typedArray.getText(R.styleable.MonetSwitch_android_text) ?: ""
+        label.text = switchText
+        typedArray.recycle()
+        materialTypedArray.recycle()
+    }
+
+    private val monet by lazy {
+        MonetCompat.getInstance()
+    }
+
+    init {
+        isClickable = true
+        isFocusable = true
+    }
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        if(!isInEditMode) {
+            monet.addMonetColorsChangedListener(this, true)
+        }
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        monet.removeMonetColorsChangedListener(this)
+    }
+
+    override fun onMonetColorsChanged(
+        monet: MonetCompat,
+        monetColors: ColorScheme,
+        isInitialChange: Boolean
+    ) {
+        applyMonet()
+    }
+
+    private fun applyMonet() = with(monet) {
+        val checkedThumbColor = monet.getPrimaryColor(context, false)
+        val uncheckedThumbColor = monet.getSecondaryColor(context, false)
+        setTint(uncheckedThumbColor, checkedThumbColor)
+    }
+
+    private fun setTint(
+        @ColorInt uncheckedThumbColor: Int,
+        @ColorInt checkedThumbColor: Int
+    ){
+        val bgTintList = ColorStateList(
+            arrayOf(intArrayOf(android.R.attr.state_activated), intArrayOf()),
+            intArrayOf(checkedThumbColor, uncheckedThumbColor)
+        )
+        root.backgroundTintList = bgTintList
+        root.backgroundTintMode = PorterDuff.Mode.SRC_ATOP
+        root.isActivated = switch.isChecked
+        switch.setOnCheckedChangeListener { _, checked ->
+            root.isActivated = switch.isChecked
+            if(!suppressCheckChange){
+                isChecked = !checked
+                performClick()
+            }
+        }
+        switch.applyMonet()
+        switch.thumbTintMode = PorterDuff.Mode.SRC_ATOP
+        overrideRippleColor(colorStateList = bgTintList)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/TransitionUtils.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/TransitionUtils.kt
index d37d254..e6c1973 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/TransitionUtils.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/TransitionUtils.kt
@@ -2,9 +2,9 @@ package com.kieronquinn.app.classicpowermenu.utils
 
 import android.content.Context
 import android.view.animation.AnimationUtils
-import com.google.android.material.transition.platform.FadeThroughProvider
-import com.google.android.material.transition.platform.MaterialSharedAxis
-import com.google.android.material.transition.platform.SlideDistanceProvider
+import com.google.android.material.transition.FadeThroughProvider
+import com.google.android.material.transition.MaterialSharedAxis
+import com.google.android.material.transition.SlideDistanceProvider
 import com.kieronquinn.app.classicpowermenu.R
 import kotlin.math.roundToInt
 
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/extensions/Extensions+Fragment.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/extensions/Extensions+Fragment.kt
new file mode 100644
index 0000000..6ea0912
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/extensions/Extensions+Fragment.kt
@@ -0,0 +1,19 @@
+package com.kieronquinn.app.classicpowermenu.utils.extensions
+
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.LifecycleOwner
+import kotlinx.coroutines.CoroutineScope
+
+/**
+ *  Helper for [LifecycleOwner].[whenResumed]
+ */
+fun Fragment.whenResumed(block: suspend CoroutineScope.() -> Unit) {
+    viewLifecycleOwner.whenResumed(block)
+}
+
+/**
+ *  Helper for [LifecycleOwner].[whenCreated]
+ */
+fun Fragment.whenCreated(block: suspend CoroutineScope.() -> Unit) {
+    viewLifecycleOwner.whenCreated(block)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/extensions/Extensions+Lifecycle.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/extensions/Extensions+Lifecycle.kt
new file mode 100644
index 0000000..a4e82ee
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/extensions/Extensions+Lifecycle.kt
@@ -0,0 +1,36 @@
+package com.kieronquinn.app.classicpowermenu.utils.extensions
+
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+
+fun LifecycleOwner.whenResumed(block: suspend CoroutineScope.() -> Unit): Job {
+    return lifecycleScope.launch {
+        lifecycle.repeatOnLifecycle(Lifecycle.State.RESUMED) {
+            block()
+        }
+    }
+}
+
+fun LifecycleOwner.whenCreated(block: suspend CoroutineScope.() -> Unit): Job {
+    return lifecycleScope.launch {
+        lifecycle.repeatOnLifecycle(Lifecycle.State.CREATED) {
+            block()
+        }
+    }
+}
+
+fun Lifecycle.runOnDestroy(block: () -> Unit) {
+    addObserver(object: LifecycleObserver {
+        @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+        fun onDestroy() {
+            block()
+        }
+    })
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/extensions/Extensions+Navigation.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/extensions/Extensions+Navigation.kt
index 80bc7ed..161e0c4 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/extensions/Extensions+Navigation.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/extensions/Extensions+Navigation.kt
@@ -1,5 +1,6 @@
 package com.kieronquinn.app.classicpowermenu.utils.extensions
 
+import androidx.activity.OnBackPressedCallback
 import androidx.annotation.IdRes
 import androidx.fragment.app.Fragment
 import androidx.navigation.NavController
@@ -26,7 +27,16 @@ fun NavController.onDestinationChanged() = callbackFlow {
         trySend(destination)
     }
     addOnDestinationChangedListener(listener)
+    currentDestination?.let {
+        trySend(it)
+    }
     awaitClose {
         removeOnDestinationChangedListener(listener)
     }
-}.debounce(250L)
\ No newline at end of file
+}.debounce(250L)
+
+fun NavController.setOnBackPressedCallback(callback: OnBackPressedCallback) {
+    NavController::class.java.getDeclaredField("onBackPressedCallback").apply {
+        isAccessible = true
+    }.set(this, callback)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/extensions/Extensions+View.kt b/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/extensions/Extensions+View.kt
index 81dee4b..953f38c 100644
--- a/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/extensions/Extensions+View.kt
+++ b/app/src/main/java/com/kieronquinn/app/classicpowermenu/utils/extensions/Extensions+View.kt
@@ -3,6 +3,10 @@ package com.kieronquinn.app.classicpowermenu.utils.extensions
 import android.graphics.Point
 import android.graphics.Rect
 import android.view.View
+import android.view.ViewTreeObserver
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.coroutineScope
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
@@ -32,4 +36,24 @@ fun View.contains(point: Point): Boolean {
         Rect(this[0], this[1], this[0] + width, this[0] + height)
     }
     return position.contains(point.x, point.y)
+}
+
+fun View.delayPreDrawUntilFlow(flow: Flow<Boolean>, lifecycle: Lifecycle) {
+    val listener = ViewTreeObserver.OnPreDrawListener {
+        false
+    }
+    val removeListener = {
+        if (viewTreeObserver.isAlive) {
+            viewTreeObserver.removeOnPreDrawListener(listener)
+        }
+    }
+    lifecycle.runOnDestroy {
+        removeListener()
+    }
+    viewTreeObserver.addOnPreDrawListener(listener)
+    lifecycle.coroutineScope.launchWhenResumed {
+        flow.collect {
+            removeListener()
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/switch_background_ripple.xml b/app/src/main/res/drawable/switch_background_ripple.xml
new file mode 100644
index 0000000..c286d3c
--- /dev/null
+++ b/app/src/main/res/drawable/switch_background_ripple.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:colorControlHighlight">
+    <item android:id="@android:id/mask">
+        <shape android:shape="rectangle">
+            <solid android:color="?android:colorPrimary"/>
+            <corners android:radius="@dimen/monet_switch_corners"/>
+        </shape>
+        <color android:color="@android:color/white"/>
+    </item>
+    <item>
+        <shape
+            android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+            <corners android:radius="@dimen/monet_switch_corners"/>
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 82f2512..ac218c9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,7 +10,9 @@
     <androidx.fragment.app.FragmentContainerView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:name="androidx.navigation.fragment.NavHostFragment"
         android:id="@+id/fragment_settings_root"
-        android:name="com.kieronquinn.app.classicpowermenu.ui.screens.settings.root.SettingsRootFragment"/>
+        app:defaultNavHost="true"
+        app:navGraph="@navigation/nav_graph_root" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_power_menu.xml b/app/src/main/res/layout/fragment_power_menu.xml
index 03884e6..2cbcbe9 100644
--- a/app/src/main/res/layout/fragment_power_menu.xml
+++ b/app/src/main/res/layout/fragment_power_menu.xml
@@ -4,6 +4,7 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:transitionGroup="true"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
diff --git a/app/src/main/res/layout/fragment_power_menu_container.xml b/app/src/main/res/layout/fragment_power_menu_container.xml
index fd925c1..c483fcb 100644
--- a/app/src/main/res/layout/fragment_power_menu_container.xml
+++ b/app/src/main/res/layout/fragment_power_menu_container.xml
@@ -2,6 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:transitionGroup="true"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.fragment.app.FragmentContainerView
diff --git a/app/src/main/res/layout/fragment_settings_container.xml b/app/src/main/res/layout/fragment_settings_container.xml
index e0c615e..14345fb 100644
--- a/app/src/main/res/layout/fragment_settings_container.xml
+++ b/app/src/main/res/layout/fragment_settings_container.xml
@@ -2,7 +2,8 @@
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:transitionGroup="true">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/app_bar"
diff --git a/app/src/main/res/layout/fragment_settings_power_options_rearrange.xml b/app/src/main/res/layout/fragment_settings_power_options_rearrange.xml
index 363a1ac..0bb2424 100644
--- a/app/src/main/res/layout/fragment_settings_power_options_rearrange.xml
+++ b/app/src/main/res/layout/fragment_settings_power_options_rearrange.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:transitionGroup="true"
     android:orientation="vertical">
 
     <View
diff --git a/app/src/main/res/layout/fragment_settings_quick_access_wallet_auto_switch_service.xml b/app/src/main/res/layout/fragment_settings_quick_access_wallet_auto_switch_service.xml
index 271e9a3..e8d78db 100644
--- a/app/src/main/res/layout/fragment_settings_quick_access_wallet_auto_switch_service.xml
+++ b/app/src/main/res/layout/fragment_settings_quick_access_wallet_auto_switch_service.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:transitionGroup="true"
     android:orientation="vertical">
 
     <com.kieronquinn.monetcompat.view.MonetToolbar
diff --git a/app/src/main/res/layout/fragment_settings_quick_access_wallet_rearrange.xml b/app/src/main/res/layout/fragment_settings_quick_access_wallet_rearrange.xml
index 1cde356..c95febe 100644
--- a/app/src/main/res/layout/fragment_settings_quick_access_wallet_rearrange.xml
+++ b/app/src/main/res/layout/fragment_settings_quick_access_wallet_rearrange.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:transitionGroup="true"
     android:orientation="vertical">
 
     <com.kieronquinn.monetcompat.view.MonetToolbar
diff --git a/app/src/main/res/layout/fragment_settings_root.xml b/app/src/main/res/layout/fragment_settings_root.xml
index 7b0ebf1..8baac1a 100644
--- a/app/src/main/res/layout/fragment_settings_root.xml
+++ b/app/src/main/res/layout/fragment_settings_root.xml
@@ -2,6 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:transitionGroup="true"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.fragment.app.FragmentContainerView
diff --git a/app/src/main/res/layout/fragment_settings_root_check.xml b/app/src/main/res/layout/fragment_settings_root_check.xml
index b149d08..dae9396 100644
--- a/app/src/main/res/layout/fragment_settings_root_check.xml
+++ b/app/src/main/res/layout/fragment_settings_root_check.xml
@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:transitionGroup="true"
     android:gravity="center">
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
diff --git a/app/src/main/res/layout/fragment_settings_switched.xml b/app/src/main/res/layout/fragment_settings_switched.xml
index ce978b8..c28f929 100644
--- a/app/src/main/res/layout/fragment_settings_switched.xml
+++ b/app/src/main/res/layout/fragment_settings_switched.xml
@@ -20,7 +20,7 @@
             android:layout_height="44dp"
             android:id="@+id/settings_switched_switch_background"/>
 
-        <com.kieronquinn.monetcompat.view.MonetSwitch
+        <com.kieronquinn.app.classicpowermenu.ui.views.MonetSwitch
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/settings_switched_switch"
diff --git a/app/src/main/res/layout/fragment_setup_accessibility.xml b/app/src/main/res/layout/fragment_setup_accessibility.xml
index 49c7a2b..4d1cca8 100644
--- a/app/src/main/res/layout/fragment_setup_accessibility.xml
+++ b/app/src/main/res/layout/fragment_setup_accessibility.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:transitionGroup="true"
     android:fillViewport="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/fragment_setup_complete.xml b/app/src/main/res/layout/fragment_setup_complete.xml
index a51097c..f263b13 100644
--- a/app/src/main/res/layout/fragment_setup_complete.xml
+++ b/app/src/main/res/layout/fragment_setup_complete.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:transitionGroup="true"
     android:fillViewport="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/fragment_setup_controls.xml b/app/src/main/res/layout/fragment_setup_controls.xml
index e059dc9..10a66be 100644
--- a/app/src/main/res/layout/fragment_setup_controls.xml
+++ b/app/src/main/res/layout/fragment_setup_controls.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:transitionGroup="true"
     android:fillViewport="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/fragment_setup_landing.xml b/app/src/main/res/layout/fragment_setup_landing.xml
index 03e3f47..6872d5c 100644
--- a/app/src/main/res/layout/fragment_setup_landing.xml
+++ b/app/src/main/res/layout/fragment_setup_landing.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:transitionGroup="true"
     android:fillViewport="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/fragment_setup_rootcheck.xml b/app/src/main/res/layout/fragment_setup_rootcheck.xml
index 6e4668c..885df2f 100644
--- a/app/src/main/res/layout/fragment_setup_rootcheck.xml
+++ b/app/src/main/res/layout/fragment_setup_rootcheck.xml
@@ -4,6 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
+    android:transitionGroup="true"
     android:orientation="vertical">
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
diff --git a/app/src/main/res/layout/fragment_setup_wallet.xml b/app/src/main/res/layout/fragment_setup_wallet.xml
index 44cf53b..630cddc 100644
--- a/app/src/main/res/layout/fragment_setup_wallet.xml
+++ b/app/src/main/res/layout/fragment_setup_wallet.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:transitionGroup="true"
     android:fillViewport="true">
 
     <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/layout/item_setting_switch.xml b/app/src/main/res/layout/item_setting_switch.xml
index 51c924a..c88fbfb 100644
--- a/app/src/main/res/layout/item_setting_switch.xml
+++ b/app/src/main/res/layout/item_setting_switch.xml
@@ -1,64 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:minHeight="72dp"
-    android:foreground="@drawable/selectable_item_background_stateful"
     android:clickable="true"
     android:focusable="true"
+    android:foreground="@drawable/selectable_item_background_stateful"
     android:gravity="center_vertical"
+    android:minHeight="72dp"
     android:orientation="horizontal">
 
     <ImageView
+        android:id="@+id/item_setting_switch_icon"
         android:layout_width="64dp"
         android:layout_height="64dp"
-        tools:src="@drawable/ic_settings_power_options"
-        android:padding="16dp"
         android:layout_marginStart="4dp"
         android:layout_marginEnd="4dp"
-        android:id="@+id/item_setting_switch_icon"/>
+        android:padding="16dp"
+        tools:src="@drawable/ic_settings_power_options" />
 
     <LinearLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/margin_8"
-        android:paddingBottom="@dimen/margin_8"
         android:layout_marginEnd="@dimen/margin_16"
         android:layout_weight="1"
         android:gravity="center_vertical"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:paddingTop="@dimen/margin_8"
+        android:paddingBottom="@dimen/margin_8">
 
         <TextView
+            android:id="@+id/item_setting_switch_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/item_setting_switch_title"
-            tools:text="Setting Title"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium.ClassicPowerMenu"
-            android:textColor="?android:textColorPrimary" />
+            android:textColor="?android:textColorPrimary"
+            tools:text="Setting Title" />
 
         <TextView
+            android:id="@+id/item_setting_switch_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small.ClassicPowerMenu"
+            android:textColor="?android:textColorPrimary"
             android:visibility="gone"
-            tools:visibility="visible"
             tools:text="Setting Content"
-            android:id="@+id/item_setting_switch_content"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small.ClassicPowerMenu"
-            android:textColor="?android:textColorPrimary" />
+            tools:visibility="visible" />
 
     </LinearLayout>
 
-    <com.google.android.material.switchmaterial.SwitchMaterial
-        android:layout_marginEnd="@dimen/margin_16"
+    <com.google.android.material.materialswitch.MaterialSwitch
         android:id="@+id/item_setting_switch_switch"
-        app:track="@drawable/switch_track"
-        android:scaleX="0.75"
-        android:scaleY="0.75"
-        app:showText="false"
-        android:thumb="@drawable/switch_thumb"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/margin_16"
+        android:theme="@style/Theme.Material3.DayNight.NoActionBar"
+        app:showText="false"
+        tools:checked="true" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_monet_switch.xml b/app/src/main/res/layout/view_monet_switch.xml
new file mode 100644
index 0000000..fbe1571
--- /dev/null
+++ b/app/src/main/res/layout/view_monet_switch.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/view_monet_switch_root"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:theme="@style/Theme.Material3.DayNight"
+    android:background="@drawable/switch_background_ripple"
+    android:minHeight="@dimen/monet_switch_height"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/view_monet_switch_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="8dp"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:padding="16dp"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        tools:text="Switch" />
+
+    <com.google.android.material.materialswitch.MaterialSwitch
+        android:id="@+id/view_monet_switch_switch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="8dp"
+        app:showText="false" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph_root.xml b/app/src/main/res/navigation/nav_graph_root.xml
new file mode 100644
index 0000000..908de5b
--- /dev/null
+++ b/app/src/main/res/navigation/nav_graph_root.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/nav_graph_root"
+    app:startDestination="@id/settingsRootFragment">
+
+    <fragment
+        android:id="@+id/settingsRootFragment"
+        android:name="com.kieronquinn.app.classicpowermenu.ui.screens.settings.root.SettingsRootFragment"
+        android:label="SettingsRootFragment"
+        tools:layout="@layout/fragment_settings_root" />
+
+</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph_settings_container.xml b/app/src/main/res/navigation/nav_graph_settings_container.xml
index 71a06db..e069a11 100644
--- a/app/src/main/res/navigation/nav_graph_settings_container.xml
+++ b/app/src/main/res/navigation/nav_graph_settings_container.xml
@@ -43,7 +43,7 @@
         <action
             android:id="@+id/action_settingsRootCheckFragment_to_settingsContainerFragment"
             app:destination="@id/settingsContainerFragment"
-            app:popUpTo="@null" />
+            app:popUpTo="@id/nav_graph_settings_container"/>
         <action
             android:id="@+id/action_settingsRootCheckFragment_to_settingsRootCheckNoRootBottomSheetFragment"
             app:destination="@id/settingsRootCheckNoRootBottomSheetFragment" />
diff --git a/app/src/main/res/navigation/nav_graph_settings_root.xml b/app/src/main/res/navigation/nav_graph_settings_root.xml
index 754db03..33ff63a 100644
--- a/app/src/main/res/navigation/nav_graph_settings_root.xml
+++ b/app/src/main/res/navigation/nav_graph_settings_root.xml
@@ -9,10 +9,12 @@
         android:label="DecisionFragment" >
         <action
             android:id="@+id/action_decisionFragment_to_nav_graph_settings_container"
-            app:destination="@id/nav_graph_settings_container" />
+            app:destination="@id/nav_graph_settings_container"
+            app:popUpTo="@id/nav_graph_settings_root" />
         <action
             android:id="@+id/action_decisionFragment_to_nav_graph_setup"
-            app:destination="@id/nav_graph_setup" />
+            app:destination="@id/nav_graph_setup"
+            app:popUpTo="@id/nav_graph_settings_root" />
     </fragment>
     <include app:graph="@navigation/nav_graph_settings_container" />
     <include app:graph="@navigation/nav_graph_setup" />
@@ -21,5 +23,5 @@
         app:destination="@id/nav_graph_settings_container"
         app:enterAnim="@anim/activity_fade_in"
         app:exitAnim="@anim/activity_fade_out"
-        app:popUpTo="@null" />
+        app:popUpTo="@string/root_check_checking_root" />
 </navigation>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index a865d7c..494009f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.nav_version = "2.7.6"
-    ext.koin_version = "3.5.0"
+    ext.nav_version = "2.7.7"
+    ext.koin_version = "3.5.3"
     ext.protobuf_version = '0.9.1'
     dependencies {
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
@@ -11,9 +11,9 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '8.2.2' apply false
-    id 'com.android.library' version '8.2.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
+    id 'com.android.application' version '8.5.2' apply false
+    id 'com.android.library' version '8.5.2' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
 }
 
 task clean(type: Delete) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 174e1ef..78c8b71 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Feb 03 22:31:39 GMT 2024
+#Fri Aug 23 23:23:13 BST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/systemstubs/build.gradle b/systemstubs/build.gradle
index c71dbeb..791d191 100644
--- a/systemstubs/build.gradle
+++ b/systemstubs/build.gradle
@@ -3,12 +3,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 34
-    buildToolsVersion "31.0.0"
+    compileSdk 34
 
     defaultConfig {
-        minSdkVersion 28
-        targetSdkVersion 34
+        minSdk 30
+        targetSdk 35
+
         consumerProguardFiles "consumer-rules.pro"
     }
 
@@ -29,5 +29,5 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.7.1'
+    implementation 'androidx.annotation:annotation:1.8.2'
 }
\ No newline at end of file