diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..fb7f4a8
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index eb2873e..1e2d92c 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7bfef59..860da66 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 244cda3..dd8a448 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/DarQ.iml" filepath="$PROJECT_DIR$/DarQ.iml" group="DarQ" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" group="DarQ/app" />
+      <module fileurl="file://$PROJECT_DIR$/DarQ.iml" filepath="$PROJECT_DIR$/DarQ.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/DarQ.app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/DarQ.app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/systemstubs/DarQ.systemstubs.iml" filepath="$PROJECT_DIR$/.idea/modules/systemstubs/DarQ.systemstubs.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/navEditor.xml b/.idea/navEditor.xml
index ac5e1f9..f2302c1 100644
--- a/.idea/navEditor.xml
+++ b/.idea/navEditor.xml
@@ -5,7 +5,330 @@
       <map>
         <entry key="nav_graph.xml">
           <value>
-            <LayoutPositions />
+            <LayoutPositions>
+              <option name="myPositions">
+                <map>
+                  <entry key="appsFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="256" />
+                            <option name="y" value="12" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="faqFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="256" />
+                            <option name="y" value="368" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="mainFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="12" />
+                            <option name="y" value="54" />
+                          </Point>
+                        </option>
+                        <option name="myPositions">
+                          <map>
+                            <entry key="action_mainFragment_to_appsFragment">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
+                            <entry key="action_mainFragment_to_faqFragment">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
+                          </map>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </LayoutPositions>
+          </value>
+        </entry>
+        <entry key="nav_graph_bottom_sheets.xml">
+          <value>
+            <LayoutPositions>
+              <option name="myPositions">
+                <map>
+                  <entry key="shizkuNotRunningBottomSheetFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="12" />
+                            <option name="y" value="12" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </LayoutPositions>
+          </value>
+        </entry>
+        <entry key="nav_graph_main.xml">
+          <value>
+            <LayoutPositions>
+              <option name="myPositions">
+                <map>
+                  <entry key="action_global_serviceTimeoutBottomSheetFragment">
+                    <value>
+                      <LayoutPositions />
+                    </value>
+                  </entry>
+                  <entry key="action_global_shizkuNotRunningBottomSheetFragment">
+                    <value>
+                      <LayoutPositions />
+                    </value>
+                  </entry>
+                  <entry key="action_global_shizukuInfoBottomSheetFragment">
+                    <value>
+                      <LayoutPositions />
+                    </value>
+                  </entry>
+                  <entry key="action_global_shizukuNotInstalledBottomSheetFragment">
+                    <value>
+                      <LayoutPositions />
+                    </value>
+                  </entry>
+                  <entry key="action_global_updateAvailableBottomSheetFragment">
+                    <value>
+                      <LayoutPositions />
+                    </value>
+                  </entry>
+                  <entry key="colorPickerBottomSheetFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="494" />
+                            <option name="y" value="-279" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="locationPermissionDialogFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="279" />
+                            <option name="y" value="358" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="ossLicencesActivity">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="497" />
+                            <option name="y" value="37" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="serviceTimeoutBottomSheetFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="267" />
+                            <option name="y" value="939" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="settingsAdvancedFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="279" />
+                            <option name="y" value="41" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="settingsAppPickerFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="43" />
+                            <option name="y" value="357" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="settingsDeveloperOptionsFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="275" />
+                            <option name="y" value="-285" />
+                          </Point>
+                        </option>
+                        <option name="myPositions">
+                          <map>
+                            <entry key="action_settingsDeveloperOptionsFragment_to_colorPickerBottomSheetFragment">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
+                          </map>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="settingsFaqFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="40" />
+                            <option name="y" value="-296" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="settingsFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="55" />
+                            <option name="y" value="32" />
+                          </Point>
+                        </option>
+                        <option name="myPositions">
+                          <map>
+                            <entry key="action_settingsFragment_to_locationPermissionDialogFragment">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
+                            <entry key="action_settingsFragment_to_ossLicencesActivity">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
+                            <entry key="action_settingsFragment_to_settingsAdvancedFragment">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
+                            <entry key="action_settingsFragment_to_settingsAppPickerFragment">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
+                            <entry key="action_settingsFragment_to_settingsDeveloperOptionsFragment">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
+                            <entry key="action_settingsFragment_to_settingsFaqFragment">
+                              <value>
+                                <LayoutPositions />
+                              </value>
+                            </entry>
+                          </map>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="shizkuNotRunningBottomSheetFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="46" />
+                            <option name="y" value="937" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="shizukuInfoBottomSheetFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="725" />
+                            <option name="y" value="942" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="shizukuNotInstalledBottomSheetFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="484" />
+                            <option name="y" value="943" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="updateAvailableBottomSheetFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="48" />
+                            <option name="y" value="642" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                  <entry key="updateDownloadBottomSheetFragment">
+                    <value>
+                      <LayoutPositions>
+                        <option name="myPosition">
+                          <Point>
+                            <option name="x" value="285" />
+                            <option name="y" value="641" />
+                          </Point>
+                        </option>
+                      </LayoutPositions>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </LayoutPositions>
           </value>
         </entry>
       </map>
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460..e497da9 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/ADB Script/readme.txt b/ADB Script/readme.txt
deleted file mode 100644
index d1d2b62..0000000
--- a/ADB Script/readme.txt	
+++ /dev/null
@@ -1,51 +0,0 @@
-# Non-root Instructions & FAQ
-
-DarQ is able to run without root, as long as you run a script from your computer using ADB every time it restarts. Once the script is run, DarQ should function until the next reboot. 
-
-You can find the latest script to run from a Windows, Linux or Mac computer on the XDA thread: https://forum.xda-developers.com/android/apps-games/app-darq-app-selectable-force-dark-t3944356
-
-## Steps to run: 
-
-1.) Download the script from the XDA post. It will be a ZIP archive, containing two files and a folder. 
-2.) Extract the ZIP *fully* to somewhere you'll easily find it. Remember, you'll be running this as often as your device restarts.
-3.) Run the correct script for your operating system. 
-	For Windows, simply double click "rundarq-windows.bat". 
-	For Linux and MacOS, you may need to open a terminal in the directory containing the scripts, and run `sh startdarq-linux-mac.sh`
-		Note: On Linux and Mac, `adb` is not included. If you do not have it installed, the script will link you to a guide to do so.
-4.) Make sure the script runs correctly. If it shows an error, it may advise you on what to do. If you find an error that isn't handled correctly, please screenshot while using the -v (verbose) switch and post it on the XDA thread
-
-## Running wirelessly (Android 11+ only):
-
-On Windows:
-1.) Open a command prompt in the directory with the script in it
-2.) Go to Settings > System > Advanced > Developer options, enable Wireless debugging and open it. Select "Pair device with pairing code"
-3.) Run "tools\adb pair <ip:pair port from settings dialog>" and enter the PIN when prompted. The pairing dialog will close after connection
-4.) Run "tools\adb connect <ip:port from settings>"
-5.) Run the batch script. The service will now be run.
-You will need to follow these steps every time the device reboots, as usual
-
-On Mac/Linux:
-Make sure your ADB is up to date before doing this. It will not work on an older ADB version than 30.
-1.) Open a command prompt in the directory with the script in it
-2.) Go to Settings > System > Advanced > Developer options, enable Wireless debugging and open it. Select "Pair device with pairing code"
-3.) Run "adb pair <ip:pair port from settings dialog>" and enter the PIN when prompted. The pairing dialog will close after connection
-4.) Run "adb connect <ip:port from settings>"
-5.) Run the bash script. The service will now be run.
-You will need to follow these steps every time the device reboots, as usual
-
-## Note:
-As well as if your device is rebooted, the script will need to be re-run if DarQ is force stopped for whatever reason, including if the system kills the background code. This includes toggling the accessibility service (which force stops the app in the process).
-
-## FAQ:
-
-*Why does DarQ require running a script from a computer when not using a rooted phone?*
-The property that force dark uses requires either the `shell` or `root` UID to be changed, or it will throw an error. Without access to `root`, `shell` is needed, which is what ADB runs as.
-Therefore, DarQ must have code running on the device in the background, started from ADB, that will allow the property to be changed.
-
-*Why does DarQ running as non-root require to be run after reboot?*
-The background script required by DarQ will get killed when the device is rebooted. Therefore, it must be run again every time.
-
-*Does my device need to stay connected to my computer for DarQ to work?*
-No. DarQ will continue working as long as the script is run successfully and the device is not rebooted.
-
-*For more questions and answers, please refer to the main FAQ*
\ No newline at end of file
diff --git a/ADB Script/rundarq-linux-mac.sh b/ADB Script/rundarq-linux-mac.sh
deleted file mode 100644
index 4f7f708..0000000
--- a/ADB Script/rundarq-linux-mac.sh	
+++ /dev/null
@@ -1,106 +0,0 @@
-scriptpath="/sdcard/Android/data/com.kieronquinn.app.darq/files/script.sh"
-
-function header(){
-	printf " ____              ___  \n"
-	printf "|  _ \  __ _ _ __ / _ \ \n"
-	printf "| | | |/ _\` | '__| | | |\n"
-	printf "| |_| | (_| | |  | |_| |\n"
-	printf "|____/ \__,_|_|   \__\_\\ \n\n"
-	printf "DarQ Linux/Mac running script v1.0\n\n"
-}
-
-function divider(){
-	printf "*****************\n"
-}
-
-function pause(){
-	read -p "Press enter to $1"
-}
-
-function runScript(){
-	printf "Running script...\n"
-	adb shell "sh $scriptpath 2>/dev/null 1>/dev/null &"
-	printf "Starting DarQ...\n"
-	if isVerbose; then
-		adb shell "am start com.kieronquinn.app.darq/.activities.MainActivity"
-	else
-		adb shell "am start com.kieronquinn.app.darq/.activities.MainActivity" > /dev/null 2> /dev/null
-	fi
-	divider
-	printf "DarQ should now be running. You may disconnect and continue on your device now.\n"
-	printf "REMINDER: DarQ needs to be run from this script *every time your device is\nrestarted*. It will not work otherwise.\n"
-	divider
-	pause "quit"
-}
-
-function checkScriptExists(){
-	printf "Checking for script...\n"
-	if runCommandExitCode "adb shell ls $scriptpath"; then
-		printf "Script found\n"
-		runScript
-	else
-		divider
-		printf "Script not found. Please run DarQ on your device to generate it first,\nthen re-run this script\n"
-		divider
-		pause "quit"
-	fi
-}
-
-function checkDevices(){
-	printf "Checking connected devices...\n"
-	if runCommandAndCheckMultiple "adb devices" "device" "-w"; then
-		printf "Device found\n"
-		checkScriptExists
-	else
-		if runCommandAndCheck "adb devices" "device" "-w"; then
-			printf "Multiple devices found, please disconnect all but the device you wish to use\nDarQ on, then run the script again\n"
-			pause "quit"
-		else
-			printf "No devices found. Please make sure your device is connected, USB debugging is\nenabled and that they are authorised (check screen for prompt), then run the script again\n"
-			pause "quit"
-		fi
-	fi
-}
-
-function checkAdb(){
-	printf "Checking ADB...\n"
-	if runCommandAndCheck "which adb" "adb"; then
-	   printf "ADB found\n"
-	   checkDevices
-	else
-		divider
-		printf "You do not have ADB installed. Please follow the steps here to install it:\nhttps://www.xda-developers.com/install-adb-windows-macos-linux/\n"
-		divider
-	fi
-}
-
-function runCommandAndCheckMultiple(){
-	output=$($1 | grep $2 -c $3)
-	[ $output == 1 ]
-}
-
-function runCommandAndCheck(){
-	if isVerbose; then
-		$1 | grep $2 $3 &
-	else
-		$1 | grep $2 $3 &> /dev/null
-	fi
-	[ $? == 0 ]
-}
-
-function runCommandExitCode(){
-	if isVerbose; then
-		$1 &> /dev/null
-	else 
-		$1 &
-	fi
-	[ $? == 0 ]
-}
-
-function isVerbose(){
-	[[ $_V -eq 1 ]]
-}
-
-header
-
-checkAdb
\ No newline at end of file
diff --git a/ADB Script/rundarq-windows.bat b/ADB Script/rundarq-windows.bat
deleted file mode 100644
index 703ae09..0000000
--- a/ADB Script/rundarq-windows.bat	
+++ /dev/null
@@ -1,87 +0,0 @@
-@ECHO OFF
-cls
-set NLM=^
-
-
-set NL=^^^%NLM%%NLM%^%NLM%%NLM%
-
-SET scriptpath=/sdcard/Android/data/com.kieronquinn.app.darq/files/script.sh
-SET divider=****************
-SET adbpath=tools\adb.exe
-
-ECHO   _____              ____  
-ECHO  ^|  __ \            / __ \ 
-ECHO  ^| ^|  ^| ^| __ _ _ __^| ^|  ^| ^|
-ECHO  ^| ^|  ^| ^|/ _` ^| '__^| ^|  ^| ^|
-ECHO  ^| ^|__^| ^| (_^| ^| ^|  ^| ^|__^| ^|
-ECHO  ^|_____/ \__,_^|_^|   \___\_\
-
-echo %NL%DarQ Windows runner script v1.0
-
-if not exist %adbpath% (
-	echo %NL%%divider%
-	echo Unable to find adb. Please make sure you extracted the full zip file including the tools folder containing adb.exe%NL%before running this script.
-	echo %divider%
-	pause
-	EXIT /B 0
-)
-
-echo %NL%Checking connected devices...
-
-%adbpath% devices > devices.txt
-if "%1"=="-v" (
-	type devices.txt
-)
-findstr /c:"device" devices.txt | find /c /v "" > temp.txt
-set /p devicecount=<temp.txt
-del temp.txt
-del devices.txt
-
-IF "%devicecount%"=="1" (
-	echo %divider%
-    ECHO No devices found. Please make sure your device is connected USB debugging is enabled, and that they are authorised%NL%^(check screen for prompt^), then run the script again
-	echo %divider%
-	pause
-	EXIT /B 0
-)
-IF "%devicecount%" NEQ "2" (
-	echo %divider%
-    ECHO Multiple devices found, please disconnect all but the device you wish to use DarQ on, then run the script again
-	echo %divider%
-	pause
-	EXIT /B 0
-)
-
-echo Device found
-echo Checking for script...
-
-if "%1"=="-v" (
-	%adbpath% shell ls %scriptpath%
-) ELSE (
-	%adbpath% shell ls %scriptpath%>nul 2>nul
-)
-
-IF %ERRORLEVEL% NEQ 0 (
-	echo %divider%
-	ECHO Script not found. Please run DarQ on your device to generate it first, then re-run this script
-	echo %divider%
-	pause
-	EXIT /B 0
-)
-
-echo Script found
-echo Running script...
-%adbpath% shell "nohup sh %scriptpath% 2>/dev/null 1>/dev/null &"
-if "%1"=="-v" (
-	%adbpath% shell "am start com.kieronquinn.app.darq/.activities.MainActivity"
-) ELSE (
-	%adbpath% shell "am start com.kieronquinn.app.darq/.activities.MainActivity">nul 2>nul
-)
-echo %divider%
-echo DarQ should now be running. You may disconnect and continue on your device now.
-echo REMINDER: DarQ needs to be run from this script *every time your device is restarted*. It will not work otherwise.
-echo %divider%
-
-pause
-exit /B 0
-
diff --git a/README.md b/README.md
index 9101e0a..625df13 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,15 @@
 # DarQ
 
+![DarQ](https://i.imgur.com/PFfaGMrl.png)
+
 DarQ provides a per-app selectable force dark option for Android 10 and above. 
 
-It uses an accessibility service and root or ADB to allow you to pick just the apps you want to use the force dark theme on. Force dark is a hidden option, provided by the Android system, which intelligently inverts light backgrounds to dark, and dark text and icons to light. It allows a majority of third party apps, such as Snapchat, Instagram and LinkedIn, as well as first-party Google apps which do not have a dark theme (such as the Play Store) to have a dark mode. 
+It uses a root or [Shizuku](https://shizuku.rikka.app/) (ADB) service to apply the theme seamlessly and quickly, without needing an accessibility service.
 
 DarQ also provides an option to apply the system dark theme (as well as selectable force dark) only after sunset and before sunrise, protecting your eyes when it's most needed. 
 
 Please read the Frequently Asked Questions sections in the app or [here](https://github.com/KieronQuinn/DarQ/blob/master/app/src/main/assets/faq.md) for more information and some answers to questions
 
-[Download from XDA Labs](https://labs.xda-developers.com/store/app/com.kieronquinn.app.darq)
-
-[Download the ADB script](https://github.com/KieronQuinn/DarQ/releases/download/1.3/DarQ.ADB.v1.1.zip)
-
-[XDA Thread](https://forum.xda-developers.com/android/apps-games/app-darq-app-selectable-force-dark-t3944356)
+[Download from GitHub Releases](https://github.com/KieronQuinn/DarQ/releases)
 
-Contains a modified version of the "HK Grotesk" font, modified to have slightly rounder edges and use the secondary "g" instead of its original primary. Licenced under the Open Font Licence, available [here](https://hanken.co/hk-grotesk)
+[XDA Thread](https://forum.xda-developers.com/t/app-root-adb-10-11-oct-darq-per-app-selectable-force-dark-option-for-android-10.3944356/)
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 622b20c..63b9073 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,72 +1,136 @@
-apply plugin: 'com.android.application'
-
-apply plugin: 'com.google.android.gms.oss-licenses-plugin'
-
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+    id 'kotlin-parcelize'
+    id 'androidx.navigation.safeargs.kotlin'
+    id 'com.google.android.gms.oss-licenses-plugin'
+}
 
-apply plugin: 'kotlin-android-extensions'
+def tagName = '2.0'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 'android-S'
     defaultConfig {
         applicationId "com.kieronquinn.app.darq"
         minSdkVersion 29
-        targetSdkVersion 30
+        targetSdkVersion 'S'
         versionCode 13
-        versionName "1.3"
+        versionName "2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        buildConfigField("String", "TAG_NAME", "\"${tagName}\"")
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    buildFeatures {
+        viewBinding true
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
     kotlinOptions {
         jvmTarget = '1.8'
     }
+
+    /**
+     *  Hack that re-replaces the minSdk and targetSdk back to levels that allow installing on lower than Android S Developer Preview
+     *  TODO remove this when S becomes stable
+     */
+    applicationVariants.all { variant ->
+        variant.outputs.each { output ->
+            output.getProcessManifestProvider().get().doLast {
+                def manifestPath = "${buildDir.path}/intermediates/merged_manifests/${variant.buildType.name}/AndroidManifest.xml"
+                def manifestFile = new File(manifestPath)
+                def manifestContent = manifestFile.getText()
+                manifestContent = manifestContent
+                        .replaceAll('android:minSdkVersion="S"', 'android:minSdkVersion="29"')
+                        .replaceAll('android:targetSdkVersion="S"', 'android:targetSdkVersion="30"')
+                        .replaceAll('android:testOnly="true"', 'android:testOnly="false"')
+                def fos = new FileOutputStream(manifestFile.getPath())
+                fos.write(manifestContent.getBytes())
+                fos.flush()
+                fos.close()
+            }
+        }
+    }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    //Kotlin + Coroutines
+    def kotlinx_coroutines_version = "1.5.0"
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'com.google.android.material:material:1.3.0-alpha03'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-    implementation 'eu.chainfire:libsuperuser:1.0.0.201811281328'
-    implementation 'eu.chainfire:librootjava:1.3.0'
-    implementation 'com.airbnb.android:lottie:3.4.0'
-    implementation 'com.squareup.picasso:picasso:2.71828'
-    implementation 'org.shredzone.commons:commons-suncalc:2.4'
-    implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
-    implementation "ru.noties.markwon:core:3.0.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version"
+
+    //Koin
+    def koin_version= "3.1.0"
+    implementation "io.insert-koin:koin-android:$koin_version"
+
+    //AndroidX
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation "androidx.work:work-runtime-ktx:2.5.0"
 
     //Navigation Component
-    def nav_version = "2.3.0"
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
+    //Lifecycle
+    def lifecycle_version = "2.3.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-service:$lifecycle_version"
+
+    //Material
+    implementation 'com.google.android.material:material:1.4.0-rc01'
+
+    //Network
+    implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+
+    //Sunrise/sunset calculator
+    implementation 'org.shredzone.commons:commons-suncalc:2.4'
+
+    //Play Services OSS
+    implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
+    implementation "ru.noties.markwon:core:3.0.2"
+
     //Preference Support
     implementation 'androidx.preference:preference-ktx:1.1.1'
 
-    //Coroutines
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7'
+    //libsu (root service)
+    def libsuVersion = '3.1.2'
+    implementation "com.github.topjohnwu.libsu:core:$libsuVersion"
+    implementation "com.github.topjohnwu.libsu:service:$libsuVersion"
 
-    //libsu has better root detection for Magisk than libsuperuser it seems, though it is unable to run from the IPC and so libsuperuser is still needed for that
-    def libsuVersion = '2.5.1'
-    implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
+    //Shizuku (non-root service)
+    def shizuku_version = '11.0.2'
+    implementation "dev.rikka.shizuku:api:$shizuku_version"
+    implementation "dev.rikka.shizuku:provider:$shizuku_version"
 
     //Xposed
     compileOnly 'de.robv.android.xposed:api:82'
+
+    //MonetCompat
+    implementation 'com.github.KieronQuinn:MonetCompat:0.1'
+
+    //Bypass Hidden APIs
+    implementation 'org.lsposed.hiddenapibypass:hiddenapibypass:2.0'
+
+    //Stubs for hidden APIs used by service. Shouldn't be included in APK.
+    compileOnly project(':systemstubs')
+
 }
 
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 932d5b3..7fbf957 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -1,5 +1,5 @@
 {
-  "version": 1,
+  "version": 2,
   "artifactType": {
     "type": "APK",
     "kind": "Directory"
@@ -10,10 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "properties": [],
       "versionCode": 13,
-      "versionName": "1.3",
-      "enabled": true,
+      "versionName": "2.0",
       "outputFile": "app-release.apk"
     }
   ]
diff --git a/app/release/output.json b/app/release/output.json
deleted file mode 100644
index 56c09fc..0000000
--- a/app/release/output.json
+++ /dev/null
@@ -1 +0,0 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":12,"versionName":"1.2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 580cf6a..949cc4a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,14 +3,15 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	package="com.kieronquinn.app.darq">
 
-	<uses-permission
-		android:name="android.permission.WRITE_SECURE_SETTINGS"
-		tools:ignore="ProtectedPermissions" />
-
+	<uses-permission android:name="android.permission.INTERNET"/>
+	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
-	<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
+	<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
+		tools:ignore="QueryAllPackagesPermission" />
+	<uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+	<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
 	<application
 		android:name=".DarqApplication"
@@ -19,12 +20,12 @@
 		android:label="@string/app_name"
 		android:roundIcon="@mipmap/ic_launcher"
 		android:supportsRtl="true"
-		android:theme="@style/AppTheme.Initial"
 		tools:ignore="GoogleAppIndexingWarning">
 
 		<activity
-			android:name=".activities.MainActivity"
-			android:screenOrientation="portrait">
+			android:name="com.kieronquinn.app.darq.ui.activities.DarqActivity"
+			android:theme="@style/AppTheme"
+			android:exported="true">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 
@@ -32,28 +33,40 @@
 			</intent-filter>
 		</activity>
 
-        <activity android:name=".activities.ModalFaqActivity"
-            android:screenOrientation="portrait"/>
+		<activity
+			android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
+			android:theme="@style/AppTheme.ThirdPartyLicences" />
+		<activity
+			android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
+			android:theme="@style/AppTheme.ThirdPartyLicences" />
+
+		<service android:name="com.kieronquinn.app.darq.service.boot.BootForegroundService"/>
+		<service android:name="com.kieronquinn.app.darq.service.autodark.DarqAutoDarkForegroundService"/>
 
-		<service
-			android:name=".services.DarqBackgroundService"
-			android:foregroundServiceType="location"
-			android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
+		<receiver android:name="com.kieronquinn.app.darq.receivers.BootReceiver"
+			android:exported="false">
 			<intent-filter>
-				<action android:name="android.accessibilityservice.AccessibilityService" />
+				<action android:name="android.intent.action.BOOT_COMPLETED"/>
 			</intent-filter>
-			<meta-data
-				android:name="android.accessibilityservice"
-				android:resource="@xml/accessibilityservice" />
-		</service>
+		</receiver>
 
-		<receiver android:name=".receivers.SunriseSunsetReceiver" android:process=":remote"/>
+		<provider
+			android:name="rikka.shizuku.ShizukuProvider"
+			android:authorities="${applicationId}.shizuku"
+			android:multiprocess="false"
+			android:enabled="true"
+			android:exported="true"
+			android:permission="android.permission.INTERACT_ACROSS_USERS_FULL" />
 
 		<provider
-			android:name=".providers.SharedPrefsProvider"
-			android:authorities="com.kieronquinn.app.darq.provider.sharedprefs"
-			android:grantUriPermissions="true"
-			android:exported="true" />
+			android:name="androidx.core.content.FileProvider"
+			android:authorities="${applicationId}.provider"
+			android:exported="false"
+			android:grantUriPermissions="true">
+			<meta-data
+				android:name="android.support.FILE_PROVIDER_PATHS"
+				android:resource="@xml/provider_paths"/>
+		</provider>
 
 		<meta-data
 			android:name="xposedmodule"
diff --git a/app/src/main/aidl/com/kieronquinn/app/darq/IDarqIPC.aidl b/app/src/main/aidl/com/kieronquinn/app/darq/IDarqIPC.aidl
deleted file mode 100644
index 3808b55..0000000
--- a/app/src/main/aidl/com/kieronquinn/app/darq/IDarqIPC.aidl
+++ /dev/null
@@ -1,20 +0,0 @@
-// IDarqIPC.aidl
-package com.kieronquinn.app.darq;
-
-interface IDarqIPC {
-    void pokeServices();
-
-    void setForceDarkEnabled(boolean enabled);
-
-    void setDarkEnabled(boolean enabled);
-
-    boolean isForceDarkEnabled();
-
-    void forceStopApp(String app);
-
-    void hookService();
-
-    boolean isRoot();
-
-    String getUid();
-}
diff --git a/app/src/main/aidl/com/kieronquinn/app/darq/IDarqService.aidl b/app/src/main/aidl/com/kieronquinn/app/darq/IDarqService.aidl
new file mode 100644
index 0000000..2f8c96e
--- /dev/null
+++ b/app/src/main/aidl/com/kieronquinn/app/darq/IDarqService.aidl
@@ -0,0 +1,18 @@
+// IDarqService.aidl
+package com.kieronquinn.app.darq;
+
+import com.kieronquinn.app.darq.model.settings.IPCSetting;
+import com.kieronquinn.app.darq.model.location.LatLng;
+
+interface IDarqService {
+    void destroy() = 16777114;
+    void ping() = 0;
+    void onBind() = 1;
+    void killOtherInstances() = 2;
+    void setupSettings(in IPCSetting ipcSetting) = 3;
+    void setupWhitelist(boolean isStart, boolean isEnd, String packageName) = 4;
+    void notifySettingsChange(in IPCSetting ipcSetting) = 5;
+    void setNightMode(boolean nightMode) = 6;
+    LatLng getLocation() = 7;
+    String getServiceType() = 8;
+}
\ No newline at end of file
diff --git a/app/src/main/aidl/com/kieronquinn/app/darq/model/location/LatLng.aidl b/app/src/main/aidl/com/kieronquinn/app/darq/model/location/LatLng.aidl
new file mode 100644
index 0000000..f45f994
--- /dev/null
+++ b/app/src/main/aidl/com/kieronquinn/app/darq/model/location/LatLng.aidl
@@ -0,0 +1,4 @@
+// LatLng.aidl
+package com.kieronquinn.app.darq.model.location;
+
+parcelable LatLng;
\ No newline at end of file
diff --git a/app/src/main/aidl/com/kieronquinn/app/darq/model/settings/IPCSetting.aidl b/app/src/main/aidl/com/kieronquinn/app/darq/model/settings/IPCSetting.aidl
new file mode 100644
index 0000000..64440e6
--- /dev/null
+++ b/app/src/main/aidl/com/kieronquinn/app/darq/model/settings/IPCSetting.aidl
@@ -0,0 +1,4 @@
+// IPCSetting.aidl
+package com.kieronquinn.app.darq.model.settings;
+
+parcelable IPCSetting;
\ No newline at end of file
diff --git a/app/src/main/assets/faq.md b/app/src/main/assets/faq.md
index 632506f..23bf73e 100644
--- a/app/src/main/assets/faq.md
+++ b/app/src/main/assets/faq.md
@@ -1,11 +1,11 @@
-## Why does DarQ only work on Android 10?
-Force dark was only added as a (hidden) option on Android 10. If you want to change the theme of apps prior to Android 10, you may wish to use a Substratum theme.
+## Why does DarQ only work on Android 10 and above?
+Force dark was only added as a (hidden) option on Android 10 and above. If you want to change the theme of apps prior to Android 10, you may wish to use a Substratum theme.
 
-## Why does DarQ need root or adb access?
-Since the final beta of Android 10, the force dark property (`debug.hwui.force_dark`) is only writable with root or with the `shell` UID (which `adb shell` runs with).
+## Why does DarQ need root or Shizuku/ADB access?
+Since the final beta of Android 10, the force dark property (`debug.hwui.force_dark`) is only writable with root or with the `shell` UID (which `adb shell` and therefore Shizuku runs with).
 
-## Why does DarQ use an Accessibility Service?
-Accessibility services are the quickest and most compatible way to monitor when an app opens and closes, without using hacks like reading the `logcat` (which obviously doesn't work if the device has logs disabled either). If you are worried about DarQ doing anything nefarious using the service, feel free to check the code out on GitHub - and compile the app yourself if you wish - to see what it's doing for yourself.
+## How does DarQ monitor running apps?
+DarQ uses a hidden API only accessible to privileged code (`IActivityManager.registerProcessObserver`), which allows it to know when an app is opened or closed without an Accessibility Service.
 
 ## Why does DarQ/force dark need the system dark theme to be enabled?
 For some reason, in the final beta of Android 10, a requirement was added to force dark to make it only work when the system dark theme is enabled. A workaround has not been found (and may not even exist) for this, so it is required for DarQ to work too.
@@ -18,10 +18,10 @@ Long answer: Force dark is able to invert light colours to dark, and dark text a
 **Please do not pester app developers to fix apps with force dark enabled. Force dark is a not normally meant as a user-facing tool, it is meant for developers. If enough developers complain to Google about users pestering for fixes with force dark enabled, it may be removed from a future release of Android, preventing DarQ from working at all.**
 
 ## Force Dark doesn't work at all on an app! Can you fix it?
-Sometimes an app launches too quickly for force dark to be applied. You may have luck closing and reopening the app, or opening and closing recent apps. Some apps, such as Google Opinion Rewards, have very basic layouts, and so load the initial page before force dark can be enabled, but any submenus have the dark theme applied. It may be possible to improve the detection and applying time in the future to provide a better experience for these apps, so please be patient and check back for future updates.
+Sometimes an app launches too quickly for force dark to be applied. You may have luck closing and reopening the app, or opening and closing recent apps.
 
 ## Which apps look good when force dark is enabled?
-During testing; Snapchat, the Google Play Store and LinkedIn were found to be usable with force dark enabled. Plenty more will work too, it's up to you to experiment and see what works for you.
+During testing; LinkedIn, Facebook and Google Opinion Rewards were found to be usable with force dark enabled. Plenty more will work too, it's up to you to experiment and see what works.
 
 Please note that some of the above require the Xposed module to be enabled for them to work.
 
@@ -35,4 +35,4 @@ This appears to be a bug in Android, and as force dark is a developer option, ma
 No. There is no customisation with force dark, so you cannot change the colours.
 
 ## How can I keep DarQ up to date? Is DarQ available on the Play Store?
-DarQ is not on the Play Store, as it uses an accessibility service for non-accessibility purposes, which Google does not like. DarQ is instead available on XDA Labs, so please use the XDA Labs app to keep the app up to date. You can quickly open the XDA Labs listing by tapping the "About" setting on the main screen of DarQ.
+DarQ is not on the Play Store, as it uses hidden APIs, which Google does not like. DarQ is instead available on GitHub, and will automatically check for updates when launched. If you would like to check manually, use the GitHub link on the main page of DarQ, and follow the "Releases" link.
diff --git a/app/src/main/assets/non-root-faq.md b/app/src/main/assets/non-root-faq.md
deleted file mode 100644
index 2ada560..0000000
--- a/app/src/main/assets/non-root-faq.md
+++ /dev/null
@@ -1,36 +0,0 @@
-DarQ is able to run without root, as long as you run a script from your computer using ADB every time it restarts. Once the script is run, DarQ should function until the next reboot. 
-
-You can find the latest script to run from a Windows, Linux or Mac computer on the [XDA thread](https://forum.xda-developers.com/android/apps-games/app-darq-app-selectable-force-dark-t3944356)
-
-# Steps to run: 
-
-1.) Download the script from the XDA post. It will be a ZIP archive, containing two files and a folder. 
-
-2.) Extract the ZIP *fully* to somewhere you'll easily find it. Remember, you'll be running this as often as your device restarts.
-
-3.) Run the correct script for your operating system. 
-
-	For Windows, simply double click "rundarq-windows.bat". 
-	
-	For Linux and MacOS, you may need to open a terminal in the directory containing the scripts, and run "sh startdarq-linux-mac.sh"
-	
-	Note: On Linux and Mac, "adb" is not included. If you do not have it installed, the script will link you to a guide to do so.
-		
-4.) Make sure the script runs correctly. If it shows an error, it may advise you on what to do. If you find an error that isn't handled correctly, please screenshot while using the -v (verbose) switch and post it on the XDA thread
-
-## Note:
-As well as if your device is rebooted, the script will need to be re-run if DarQ is force stopped for whatever reason, including if the system kills the background code. This includes toggling the accessibility service (which force stops the app in the process).
-
-# FAQ:
-
-## Why does DarQ require running a script from a computer when not using a rooted phone?
-The property that force dark uses requires either the `shell` or `root` UID to be changed, or it will throw an error. Without access to `root`, `shell` is needed, which is what ADB runs as.
-Therefore, DarQ must have code running on the device in the background, started from ADB, that will allow the property to be changed.
-
-## Why does DarQ running as non-root require to be run after reboot?
-The background script required by DarQ will get killed when the device is rebooted. Therefore, it must be run again every time.
-
-## Does my device need to stay connected to my computer for DarQ to work?
-No. DarQ will continue working as long as the script is run successfully and the device is not rebooted.
-
-## For more questions and answers, please refer to the main FAQ
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/DarqApplication.kt b/app/src/main/java/com/kieronquinn/app/darq/DarqApplication.kt
index 8795bf3..b4cd057 100644
--- a/app/src/main/java/com/kieronquinn/app/darq/DarqApplication.kt
+++ b/app/src/main/java/com/kieronquinn/app/darq/DarqApplication.kt
@@ -1,34 +1,88 @@
 package com.kieronquinn.app.darq
 
 import android.app.Application
+import android.app.DownloadManager
+import android.content.Context
+import com.kieronquinn.app.darq.components.github.UpdateChecker
+import com.kieronquinn.app.darq.components.navigation.Navigation
+import com.kieronquinn.app.darq.components.navigation.NavigationImpl
+import com.kieronquinn.app.darq.components.settings.AppSharedPreferences
+import com.kieronquinn.app.darq.components.settings.DarqSharedPreferences
+import com.kieronquinn.app.darq.providers.DarqServiceConnectionProvider
+import com.kieronquinn.app.darq.providers.blur.BlurProvider
+import com.kieronquinn.app.darq.ui.screens.bottomsheets.update.UpdateDownloadBottomSheetViewModel
+import com.kieronquinn.app.darq.ui.screens.bottomsheets.update.UpdateDownloadBottomSheetViewModelImpl
+import com.kieronquinn.app.darq.ui.screens.container.ContainerSharedViewModel
+import com.kieronquinn.app.darq.ui.screens.container.ContainerSharedViewModelImpl
+import com.kieronquinn.app.darq.ui.screens.dialogs.LocationPermissionDialogViewModel
+import com.kieronquinn.app.darq.ui.screens.dialogs.LocationPermissionDialogViewModelImpl
+import com.kieronquinn.app.darq.ui.screens.settings.SettingsViewModel
+import com.kieronquinn.app.darq.ui.screens.settings.SettingsViewModelImpl
+import com.kieronquinn.app.darq.ui.screens.settings.apppicker.SettingsAppPickerViewModel
+import com.kieronquinn.app.darq.ui.screens.settings.apppicker.SettingsAppPickerViewModelImpl
+import com.kieronquinn.app.darq.ui.screens.settings.developer.SettingsDeveloperOptionsViewModel
+import com.kieronquinn.app.darq.ui.screens.settings.developer.SettingsDeveloperOptionsViewModelImpl
 import com.kieronquinn.app.darq.utils.AppIconRequestHandler
+import com.kieronquinn.monetcompat.core.MonetCompat
 import com.squareup.picasso.Picasso
-import com.topjohnwu.superuser.Shell.Config.*
-import com.topjohnwu.superuser.Shell.FLAG_REDIRECT_STDERR
+import org.koin.android.ext.android.get
+import org.koin.android.ext.koin.androidContext
+import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.core.context.startKoin
+import org.koin.dsl.module
+import org.lsposed.hiddenapibypass.HiddenApiBypass
 
 
 class DarqApplication : Application() {
 
-    init {
-        /* Shell.Config methods shall be called before any shell is created
-     * This is the why in this example we call it in a static block
-     * The followings are some examples, check Javadoc for more details */
-        setFlags(FLAG_REDIRECT_STDERR);
-        verboseLogging(BuildConfig.DEBUG);
-        setTimeout(10);
+    private val serviceModule = module {
+        single { DarqServiceConnectionProvider(get(), get()) }
     }
 
-    var hasCheckedRoot = false
-    var isRoot = false
-    var uid: String? = null
+    private val appComponentsModule = module {
+        single<DarqSharedPreferences> { AppSharedPreferences(get()) }
+        single<Navigation> { NavigationImpl() }
+        single { UpdateChecker() }
+    }
+
+    private val viewModelsModule = module {
+        viewModel<ContainerSharedViewModel>{ ContainerSharedViewModelImpl(get(), get(), get(), get()) }
+        viewModel<SettingsViewModel>{ SettingsViewModelImpl(get(), get()) }
+        viewModel<SettingsAppPickerViewModel>{ SettingsAppPickerViewModelImpl(get(), get()) }
+        viewModel<SettingsDeveloperOptionsViewModel>{ SettingsDeveloperOptionsViewModelImpl(get()) }
+        viewModel<UpdateDownloadBottomSheetViewModel>{ UpdateDownloadBottomSheetViewModelImpl(getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager) }
+        viewModel<LocationPermissionDialogViewModel> { LocationPermissionDialogViewModelImpl(get(), get()) }
+    }
+
+    private val providersModule = module {
+        single { BlurProvider.getBlurProvider(resources) }
+    }
 
     override fun onCreate() {
         super.onCreate()
+        runCatching {
+            //Allows blurs on some devices, doesn't really matter if it fails
+            HiddenApiBypass.addHiddenApiExemptions("L")
+        }
         Picasso.setSingletonInstance(
             Picasso.Builder(this)
                 .addRequestHandler(AppIconRequestHandler(this))
                 .build()
         )
+        startKoin {
+            androidContext(this@DarqApplication)
+            modules(serviceModule, appComponentsModule, viewModelsModule, providersModule)
+        }
+        setupMonet()
+    }
+
+    private fun setupMonet(){
+        val settings = get<DarqSharedPreferences>()
+        MonetCompat.wallpaperColorPicker = {
+            val selectedColor = settings.monetColor
+            if(selectedColor != Integer.MAX_VALUE && it?.contains(selectedColor) == true) selectedColor
+            else it?.firstOrNull()
+        }
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/Xposed.kt b/app/src/main/java/com/kieronquinn/app/darq/Xposed.kt
index 621abed..7c115ba 100644
--- a/app/src/main/java/com/kieronquinn/app/darq/Xposed.kt
+++ b/app/src/main/java/com/kieronquinn/app/darq/Xposed.kt
@@ -1,42 +1,19 @@
 package com.kieronquinn.app.darq
 
-import android.content.Context
+import android.util.Log
 import android.view.View
-import com.kieronquinn.app.darq.utils.PreferenceUtils
-import com.kieronquinn.app.darq.utils.getSharedBoolPref
-import com.kieronquinn.app.darq.utils.getSharedStringPref
 import de.robv.android.xposed.IXposedHookLoadPackage
-import de.robv.android.xposed.XC_MethodHook
+import de.robv.android.xposed.XC_MethodReplacement
 import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_LoadPackage
-import org.json.JSONArray
-
 
 class Xposed : IXposedHookLoadPackage {
 
-    private var enabledApps: List<String>? = null
-
-    private fun getEnabledApps(context: Context) {
-        val rawEnabledApps = getSharedStringPref(context, PreferenceUtils.KEY_ENABLED_APPS, "[]")
-        val enabledAppsArray = JSONArray(rawEnabledApps)
-        val enabledApps = ArrayList<String>()
-        for (i in 0 until enabledAppsArray.length()) {
-            enabledApps.add(enabledAppsArray.getString(i))
-        }
-        this.enabledApps = enabledApps
-    }
-
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
-        XposedHelpers.findAndHookMethod(View::class.java, "setForceDarkAllowed", Boolean::class.java, object : XC_MethodHook() {
-            override fun beforeHookedMethod(param: MethodHookParam) {
-                super.beforeHookedMethod(param)
-                (param.thisObject as View).run {
-                    getEnabledApps(context)
-                    val isOverrideEnabled = getSharedBoolPref(context, PreferenceUtils.KEY_GLOBAL_OVERRIDE, false)
-                    if(enabledApps?.contains(lpparam.packageName) == true || isOverrideEnabled){
-                        param.args[0] = true
-                    }
-                }
+        XposedHelpers.findAndHookMethod(View::class.java, "setForceDarkAllowed", Boolean::class.java, object : XC_MethodReplacement() {
+            override fun replaceHookedMethod(param: MethodHookParam?): Any? {
+                Log.d("DarQXposed", "Preventing the use of setForceDarkAllowed for ${lpparam.packageName}")
+                return null
             }
         })
     }
diff --git a/app/src/main/java/com/kieronquinn/app/darq/activities/MainActivity.kt b/app/src/main/java/com/kieronquinn/app/darq/activities/MainActivity.kt
deleted file mode 100644
index 34a6692..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/activities/MainActivity.kt
+++ /dev/null
@@ -1,519 +0,0 @@
-package com.kieronquinn.app.darq.activities
-
-import android.animation.Animator
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.content.pm.ApplicationInfo
-import android.content.res.ColorStateList
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.os.Bundle
-import android.provider.Settings
-import android.util.Log
-import android.util.TypedValue
-import android.view.View
-import android.view.ViewAnimationUtils
-import android.view.WindowManager
-import android.widget.FrameLayout
-import android.widget.ImageView
-import androidx.appcompat.app.AppCompatActivity
-import androidx.navigation.findNavController
-import com.kieronquinn.app.darq.R
-import com.kieronquinn.app.darq.fragments.BottomSheetFragment
-import com.kieronquinn.app.darq.holders.App
-import com.kieronquinn.app.darq.interfaces.ActivityCallbacks
-import com.kieronquinn.app.darq.root.DarqIPCReceiver
-import com.kieronquinn.app.darq.services.DarqBackgroundService
-import com.kieronquinn.app.darq.services.DarqBackgroundService.Companion.BROADCAST_PING
-import com.kieronquinn.app.darq.services.DarqBackgroundService.Companion.BROADCAST_PONG
-import com.kieronquinn.app.darq.utils.*
-import com.topjohnwu.superuser.Shell
-import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.include_dark_mode_warning.*
-import kotlinx.coroutines.*
-import java.io.File
-import java.nio.charset.Charset
-
-class MainActivity : AppCompatActivity() {
-
-    private val job = Job()
-
-    private val uiScope = CoroutineScope(Dispatchers.Main + job)
-
-    val allApps = ArrayList<App>()
-
-    private var isWaitingForDismiss = false
-
-    private var isWaitingToPause = false
-
-    private var isDarkTheme: Boolean = false
-
-    var activityCallbacks : ActivityCallbacks? = null
-
-    var preferenceUtils: PreferenceUtils? = null
-
-    private var currentBottomSheet: BottomSheetFragment? = null
-
-    companion object {
-        private var statusBarHeight: Int? = null
-        var navBarHeight: Int? = null
-        private var actionBarHeight: Int? = null
-        private var INTENT_RELOAD = 1
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        preferenceUtils = PreferenceUtils(this)
-        isDarkTheme = isDarkTheme(this)
-        if (isDarkTheme) setTheme(R.style.AppTheme_Dark)
-        else setTheme(R.style.AppTheme_Light)
-        setContentView(R.layout.activity_main)
-        setSupportActionBar(toolbar)
-        adjustToolbar()
-        supportActionBar?.title = ""
-        checkRootAndSecure()
-        setupLottieListener()
-        setupNavController()
-        dark_mode_warning.visibility = if(isDarkTheme) View.GONE else View.VISIBLE
-    }
-
-    private fun setupNavController() {
-        val navController = findNavController(R.id.nav_host_fragment)
-        navController.addOnDestinationChangedListener { controller, destination, arguments ->
-            when(destination.id){
-                R.id.appsFragment -> {
-                    home.visibility = View.VISIBLE
-                }
-                R.id.faqFragment -> {
-                    home.visibility = View.VISIBLE
-                }
-                R.id.mainFragment -> {
-                    home.visibility = View.GONE
-                }
-            }
-            val dots = findViewById<ImageView>(R.id.menu)
-            if(destination.id != R.id.mainFragment){
-                dark_mode_warning.visibility = View.GONE
-            }else{
-                dots.visibility = View.GONE
-                dark_mode_warning.visibility = if(isDarkTheme) View.GONE else View.VISIBLE
-            }
-            if(destination.id == R.id.appsFragment){
-                toolbar.elevation = 0f
-            }else{
-                toolbar.elevation = resources.getDimension(R.dimen.toolbar_elevation)
-            }
-            toolbar_title.text = destination.label
-        }
-        home.setOnClickListener {
-            navController.navigateUp()
-        }
-        home.visibility = View.INVISIBLE
-    }
-
-    private fun adjustToolbar() {
-        window.setFlags(
-            WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
-            WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
-        )
-        //Adjust toolbar height to account for transparent status bar
-        window.decorView.rootView.setOnApplyWindowInsetsListener { view, insets ->
-            val statusBarSize = insets.systemWindowInsetTop
-            val navBarSize = insets.systemWindowInsetBottom
-            if (statusBarSize != 0) {
-                statusBarHeight = statusBarSize
-                toolbar.post {
-                    val tv = TypedValue()
-                    if (theme.resolveAttribute(android.R.attr.actionBarSize, tv, true)) {
-                        val actionBarHeight = TypedValue.complexToDimensionPixelSize(
-                            tv.data,
-                            resources.displayMetrics
-                        )
-                        Companion.actionBarHeight = actionBarHeight
-                        setupStatusPadding()
-                    }
-                }
-            }
-            if(navBarSize != 0){
-                navBarHeight = navBarSize
-                val params = fragment_container.layoutParams as FrameLayout.LayoutParams
-                params.bottomMargin = navBarSize
-            }
-            insets
-        }
-    }
-
-    private fun setInitialDarkTheme(){
-        lottie.frame = 21
-        loadingState.background = ColorDrawable(getColor(android.R.color.black))
-        toolbar_background.background =
-                ColorDrawable(getColor(R.color.toolbar_dark))
-        loading_text.setTextColor(Color.WHITE)
-        toolbar_title.setTextColor(Color.WHITE)
-        home.imageTintList = ColorStateList.valueOf(Color.WHITE)
-        menu.imageTintList = ColorStateList.valueOf(Color.WHITE)
-        window.decorView.systemUiVisibility = 0
-    }
-
-    private fun setupLottieListener() {
-        var isDarkBackground = false
-        if(isDarkTheme){
-            setInitialDarkTheme()
-            isDarkBackground = true
-        }
-        lottie.playAnimation()
-        lottie.addAnimatorUpdateListener {
-            if (lottie.frame == 20 && !isDarkBackground) {
-                if (isWaitingForDismiss) stopLoading(true)
-                else {
-                    createCircularAnimation(true, darkAnimationReveal, {
-                        darkAnimationReveal.visibility = View.VISIBLE
-                    }, {
-                        loadingState.background = ColorDrawable(getColor(android.R.color.black))
-                        darkAnimationReveal.visibility = View.INVISIBLE
-                    }, { anim ->
-                        delay((anim.duration * 0.1).toLong())
-                        loading_text.setTextColor(Color.WHITE)
-                        delay((anim.duration * 0.9).toLong())
-                        toolbar_title.setTextColor(Color.WHITE)
-                        home.imageTintList = ColorStateList.valueOf(Color.WHITE)
-                        menu.imageTintList = ColorStateList.valueOf(Color.WHITE)
-                        delay((anim.duration * 0.05).toLong())
-                        window.decorView.systemUiVisibility = 0
-                    })?.start()
-                    createCircularAnimation(true, toolbar_background_dark, {
-                        toolbar_background_dark.visibility = View.VISIBLE
-                    }, {
-                        toolbar_background.background =
-                                ColorDrawable(getColor(R.color.toolbar_dark))
-                        toolbar_background_dark.visibility = View.INVISIBLE
-                    }, null)?.start()
-                    isDarkBackground = true
-                }
-                if(isWaitingToPause && isDarkTheme) lottie.pauseAnimation()
-            } else if (lottie.frame == 65 && isDarkBackground) {
-                if (isWaitingForDismiss) stopLoading(false)
-                else {
-                    createCircularAnimation(false, lightAnimationReveal, {
-                        lightAnimationReveal.visibility = View.VISIBLE
-                    }, {
-                        loadingState.background = ColorDrawable(getColor(R.color.windowBackground))
-                        lightAnimationReveal.visibility = View.INVISIBLE
-                    }, { anim ->
-                        delay((anim.duration * 0.1).toLong())
-                        loading_text.setTextColor(Color.BLACK)
-                        delay((anim.duration * 0.9).toLong())
-                        toolbar_title.setTextColor(Color.BLACK)
-                        home.imageTintList = ColorStateList.valueOf(Color.BLACK)
-                        menu.imageTintList = ColorStateList.valueOf(Color.BLACK)
-                        delay((anim.duration * 0.05).toLong())
-                        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR or
-                                View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-                    })?.start()
-                    createCircularAnimation(false, toolbar_background_light, {
-                        toolbar_background_light.visibility = View.VISIBLE
-                    }, {
-                        toolbar_background.background =
-                                ColorDrawable(getColor(android.R.color.white))
-                        toolbar_background_light.visibility = View.INVISIBLE
-                    }, null)?.start()
-                    isDarkBackground = false
-                }
-                if(isWaitingToPause && !isDarkTheme) lottie.pauseAnimation()
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        setupStatusPadding()
-    }
-
-    private fun setupStatusPadding() {
-        if (actionBarHeight != null && statusBarHeight != null) {
-            toolbar?.layoutParams?.height = actionBarHeight!! + statusBarHeight!!
-            fragment_container.setPadding(0, statusBarHeight!!, 0, 0)
-        }
-    }
-
-    private fun checkRootAndSecure() {
-        uiScope.launch {
-            var isRooted = false
-            loading_text.text = getString(R.string.checking_root)
-            withContext(Dispatchers.Default) {
-                isRooted = Shell.rootAccess()
-            }
-            loading_text.text = getString(R.string.loading_apps)
-            withContext(Dispatchers.Default){
-                loadApps()
-                preferenceUtils?.getEnabledApps(this@MainActivity)
-                preferenceUtils?.enabledApps?.let {
-                    activityCallbacks?.onEnabledAppListLoaded(it)
-                }
-            }
-            Log.d("DarQ", "isRooted $isRooted")
-            if (isRooted) {
-                launchScript()
-                checkServiceRunning()
-                hasCheckedRoot = true
-            }else{
-                generateShellScript()
-                checkServiceRunning()
-            }
-        }
-    }
-
-    private fun launchScript(){
-        uiScope.launch {
-            withContext(Dispatchers.Default){
-                val command = DarqIPCReceiver.getLaunchScript(this@MainActivity)
-                runRootCommand(command)
-            }
-        }
-    }
-
-    private fun checkServiceRunning() {
-        loading_text.text = getString(R.string.checking_service)
-
-        if (!isAccessibilityServiceEnabled(this, DarqBackgroundService::class.java)) {
-            showAccessibilitySheet()
-            return
-        }
-
-        var hasReceived = false
-        var isIpcEnabled = false
-
-        //Register a receiver to wait for the response
-        registerReceiver(object : BroadcastReceiver() {
-            override fun onReceive(p0: Context?, intent: Intent?) {
-                hasReceived = true
-                isIpcEnabled = intent?.getBooleanExtra(DarqBackgroundService.KEY_IPC_FOUND, false) ?: false
-                if(isIpcEnabled) isWaitingForDismiss = true
-                unregisterReceiver(this)
-            }
-        }, IntentFilter(BROADCAST_PONG))
-
-        //Setup a timeout
-        uiScope.launch {
-            withContext(Dispatchers.Default) {
-                delay(5000L)
-            }
-            if (!isIpcEnabled){
-               if(isRoot){
-                   showNoServiceRootSheet()
-               }else{
-                   showNoServiceSheet()
-               }
-            }
-            if (!hasReceived) {
-                showAccessibilityRunningSheet()
-            }
-        }
-
-        //Send a broadcast and wait for the reply
-        val intent = Intent(BROADCAST_PING)
-        intent.`package` = packageName
-        sendBroadcast(intent)
-    }
-
-    private fun showNoServiceSheet(){
-        isWaitingToPause = true
-        val bottomSheet = BottomSheetFragment()
-        bottomSheet.layout =
-            R.layout.bottom_sheet_no_service
-        bottomSheet.cancelListener = {
-            finish()
-            true
-        }
-        bottomSheet.okLabel =
-            R.string.bottom_sheet_no_service_steps
-        bottomSheet.okListener = {
-            startActivity(Intent(this, ModalFaqActivity::class.java))
-            false
-        }
-        if(!supportFragmentManager.isDestroyed) {
-            bottomSheet.show(supportFragmentManager, "bs_no_service")
-        }
-    }
-
-    private fun showNoServiceRootSheet(){
-        isWaitingToPause = true
-        val bottomSheet = BottomSheetFragment()
-        bottomSheet.layout =
-            R.layout.bottom_sheet_no_service_root
-        bottomSheet.okListener = {
-            finish()
-            true
-        }
-        if(!supportFragmentManager.isDestroyed) {
-            bottomSheet.show(supportFragmentManager, "bs_no_service_root")
-        }
-    }
-
-    private fun showAccessibilitySheet(){
-        isWaitingToPause = true
-        val bottomSheet = BottomSheetFragment()
-        bottomSheet.layout =
-            R.layout.bottom_sheet_accessibility
-        bottomSheet.cancelListener = {
-            finish()
-            true
-        }
-        bottomSheet.okListener = {
-            currentBottomSheet = bottomSheet
-            val intent = Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)
-            startActivityForResult(
-                intent,
-                INTENT_RELOAD
-            )
-            false
-        }
-        if(!supportFragmentManager.isDestroyed) {
-            bottomSheet.show(supportFragmentManager, "bs_accessibility")
-        }
-    }
-
-    private fun showAccessibilityRunningSheet(){
-        isWaitingToPause = true
-        val bottomSheet = BottomSheetFragment()
-        bottomSheet.layout =
-            R.layout.bottom_sheet_accessibility_not_running
-        bottomSheet.cancelListener = {
-            finish()
-            true
-        }
-        bottomSheet.okListener = {
-            currentBottomSheet = bottomSheet
-            val intent = Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS)
-            startActivityForResult(intent,
-                INTENT_RELOAD
-            )
-            false
-        }
-        if(!supportFragmentManager.isDestroyed) {
-            bottomSheet.show(supportFragmentManager, "bs_accessibility_not_running")
-        }
-    }
-
-    private fun generateShellScript(){
-        val rootCommand = DarqIPCReceiver.getLaunchShellScript(this)
-        val file = File(getExternalFilesDir(null), "script.sh")
-        file.parentFile?.mkdirs()
-        file.writer(Charset.defaultCharset()).buffered().run {
-            write("#!/system/bin/sh")
-            newLine()
-            for((count, line) in rootCommand.withIndex()){
-                write(line)
-                if(count < rootCommand.size - 1) {
-                    newLine()
-                }else{
-                    write(" &")
-                }
-            }
-            close()
-        }
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if(requestCode == INTENT_RELOAD){
-            currentBottomSheet?.dismiss()
-            currentBottomSheet = null
-            recreate()
-        }
-    }
-
-    private fun stopLoading(isEnd: Boolean) {
-        isWaitingForDismiss = false
-        lottie.pauseAnimation()
-        loading_text.text = getString(R.string.loading)
-        root.background =
-                if (isDarkTheme) ColorDrawable(Color.BLACK) else ColorDrawable(getColor(
-                    R.color.windowBackground
-                ))
-        createCircularAnimation(isEnd, fragment_container, {
-            fragment_container.visibility = View.VISIBLE
-        }, {
-            loadingState.visibility = View.GONE
-        }, { anim ->
-            val color = if (isDarkTheme) Color.WHITE else Color.BLACK
-            delay((anim.duration * 0.1).toLong())
-            loading_text.setTextColor(color)
-            delay((anim.duration * 0.9).toLong())
-            toolbar_title.setTextColor(color)
-            home.imageTintList = ColorStateList.valueOf(color)
-            menu.imageTintList = ColorStateList.valueOf(color)
-            delay((anim.duration * 0.05).toLong())
-            window.decorView.systemUiVisibility =
-                    if (isDarkTheme) 0 else View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR or
-                            View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-        })?.start()
-        val view = if (isDarkTheme) toolbar_background_dark else toolbar_background_light
-        val color = if (isDarkTheme) getColor(R.color.toolbar_dark) else Color.WHITE
-        createCircularAnimation(isEnd, view, {
-            view.visibility = View.VISIBLE
-        }, {
-            toolbar_background.background =
-                    ColorDrawable(color)
-            view.visibility = View.INVISIBLE
-        }, null)?.start()
-    }
-
-    private fun loadApps() {
-        allApps.clear()
-        allApps.addAll(packageManager.getInstalledPackages(0).map {
-            App(it.packageName, packageManager.getApplicationLabel(it.applicationInfo), it.applicationInfo.flags.and(ApplicationInfo.FLAG_SYSTEM) != 0)
-        })
-        allApps.sortWith(compareBy{it.appName.toString().toLowerCase()})
-        activityCallbacks?.onAppListLoaded(allApps)
-    }
-
-    /**
-     * Creates a circular reveal animation for a given "reveal" view, and optional three listeners
-     * @param animationRevealView The view to reveal
-     * @param startListener Method to invoke from onAnimationStart of the animation
-     * @param endListener Method to invoke from onAnimationStart of the animation
-     * @param asyncTask Suspend function to invoke while animation is running, passes animation object (to be used with arbitrary delays to invert text)
-     */
-    private fun createCircularAnimation(
-        isEnd: Boolean = false,
-        animationRevealView: View,
-        startListener: (() -> Unit)?,
-        endListener: (() -> Unit)?,
-        asyncTask: (suspend (anim: Animator) -> Unit)?
-    ): Animator? {
-        val cx = lottie.x + (lottie.width * (if (isEnd) 0.65 else 0.35))
-        val cy = lottie.y + (lottie.height / 2)
-        val finalRadius = Math.hypot(cx, cy.toDouble())
-        //if(!animationRevealView.isAttachedToWindow) return null
-        val anim = ViewAnimationUtils.createCircularReveal(
-            animationRevealView,
-            cx.toInt(),
-            cy.toInt(),
-            0f,
-            finalRadius.toFloat()
-        )
-        anim.addListener(object : Animator.AnimatorListener {
-            override fun onAnimationRepeat(p0: Animator?) {
-            }
-
-            override fun onAnimationCancel(p0: Animator?) {
-            }
-
-            override fun onAnimationStart(p0: Animator?) {
-                startListener?.invoke()
-            }
-
-            override fun onAnimationEnd(p0: Animator?) {
-                endListener?.invoke()
-            }
-        })
-        uiScope.launch {
-            asyncTask?.invoke(anim)
-        }
-        anim.duration = (anim.duration / 1.25).toLong()
-        return anim
-    }
-}
diff --git a/app/src/main/java/com/kieronquinn/app/darq/activities/ModalFaqActivity.kt b/app/src/main/java/com/kieronquinn/app/darq/activities/ModalFaqActivity.kt
deleted file mode 100644
index 0072474..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/activities/ModalFaqActivity.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.kieronquinn.app.darq.activities
-
-import android.content.res.ColorStateList
-import android.graphics.Color
-import android.os.Bundle
-import android.view.View
-import androidx.appcompat.app.AppCompatActivity
-import com.kieronquinn.app.darq.R
-import com.kieronquinn.app.darq.utils.isDarkTheme
-import kotlinx.android.synthetic.main.activity_modal_faq.*
-
-class ModalFaqActivity : AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val isDarkTheme = isDarkTheme(this)
-        if (isDarkTheme){
-            setTheme(R.style.AppTheme_Dark)
-            window.statusBarColor = getColor(R.color.toolbar_dark)
-            window.decorView.systemUiVisibility = 0
-        }
-        else{
-            setTheme(R.style.AppTheme_Light)
-            window.statusBarColor = getColor(android.R.color.white)
-            window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-        }
-        setContentView(R.layout.activity_modal_faq)
-        if(isDarkTheme) home.imageTintList = ColorStateList.valueOf(Color.WHITE)
-        else home.imageTintList = ColorStateList.valueOf(Color.BLACK)
-        setSupportActionBar(toolbar)
-        supportActionBar?.title = ""
-        home.setImageResource(R.drawable.ic_close)
-        toolbar_title.text = getString(R.string.setting_non_root_faq)
-        home.setOnClickListener { finish() }
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/adapters/AppsAdapter.kt b/app/src/main/java/com/kieronquinn/app/darq/adapters/AppsAdapter.kt
deleted file mode 100644
index 505cd05..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/adapters/AppsAdapter.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.kieronquinn.app.darq.adapters
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.kieronquinn.app.darq.R
-import com.kieronquinn.app.darq.holders.App
-import kotlinx.android.synthetic.main.item_app.view.*
-import com.kieronquinn.app.darq.utils.AppIconRequestHandler
-import android.net.Uri
-import android.widget.CheckBox
-import com.squareup.picasso.Picasso
-
-
-class AppsAdapter(context: Context, var apps : List<App>, private val enabledApps: List<String>, private val checkedChangeListener : (packageName: String, isChecked: Boolean, checkbox: CheckBox) -> Unit) : RecyclerView.Adapter<AppsAdapter.ViewHolder>() {
-
-    private val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(layoutInflater.inflate(R.layout.item_app, parent, false))
-    }
-
-    override fun getItemCount(): Int {
-        return apps.size
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val app = apps[position]
-        holder.itemView.title.text = app.appName
-        val uri = Uri.parse("${AppIconRequestHandler.SCHEME_PNAME}:${app.packageName}")
-        Picasso.get().load(uri).into(holder.itemView.icon)
-        holder.itemView.setOnClickListener {
-            holder.itemView.checkbox.toggle()
-        }
-        holder.itemView.checkbox.setOnCheckedChangeListener(null)
-        holder.itemView.checkbox.isEnabled = true
-        holder.itemView.checkbox.isChecked = enabledApps.contains(app.packageName)
-        holder.itemView.checkbox.setOnCheckedChangeListener { checkbox, isChecked ->
-            checkedChangeListener.invoke(app.packageName, isChecked, checkbox as CheckBox)
-        }
-    }
-
-    class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/components/github/Asset.kt b/app/src/main/java/com/kieronquinn/app/darq/components/github/Asset.kt
new file mode 100644
index 0000000..4cb085d
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/components/github/Asset.kt
@@ -0,0 +1,58 @@
+package com.kieronquinn.app.darq.components.github
+
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+
+class Asset {
+    @SerializedName("url")
+    @Expose
+    var url: String? = null
+
+    @SerializedName("id")
+    @Expose
+    var id: Int? = null
+
+    @SerializedName("node_id")
+    @Expose
+    var nodeId: String? = null
+
+    @SerializedName("name")
+    @Expose
+    var name: String? = null
+
+    @SerializedName("label")
+    @Expose
+    var label: Any? = null
+
+    @SerializedName("uploader")
+    @Expose
+    var uploader: Uploader? = null
+
+    @SerializedName("content_type")
+    @Expose
+    var contentType: String? = null
+
+    @SerializedName("state")
+    @Expose
+    var state: String? = null
+
+    @SerializedName("size")
+    @Expose
+    var size: Int? = null
+
+    @SerializedName("download_count")
+    @Expose
+    var downloadCount: Int? = null
+
+    @SerializedName("created_at")
+    @Expose
+    var createdAt: String? = null
+
+    @SerializedName("updated_at")
+    @Expose
+    var updatedAt: String? = null
+
+    @SerializedName("browser_download_url")
+    @Expose
+    var browserDownloadUrl: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/components/github/Author.kt b/app/src/main/java/com/kieronquinn/app/darq/components/github/Author.kt
new file mode 100644
index 0000000..f3c922f
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/components/github/Author.kt
@@ -0,0 +1,78 @@
+package com.kieronquinn.app.darq.components.github
+
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+
+class Author {
+    @SerializedName("login")
+    @Expose
+    var login: String? = null
+
+    @SerializedName("id")
+    @Expose
+    var id: Int? = null
+
+    @SerializedName("node_id")
+    @Expose
+    var nodeId: String? = null
+
+    @SerializedName("avatar_url")
+    @Expose
+    var avatarUrl: String? = null
+
+    @SerializedName("gravatar_id")
+    @Expose
+    var gravatarId: String? = null
+
+    @SerializedName("url")
+    @Expose
+    var url: String? = null
+
+    @SerializedName("html_url")
+    @Expose
+    var htmlUrl: String? = null
+
+    @SerializedName("followers_url")
+    @Expose
+    var followersUrl: String? = null
+
+    @SerializedName("following_url")
+    @Expose
+    var followingUrl: String? = null
+
+    @SerializedName("gists_url")
+    @Expose
+    var gistsUrl: String? = null
+
+    @SerializedName("starred_url")
+    @Expose
+    var starredUrl: String? = null
+
+    @SerializedName("subscriptions_url")
+    @Expose
+    var subscriptionsUrl: String? = null
+
+    @SerializedName("organizations_url")
+    @Expose
+    var organizationsUrl: String? = null
+
+    @SerializedName("repos_url")
+    @Expose
+    var reposUrl: String? = null
+
+    @SerializedName("events_url")
+    @Expose
+    var eventsUrl: String? = null
+
+    @SerializedName("received_events_url")
+    @Expose
+    var receivedEventsUrl: String? = null
+
+    @SerializedName("type")
+    @Expose
+    var type: String? = null
+
+    @SerializedName("site_admin")
+    @Expose
+    var siteAdmin: Boolean? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/components/github/GitHubReleaseResponse.kt b/app/src/main/java/com/kieronquinn/app/darq/components/github/GitHubReleaseResponse.kt
new file mode 100644
index 0000000..ff99b7f
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/components/github/GitHubReleaseResponse.kt
@@ -0,0 +1,78 @@
+package com.kieronquinn.app.darq.components.github
+
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+
+class GitHubReleaseResponse {
+    @SerializedName("url")
+    @Expose
+    var url: String? = null
+
+    @SerializedName("assets_url")
+    @Expose
+    var assetsUrl: String? = null
+
+    @SerializedName("upload_url")
+    @Expose
+    var uploadUrl: String? = null
+
+    @SerializedName("html_url")
+    @Expose
+    var htmlUrl: String? = null
+
+    @SerializedName("id")
+    @Expose
+    var id: Int? = null
+
+    @SerializedName("node_id")
+    @Expose
+    var nodeId: String? = null
+
+    @SerializedName("tag_name")
+    @Expose
+    var tagName: String? = null
+
+    @SerializedName("target_commitish")
+    @Expose
+    var targetCommitish: String? = null
+
+    @SerializedName("name")
+    @Expose
+    var name: String? = null
+
+    @SerializedName("draft")
+    @Expose
+    var draft: Boolean? = null
+
+    @SerializedName("author")
+    @Expose
+    var author: Author? = null
+
+    @SerializedName("prerelease")
+    @Expose
+    var prerelease: Boolean? = null
+
+    @SerializedName("created_at")
+    @Expose
+    var createdAt: String? = null
+
+    @SerializedName("published_at")
+    @Expose
+    var publishedAt: String? = null
+
+    @SerializedName("assets")
+    @Expose
+    var assets: List<Asset>? = null
+
+    @SerializedName("tarball_url")
+    @Expose
+    var tarballUrl: String? = null
+
+    @SerializedName("zipball_url")
+    @Expose
+    var zipballUrl: String? = null
+
+    @SerializedName("body")
+    @Expose
+    var body: String? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/components/github/UpdateChecker.kt b/app/src/main/java/com/kieronquinn/app/darq/components/github/UpdateChecker.kt
new file mode 100644
index 0000000..b79b2f8
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/components/github/UpdateChecker.kt
@@ -0,0 +1,97 @@
+package com.kieronquinn.app.darq.components.github
+
+import android.content.Context
+import android.os.Parcelable
+import com.kieronquinn.app.darq.BuildConfig
+import kotlinx.android.parcel.Parcelize
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.withContext
+import retrofit2.Call
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import retrofit2.http.GET
+import java.io.File
+
+class UpdateChecker {
+
+    private val retrofit by lazy {
+        Retrofit.Builder()
+            .baseUrl(BASE_URL)
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+    }
+
+    companion object {
+        private const val BASE_URL = "https://api.github.com/repos/KieronQuinn/DarQ/"
+    }
+
+    fun getLatestRelease() = callbackFlow {
+        withContext(Dispatchers.IO){
+            getReleaseList()?.let { gitHubReleaseResponse ->
+                val currentTag = gitHubReleaseResponse.tagName
+                if (currentTag != null && currentTag != BuildConfig.TAG_NAME) {
+                    //New update available!
+                    val asset =
+                        gitHubReleaseResponse.assets?.firstOrNull { it.name?.endsWith(".apk") == true }
+                    val releaseUrl =
+                        asset?.browserDownloadUrl?.replace("/download/", "/tag/")?.apply {
+                            substring(0, lastIndexOf("/"))
+                        }
+                    val name = gitHubReleaseResponse.name ?: run {
+                        this@callbackFlow.trySend(null).isSuccess
+                        return@let
+                    }
+                    val body = gitHubReleaseResponse.body ?: run {
+                        this@callbackFlow.trySend(null).isSuccess
+                        return@let
+                    }
+                    val publishedAt = gitHubReleaseResponse.publishedAt ?: run {
+                        this@callbackFlow.trySend(null).isSuccess
+                        return@let
+                    }
+                    this@callbackFlow.trySend(
+                        Update(
+                            name,
+                            body,
+                            publishedAt,
+                            asset?.browserDownloadUrl
+                                ?: "https://github.com/KieronQuinn/DarQ/releases",
+                            asset?.name ?: "DarQ.apk",
+                            releaseUrl ?: "https://github.com/KieronQuinn/DarQ/releases"
+                        )
+                    ).isSuccess
+                }
+            } ?: run {
+                this@callbackFlow.trySend(null).isSuccess
+            }
+        }
+        awaitClose {  }
+    }
+
+    fun clearCachedDownloads(context: Context){
+        File(context.externalCacheDir, "updates").deleteRecursively()
+    }
+
+    private fun getReleaseList(): GitHubReleaseResponse? {
+        val service: GitHubService = retrofit.create(GitHubService::class.java)
+        runCatching {
+            service.getReleaseList().execute().body()
+        }.onSuccess {
+            return it
+        }.onFailure {
+            return null
+        }
+        return null
+    }
+
+    interface GitHubService {
+        @GET("releases/latest")
+        fun getReleaseList(): Call<GitHubReleaseResponse>
+    }
+
+    @Parcelize
+    data class Update(val name: String, val changelog: String, val timestamp: String, val assetUrl: String, val assetName: String, val releaseUrl: String): Parcelable
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/components/github/Uploader.kt b/app/src/main/java/com/kieronquinn/app/darq/components/github/Uploader.kt
new file mode 100644
index 0000000..6c56eee
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/components/github/Uploader.kt
@@ -0,0 +1,78 @@
+package com.kieronquinn.app.darq.components.github
+
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+
+class Uploader {
+    @SerializedName("login")
+    @Expose
+    var login: String? = null
+
+    @SerializedName("id")
+    @Expose
+    var id: Int? = null
+
+    @SerializedName("node_id")
+    @Expose
+    var nodeId: String? = null
+
+    @SerializedName("avatar_url")
+    @Expose
+    var avatarUrl: String? = null
+
+    @SerializedName("gravatar_id")
+    @Expose
+    var gravatarId: String? = null
+
+    @SerializedName("url")
+    @Expose
+    var url: String? = null
+
+    @SerializedName("html_url")
+    @Expose
+    var htmlUrl: String? = null
+
+    @SerializedName("followers_url")
+    @Expose
+    var followersUrl: String? = null
+
+    @SerializedName("following_url")
+    @Expose
+    var followingUrl: String? = null
+
+    @SerializedName("gists_url")
+    @Expose
+    var gistsUrl: String? = null
+
+    @SerializedName("starred_url")
+    @Expose
+    var starredUrl: String? = null
+
+    @SerializedName("subscriptions_url")
+    @Expose
+    var subscriptionsUrl: String? = null
+
+    @SerializedName("organizations_url")
+    @Expose
+    var organizationsUrl: String? = null
+
+    @SerializedName("repos_url")
+    @Expose
+    var reposUrl: String? = null
+
+    @SerializedName("events_url")
+    @Expose
+    var eventsUrl: String? = null
+
+    @SerializedName("received_events_url")
+    @Expose
+    var receivedEventsUrl: String? = null
+
+    @SerializedName("type")
+    @Expose
+    var type: String? = null
+
+    @SerializedName("site_admin")
+    @Expose
+    var siteAdmin: Boolean? = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/components/navigation/Navigation.kt b/app/src/main/java/com/kieronquinn/app/darq/components/navigation/Navigation.kt
new file mode 100644
index 0000000..6aa1f6e
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/components/navigation/Navigation.kt
@@ -0,0 +1,48 @@
+package com.kieronquinn.app.darq.components.navigation
+
+import androidx.annotation.IdRes
+import androidx.navigation.NavDirections
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+
+abstract class Navigation {
+
+    abstract val navigationBus: Flow<NavigationEvent>
+
+    abstract suspend fun navigate(navDirections: NavDirections)
+    abstract suspend fun navigate(@IdRes id: Int)
+    abstract suspend fun navigateUpTo(@IdRes id: Int, popInclusive: Boolean = false)
+    abstract suspend fun navigateBack()
+
+    sealed class NavigationEvent {
+        data class Directions(val directions: NavDirections): NavigationEvent()
+        data class Id(@IdRes val id: Int): NavigationEvent()
+        data class PopupTo(@IdRes val id: Int, val popInclusive: Boolean): NavigationEvent()
+        object Back: NavigationEvent()
+    }
+
+}
+
+class NavigationImpl: Navigation() {
+
+    private val _navigationBus = MutableSharedFlow<NavigationEvent>()
+    override val navigationBus = _navigationBus.asSharedFlow()
+
+    override suspend fun navigate(id: Int) {
+        _navigationBus.emit(NavigationEvent.Id(id))
+    }
+
+    override suspend fun navigate(navDirections: NavDirections) {
+        _navigationBus.emit(NavigationEvent.Directions(navDirections))
+    }
+
+    override suspend fun navigateBack() {
+        _navigationBus.emit(NavigationEvent.Back)
+    }
+
+    override suspend fun navigateUpTo(id: Int, popInclusive: Boolean) {
+        _navigationBus.emit(NavigationEvent.PopupTo(id, popInclusive))
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/components/settings/AppSharedPreferences.kt b/app/src/main/java/com/kieronquinn/app/darq/components/settings/AppSharedPreferences.kt
new file mode 100644
index 0000000..732e5f9
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/components/settings/AppSharedPreferences.kt
@@ -0,0 +1,133 @@
+package com.kieronquinn.app.darq.components.settings
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.SharedPreferences
+import com.kieronquinn.app.darq.BuildConfig
+import com.kieronquinn.app.darq.model.settings.IPCSetting
+import com.kieronquinn.app.darq.utils.extensions.ReadWriteProperty
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
+import org.json.JSONArray
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+//These calls are from background threads and need to await changes so commit is required
+@SuppressLint("ApplySharedPref")
+class AppSharedPreferences(context: Context): DarqSharedPreferences() {
+
+    override val sharedPreferences: SharedPreferences by lazy {
+        context.getSharedPreferences("${BuildConfig.APPLICATION_ID}_prefs", Context.MODE_PRIVATE)
+    }
+
+    private val _changed = MutableSharedFlow<IPCSetting>()
+    override val changed: Flow<IPCSetting> = _changed.asSharedFlow()
+
+    override fun shared(key: String, default: String) = ReadWriteProperty({
+        sharedPreferences.getString(key, default) ?: default
+    }, {
+        runInBackground {
+            sharedPreferences.edit().putString(key, it).commit()
+            notifyPrefChange(key)
+        }
+    })
+
+    override fun shared(key: String, default: Int) = ReadWriteProperty({
+        sharedPreferences.getInt(key, default)
+    }, {
+        runInBackground {
+            sharedPreferences.edit().putInt(key, it).commit()
+            notifyPrefChange(key)
+        }
+    })
+
+    override fun shared(key: String, default: Boolean) = ReadWriteProperty({
+        sharedPreferences.getBoolean(key, default)
+    }, {
+        runInBackground {
+            sharedPreferences.edit().putBoolean(key, it).commit()
+            notifyPrefChange(key)
+        }
+    })
+
+    //The following two, while their types are supported by SharedPreferences, are not by the SharedPrefsProvider
+
+    override fun shared(key: String, default: Float) = ReadWriteProperty({
+        sharedPreferences.getString(key, default.toString())?.toFloatOrNull() ?: default
+    }, {
+        runInBackground {
+            sharedPreferences.edit().putString(key, it.toString()).commit()
+            notifyPrefChange(key)
+        }
+    })
+
+    override fun shared(key: String, default: Long) = ReadWriteProperty({
+        sharedPreferences.getString(key, default.toString())?.toLongOrNull() ?: default
+    }, {
+        runInBackground {
+            sharedPreferences.edit().putString(key, it.toString()).commit()
+            notifyPrefChange(key)
+        }
+    })
+
+    override fun shared(key: String, default: Double) = ReadWriteProperty({
+        sharedPreferences.getString(key, default.toString())?.toDoubleOrNull() ?: default
+    }, {
+        runInBackground {
+            sharedPreferences.edit().putString(key, it.toString()).commit()
+            notifyPrefChange(key)
+        }
+    })
+
+    override fun sharedJSONArray(key: String): ReadWriteProperty<Any?, Array<String>> = ReadWriteProperty({
+        val rawJson = sharedPreferences.getString(key, "[]") ?: "[]"
+        JSONArray(rawJson).toStringArray()
+    }, {
+        runInBackground {
+            sharedPreferences.edit().putString(key, it.toJSONArray().toString()).commit()
+        }
+    })
+
+    inline fun <reified T : Enum<T>> sharedEnum(key: String, default: Enum<T>): ReadWriteProperty<Any?, T> {
+        return object: ReadWriteProperty<Any?, T> {
+
+            override operator fun getValue(thisRef: Any?, property: KProperty<*>): T {
+                return java.lang.Enum.valueOf(T::class.java, sharedPreferences.getString(key, default.name))
+            }
+
+            override operator fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
+                GlobalScope.launch(Dispatchers.IO) {
+                    sharedPreferences.edit().putString(key, value.name).commit()
+                    notifyPrefChange(key)
+                }
+            }
+
+        }
+    }
+
+    fun notifyPrefChange(key: String){
+        val ipcSetting = getIPCSettingForKey(key) ?: return
+        GlobalScope.launch(Dispatchers.IO) {
+            _changed.emit(ipcSetting)
+        }
+    }
+
+    private fun runInBackground(method: suspend () -> Unit){
+        GlobalScope.launch(Dispatchers.IO) {
+            method.invoke()
+        }
+    }
+
+    private fun Array<String>.toJSONArray(): JSONArray {
+        return JSONArray().apply {
+            this@toJSONArray.forEach {
+                put(it)
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/components/settings/BaseSharedPreferences.kt b/app/src/main/java/com/kieronquinn/app/darq/components/settings/BaseSharedPreferences.kt
new file mode 100644
index 0000000..7633355
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/components/settings/BaseSharedPreferences.kt
@@ -0,0 +1,25 @@
+package com.kieronquinn.app.darq.components.settings
+
+import android.content.SharedPreferences
+import kotlin.properties.ReadWriteProperty
+
+abstract class BaseSharedPreferences {
+
+    abstract fun shared(key: String, default: String): ReadWriteProperty<Any?, String>
+    abstract fun shared(key: String, default: Int): ReadWriteProperty<Any?, Int>
+    abstract fun shared(key: String, default: Boolean): ReadWriteProperty<Any?, Boolean>
+    abstract fun shared(key: String, default: Double): ReadWriteProperty<Any?, Double>
+    abstract fun shared(key: String, default: Long): ReadWriteProperty<Any?, Long>
+    abstract fun shared(key: String, default: Float): ReadWriteProperty<Any?, Float>
+    abstract fun sharedJSONArray(key: String): ReadWriteProperty<Any?, Array<String>>
+
+    inline fun <reified T : Enum<T>> shared(key: String, default: Enum<T>): ReadWriteProperty<Any?, T> {
+        return when(this){
+            is AppSharedPreferences -> sharedEnum(key, default)
+            else -> throw NotImplementedError("Unknown shared prefs type")
+        }
+    }
+
+    abstract val sharedPreferences: SharedPreferences
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/components/settings/DarqSharedPreferences.kt b/app/src/main/java/com/kieronquinn/app/darq/components/settings/DarqSharedPreferences.kt
new file mode 100644
index 0000000..4851b8b
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/components/settings/DarqSharedPreferences.kt
@@ -0,0 +1,72 @@
+package com.kieronquinn.app.darq.components.settings
+
+import com.kieronquinn.app.darq.model.settings.IPCSetting
+import kotlinx.coroutines.flow.Flow
+import org.json.JSONArray
+
+abstract class DarqSharedPreferences: BaseSharedPreferences() {
+
+    companion object {
+
+        private const val KEY_ENABLED = "enabled"
+        private const val DEFAULT_ENABLED = true
+
+        private const val KEY_AUTO_DARK_THEME = "auto_dark_theme"
+        private const val DEFAULT_AUTO_DARK_THEME = false
+
+        private const val KEY_SEND_APP_CLOSES = "send_app_closes"
+        private const val DEFAULT_SEND_APP_CLOSES = false
+
+        private const val KEY_OXYGEN_FORCE_DARK = "oxygen_force_dark"
+        private const val DEFAULT_OXYGEN_FORCE_DARK = false
+
+        private const val KEY_ALWAYS_FORCE_DARK = "always_force_dark"
+        private const val DEFAULT_ALWAYS_FORCE_DARK = false
+
+        private const val KEY_USE_LOCATION = "use_location"
+        private const val DEFAULT_USE_LOCATION = false
+
+        private const val KEY_DEVELOPER_OPTIONS = "developer_options"
+        private const val DEFAULT_DEVELOPER_OPTIONS = false
+
+        private const val KEY_UI_MONET_COLOR = "monet_color"
+
+        private const val KEY_ENABLED_APPS = "enabled_apps"
+
+    }
+
+    abstract val changed: Flow<IPCSetting>
+
+    var enabled by this.shared(KEY_ENABLED, DEFAULT_ENABLED)
+    var autoDarkTheme by this.shared(KEY_AUTO_DARK_THEME, DEFAULT_AUTO_DARK_THEME)
+    var sendAppCloses by this.shared(KEY_SEND_APP_CLOSES, DEFAULT_SEND_APP_CLOSES)
+    var oxygenForceDark by this.shared(KEY_OXYGEN_FORCE_DARK, DEFAULT_OXYGEN_FORCE_DARK)
+    var alwaysForceDark by this.shared(KEY_ALWAYS_FORCE_DARK, DEFAULT_ALWAYS_FORCE_DARK)
+    var useLocation by this.shared(KEY_USE_LOCATION, DEFAULT_USE_LOCATION)
+    var developerOptions by this.shared(KEY_DEVELOPER_OPTIONS, DEFAULT_DEVELOPER_OPTIONS)
+    var monetColor by this.shared(KEY_UI_MONET_COLOR, Integer.MAX_VALUE)
+    var enabledApps by this.sharedJSONArray(KEY_ENABLED_APPS)
+
+    fun getIPCSettingForKey(key: String): IPCSetting? {
+        return when(key){
+            KEY_ENABLED -> IPCSetting(enabled = enabled)
+            KEY_ALWAYS_FORCE_DARK -> IPCSetting(alwaysForceDark = alwaysForceDark)
+            KEY_OXYGEN_FORCE_DARK -> IPCSetting(oxygenForceDark = oxygenForceDark)
+            KEY_SEND_APP_CLOSES -> IPCSetting(sendAppCloses = sendAppCloses)
+            else -> null
+        }
+    }
+
+    fun toIPCSetting(): IPCSetting {
+        return IPCSetting(enabled, oxygenForceDark, alwaysForceDark, sendAppCloses)
+    }
+
+    internal fun JSONArray.toStringArray(): Array<String> {
+        return ArrayList<String>().apply {
+            for (i in 0 until this@toStringArray.length()) {
+                add(this@toStringArray.getString(i))
+            }
+        }.toTypedArray()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/fragments/AppsFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/fragments/AppsFragment.kt
deleted file mode 100644
index d81fd9f..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/fragments/AppsFragment.kt
+++ /dev/null
@@ -1,204 +0,0 @@
-package com.kieronquinn.app.darq.fragments
-
-import android.app.Activity
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.os.Bundle
-import android.view.Gravity
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.inputmethod.EditorInfo
-import android.view.inputmethod.InputMethodManager
-import android.widget.CheckBox
-import android.widget.ImageView
-import android.widget.PopupMenu
-import androidx.core.widget.addTextChangedListener
-import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.kieronquinn.app.darq.BuildConfig
-import com.kieronquinn.app.darq.R
-import com.kieronquinn.app.darq.activities.MainActivity
-import com.kieronquinn.app.darq.adapters.AppsAdapter
-import com.kieronquinn.app.darq.holders.App
-import com.kieronquinn.app.darq.services.DarqBackgroundService
-import com.kieronquinn.app.darq.utils.PreferenceUtils
-import com.kieronquinn.app.darq.utils.sendBroadcast
-import kotlinx.android.synthetic.main.fragment_apps.*
-import kotlinx.coroutines.*
-import java.util.*
-import kotlin.collections.ArrayList
-
-class AppsFragment : Fragment() {
-
-    private val job = Job()
-
-    private val uiScope = CoroutineScope(Dispatchers.Main + job)
-
-    private val preferenceUtils: PreferenceUtils?
-        get() = (activity as? MainActivity)?.preferenceUtils
-
-    private val checkboxHolder = ArrayList<CheckBox>()
-
-    private var shouldShowSystemApps: Boolean = false
-    private var searchTerm: String? = null
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_apps, container, false)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        setHasOptionsMenu(true)
-        context?.let { context ->
-            recyclerView.layoutManager = LinearLayoutManager(context)
-            getApps(shouldShowSystemApps, searchTerm){ apps ->
-                preferenceUtils?.enabledApps?.let {enabledApps ->
-                    swipeRefreshLayout.post {
-                        swipeRefreshLayout.isEnabled = false
-                        swipeRefreshLayout.isRefreshing = true
-                    }
-                    recyclerView.adapter = AppsAdapter(context, apps, enabledApps) { packageName, isChecked, checkbox ->
-                        checkboxHolder.add(checkbox)
-                        checkbox.isEnabled = false
-                        if (isChecked) enabledApps.add(packageName)
-                        else enabledApps.remove(packageName)
-                        preferenceUtils?.saveApps(context, enabledApps)
-                        activity?.sendBroadcast(DarqBackgroundService.REFRESH, Pair(DarqBackgroundService.EXTRA_FORCE_STOP, packageName))
-                    }
-                    recyclerView.adapter?.notifyDataSetChanged()
-                    swipeRefreshLayout.postDelayed({
-                        swipeRefreshLayout.isRefreshing = false
-                    }, 500)
-                }
-            }
-        }
-        searchBox.setOnEditorActionListener { v, actionId, event ->
-            val result = if(actionId == EditorInfo.IME_ACTION_SEARCH){
-                swipeRefreshLayout.isRefreshing = true
-                val imm: InputMethodManager = swipeRefreshLayout.context.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
-                imm.hideSoftInputFromWindow(view.windowToken, 0)
-                getApps(shouldShowSystemApps, searchBox.text.toString()){
-                    searchTerm = searchBox.text.toString()
-                    val adapter = recyclerView.adapter as AppsAdapter
-                    adapter.apps = it
-                    adapter.notifyDataSetChanged()
-                    swipeRefreshLayout.isRefreshing = false
-                    if(it.isEmpty()){
-                        recyclerView.visibility = View.GONE
-                        empty_list.visibility = View.VISIBLE
-                    }else{
-                        recyclerView.visibility = View.VISIBLE
-                        empty_list.visibility = View.GONE
-                    }
-                }
-                true
-            }else false
-            result
-        }
-        searchBox.addTextChangedListener {
-            if(it?.isNotEmpty() == true){
-                search_clear.visibility = View.VISIBLE
-            }else{
-                search_clear.visibility = View.GONE
-            }
-        }
-        search_clear.setOnClickListener {
-            searchTerm = null
-            searchBox.editableText.clear()
-            swipeRefreshLayout.isRefreshing = true
-            val imm: InputMethodManager = swipeRefreshLayout.context.getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
-            imm.hideSoftInputFromWindow(view.windowToken, 0)
-            getApps(shouldShowSystemApps, searchTerm){
-                searchTerm = searchBox.text.toString()
-                val adapter = recyclerView.adapter as AppsAdapter
-                adapter.apps = it
-                adapter.notifyDataSetChanged()
-                swipeRefreshLayout.isRefreshing = false
-                if(it.isEmpty()){
-                    recyclerView.visibility = View.GONE
-                    empty_list.visibility = View.VISIBLE
-                }else{
-                    recyclerView.visibility = View.VISIBLE
-                    empty_list.visibility = View.GONE
-                }
-            }
-        }
-        search_clear.visibility = View.GONE
-    }
-
-    private fun getApps(showSystemApps: Boolean, searchString: String?, callback: ((apps: List<App>) -> Unit)? = null) {
-        getApps()?.let { apps ->
-            uiScope.launch {
-                withContext(Dispatchers.IO) {
-                    val appList = apps.filter {
-                        (!it.isSystemApp || showSystemApps) && (searchString == null || it.appName.toString().toLowerCase(Locale.getDefault()).contains(searchString.toLowerCase(Locale.getDefault()))) && it.packageName != BuildConfig.APPLICATION_ID
-                    }
-                    withContext(Dispatchers.Main){
-                        callback?.invoke(appList)
-                    }
-                }
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        activity?.registerReceiver(reloadListener, IntentFilter(DarqBackgroundService.REFRESH))
-        setupDots()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        activity?.unregisterReceiver(reloadListener)
-    }
-
-    private val reloadListener = object : BroadcastReceiver() {
-        override fun onReceive(context: Context?, intent: Intent?) {
-            for(checkbox in checkboxHolder){
-                checkbox.isEnabled = true
-            }
-        }
-    }
-
-    private fun getApps(): ArrayList<App>? {
-        return (activity as? MainActivity)?.allApps
-    }
-
-    private fun toggleSystemApps(shouldShow: Boolean, callback: (() -> Unit)){
-        swipeRefreshLayout.isRefreshing = true
-        val adapter = recyclerView.adapter as AppsAdapter
-        getApps(shouldShow, searchTerm){
-            adapter.apps = it
-            adapter.notifyDataSetChanged()
-            shouldShowSystemApps = shouldShow
-            swipeRefreshLayout.isRefreshing = false
-            callback.invoke()
-        }
-    }
-
-    private fun setupDots(){
-        val dots = activity?.findViewById<ImageView>(R.id.menu)
-        dots?.let {
-            dots.visibility = View.VISIBLE
-            val popupMenu = PopupMenu(it.context, it)
-            popupMenu.gravity = Gravity.END
-            popupMenu.inflate(R.menu.menu_apps)
-            val checkBox = popupMenu.menu.findItem(R.id.menu_show_system)
-            checkBox.setOnMenuItemClickListener {
-                checkBox.isEnabled = false
-                checkBox.isChecked = !checkBox.isChecked
-                toggleSystemApps(checkBox.isChecked) {
-                    checkBox.isEnabled = true
-                }
-                true
-            }
-            dots.setOnClickListener {
-                popupMenu.show()
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/fragments/BottomSheetFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/fragments/BottomSheetFragment.kt
deleted file mode 100644
index 024122d..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/fragments/BottomSheetFragment.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.kieronquinn.app.darq.fragments
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.LayoutRes
-import androidx.annotation.StringRes
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import com.kieronquinn.app.darq.R
-import com.kieronquinn.app.darq.utils.isDarkTheme
-import kotlinx.android.synthetic.main.bottom_sheet_buttons.*
-
-class BottomSheetFragment : BottomSheetDialogFragment() {
-
-    @LayoutRes
-    var layout: Int? = null
-
-    @StringRes
-    var okLabel : Int? = null
-
-    @StringRes
-    var cancelLabel : Int? = null
-
-    var okListener: (() -> Boolean)? = null
-    var cancelListener: (() -> Boolean)? = null
-    var neutralListener: (() -> Boolean)? = null
-
-    var isSwipeable = false
-
-    var showListener: ((View) -> Unit)? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        isCancelable = isSwipeable
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        layout?.let{
-           return inflater.inflate(it, container, false)
-        }
-        return View(context)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        if(okListener != null){
-            bottom_sheet_ok.visibility = View.VISIBLE
-            bottom_sheet_ok.setOnClickListener {
-                if(okListener?.invoke() == true){
-                    dismiss()
-                }
-            }
-        }
-        if(cancelListener != null){
-            bottom_sheet_cancel.visibility = View.VISIBLE
-            bottom_sheet_cancel.setOnClickListener {
-                if(cancelListener?.invoke() == true){
-                    dismiss()
-                }
-            }
-        }
-        if(neutralListener != null){
-            bottom_sheet_neutral.visibility = View.VISIBLE
-            bottom_sheet_neutral.setOnClickListener {
-                if(neutralListener?.invoke() == true){
-                    dismiss()
-                }
-            }
-        }
-        okLabel?.let {
-            bottom_sheet_ok.text = getString(it)
-        }
-        cancelLabel?.let {
-            bottom_sheet_cancel.text = getString(it)
-        }
-        showListener?.invoke(view)
-    }
-
-    override fun getTheme(): Int {
-        activity?.let {
-            return if(isDarkTheme(it)) R.style.BaseBottomSheetDialog_Dark
-            else R.style.BaseBottomSheetDialog
-        }
-        return R.style.BaseBottomSheetDialog
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): BottomSheetDialog = BottomSheetDialog(requireContext(), theme)
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/fragments/FaqFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/fragments/FaqFragment.kt
deleted file mode 100644
index 140c10a..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/fragments/FaqFragment.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.kieronquinn.app.darq.fragments
-
-import android.os.Bundle
-import android.text.style.ForegroundColorSpan
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.res.ResourcesCompat
-import androidx.fragment.app.Fragment
-import com.kieronquinn.app.darq.R
-import com.kieronquinn.app.darq.utils.getColorResCompat
-import kotlinx.android.synthetic.main.fragment_faq.view.*
-import org.commonmark.node.Heading
-import ru.noties.markwon.AbstractMarkwonPlugin
-import ru.noties.markwon.Markwon
-import ru.noties.markwon.MarkwonSpansFactory
-import ru.noties.markwon.core.MarkwonTheme
-
-
-class FaqFragment : Fragment() {
-
-	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-		return inflater.inflate(R.layout.fragment_faq, container, false)
-	}
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		activity?.let { activity ->
-			val typeface = ResourcesCompat.getFont(activity, R.font.hkgrotesk)
-			val markwon = Markwon.builder(activity).usePlugin(object: AbstractMarkwonPlugin() {
-				override fun configureTheme(builder: MarkwonTheme.Builder) {
-					typeface?.let {
-						builder.headingTypeface(it)
-						builder.headingBreakHeight(0)
-					}
-				}
-
-				override fun configureSpansFactory(builder: MarkwonSpansFactory.Builder) {
-					val origin = builder.requireFactory(Heading::class.java)
-					builder.setFactory(Heading::class.java) { configuration, props ->
-						arrayOf(origin.getSpans(configuration, props), ForegroundColorSpan(activity.getColorResCompat(android.R.attr.textColorPrimary)))
-					}
-				}
-			}).build()
-			val markdown = activity.assets.open("faq.md").bufferedReader().use { it.readText() }
-			markwon.setMarkdown(view.markdown, markdown)
-		}
-
-	}
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/fragments/MainFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/fragments/MainFragment.kt
deleted file mode 100644
index 2acc9f6..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/fragments/MainFragment.kt
+++ /dev/null
@@ -1,249 +0,0 @@
-package com.kieronquinn.app.darq.fragments
-
-import android.Manifest
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.content.pm.PackageManager
-import android.os.Build
-import android.os.Bundle
-import android.os.Handler
-import android.util.Log
-import android.widget.TextView
-import androidx.navigation.fragment.findNavController
-import androidx.preference.Preference.OnPreferenceClickListener
-import androidx.preference.PreferenceFragmentCompat
-import androidx.preference.SwitchPreferenceCompat
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.snackbar.Snackbar
-import com.kieronquinn.app.darq.BuildConfig
-import com.kieronquinn.app.darq.activities.MainActivity
-import com.kieronquinn.app.darq.R
-import com.kieronquinn.app.darq.holders.App
-import com.kieronquinn.app.darq.interfaces.ActivityCallbacks
-import com.kieronquinn.app.darq.preferences.Preference
-import com.kieronquinn.app.darq.preferences.SwitchPreference
-import com.kieronquinn.app.darq.services.DarqBackgroundService
-import com.kieronquinn.app.darq.services.DarqBackgroundService.Companion.BROADCAST_SET_FORCE_DARK_SUCCESS
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import java.util.*
-import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
-import com.kieronquinn.app.darq.activities.ModalFaqActivity
-import com.kieronquinn.app.darq.utils.*
-
-
-class MainFragment : PreferenceFragmentCompat(), ActivityCallbacks {
-
-    private val job = Job()
-
-    val uiScope = CoroutineScope(Dispatchers.Main + job)
-
-    private val onAutoDarkCheckedChangeListener = object: androidx.preference.Preference.OnPreferenceChangeListener {
-        override fun onPreferenceChange(preference: androidx.preference.Preference?, newValue: Any?): Boolean {
-            if(newValue == true) {
-                if (activity?.checkCallingOrSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-                    showAutoDarkBottomSheet(preference as SwitchPreference)
-                    return false
-                }
-            }
-            return true
-        }
-    }
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.main_preferences, rootKey)
-        val darkModePreference = findPreference<SwitchPreferenceCompat>("switch_dark_mode")
-        val forceDarkModePreference = findPreference<SwitchPreferenceCompat>("switch_force_dark_mode")
-        val autoDarkPreference = findPreference<SwitchPreferenceCompat>("switch_auto_night_dark")
-        val oxygenOsPreference = findPreference<SwitchPreferenceCompat>("oxygen_os_toggle")
-        val whiteListPreference = findPreference<Preference>("preference_whitelist")
-        val faqAboutPreference = findPreference<Preference>("preference_faq_about")
-        val debugPreference = findPreference<Preference>("debug")
-        val nonRootFaqPreference = findPreference<Preference>("preference_non_root_faq")
-        (activity as? MainActivity)?.let {
-            it.activityCallbacks = this
-            darkModePreference?.isChecked = isDarkTheme(it)
-            darkModePreference?.onPreferenceClickListener = OnPreferenceClickListener {
-                toggleDarkMode()
-                true
-            }
-            forceDarkModePreference?.isChecked = getIsForceDarkTheme()
-            forceDarkModePreference?.onPreferenceClickListener = OnPreferenceClickListener {
-                toggleForceDarkMode(it as SwitchPreferenceCompat)
-                true
-            }
-            whiteListPreference?.onPreferenceClickListener = OnPreferenceClickListener {
-                findNavController().navigate(R.id.action_mainFragment_to_appsFragment)
-                true
-            }
-            debugPreference?.run {
-                isVisible = BuildConfig.DEBUG
-                setOnPreferenceClickListener {
-                    activity?.let { activity ->
-                        val isEnabled = isDarkTheme(activity)
-                        val intent = Intent()
-                        intent.action = DarqBackgroundService.BROADCAST_TEST
-                        intent.`package` = activity.packageName
-                        activity.sendBroadcast(intent)
-                    }
-                    true
-                }
-            }
-            if(BuildConfig.DEBUG){
-                Handler().postDelayed({
-                    activity?.runOnUiThread {
-                        debugPreference?.summary = "Running as $uid (isRoot $isRoot)"
-                    }
-                },1000)
-            }
-            autoDarkPreference?.onPreferenceChangeListener = onAutoDarkCheckedChangeListener
-            faqAboutPreference?.setOnPreferenceClickListener { preference ->
-                showFaqAbout(preference as Preference)
-                true
-            }
-            oxygenOsPreference?.isVisible = Build.MANUFACTURER == "OnePlus"
-            nonRootFaqPreference?.isVisible = !isRoot
-            if(!isRoot){
-                nonRootFaqPreference?.setOnPreferenceClickListener {
-                    startActivity(Intent(activity, ModalFaqActivity::class.java))
-                    true
-                }
-            }
-        }
-
-    }
-
-    private fun toggleDarkMode() {
-        activity?.let {
-            val isEnabled = isDarkTheme(it)
-            val intent = Intent()
-            intent.action = DarqBackgroundService.BROADCAST_SET_DARK
-            intent.putExtra(DarqBackgroundService.KEY_ENABLED, !isEnabled)
-            intent.`package` = it.packageName
-            it.sendBroadcast(intent)
-        }
-    }
-
-    private fun toggleForceDarkMode(forceDarkModePreference: SwitchPreferenceCompat) {
-        val isEnabled = getIsForceDarkTheme()
-        forceDarkModePreference.isEnabled = false
-        forceDarkModePreference.isChecked = !isEnabled
-        //Register a receiver for success
-        activity?.registerReceiver(object: BroadcastReceiver(){
-            override fun onReceive(p0: Context?, p1: Intent?) {
-                forceDarkModePreference.isEnabled = true
-                forceDarkModePreference.isChecked = getIsForceDarkTheme()
-                activity?.unregisterReceiver(this)
-                showSnackbar(getString(R.string.setting_force_dark_mode_snackbar))
-            }
-
-        }, IntentFilter(BROADCAST_SET_FORCE_DARK_SUCCESS))
-        activity?.let {
-            val intent = Intent()
-            intent.action = DarqBackgroundService.BROADCAST_SET_FORCE_DARK
-            intent.putExtra(DarqBackgroundService.KEY_ENABLED, !isEnabled)
-            intent.`package` = it.packageName
-            it.sendBroadcast(intent)
-        }
-    }
-
-    private fun showAutoDarkBottomSheet(switchPreference: SwitchPreference){
-        val bottomSheetFragment = BottomSheetFragment()
-        bottomSheetFragment.layout = R.layout.bottom_sheet_auto_dark_permission
-        bottomSheetFragment.okLabel = R.string.bottom_sheet_auto_dark_location
-        bottomSheetFragment.cancelLabel = R.string.bottom_sheet_auto_dark_timezone
-        bottomSheetFragment.okListener = {
-            requestPermissions(arrayOf(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_BACKGROUND_LOCATION), 0)
-            true
-        }
-        bottomSheetFragment.cancelListener = {
-            switchPreference.onPreferenceChangeListener = null
-            switchPreference.isChecked = true
-            switchPreference.onPreferenceChangeListener = onAutoDarkCheckedChangeListener
-            true
-        }
-        bottomSheetFragment.neutralListener = {
-            true
-        }
-        bottomSheetFragment.isSwipeable = true
-        bottomSheetFragment.showListener = {
-            it.findViewById<TextView>(android.R.id.content).text = getString(R.string.bottom_sheet_auto_dark_desc, TimeZone.getDefault().id)
-        }
-        bottomSheetFragment.show(childFragmentManager, "bs_auto_dark")
-    }
-
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        if(grantResults.firstOrNull() == PackageManager.PERMISSION_GRANTED) {
-            val autoDarkPreference = findPreference<SwitchPreferenceCompat>("switch_auto_night_dark")
-            autoDarkPreference?.isChecked = true
-        }else{
-            view?.let {
-                Snackbar.make(it, getString(R.string.permission_failed), Snackbar.LENGTH_LONG).show()
-            }
-        }
-    }
-
-    private fun showSnackbar(message: String){
-        view?.let {
-            val snackbar = Snackbar.make(it, message, Snackbar.LENGTH_LONG)
-            val snackBarView = snackbar.view
-            snackBarView.setPadding(snackBarView.paddingLeft, snackBarView.paddingTop, snackBarView.paddingRight, snackBarView.paddingBottom + (MainActivity.navBarHeight ?: 0))
-            snackbar.show()
-        }
-    }
-
-    override fun onAppListLoaded(apps: List<App>) {
-
-    }
-
-    override fun onEnabledAppListLoaded(pNames: List<String>) {
-        refreshEnabledApps(pNames)
-        //Re-apply force dark toggle state (sometimes checks too soon after launch)
-        val forceDarkModePreference = findPreference<SwitchPreferenceCompat>("switch_force_dark_mode")
-        forceDarkModePreference?.isChecked = getIsForceDarkTheme()
-    }
-
-    private fun showFaqAbout(preference: Preference){
-        preference.isVisible = false
-        addPreferencesFromResource(R.xml.faq_about_preferences)
-        context?.let {
-            Links.setupPreference(it, preferenceScreen, "xda_thread", Links.LINK_XDA)
-            Links.setupPreference(it, preferenceScreen, "twitter", Links.LINK_TWITTER)
-            Links.setupPreference(it, preferenceScreen, "donate", Links.LINK_DONATE)
-            Links.setupPreference(it, preferenceScreen, "github", Links.LINK_GITHUB)
-            Links.setupPreference(it, preferenceScreen, "about", Links.LINK_XDA_LABS)
-            val licences = findPreference<Preference>("licences")
-            licences?.onPreferenceClickListener = OnPreferenceClickListener {
-                startActivity(Intent(context, OssLicensesMenuActivity::class.java))
-                true
-            }
-            val faq = findPreference<Preference>("faq")
-            faq?.onPreferenceClickListener = OnPreferenceClickListener {
-                findNavController().navigate(R.id.action_mainFragment_to_faqFragment)
-                true
-            }
-            val about = findPreference<Preference>("about")
-            about?.setSummary(getString(R.string.setting_about_desc, BuildConfig.VERSION_NAME))
-        }
-    }
-
-    private fun refreshEnabledApps(pNames: List<String>){
-        val preference = findPreference<Preference>("preference_whitelist")
-        context?.let {
-            preference?.summary = resources.getQuantityString(R.plurals.setting_whitelist_desc, pNames.size, pNames.size)
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        (activity as? MainActivity)?.preferenceUtils?.enabledApps?.let {
-            refreshEnabledApps(it)
-        }
-        (view as? RecyclerView)?.overScrollMode = RecyclerView.OVER_SCROLL_NEVER
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/fragments/NonRootFaqFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/fragments/NonRootFaqFragment.kt
deleted file mode 100644
index c0f1798..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/fragments/NonRootFaqFragment.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.kieronquinn.app.darq.fragments
-
-import android.os.Bundle
-import android.text.style.ForegroundColorSpan
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.res.ResourcesCompat
-import androidx.fragment.app.Fragment
-import com.kieronquinn.app.darq.R
-import com.kieronquinn.app.darq.utils.getColorResCompat
-import kotlinx.android.synthetic.main.fragment_faq.view.*
-import org.commonmark.node.Heading
-import ru.noties.markwon.AbstractMarkwonPlugin
-import ru.noties.markwon.Markwon
-import ru.noties.markwon.MarkwonSpansFactory
-import ru.noties.markwon.core.MarkwonTheme
-
-
-class NonRootFaqFragment : Fragment() {
-
-	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-		return inflater.inflate(R.layout.fragment_faq, container, false)
-	}
-
-	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-		super.onViewCreated(view, savedInstanceState)
-		activity?.let { activity ->
-			val typeface = ResourcesCompat.getFont(activity, R.font.hkgrotesk)
-			val markwon = Markwon.builder(activity).usePlugin(object: AbstractMarkwonPlugin() {
-				override fun configureTheme(builder: MarkwonTheme.Builder) {
-					typeface?.let {
-						builder.headingTypeface(it)
-						builder.headingBreakHeight(0)
-					}
-				}
-
-				override fun configureSpansFactory(builder: MarkwonSpansFactory.Builder) {
-					val origin = builder.requireFactory(Heading::class.java)
-					builder.setFactory(Heading::class.java) { configuration, props ->
-						arrayOf(origin.getSpans(configuration, props), ForegroundColorSpan(activity.getColorResCompat(android.R.attr.textColorPrimary)))
-					}
-				}
-			}).build()
-			val markdown = activity.assets.open("non-root-faq.md").bufferedReader().use { it.readText() }
-			markwon.setMarkdown(view.markdown, markdown)
-		}
-
-	}
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/holders/App.kt b/app/src/main/java/com/kieronquinn/app/darq/holders/App.kt
deleted file mode 100644
index 6f019b9..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/holders/App.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.kieronquinn.app.darq.holders
-
-data class App(val packageName : String, val appName: CharSequence, val isSystemApp: Boolean)
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/interfaces/ActivityCallbacks.kt b/app/src/main/java/com/kieronquinn/app/darq/interfaces/ActivityCallbacks.kt
deleted file mode 100644
index 27a4ae7..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/interfaces/ActivityCallbacks.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.kieronquinn.app.darq.interfaces
-
-import com.kieronquinn.app.darq.holders.App
-
-interface ActivityCallbacks {
-
-    fun onAppListLoaded(apps : List<App>)
-
-    fun onEnabledAppListLoaded(pNames : List<String>)
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/model/darq/DarqConstants.kt b/app/src/main/java/com/kieronquinn/app/darq/model/darq/DarqConstants.kt
new file mode 100644
index 0000000..5b1e016
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/model/darq/DarqConstants.kt
@@ -0,0 +1,7 @@
+package com.kieronquinn.app.darq.model.darq
+
+object DarqConstants {
+    const val SETTINGS_SECURE_UI_MODE = "ui_night_mode"
+    const val IPC_SYNC_TIMEOUT = 100L
+    const val IPC_SYNC_TIMEOUT_LONG = 200L
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/model/location/LatLng.kt b/app/src/main/java/com/kieronquinn/app/darq/model/location/LatLng.kt
new file mode 100644
index 0000000..d93e32c
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/model/location/LatLng.kt
@@ -0,0 +1,7 @@
+package com.kieronquinn.app.darq.model.location
+
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+data class LatLng(val latitude: Double, val longitude: Double): Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/model/root/RootConstants.kt b/app/src/main/java/com/kieronquinn/app/darq/model/root/RootConstants.kt
new file mode 100644
index 0000000..4dc3d2a
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/model/root/RootConstants.kt
@@ -0,0 +1,5 @@
+package com.kieronquinn.app.darq.model.root
+
+object RootConstants {
+    const val SERVICE_NAME = "root"
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/model/settings/AppPickerItem.kt b/app/src/main/java/com/kieronquinn/app/darq/model/settings/AppPickerItem.kt
new file mode 100644
index 0000000..801d5e9
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/model/settings/AppPickerItem.kt
@@ -0,0 +1,15 @@
+package com.kieronquinn.app.darq.model.settings
+
+sealed class AppPickerItem(open val itemType: AppPickerItemType) {
+    data class App(val packageName: String, val label: CharSequence, var enabled: Boolean): AppPickerItem(AppPickerItemType.APP){
+        fun toIPCSetting(): IPCSetting {
+            return IPCSetting(packageChange = IPCPackageChange(packageName, enabled))
+        }
+    }
+
+    object SnackbarPadding: AppPickerItem(AppPickerItemType.SNACKBAR_PADDING)
+}
+
+enum class AppPickerItemType {
+    APP, SNACKBAR_PADDING
+}
diff --git a/app/src/main/java/com/kieronquinn/app/darq/model/settings/IPCPackageChange.kt b/app/src/main/java/com/kieronquinn/app/darq/model/settings/IPCPackageChange.kt
new file mode 100644
index 0000000..b8bfc0f
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/model/settings/IPCPackageChange.kt
@@ -0,0 +1,11 @@
+package com.kieronquinn.app.darq.model.settings
+
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+data class IPCPackageChange(val packageName: String, val enabled: Boolean): Parcelable {
+    override fun toString(): String {
+        return "IPCPackageChange packageName=$packageName enabled=$enabled"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/model/settings/IPCSetting.kt b/app/src/main/java/com/kieronquinn/app/darq/model/settings/IPCSetting.kt
new file mode 100644
index 0000000..765bb87
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/model/settings/IPCSetting.kt
@@ -0,0 +1,17 @@
+package com.kieronquinn.app.darq.model.settings
+
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+data class IPCSetting(
+    val enabled: Boolean? = null,
+    val oxygenForceDark: Boolean? = null,
+    val alwaysForceDark: Boolean? = null,
+    val sendAppCloses: Boolean? = null,
+    val packageChange: IPCPackageChange? = null
+): Parcelable {
+    override fun toString(): String {
+        return "IPCSetting enabled=$enabled oxygenForceDark=$oxygenForceDark sendAppCloses=$sendAppCloses packageChange=[$packageChange]"
+    }
+}
diff --git a/app/src/main/java/com/kieronquinn/app/darq/model/settings/SettingsItem.kt b/app/src/main/java/com/kieronquinn/app/darq/model/settings/SettingsItem.kt
new file mode 100644
index 0000000..c49f615
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/model/settings/SettingsItem.kt
@@ -0,0 +1,35 @@
+package com.kieronquinn.app.darq.model.settings
+
+import androidx.annotation.DrawableRes
+import kotlin.reflect.KMutableProperty0
+
+sealed class SettingsItem constructor(open val itemType: SettingsItemType, open var visible: () -> Boolean = {true}) {
+    data class Header(val title: String, override var visible: () -> Boolean = {true}): SettingsItem(SettingsItemType.HEADER)
+    data class Setting(
+        @DrawableRes val icon: Int,
+        val title: String,
+        var content: String? = null,
+        override var visible: () -> Boolean = {true},
+        val tapAction: (() -> Unit)? = null
+    ): SettingsItem(SettingsItemType.SETTING)
+    data class SwitchSetting(
+        @DrawableRes val icon: Int,
+        val title: String,
+        var content: String? = null,
+        val setting: KMutableProperty0<Boolean>,
+        override var visible: () -> Boolean = {true},
+        val tapAction: ((Boolean) -> Boolean)? = null
+    ): SettingsItem(SettingsItemType.SWITCH_SETTING)
+    data class AboutSetting(
+        @DrawableRes val icon: Int,
+        val title: String,
+        var content: String? = null,
+        override var visible: () -> Boolean = {true},
+        val tripleTapAction: (() -> Unit)? = null
+    ): SettingsItem(SettingsItemType.ABOUT_SETTING)
+    object SnackbarPadding: SettingsItem(SettingsItemType.SNACKBAR_PADDING)
+}
+
+enum class SettingsItemType {
+    HEADER, SETTING, ABOUT_SETTING, SWITCH_SETTING, SNACKBAR_PADDING
+}
diff --git a/app/src/main/java/com/kieronquinn/app/darq/model/shizuku/ShizukuConstants.kt b/app/src/main/java/com/kieronquinn/app/darq/model/shizuku/ShizukuConstants.kt
new file mode 100644
index 0000000..df92b64
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/model/shizuku/ShizukuConstants.kt
@@ -0,0 +1,9 @@
+package com.kieronquinn.app.darq.model.shizuku
+
+import rikka.shizuku.ShizukuProvider
+
+object ShizukuConstants {
+    const val SERVICE_NAME = "service"
+    const val SHIZUKU_PACKAGE_NAME = ShizukuProvider.MANAGER_APPLICATION_ID
+    const val SHIZUKU_WEB = "https://shizuku.rikka.app/download/"
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/preferences/Preference.kt b/app/src/main/java/com/kieronquinn/app/darq/preferences/Preference.kt
deleted file mode 100644
index 6ea3d27..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/preferences/Preference.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.kieronquinn.app.darq.preferences
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.TextView
-import androidx.core.content.res.ResourcesCompat
-import androidx.preference.PreferenceViewHolder
-import com.kieronquinn.app.darq.R
-
-class Preference : androidx.preference.Preference {
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(
-        context,
-        attrs,
-        defStyleAttr,
-        defStyleRes
-    )
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(
-        context,
-        attrs,
-        defStyleAttr
-    )
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {}
-
-    constructor(context: Context) : super(context) {}
-
-    override fun onBindViewHolder(holder: PreferenceViewHolder?) {
-        super.onBindViewHolder(holder)
-        val titleView = holder?.findViewById(android.R.id.title) as TextView
-        titleView.typeface = ResourcesCompat.getFont(context, R.font.hkgrotesk)
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/preferences/SwitchPreference.kt b/app/src/main/java/com/kieronquinn/app/darq/preferences/SwitchPreference.kt
deleted file mode 100644
index 35bcd4e..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/preferences/SwitchPreference.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.kieronquinn.app.darq.preferences
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.Switch
-import androidx.core.content.res.ResourcesCompat
-import androidx.preference.PreferenceViewHolder
-import androidx.preference.SwitchPreference
-import com.kieronquinn.app.darq.R
-import android.widget.TextView
-import androidx.preference.SwitchPreferenceCompat
-
-
-class SwitchPreference : SwitchPreferenceCompat{
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(
-        context,
-        attrs,
-        defStyleAttr,
-        defStyleRes
-    )
-
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(
-        context,
-        attrs,
-        defStyleAttr
-    )
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {}
-
-    constructor(context: Context) : super(context) {}
-
-    override fun onBindViewHolder(holder: PreferenceViewHolder?) {
-        super.onBindViewHolder(holder)
-        val titleView = holder?.findViewById(android.R.id.title) as TextView
-        titleView.typeface = ResourcesCompat.getFont(context, R.font.hkgrotesk)
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/providers/DarqServiceConnectionProvider.kt b/app/src/main/java/com/kieronquinn/app/darq/providers/DarqServiceConnectionProvider.kt
new file mode 100644
index 0000000..cdb9019
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/providers/DarqServiceConnectionProvider.kt
@@ -0,0 +1,131 @@
+package com.kieronquinn.app.darq.providers
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.content.pm.PackageManager
+import android.os.DeadObjectException
+import android.os.IBinder
+import com.kieronquinn.app.darq.BuildConfig
+import com.kieronquinn.app.darq.IDarqService
+import com.kieronquinn.app.darq.components.settings.DarqSharedPreferences
+import com.kieronquinn.app.darq.model.shizuku.ShizukuConstants
+import com.kieronquinn.app.darq.service.impl.DarqService
+import com.kieronquinn.app.darq.service.root.DarqRootService
+import com.kieronquinn.app.darq.utils.extensions.isShizukuInstalled
+import com.kieronquinn.app.darq.utils.extensions.suspendCoroutineWithTimeout
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.ipc.RootService
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import rikka.shizuku.Shizuku
+import rikka.shizuku.Shizuku.UserServiceArgs
+import kotlin.coroutines.resume
+
+class DarqServiceConnectionProvider(private val context: Context, private val settings: DarqSharedPreferences) {
+
+    companion object {
+        private const val SERVICE_TIMEOUT = 25000L
+    }
+
+    private val rootServiceIntent = Intent(context, DarqRootService::class.java)
+    private var rootService: IDarqService? = null
+    private val serviceLock = Mutex()
+
+    private val darqProcessArgs = UserServiceArgs(ComponentName(context, DarqService::class.java)).apply {
+        processNameSuffix(ShizukuConstants.SERVICE_NAME)
+        debuggable(BuildConfig.DEBUG)
+        version(BuildConfig.VERSION_CODE)
+    }
+
+    sealed class ServiceResult {
+        data class Success(val service: IDarqService, val serviceType: ServiceType): ServiceResult()
+        data class Failed(val reason: ServiceFailureReason): ServiceResult()
+    }
+
+    enum class ServiceFailureReason {
+        TIMEOUT, SHIZUKU_PERMISSION_REQUIRED, SHIZUKU_NOT_STARTED, SHIZUKU_NOT_INSTALLED
+    }
+
+    enum class ServiceType {
+        SHIZUKU, ROOT, UNKNOWN
+    }
+
+    private var serviceType: ServiceType = ServiceType.UNKNOWN
+
+    suspend fun getService(): ServiceResult {
+        return serviceLock.withLock {
+            withContext(Dispatchers.IO) {
+                getServiceLocked() ?: ServiceResult.Failed(ServiceFailureReason.TIMEOUT)
+            }
+        }
+    }
+
+    private suspend fun getServiceLocked() = suspendCoroutineWithTimeout<ServiceResult>(
+        SERVICE_TIMEOUT
+    ) {
+        rootService?.let { service ->
+            try {
+                service.ping()
+                it.resume(ServiceResult.Success(service, serviceType))
+                return@suspendCoroutineWithTimeout
+            }catch (e: DeadObjectException){
+                //Service has died but onServiceDisconnected has not been called, restart as normal
+            }
+        }
+        val serviceConnection = object: ServiceConnection {
+            override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
+                try {
+                    val rootService = IDarqService.Stub.asInterface(service)
+                    rootService.setupService()
+                    this@DarqServiceConnectionProvider.rootService = rootService
+                    it.resume(ServiceResult.Success(rootService, serviceType))
+                }catch (e: DeadObjectException){
+                    it.resume(ServiceResult.Failed(ServiceFailureReason.TIMEOUT))
+                }
+            }
+
+            override fun onServiceDisconnected(name: ComponentName?) {
+                rootService = null
+            }
+        }
+        if (Shell.rootAccess()) {
+            //libsu:service doesn't re-bind so we have to stop & start
+            RootService.stop(rootServiceIntent)
+            RootService.bind(rootServiceIntent, serviceConnection)
+        } else if(context.isShizukuInstalled()) {
+            GlobalScope.launch {
+                runCatching {
+                    if (Shizuku.checkSelfPermission() == PackageManager.PERMISSION_GRANTED) {
+                        Shizuku.bindUserService(darqProcessArgs, serviceConnection)
+                    } else {
+                        it.resume(ServiceResult.Failed(ServiceFailureReason.SHIZUKU_PERMISSION_REQUIRED))
+                    }
+                }.onFailure { e ->
+                    it.resume(ServiceResult.Failed(ServiceFailureReason.SHIZUKU_NOT_STARTED))
+                }
+            }
+        } else {
+            it.resume(ServiceResult.Failed(ServiceFailureReason.SHIZUKU_NOT_INSTALLED))
+        }
+    }
+
+    private fun IDarqService.setupService(){
+        GlobalScope.launch {
+            withContext(Dispatchers.IO){
+                onBind()
+                setupSettings(settings.toIPCSetting())
+                val enabledApps = settings.enabledApps
+                enabledApps.forEachIndexed { index, app ->
+                    setupWhitelist(index == 0, index == enabledApps.size - 1, app)
+                }
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/providers/SharedPrefsProvider.kt b/app/src/main/java/com/kieronquinn/app/darq/providers/SharedPrefsProvider.kt
deleted file mode 100644
index 7da14a1..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/providers/SharedPrefsProvider.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.kieronquinn.app.darq.providers
-
-import android.content.*
-import android.database.Cursor
-import android.database.MatrixCursor
-import android.net.Uri
-import com.kieronquinn.app.darq.utils.PreferenceUtils
-
-//Based off https://code.highspec.ru/Mikanoshi/CustoMIUIzer
-class SharedPrefsProvider : ContentProvider() {
-    var prefs: SharedPreferences? = null
-
-    companion object {
-        const val AUTHORITY = "com.kieronquinn.app.darq.provider.sharedprefs"
-        private val uriMatcher = UriMatcher(UriMatcher.NO_MATCH)
-
-        init {
-            uriMatcher.addURI(AUTHORITY, "string/*/*", 1)
-            uriMatcher.addURI(AUTHORITY, "integer/*/*", 2)
-            uriMatcher.addURI(AUTHORITY, "boolean/*/*", 3)
-        }
-    }
-
-    override fun onCreate(): Boolean {
-        return try {
-            prefs = context!!.getSharedPreferences(PreferenceUtils.SHARED_PREFS_NAME, Context.MODE_PRIVATE)
-            true
-        } catch (throwable: Throwable) {
-            false
-        }
-    }
-
-    override fun query(uri: Uri, projection: Array<String>?, selection: String?, selectionArgs: Array<String>?, sortOrder: String?): Cursor? {
-        val parts = uri.pathSegments
-        val cursor = MatrixCursor(arrayOf("data"))
-        when (uriMatcher.match(uri)) {
-            1 -> {
-                cursor.newRow().add("data", prefs!!.getString(parts[1], parts[2]))
-                return cursor
-            }
-            2 -> {
-                cursor.newRow().add("data", prefs!!.getInt(parts[1], parts[2].toInt()))
-                return cursor
-            }
-            3 -> {
-                cursor.newRow().add("data", if (prefs!!.getBoolean(parts[1], parts[2].toInt() == 1)) 1 else 0)
-                return cursor
-            }
-        }
-        return null
-    }
-
-    override fun getType(uri: Uri): String? {
-        return null
-    }
-
-    override fun insert(uri: Uri, values: ContentValues?): Uri? {
-        return null
-    }
-
-    override fun delete(uri: Uri, selection: String?, selectionArgs: Array<String>?): Int {
-        return 0
-    }
-
-    override fun update(uri: Uri, values: ContentValues?, selection: String?, selectionArgs: Array<String>?): Int {
-        return 0
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/providers/blur/BlurProvider.kt b/app/src/main/java/com/kieronquinn/app/darq/providers/blur/BlurProvider.kt
new file mode 100644
index 0000000..f81a969
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/providers/blur/BlurProvider.kt
@@ -0,0 +1,42 @@
+package com.kieronquinn.app.darq.providers.blur
+
+import android.content.res.Resources
+import android.os.Build
+import android.view.Window
+import android.view.WindowManager
+import androidx.core.os.BuildCompat
+
+abstract class BlurProvider {
+
+    companion object {
+        private fun lerp(start: Float, stop: Float, amount: Float): Float {
+            return start + (stop - start) * amount
+        }
+
+        fun getBlurProvider(resources: Resources): BlurProvider {
+            return when {
+                Build.VERSION.SDK_INT >= 31 || BuildCompat.isAtLeastS() -> BlurProvider31(resources)
+                Build.VERSION.SDK_INT >= 30 -> BlurProvider30(resources)
+                else -> BlurProvider29()
+            }
+        }
+    }
+
+    abstract val minBlurRadius: Float
+    abstract val maxBlurRadius: Float
+
+    abstract fun applyBlur(dialogWindow: Window, appWindow: Window, ratio: Float)
+
+    internal fun Window.clearDimming() {
+        clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+    }
+
+    internal fun Window.addDimming() {
+        addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+    }
+
+    internal fun blurRadiusOfRatio(ratio: Float): Int {
+        return if (ratio == 0.0f) 0 else lerp(minBlurRadius, maxBlurRadius, ratio).toInt()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/providers/blur/BlurProvider29.kt b/app/src/main/java/com/kieronquinn/app/darq/providers/blur/BlurProvider29.kt
new file mode 100644
index 0000000..cee69c8
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/providers/blur/BlurProvider29.kt
@@ -0,0 +1,14 @@
+package com.kieronquinn.app.darq.providers.blur
+
+import android.view.Window
+
+class BlurProvider29: BlurProvider() {
+
+    override val minBlurRadius = 0f
+    override val maxBlurRadius = 0f
+
+    override fun applyBlur(dialogWindow: Window, appWindow: Window, ratio: Float) {
+        dialogWindow.addDimming()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/providers/blur/BlurProvider30.kt b/app/src/main/java/com/kieronquinn/app/darq/providers/blur/BlurProvider30.kt
new file mode 100644
index 0000000..2f117ec
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/providers/blur/BlurProvider30.kt
@@ -0,0 +1,56 @@
+package com.kieronquinn.app.darq.providers.blur
+
+import android.content.res.Resources
+import android.view.SurfaceControl
+import android.view.View
+import android.view.ViewRootImpl
+import android.view.Window
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.utils.SystemProperties
+
+class BlurProvider30(resources: Resources): BlurProvider() {
+
+    private val blurDisabledSysProp by lazy {
+        SystemProperties.getBoolean("persist.sys.sf.disable_blurs", false)
+    }
+
+    private val getViewRootImpl by lazy {
+        try {
+            View::class.java.getMethod("getViewRootImpl")
+        }catch (e: NoSuchMethodException){
+            null
+        }
+    }
+
+    private val setBackgroundBlurRadius by lazy {
+        try {
+            SurfaceControl.Transaction::class.java.getMethod("setBackgroundBlurRadius", SurfaceControl::class.java, Integer.TYPE)
+        }catch (e: NoSuchMethodException) {
+            null
+        }
+    }
+
+    override val maxBlurRadius by lazy {
+        resources.getDimension(R.dimen.max_window_blur_radius)
+    }
+
+    override val minBlurRadius by lazy {
+        resources.getDimension(R.dimen.min_window_blur_radius)
+    }
+
+    override fun applyBlur(dialogWindow: Window, appWindow: Window, ratio: Float) {
+        if(blurDisabledSysProp){
+            return
+        }
+        val radius = blurRadiusOfRatio(ratio)
+        runCatching {
+            dialogWindow.addDimming()
+            val viewRootImpl = getViewRootImpl!!.invoke(dialogWindow.decorView) as ViewRootImpl
+            val surfaceControl = viewRootImpl.surfaceControl
+            val transaction = SurfaceControl.Transaction()
+            val setBackgroundBlurRadiusResult = setBackgroundBlurRadius!!.invoke(transaction, surfaceControl, radius) as SurfaceControl.Transaction
+            setBackgroundBlurRadiusResult.apply()
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/providers/blur/BlurProvider31.kt b/app/src/main/java/com/kieronquinn/app/darq/providers/blur/BlurProvider31.kt
new file mode 100644
index 0000000..5970ccf
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/providers/blur/BlurProvider31.kt
@@ -0,0 +1,31 @@
+package com.kieronquinn.app.darq.providers.blur
+
+import android.annotation.SuppressLint
+import android.content.res.Resources
+import android.graphics.RenderEffect
+import android.graphics.Shader
+import android.view.Window
+import com.kieronquinn.app.darq.R
+
+class BlurProvider31(resources: Resources): BlurProvider() {
+
+    override val minBlurRadius by lazy {
+        resources.getDimensionPixelSize(R.dimen.min_window_blur_radius).toFloat()
+    }
+
+    override val maxBlurRadius by lazy {
+        resources.getDimensionPixelSize(R.dimen.max_window_blur_radius).toFloat()
+    }
+
+    @SuppressLint("NewApi")
+    override fun applyBlur(dialogWindow: Window, appWindow: Window, ratio: Float) {
+        val radius = blurRadiusOfRatio(ratio)
+        if(radius == 0){
+            appWindow.decorView.setRenderEffect(null)
+        }else {
+            val renderEffect = RenderEffect.createBlurEffect(radius.toFloat(), radius.toFloat(), Shader.TileMode.MIRROR)
+            appWindow.decorView.setRenderEffect(renderEffect)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/receivers/BootReceiver.kt b/app/src/main/java/com/kieronquinn/app/darq/receivers/BootReceiver.kt
new file mode 100644
index 0000000..fc30c25
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/receivers/BootReceiver.kt
@@ -0,0 +1,15 @@
+package com.kieronquinn.app.darq.receivers
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.kieronquinn.app.darq.service.boot.BootForegroundService
+
+class BootReceiver: BroadcastReceiver() {
+
+    override fun onReceive(context: Context?, intent: Intent?) {
+        if(context == null || intent?.action != Intent.ACTION_BOOT_COMPLETED) return
+        context.startForegroundService(Intent(context, BootForegroundService::class.java))
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/receivers/SunriseSunsetReceiver.kt b/app/src/main/java/com/kieronquinn/app/darq/receivers/SunriseSunsetReceiver.kt
deleted file mode 100644
index e8e89fe..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/receivers/SunriseSunsetReceiver.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.kieronquinn.app.darq.receivers
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.util.Log
-import com.kieronquinn.app.darq.services.DarqBackgroundService
-
-class SunriseSunsetReceiver : BroadcastReceiver() {
-    override fun onReceive(context: Context?, intent: Intent?) {
-        Log.d("SunriseSunsetReceiver", "Received")
-        intent?.getStringExtra(DarqBackgroundService.EXTRA_ACTION)?.let {
-            Log.d("SunriseSunsetReceiver", "Got $it")
-            val broacastIntent = Intent(it)
-            broacastIntent.`package` = context?.packageName
-            context?.sendBroadcast(broacastIntent)
-            Log.d("SunriseSunsetReceiver", "Broadcast $it sent")
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/root/DarqIPCReceiver.java b/app/src/main/java/com/kieronquinn/app/darq/root/DarqIPCReceiver.java
deleted file mode 100644
index 564bf5b..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/root/DarqIPCReceiver.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package com.kieronquinn.app.darq.root;
-
-import android.annotation.SuppressLint;
-import android.app.UiModeManager;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.graphics.Rect;
-import android.os.IBinder;
-import android.os.Parcel;
-import android.os.RemoteException;
-import android.util.Log;
-
-import com.kieronquinn.app.darq.BuildConfig;
-import com.kieronquinn.app.darq.IDarqIPC;
-import com.kieronquinn.app.darq.utils.ExtensionsKt;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-import eu.chainfire.librootjava.RootIPC;
-import eu.chainfire.librootjava.RootJava;
-import eu.chainfire.libsuperuser.Shell;
-
-import static com.kieronquinn.app.darq.utils.ExtensionsKt.KEY_FORCE_DARK;
-
-public class DarqIPCReceiver {
-
-    public static void main(String[] args) {
-
-        IBinder ipc = new IDarqIPC.Stub() {
-            @Override
-            public void pokeServices() throws RemoteException {
-                Log.d("SystemPropPoker", "pokeServices START");
-                try {
-                    Class serviceManagerClass = Class.forName("android.os.ServiceManager");
-                    String[] services = (String[]) serviceManagerClass.getMethod("listServices").invoke(null);
-                    if (services == null) {
-                        Log.e("SystemPropPoker", "There are no services, how odd");
-                        return;
-                    }
-
-                    int v4;
-                    for (v4 = 0; v4 < services.length; ++v4) {
-                        String v5 = services[v4];
-                        IBinder v6 = (IBinder) serviceManagerClass.getMethod("checkService", String.class).invoke(null, v5);
-                        if (v6 != null) {
-                            Parcel v7 = Parcel.obtain();
-                            try {
-                                v6.transact(0x5F535052, v7, null, 0);
-                                v7.recycle();
-                                Log.i("SystemPropPoker", "Successfully poked service " + v5);
-                            } catch (RemoteException unused_ex) {
-                                v7.recycle();
-                            } catch (Exception v6_1) {
-                                Log.i("SystemPropPoker", "Someone wrote a bad service \'" + v5 + "\' that doesn\'t like to be poked", v6_1);
-                            }
-                        }
-                    }
-                } catch (ClassNotFoundException e) {
-                    e.printStackTrace();
-                } catch (NoSuchMethodException e) {
-                    e.printStackTrace();
-                } catch (IllegalAccessException e) {
-                    e.printStackTrace();
-                } catch (InvocationTargetException e) {
-                    e.printStackTrace();
-                }
-            }
-
-            @Override
-            public void setForceDarkEnabled(boolean enabled) throws RemoteException {
-                Log.d("SetProp", "setprop " + KEY_FORCE_DARK + " " + enabled);
-                Shell.SH.run("setprop " + KEY_FORCE_DARK + " " + enabled);
-                Log.d("DarQ", "isRoot " + Shell.SH.run("whoami") + "isOnePlus " + ExtensionsKt.isOnePlus() + " enabled " + enabled + " is dark theme " + isDarkTheme());
-                if(ExtensionsKt.isOnePlus() && (!enabled || isDarkTheme())){
-                    Shell.SH.run("settings put secure op_force_dark_entire_world " + (enabled ? "1" : "0"));
-                    Shell.SH.run("settings put secure aosp_force_dark_mode " + (enabled ? "1" : "0"));
-                }
-            }
-
-            @SuppressLint("WrongConstant")
-            @Override
-            public void setDarkEnabled(boolean enabled) throws RemoteException {
-                int state = enabled ? 2 : 1;
-                Shell.SH.run("settings put secure ui_night_mode " + state);
-                Context context = RootJava.getSystemContext();
-                //Force a state change by enabling and immediately disabling car mode
-                UiModeManager uiModeManager = (UiModeManager) context.getSystemService(Context.UI_MODE_SERVICE);
-                uiModeManager.enableCarMode(0);
-                uiModeManager.disableCarMode(0);
-            }
-
-            @Override
-            public boolean isForceDarkEnabled() throws RemoteException {
-                return ExtensionsKt.getIsForceDarkTheme();
-            }
-
-            @Override
-            public void forceStopApp(String app) throws RemoteException {
-                Log.d("DarqR", "Force stop " + app);
-                Shell.SH.run("am force-stop " + app);
-            }
-
-            @Override
-            public void hookService() throws RemoteException {
-                /* Below is some broken code for attempting to change the status bar to be in LIGHT mode
-                  (it doesn't work).
-
-
-                try {
-
-                    Log.d("DarqR", "Status bar start");
-
-                    Class IStatusBarStub = Class.forName("com.android.internal.statusbar.IStatusBarService$Stub");
-                    Class IStatusBarProxy = Class.forName("com.android.internal.statusbar.IStatusBarService$Stub$Proxy");
-                    Field sDefaultImpl = IStatusBarProxy.getDeclaredField("sDefaultImpl");
-                    Object IStatusBarStatic = sDefaultImpl.get(null);
-                    Log.d("DarqR", "IStatusBarStatic " + IStatusBarStatic);
-                    Class IStatusBar = Class.forName("com.android.internal.statusbar.IStatusBarService");
-                    Method asInterface = IStatusBarStub.getDeclaredMethod("asInterface", IBinder.class);
-                    Class ServiceManager = Class.forName("android.os.ServiceManager");
-                    Object statusBarService = ServiceManager.getMethod("getService", String.class).invoke(null, "statusbar");
-                    Object StatusBar = asInterface.invoke(IStatusBarStub, statusBarService);
-                    Method setSystemUiVisibility = IStatusBar.getDeclaredMethod("setSystemUiVisibility", int.class, int.class, int.class, String.class);
-                    //setSystemUiVisibility.invoke(StatusBar, 0, View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR, View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR, "");
-                    /*for(Method method : IStatusBar.getDeclaredMethods()){
-                        Log.d("DarqR", method.getName() + " " + method.getParameterTypes());
-                        int x = 0;
-                        for(Class cls : method.getParameterTypes()){
-                            Log.d("DarqR", "--> " + cls.getName() + " " + x);
-                            x++;
-                        }
-                    }
-                    //setSystemUiVisibility(0, View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR, View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR, View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR, View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR, new Rect(), new Rect(), true);
-                    //Context context = RootJava.getSystemContext();
-                    Log.d("DarqR", "Status bar found");
-                } catch (ClassNotFoundException e) {
-                    Log.d("DarqR", "Status bar class not found");
-                    e.printStackTrace();
-                } catch (NoSuchMethodException e) {
-                    Log.d("DarqR", "Status bar method not found " + Log.getStackTraceString(e));
-                    e.printStackTrace();
-                } catch (IllegalAccessException e) {
-                    Log.d("DarqR", "invoke illegal");
-                    e.printStackTrace();
-                } catch (InvocationTargetException e) {
-                    e.printStackTrace();
-                } catch (NoSuchFieldException e) {
-                    Log.d("DarqR", "no such field " + Log.getStackTraceString(e));
-                    e.printStackTrace();
-                }
-                //Object statusbarService = android.server.status.IStatusBar.Stub.asInterface(sm.getService("statusbar"));*/
-
-            }
-
-            @Override
-            public boolean isRoot(){
-                return ExtensionsKt.getUID() == 0;
-            }
-
-            @Override
-            public String getUid(){
-                String uidString = Shell.SH.run("whoami").toString();
-                Log.d("DarQ", "Running as " + uidString);
-                return uidString;
-            }
-        };
-
-        Log.d("SystemPropPoker", "Darq start");
-
-        try {
-            new RootIPC(BuildConfig.APPLICATION_ID, ipc, 0, 30 * 1000, true);
-        } catch (RootIPC.TimeoutException e) {
-            Log.d("SystemPropPoker", "Unable to connect to IPC: timeout");
-        }
-
-    }
-
-    public static boolean isDarkTheme() {
-        return Shell.SH.run("settings get secure ui_night_mode").get(0).equals("2");
-    }
-
-    public static String getLaunchScript(Context context) {
-        try {
-            String path = context.getPackageManager().getApplicationInfo(context.getPackageName(), 0).sourceDir;
-            return "su -c 'CLASSPATH="+path+" app_process /system/bin com.kieronquinn.app.darq.root.DarqIPCReceiver'";
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-        }
-        return "";
-    }
-
-    @NotNull
-    public static List<String> getLaunchShellScript(@NotNull Context context) {
-        return RootJava.getLaunchScript(
-                context,
-                DarqIPCReceiver.class,
-                null,
-                null,
-                null,
-                BuildConfig.APPLICATION_ID + ":root"
-        );
-    }
-}
diff --git a/app/src/main/java/com/kieronquinn/app/darq/service/autodark/DarqAutoDarkForegroundService.kt b/app/src/main/java/com/kieronquinn/app/darq/service/autodark/DarqAutoDarkForegroundService.kt
new file mode 100644
index 0000000..0146ba9
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/service/autodark/DarqAutoDarkForegroundService.kt
@@ -0,0 +1,165 @@
+package com.kieronquinn.app.darq.service.autodark
+
+import android.app.*
+import android.content.Context
+import android.content.Intent
+import androidx.lifecycle.LifecycleService
+import androidx.lifecycle.lifecycleScope
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkManager
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.components.settings.DarqSharedPreferences
+import com.kieronquinn.app.darq.model.location.LatLng
+import com.kieronquinn.app.darq.providers.DarqServiceConnectionProvider
+import com.kieronquinn.app.darq.ui.activities.DarqActivity
+import com.kieronquinn.app.darq.utils.TimeZoneUtils
+import com.kieronquinn.app.darq.work.DarqSunriseSunsetWork
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.koin.android.ext.android.inject
+import org.shredzone.commons.suncalc.SunTimes
+import java.util.*
+import java.util.concurrent.TimeUnit
+
+class DarqAutoDarkForegroundService: LifecycleService() {
+
+    companion object {
+        private const val NOTIFICATION_CHANNEL_AUTO_DARK = "channel_auto_dark"
+        private const val NOTIFICATION_ID_AUTO_DARK = 1003
+        const val KEY_ENABLE_DARK = "enable_dark"
+        const val KEY_JUST_RESCHEDULE = "just_reschedule"
+    }
+
+    private val notificationManager by lazy {
+        getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+    }
+
+    private val launchIntent by lazy {
+        Intent(this, DarqActivity::class.java).let { notificationIntent ->
+            PendingIntent.getActivity(this, 0, notificationIntent, 0)
+        }
+    }
+
+    private val workManager by lazy {
+        WorkManager.getInstance(this)
+    }
+
+    private val serviceProvider by inject<DarqServiceConnectionProvider>()
+    private val settings by inject<DarqSharedPreferences>()
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(
+                NOTIFICATION_CHANNEL_AUTO_DARK,
+                getString(R.string.notification_channel_boot_auto_dark_title),
+                NotificationManager.IMPORTANCE_LOW
+            ).apply {
+                this.description = getString(R.string.notification_channel_boot_auto_dark_description)
+            })
+
+        val justReschedule = intent?.getBooleanExtra(KEY_JUST_RESCHEDULE, false) ?: false
+        val notificationContent = if(justReschedule){
+            R.string.auto_dark_foreground_notification_content_changes
+        }else{
+            R.string.auto_dark_foreground_notification_content
+        }
+
+        val notification: Notification =
+            Notification.Builder(this, NOTIFICATION_CHANNEL_AUTO_DARK)
+                .setContentTitle(getText(R.string.auto_dark_foreground_notification_title))
+                .setContentText(getText(notificationContent))
+                .setSmallIcon(R.drawable.ic_notification)
+                .setContentIntent(launchIntent)
+                .setTicker(getText(notificationContent))
+                .build()
+
+        startForeground(NOTIFICATION_ID_AUTO_DARK, notification)
+
+        lifecycleScope.launchWhenCreated {
+            if(!justReschedule) {
+                val enableDark = intent?.getBooleanExtra(KEY_ENABLE_DARK, false) ?: false
+                setDarkModeEnabled(enableDark)
+            }
+            val nextTriggerTimes = getNextTriggerTimes()
+            if(nextTriggerTimes != null) {
+                cancelAndScheduleWork(nextTriggerTimes)
+            }
+            stopForeground(true)
+            stopSelf()
+        }
+
+        return super.onStartCommand(intent, flags, startId)
+    }
+
+    private suspend fun setDarkModeEnabled(enabled: Boolean) = withContext(Dispatchers.IO) {
+        val service = serviceProvider.getService()
+        if(service is DarqServiceConnectionProvider.ServiceResult.Success){
+            service.service.setNightMode(enabled)
+        }else{
+            showFailedNotification()
+        }
+    }
+
+    private suspend fun getNextTriggerTimes(): SunTimes? = withContext(Dispatchers.IO){
+        val latLng = if(settings.useLocation){
+            val service = serviceProvider.getService()
+            if(service is DarqServiceConnectionProvider.ServiceResult.Success){
+                service.service.location ?: getTimezoneLocation() ?: return@withContext null
+            }else getTimezoneLocation() ?: return@withContext null
+        }else getTimezoneLocation() ?: return@withContext null
+        SunTimes.compute().on(Calendar.getInstance()).at(latLng.latitude, latLng.longitude).execute()
+    }
+
+    /**
+     *  Gets the user's country location using their timezone. This is nowhere near accurate for
+     *  location use, but is good *enough* for sunrise / sunset
+     */
+    private fun getTimezoneLocation(): LatLng? {
+        return TimeZoneUtils.getLatLngForTimezone(this, TimeZone.getDefault())
+    }
+
+    /**
+     *  Schedules the sunrise/sunset work for a given set of SunTimes
+     *  This gets called every sunrise/sunset, somewhat counterintuitively, but that way it
+     *  will stay at least semi-up-to-date for location changes (ie. only one sunrise/sunset would
+     *  be out if the user changes timezones)
+     */
+    private fun cancelAndScheduleWork(sunTimes: SunTimes){
+        workManager.cancelAllWorkByTag(DarqSunriseSunsetWork.TAG_SUNSET)
+        workManager.cancelAllWorkByTag(DarqSunriseSunsetWork.TAG_SUNRISE)
+        if(settings.autoDarkTheme) {
+            val now = System.currentTimeMillis()
+            val sunriseTime = sunTimes.rise?.time
+            val sunsetTime = sunTimes.set?.time
+            if (sunriseTime != null) {
+                val sunriseDelay = sunriseTime - now
+                val sunriseWork = OneTimeWorkRequestBuilder<DarqSunriseSunsetWork>()
+                    .setInitialDelay(sunriseDelay, TimeUnit.MILLISECONDS)
+                    .addTag(DarqSunriseSunsetWork.TAG_SUNRISE).build()
+                workManager.enqueue(sunriseWork)
+            }
+            if (sunsetTime != null) {
+                val sunsetDelay = sunsetTime - now
+                val sunsetWork = OneTimeWorkRequestBuilder<DarqSunriseSunsetWork>()
+                    .setInitialDelay(sunsetDelay, TimeUnit.MILLISECONDS)
+                    .addTag(DarqSunriseSunsetWork.TAG_SUNSET).build()
+                workManager.enqueue(sunsetWork)
+            }
+        }
+    }
+
+    private fun showFailedNotification() {
+        val notification: Notification =
+            Notification.Builder(this, NOTIFICATION_CHANNEL_AUTO_DARK)
+                .setContentTitle(getText(R.string.auto_dark_foreground_notification_failed_title))
+                .setContentText(getText(R.string.auto_dark_foreground_notification_failed_content))
+                .setSmallIcon(R.drawable.ic_notification)
+                .setContentIntent(launchIntent)
+                .setAutoCancel(true)
+                .setStyle(Notification.BigTextStyle().bigText(getString(R.string.auto_dark_foreground_notification_failed_content)))
+                .setTicker(getText(R.string.auto_dark_foreground_notification_failed_content))
+                .build()
+        notificationManager.notify(NOTIFICATION_ID_AUTO_DARK, notification)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/service/boot/BootForegroundService.kt b/app/src/main/java/com/kieronquinn/app/darq/service/boot/BootForegroundService.kt
new file mode 100644
index 0000000..432cfe4
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/service/boot/BootForegroundService.kt
@@ -0,0 +1,124 @@
+package com.kieronquinn.app.darq.service.boot
+
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import androidx.lifecycle.LifecycleService
+import androidx.lifecycle.lifecycleScope
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.model.shizuku.ShizukuConstants
+import com.kieronquinn.app.darq.providers.DarqServiceConnectionProvider
+import com.kieronquinn.app.darq.ui.activities.DarqActivity
+import org.koin.android.ext.android.inject
+
+class BootForegroundService : LifecycleService() {
+
+    companion object {
+        private const val NOTIFICATION_CHANNEL_BOOT_STARTUP = "channel_startup"
+        private const val NOTIFICATION_ID_STARTUP = 1001
+        private const val NOTIFICATION_ID_STARTUP_FAILED = 1002
+    }
+
+    private val notificationManager by lazy {
+        getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+    }
+
+    private val connectionProvider by inject<DarqServiceConnectionProvider>()
+
+    private val launchIntent by lazy {
+        Intent(this, DarqActivity::class.java).let { notificationIntent ->
+            PendingIntent.getActivity(this, 0, notificationIntent, 0)
+        }
+    }
+
+    private val shizukuLaunchIntent by lazy {
+        Intent(packageManager.getLaunchIntentForPackage(ShizukuConstants.SHIZUKU_PACKAGE_NAME)).let { notificationIntent ->
+            PendingIntent.getActivity(this, 0, notificationIntent, 0)
+        }
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        notificationManager.createNotificationChannel(
+            NotificationChannel(
+                NOTIFICATION_CHANNEL_BOOT_STARTUP,
+                getString(R.string.notification_channel_boot_startup_title),
+                NotificationManager.IMPORTANCE_LOW
+            ).apply {
+                this.description = getString(R.string.notification_channel_boot_startup_description)
+            })
+
+        val notification: Notification =
+            Notification.Builder(this, NOTIFICATION_CHANNEL_BOOT_STARTUP)
+                .setContentTitle(getText(R.string.boot_foreground_service_notification_title))
+                .setContentText(getText(R.string.boot_foreground_service_notification_content))
+                .setSmallIcon(R.drawable.ic_notification)
+                .setContentIntent(launchIntent)
+                .setTicker(getText(R.string.boot_foreground_service_notification_content))
+                .build()
+
+        startForeground(NOTIFICATION_ID_STARTUP, notification)
+
+        lifecycleScope.launchWhenCreated {
+            val result = connectionProvider.getService()
+            if (result.isFailure) {
+                //Failed to start
+                showFailedNotification()
+            } else {
+                if (result is DarqServiceConnectionProvider.ServiceResult.Failed &&
+                    result.reason == DarqServiceConnectionProvider.ServiceFailureReason.SHIZUKU_NOT_STARTED) {
+                    showShizukuNotification()
+                }
+            }
+            stopForeground(true)
+            stopSelf()
+        }
+        return super.onStartCommand(intent, flags, startId)
+    }
+
+    private fun showFailedNotification() {
+        val notification: Notification =
+            Notification.Builder(this, NOTIFICATION_CHANNEL_BOOT_STARTUP)
+                .setContentTitle(getText(R.string.boot_foreground_service_notification_failed_title))
+                .setContentText(getText(R.string.boot_foreground_service_notification_failed_content))
+                .setSmallIcon(R.drawable.ic_notification)
+                .setContentIntent(launchIntent)
+                .setAutoCancel(true)
+                .setStyle(Notification.BigTextStyle().bigText(getString(R.string.boot_foreground_service_notification_failed_content)))
+                .setTicker(getText(R.string.boot_foreground_service_notification_failed_content))
+                .build()
+        notificationManager.notify(NOTIFICATION_ID_STARTUP_FAILED, notification)
+    }
+
+    private fun showShizukuNotification() {
+        val notification: Notification =
+            Notification.Builder(this, NOTIFICATION_CHANNEL_BOOT_STARTUP)
+                .setContentTitle(getText(R.string.boot_foreground_service_notification_shizuku_title))
+                .setContentText(getText(R.string.boot_foreground_service_notification_shizuku_content))
+                .setSmallIcon(R.drawable.ic_notification)
+                .setContentIntent(shizukuLaunchIntent)
+                .setAutoCancel(true)
+                .setStyle(Notification.BigTextStyle().bigText(getString(R.string.boot_foreground_service_notification_shizuku_content)))
+                .setTicker(getText(R.string.boot_foreground_service_notification_shizuku_content))
+                .build()
+        notificationManager.notify(NOTIFICATION_ID_STARTUP_FAILED, notification)
+    }
+
+    private val DarqServiceConnectionProvider.ServiceResult.isFailure: Boolean
+        get() {
+            return when (this) {
+                is DarqServiceConnectionProvider.ServiceResult.Success -> false
+                is DarqServiceConnectionProvider.ServiceResult.Failed -> {
+                    when (reason) {
+                        DarqServiceConnectionProvider.ServiceFailureReason.TIMEOUT,
+                        DarqServiceConnectionProvider.ServiceFailureReason.SHIZUKU_PERMISSION_REQUIRED,
+                        DarqServiceConnectionProvider.ServiceFailureReason.SHIZUKU_NOT_INSTALLED -> true
+                        DarqServiceConnectionProvider.ServiceFailureReason.SHIZUKU_NOT_STARTED -> false
+                    }
+                }
+            }
+        }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/service/impl/DarqService.kt b/app/src/main/java/com/kieronquinn/app/darq/service/impl/DarqService.kt
new file mode 100644
index 0000000..ba4b364
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/service/impl/DarqService.kt
@@ -0,0 +1,367 @@
+package com.kieronquinn.app.darq.service.impl
+
+import android.annotation.SuppressLint
+import android.app.IActivityManager
+import android.app.IProcessObserver
+import android.app.IUiModeManager
+import android.content.ComponentName
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.content.pm.ResolveInfo
+import android.content.res.Resources
+import android.location.ILocationManager
+import android.location.Location
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ServiceLifecycleDispatcher
+import androidx.lifecycle.lifecycleScope
+import com.kieronquinn.app.darq.BuildConfig
+import com.kieronquinn.app.darq.IDarqService
+import com.kieronquinn.app.darq.model.location.LatLng
+import com.kieronquinn.app.darq.model.root.RootConstants
+import com.kieronquinn.app.darq.model.settings.IPCSetting
+import com.kieronquinn.app.darq.model.shizuku.ShizukuConstants
+import com.kieronquinn.app.darq.providers.DarqServiceConnectionProvider
+import com.kieronquinn.app.darq.utils.SystemProperties
+import com.topjohnwu.superuser.internal.Utils
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.launch
+import rikka.shizuku.SystemServiceHelper
+import kotlin.streams.toList
+import kotlin.system.exitProcess
+
+
+@SuppressLint("RestrictedApi")
+class DarqService(private val serviceType: DarqServiceConnectionProvider.ServiceType = DarqServiceConnectionProvider.ServiceType.SHIZUKU) : IDarqService.Stub(), LifecycleOwner {
+
+    companion object {
+        private const val TAG = "DarQService"
+        private const val FORCE_DARK_PROP = "debug.hwui.force_dark"
+        private const val OXYGEN_OS_WORLD_FORCE_DARK = "op_force_dark_entire_world"
+        private const val OXYGEN_OS_AOSP_FORCE_DARK = "aosp_force_dark_mode"
+        private const val SHIZUKU_SERVICE_ID = "${BuildConfig.APPLICATION_ID}:${ShizukuConstants.SERVICE_NAME}"
+        private const val ROOT_SERVICE_ID = "${BuildConfig.APPLICATION_ID}:${RootConstants.SERVICE_NAME}"
+    }
+
+    private var isEnabled = true
+    private var isAlwaysForceDarkEnabled = false
+    private var isOxygenForceDarkEnabled = false
+    private val appWhitelist = emptySet<String>().toMutableSet()
+    private var tempAppList = emptyList<String>().toMutableList()
+    private var currentApp = MutableStateFlow<String?>(null)
+
+    private val mDispatcher by lazy {
+        ServiceLifecycleDispatcher(this)
+    }
+
+    override fun getLifecycle(): Lifecycle {
+        return mDispatcher.lifecycle
+    }
+
+    //Whether to send `null` when an app is closed and no new one is opened (causes more incorrect Force Dark changes)
+    private var sendAppCloses = false
+
+    //This is the "current application" context, in this case the system context. It's only used to query PackageManager.
+    private val context by lazy {
+        Utils.getContext()
+    }
+
+    //This is the internal ActivityManager via SystemServiceHelper
+    private val activityManager by lazy {
+        val activityManagerProxy = SystemServiceHelper.getSystemService("activity")
+        IActivityManager.Stub.asInterface(activityManagerProxy)
+    }
+
+    private val uiModeManager by lazy {
+        val uiModeManagerProxy = SystemServiceHelper.getSystemService("uimode")
+        IUiModeManager.Stub.asInterface(uiModeManagerProxy)
+    }
+
+    private val locationManager by lazy {
+        val locationManagerProxy = SystemServiceHelper.getSystemService("location")
+        ILocationManager.Stub.asInterface(locationManagerProxy)
+    }
+
+    //Packages to ignore foreground changes to. These include the launcher, recents provider and android itself.
+    private val ignoredPackages = arrayOf("android", "com.android.systemui", getLauncherPackage(), getQuickstepPackage()).distinct().filterNotNull()
+
+    init {
+        mDispatcher.onServicePreSuperOnCreate()
+        mDispatcher.onServicePreSuperOnStart()
+    }
+
+    /**
+     *  Called from DarqServiceConnectionProvider when the service is bound to
+     */
+    override fun onBind() {
+        Handler(Looper.getMainLooper()).post {
+            mDispatcher.onServicePreSuperOnBind()
+        }
+        lifecycleScope.launch {
+            currentApp.collect {
+                if(it == null && !sendAppCloses) return@collect
+                setForceDarkEnabled(appWhitelist.contains(it))
+            }
+
+        }
+        registerProcessObserver()
+    }
+
+
+    /**
+     *  Called for each whitelisted app when the service is started (Binder limit is 1Mb so it
+     *  has to be split for users with huge app lists)
+     */
+    override fun setupWhitelist(isStart: Boolean, isEnd: Boolean, packageName: String) {
+        if(isStart){
+            tempAppList.clear()
+        }
+        tempAppList.add(packageName)
+        if(isEnd){
+            appWhitelist.clear()
+            appWhitelist.addAll(tempAppList)
+            tempAppList.clear()
+        }
+    }
+
+    /**
+     *  Setup with a given IPCSetting object. All the fields should be non-null here, except packageChange as that
+     *  is handled separately.
+     */
+    override fun setupSettings(ipcSetting: IPCSetting) {
+        if(ipcSetting.enabled != null) {
+            isEnabled = ipcSetting.enabled
+        }
+        if(ipcSetting.alwaysForceDark != null) {
+            isAlwaysForceDarkEnabled = ipcSetting.alwaysForceDark
+            if(isAlwaysForceDarkEnabled){
+                setForceDarkEnabled(true)
+            }
+        }
+        if(ipcSetting.oxygenForceDark != null) {
+            isOxygenForceDarkEnabled = ipcSetting.oxygenForceDark
+            setOxygenOSEntireWorldEnabled(isOxygenForceDarkEnabled)
+        }
+        if(ipcSetting.sendAppCloses != null) sendAppCloses = ipcSetting.sendAppCloses
+    }
+
+    /**
+     *  Settings change from the settings UI. This will only be called after the service is set up and the app is running
+     *  Only one of the fields should be non-null
+     */
+    override fun notifySettingsChange(ipcSetting: IPCSetting) {
+        when {
+            ipcSetting.enabled != null -> {
+                isEnabled = ipcSetting.enabled
+                if(!isEnabled) {
+                    setForceDarkEnabled(false)
+                }else{
+                    setForceDarkEnabled(isAlwaysForceDarkEnabled)
+                }
+            }
+            ipcSetting.alwaysForceDark != null -> {
+                isAlwaysForceDarkEnabled = ipcSetting.alwaysForceDark
+                setForceDarkEnabled(isAlwaysForceDarkEnabled)
+            }
+            ipcSetting.oxygenForceDark != null -> {
+                isOxygenForceDarkEnabled = ipcSetting.oxygenForceDark
+                setOxygenOSEntireWorldEnabled(isOxygenForceDarkEnabled)
+            }
+            ipcSetting.sendAppCloses != null -> sendAppCloses = ipcSetting.sendAppCloses
+            ipcSetting.packageChange != null -> {
+                with(ipcSetting.packageChange){
+                    if(enabled) appWhitelist.add(packageName)
+                    else appWhitelist.remove(packageName)
+                }
+            }
+        }
+    }
+
+    /**
+     *  Sets Force Dark to a given value using the reflected SystemProperties rather than a shell
+     *  command (for speed)
+     */
+    private fun setForceDarkEnabled(enabled: Boolean) {
+        val currentValue = SystemProperties[FORCE_DARK_PROP]?.toBoolean() ?: false
+        if(currentValue == enabled) return
+        SystemProperties[FORCE_DARK_PROP] = enabled.toString()
+    }
+
+    /**
+     *  Sets the Oxygen OS "entire world" force dark Settings.Secure setting
+     *  This only seems to be used in Oxygen OS 10 and does nothing in 11
+     */
+    private fun setOxygenOSEntireWorldEnabled(enabled: Boolean){
+        val enabledString = if(enabled) "1" else "0"
+        val commands = arrayOf(OXYGEN_OS_WORLD_FORCE_DARK, OXYGEN_OS_AOSP_FORCE_DARK).map { "settings put secure $it $enabledString" }
+        runCommands(*commands.toTypedArray())
+    }
+
+    /**
+     *  Registers a Process Observer via IActivityManager - to the system Activity Manager service.
+     *  The magic here is Shizuku's SystemServiceHelper, which uses reflection to get the system
+     *  service, which we can then use registerProcessObserver() on and note the callbacks to
+     *  onForegroundActivitiesChanged(), where foregroundActivities = true when an app is opened.
+     */
+    private val processObserver = object : IProcessObserver.Stub() {
+        override fun onForegroundActivitiesChanged(pid: Int, uid: Int, foregroundActivities: Boolean) {
+            if(!isEnabled || isAlwaysForceDarkEnabled) return
+            val packageName = activityManager.getPackageNameForPid(pid) ?: return
+            if(ignoredPackages.contains(packageName)) return
+            if(foregroundActivities){
+                //New app open
+                currentApp.tryEmit(packageName)
+            }else if(!foregroundActivities && sendAppCloses && packageName == currentApp.value){
+                //App closed & user has chosen to send app closes
+                currentApp.tryEmit(null)
+            }
+        }
+
+        override fun onForegroundServicesChanged(pid: Int, uid: Int, serviceTypes: Int) {
+            //Don't care
+        }
+
+        override fun onProcessDied(pid: Int, uid: Int) {
+            //Don't care
+        }
+    }
+
+    private fun registerProcessObserver() {
+        activityManager.unregisterProcessObserver(processObserver)
+        activityManager.registerProcessObserver(processObserver)
+    }
+
+    /**
+     *  Called by Shizuku - NOT by libsu though. Clean up what we can nicely.
+     *  libsu will simply kill the process as part of the restart
+     */
+    override fun destroy() {
+        activityManager.unregisterProcessObserver(processObserver)
+        mDispatcher.onServicePreSuperOnDestroy()
+        exitProcess(0)
+    }
+
+    /**
+     *  Finds a given PID in the running apps and returns its process name, which seems to be the
+     *  package name.
+     */
+    private fun IActivityManager.getPackageNameForPid(pid: Int): String? {
+        val rawName = runningAppProcesses.find { it.pid == pid }?.processName
+        return if(rawName?.contains(":") == true){
+            rawName.substring(0, rawName.indexOf(":"))
+        }else rawName
+    }
+
+    /**
+     *  Kills all other processes of either the :root or the :service IPCs.
+     *  This is done by reading the whole list of processes, printing the PID and names,
+     *  filtering the list by those that are the :root or :service processes, and killing the
+     *  given pid using `kill`. If no other processes are found, nothing is killed.
+     */
+    override fun killOtherInstances(){
+        val myPid = android.os.Process.myPid()
+        val processesByName = runCommand("ps -A -o PID,NAME")
+        //Find just my processes & retrieve the PIDs that don't match our own
+        val otherPids = processesByName.map { it.trim() }
+            .filter { it.endsWith(SHIZUKU_SERVICE_ID) || it.endsWith(ROOT_SERVICE_ID) }
+            .mapNotNull {
+                val split = it.split(" ")
+                val pid = split[0]
+                val name = split[1]
+                if (name == SHIZUKU_SERVICE_ID || name == ROOT_SERVICE_ID) pid.toIntOrNull() else null
+            }.filterNot { it == myPid }
+        if (otherPids.isEmpty()) {
+            return
+        }
+        val killCommands = otherPids.map { "kill $it" }
+        runCommands(*killCommands.toTypedArray())
+    }
+
+    /**
+     *  Gets the device's last location, this is ONLY used with user consent.
+     */
+    override fun getLocation(): LatLng? {
+        return try {
+            val location = if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R){
+                locationManager.getLastLocation(null, BuildConfig.APPLICATION_ID, "darq") ?: return null
+            }else{
+                val locationRequestClass = Class.forName("android.location.LocationRequest")
+                val lastLocationMethod = locationManager::class.java.getMethod("getLastLocation", locationRequestClass, String::class.java)
+                val location = lastLocationMethod.invoke(locationManager, null, BuildConfig.APPLICATION_ID) as? Location
+                location ?: return null
+            }
+            return LatLng(location.latitude, location.longitude)
+        }catch (e: Exception){
+            null
+        }
+    }
+
+    /**
+     *  Sets the night mode using UiModeManager
+     */
+    override fun setNightMode(nightMode: Boolean) {
+        @Suppress("UsePropertyAccessSyntax")
+        uiModeManager.setNightMode(if(nightMode) 2 else 1)
+    }
+
+    /**
+     *  Runs a given command *without root*, wrapping it in `sh` and returning the output lines
+     */
+    private fun runCommand(command: String): List<String> {
+        ProcessBuilder().command("sh", "-c", command).start().run {
+            val lines = inputStream.bufferedReader().lines().toList()
+            destroy()
+            return lines
+        }
+    }
+
+    /**
+     *  Runs a set of commands, wrapping each in `sh`, ignoring output
+     */
+    private fun runCommands(vararg commands: String) {
+        ProcessBuilder().run {
+            commands.forEach {
+                command("sh", "-c", it).start().waitFor()
+            }
+        }
+    }
+
+    /**
+     *  Gets the default "Home" app if set, or null if not. We don't want to apply force dark to
+     *  the home app, and don't want to disable/enable it when Home is briefly visible for speed.
+     */
+    private fun getLauncherPackage(): String? {
+        val intent = Intent(Intent.ACTION_MAIN)
+        intent.addCategory(Intent.CATEGORY_HOME)
+        val resolveInfo: ResolveInfo = context.packageManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY) ?: return null
+        return resolveInfo.activityInfo.packageName
+    }
+
+    /**
+     *  Gets the "Quickstep" (recents) package the device is using, so we don't apply changes to
+     *  force dark when the recents is opened and closed, again for speed.
+     *  If the user hasn't set a custom launcher, this will most likely be the same as the launcher
+     *  package, and will be filtered out with distinct()
+     */
+    private fun getQuickstepPackage(): String? {
+        val systemResources = Resources.getSystem()
+        val recentsComponentNameId = systemResources.getIdentifier("config_recentsComponentName", "string", "android")
+        if(recentsComponentNameId == 0) return null
+        val recentsComponentName = systemResources.getString(recentsComponentNameId)
+        return if(recentsComponentName != null) {
+            ComponentName.unflattenFromString(recentsComponentName)?.packageName
+        }else null
+    }
+
+    override fun ping() {
+        //Hello!
+    }
+
+    override fun getServiceType(): String {
+        return this.serviceType.toString()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/service/root/DarqRootService.kt b/app/src/main/java/com/kieronquinn/app/darq/service/root/DarqRootService.kt
new file mode 100644
index 0000000..3876073
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/service/root/DarqRootService.kt
@@ -0,0 +1,19 @@
+package com.kieronquinn.app.darq.service.root
+
+import android.content.Intent
+import android.os.IBinder
+import com.kieronquinn.app.darq.providers.DarqServiceConnectionProvider
+import com.kieronquinn.app.darq.service.impl.DarqService
+import com.topjohnwu.superuser.ipc.RootService
+
+class DarqRootService: RootService() {
+
+    override fun onBind(intent: Intent): IBinder {
+        return DarqService(DarqServiceConnectionProvider.ServiceType.ROOT)
+    }
+
+    override fun onUnbind(intent: Intent): Boolean {
+        return true
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/services/DarqBackgroundService.kt b/app/src/main/java/com/kieronquinn/app/darq/services/DarqBackgroundService.kt
deleted file mode 100644
index 556d82f..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/services/DarqBackgroundService.kt
+++ /dev/null
@@ -1,298 +0,0 @@
-package com.kieronquinn.app.darq.services
-
-import android.Manifest
-import android.accessibilityservice.AccessibilityService
-import android.app.AlarmManager
-import android.app.PendingIntent
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.content.pm.ApplicationInfo
-import android.content.pm.PackageManager
-import android.location.Criteria
-import android.location.LocationManager
-import android.util.Log
-import android.view.accessibility.AccessibilityEvent
-import com.kieronquinn.app.darq.BuildConfig
-import com.kieronquinn.app.darq.DarqApplication
-import com.kieronquinn.app.darq.IDarqIPC
-import com.kieronquinn.app.darq.receivers.SunriseSunsetReceiver
-import com.kieronquinn.app.darq.root.DarqIPCReceiver
-import com.kieronquinn.app.darq.utils.PreferenceUtils
-import com.kieronquinn.app.darq.utils.TimeZoneUtils
-import com.kieronquinn.app.darq.utils.runRootCommand
-import com.kieronquinn.app.darq.utils.sendBroadcast
-import eu.chainfire.librootjava.RootIPCReceiver
-import eu.chainfire.libsuperuser.Shell
-import kotlinx.coroutines.*
-import org.shredzone.commons.suncalc.SunTimes
-import java.util.*
-
-
-class DarqBackgroundService : AccessibilityService() {
-
-    private val job = Job()
-
-    private val reloadScope = CoroutineScope(Dispatchers.Main + job)
-
-    companion object {
-        const val BROADCAST_PING = "${BuildConfig.APPLICATION_ID}.DARQ_PING"
-        const val BROADCAST_PONG = "${BuildConfig.APPLICATION_ID}.DARQ_PONG"
-        const val BROADCAST_SET_DARK = "${BuildConfig.APPLICATION_ID}.SET_DARK"
-        const val BROADCAST_TEST = "${BuildConfig.APPLICATION_ID}.TEST"
-        const val BROADCAST_SET_FORCE_DARK = "${BuildConfig.APPLICATION_ID}.SET_FORCE_DARK"
-        const val BROADCAST_SET_FORCE_DARK_SUCCESS = "${BuildConfig.APPLICATION_ID}.SET_FORCE_DARK_SUCCESS"
-        const val BROADCAST_SUNRISE = "${BuildConfig.APPLICATION_ID}.SUNRISE"
-        const val BROADCAST_SUNSET = "${BuildConfig.APPLICATION_ID}.SUNSET"
-        const val REFRESH = "${BuildConfig.APPLICATION_ID}.REFRESH"
-        const val REFRESH_TOGGLES = "${BuildConfig.APPLICATION_ID}.REFRESH_TOGGLES"
-        const val REFRESH_COMPLETE = "${BuildConfig.APPLICATION_ID}.REFRESH_COMPLETE"
-        const val EXTRA_FORCE_STOP = "${BuildConfig.APPLICATION_ID}.EXTRA_FORCE_STOP"
-        const val EXTRA_ACTION = "${BuildConfig.APPLICATION_ID}.EXTRA_ACTION"
-        const val KEY_ENABLED = "enabled"
-        const val KEY_IPC_FOUND = "ipc_found"
-    }
-
-    private val enabledApps = arrayListOf<String>()
-
-    private var isGlobalForceDarkEnabled = false
-
-    private val sunriseIntent: Intent
-        get() {
-            val intent = Intent(this, SunriseSunsetReceiver::class.java)
-
-            intent.`package` = packageName
-            intent.putExtra(EXTRA_ACTION, BROADCAST_SUNRISE)
-            return intent
-        }
-
-    private val sunrisePendingIntent: PendingIntent
-        get() = PendingIntent.getBroadcast(this, 1, sunriseIntent, PendingIntent.FLAG_UPDATE_CURRENT)
-
-    private val sunsetIntent: Intent
-        get() {
-            val intent = Intent(this, SunriseSunsetReceiver::class.java)
-            intent.`package` = packageName
-            intent.putExtra(EXTRA_ACTION, BROADCAST_SUNSET)
-            return intent
-        }
-
-    private val sunsetPendingIntent: PendingIntent
-        get() = PendingIntent.getBroadcast(this, 2, sunsetIntent, PendingIntent.FLAG_UPDATE_CURRENT)
-
-    private val isAutoDarkEnabled: Boolean
-        get() {
-            val preferenceUtils = PreferenceUtils(this@DarqBackgroundService)
-            return preferenceUtils.isAutoDarkEnabled
-        }
-
-    private val receiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context?, intent: Intent?) {
-            Log.d(TAG, "onReceive ${intent?.action}")
-            when (intent?.action) {
-                BROADCAST_PING -> {
-                    sendBroadcast(BROADCAST_PONG, Pair(KEY_IPC_FOUND, ipc != null))
-                }
-                BROADCAST_SET_DARK -> setDark(intent.getBooleanExtra(KEY_ENABLED, false))
-                BROADCAST_SET_FORCE_DARK -> setForceDark(intent.getBooleanExtra(KEY_ENABLED, false))
-                REFRESH -> refreshEnabledApps(intent.getStringExtra(EXTRA_FORCE_STOP))
-                BROADCAST_TEST -> ipc?.hookService()
-                BROADCAST_SUNRISE -> {
-                    if(isAutoDarkEnabled) {
-                        setDark(false)
-                    }
-                    getAlarmTimes()
-                }
-                BROADCAST_SUNSET -> {
-                    if(isAutoDarkEnabled) {
-                        setDark(true)
-                    }
-                    getAlarmTimes()
-                }
-            }
-        }
-    }
-
-    private fun setForceDark(enabled: Boolean) {
-        if (enabled) enableForceDark()
-        else disableForceDark()
-        refreshToggles()
-        sendBroadcast(BROADCAST_SET_FORCE_DARK_SUCCESS)
-    }
-
-    private fun setDark(enabled: Boolean) {
-        Log.d(TAG, "Set dark $enabled")
-        ipc?.setDarkEnabled(enabled)
-    }
-
-    private var currentPackageName = ""
-    private var isForceDarkTheme: Boolean
-        get() {
-            return ipc?.isForceDarkEnabled ?: false
-        }
-        set(value) {
-            ipc?.isForceDarkEnabled = value
-        }
-
-    private val ignoredPackages = arrayOf("com.android.systemui", "com.google.android.apps.nexuslauncher")
-
-    private val TAG = javaClass.simpleName
-
-    private var ipc: IDarqIPC? = null
-
-    private val darqIPCReceiver: RootIPCReceiver<IDarqIPC> = object : RootIPCReceiver<IDarqIPC>(null, 0) {
-        override fun onConnect(ipc: IDarqIPC?) {
-            Log.d(TAG, "Connected")
-            this@DarqBackgroundService.ipc = ipc
-            (application as? DarqApplication)?.isRoot = ipc?.isRoot ?: false
-            (application as? DarqApplication)?.uid = ipc?.uid
-        }
-
-        override fun onDisconnect(ipc: IDarqIPC?) {
-            Log.d(TAG, "Disconnected")
-            this@DarqBackgroundService.ipc = null
-        }
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-        checkRootAndSecure()
-        registerReceiver(receiver, IntentFilter(BROADCAST_PING))
-        registerReceiver(receiver, IntentFilter(BROADCAST_SET_DARK))
-        registerReceiver(receiver, IntentFilter(BROADCAST_SET_FORCE_DARK))
-        registerReceiver(receiver, IntentFilter(REFRESH))
-        registerReceiver(receiver, IntentFilter(BROADCAST_TEST))
-        registerReceiver(receiver, IntentFilter(BROADCAST_SUNRISE))
-        registerReceiver(receiver, IntentFilter(BROADCAST_SUNSET))
-        refreshEnabledApps("")
-        refreshToggles()
-        getAlarmTimes()
-        if(isForceDarkTheme){
-            enableForceDark()
-        }
-    }
-
-    private fun getAlarmTimes() {
-        reloadScope.launch {
-            var times: SunTimes? = null
-            withContext(Dispatchers.Default) {
-                val latLng =
-                    if (checkCallingOrSelfPermission(Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
-                        val locationManager = getSystemService(Context.LOCATION_SERVICE) as LocationManager
-                        val criteria = Criteria()
-                        val provider = locationManager.getBestProvider(criteria, true)!!
-                        val location = locationManager.getLastKnownLocation(provider)
-                        if (location != null) Pair(location.latitude, location.longitude)
-                        else getTimeZoneLatLng()
-                    } else getTimeZoneLatLng()
-                latLng?.let {
-                    times = SunTimes.compute().on(Calendar.getInstance()).at(it.first, it.second).execute()
-                }
-            }
-            times?.let {
-                registerAlarmTimes(it)
-            }
-        }
-
-    }
-
-    private fun registerAlarmTimes(times: SunTimes) {
-        val alarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
-        alarmManager.cancel(sunrisePendingIntent)
-        alarmManager.cancel(sunsetPendingIntent)
-
-        times.rise?.let {
-            Log.d(TAG, "Registering sunrise time $it")
-            alarmManager.set(AlarmManager.RTC, it.time, sunrisePendingIntent)
-        }
-
-        times.set?.let {
-            Log.d(TAG, "Registering sunset time ${it.time}")
-            alarmManager.set(AlarmManager.RTC, it.time, sunsetPendingIntent)
-        }
-    }
-
-    private fun getTimeZoneLatLng(): Pair<Double, Double>? {
-        return TimeZoneUtils.getLatLngForTimezone(this, TimeZone.getDefault())
-    }
-
-    private fun checkRootAndSecure() {
-        val isRooted: Boolean = Shell.SU.available()
-        if (isRooted) {
-            val rootCommand = DarqIPCReceiver.getLaunchScript(this)
-            runRootCommand(rootCommand)
-            darqIPCReceiver.setContext(this)
-        } else {
-            darqIPCReceiver.setContext(this)
-            //TODO no root screen
-        }
-    }
-
-    override fun onDestroy() {
-        darqIPCReceiver.release()
-        super.onDestroy()
-        unregisterReceiver(receiver)
-    }
-
-    override fun onAccessibilityEvent(event: AccessibilityEvent) {
-        if (isGlobalForceDarkEnabled) return
-        val packageName = event.packageName.toString()
-        if (event.eventType == AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED && packageName != currentPackageName && !ignoredPackages.contains(
-                packageName
-            )
-        ) {
-            Log.d(TAG, "Package $packageName")
-            if (enabledApps.contains(packageName)) enableForceDark()
-            else disableForceDark()
-            currentPackageName = packageName
-
-        }
-    }
-
-    private fun disableForceDark() {
-        Log.d(TAG, "Disabling force dark pre")
-        if (!isForceDarkTheme) return
-        Log.d(TAG, "Disabling force dark")
-        ipc?.setForceDarkEnabled(false)
-        ipc?.pokeServices()
-        isForceDarkTheme = false
-    }
-
-    private fun enableForceDark() {
-        Log.d(TAG, "Enabling force dark pre")
-        if (isForceDarkTheme) return
-        Log.d(TAG, "Enabling force dark ipc ${ipc != null}")
-        ipc?.setForceDarkEnabled(true)
-        ipc?.pokeServices()
-        isForceDarkTheme = true
-    }
-
-    private fun refreshEnabledApps(forceStopApp: String?) {
-        //job.cancel()
-
-        Log.d(TAG, "Refresh start")
-        reloadScope.launch {
-            val preferenceUtils = PreferenceUtils(this@DarqBackgroundService)
-            preferenceUtils.getEnabledApps(this@DarqBackgroundService)
-            enabledApps.clear()
-            enabledApps.addAll(preferenceUtils.enabledApps)
-            Log.d(TAG, "Refresh done ${enabledApps.size}")
-            if (forceStopApp != null) {
-                ipc?.forceStopApp(forceStopApp)
-            }
-        }
-
-        Log.d(TAG, "Refresh send broadcast")
-        sendBroadcast(REFRESH_COMPLETE)
-    }
-
-    private fun refreshToggles() {
-        val preferenceUtils = PreferenceUtils(this)
-        isGlobalForceDarkEnabled = preferenceUtils.isGlobalForceDark
-    }
-
-
-    override fun onInterrupt() {
-    }
-}
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/activities/DarqActivity.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/activities/DarqActivity.kt
new file mode 100644
index 0000000..762ebe7
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/activities/DarqActivity.kt
@@ -0,0 +1,55 @@
+package com.kieronquinn.app.darq.ui.activities
+
+import android.content.Context
+import android.os.Bundle
+import android.util.AttributeSet
+import android.view.View
+import androidx.appcompat.view.menu.ListMenuItemView
+import androidx.core.view.WindowCompat
+import androidx.lifecycle.lifecycleScope
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.monetcompat.app.MonetCompatActivity
+import com.kieronquinn.monetcompat.extensions.views.applyMonetRecursively
+
+class DarqActivity: MonetCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        setUseLightStatusNav(false)
+        lifecycleScope.launchWhenResumed {
+            monet.awaitMonetReady()
+            setContentView(R.layout.activity_darq)
+            val lightStatusNav = resources.getBoolean(R.bool.lightStatusNav)
+            setUseLightStatusNav(lightStatusNav)
+        }
+    }
+
+    /**
+     *  Applies Monet to the overflow menu's checkbox
+     */
+    override fun onCreateView(
+        parent: View?,
+        name: String,
+        context: Context,
+        attrs: AttributeSet
+    ): View? {
+        if (applyBackgroundColorToMenu && name == ListMenuItemView::class.java.name) {
+            //Toolbar dropdown menu list item
+            (parent?.parent as? View)?.run {
+                post {
+                    applyMonetRecursively()
+                }
+            }
+        }
+        return super.onCreateView(parent, name, context, attrs)
+    }
+
+    private fun setUseLightStatusNav(enabled: Boolean){
+        WindowCompat.getInsetsController(window, window.decorView)?.run {
+            isAppearanceLightNavigationBars = enabled
+            isAppearanceLightStatusBars = enabled
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/base/BaseBottomSheetDialogFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/base/BaseBottomSheetDialogFragment.kt
new file mode 100644
index 0000000..1400fc3
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/base/BaseBottomSheetDialogFragment.kt
@@ -0,0 +1,87 @@
+package com.kieronquinn.app.darq.ui.base
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.components.navigation.Navigation
+import com.kieronquinn.app.darq.databinding.FragmentBottomSheetBinding
+import org.koin.android.ext.android.inject
+
+
+abstract class BaseBottomSheetDialogFragment : BaseBottomSheetFragment<FragmentBottomSheetBinding>(FragmentBottomSheetBinding::inflate) {
+
+    internal val navigation by inject<Navigation>()
+
+    abstract val title: CharSequence
+    abstract val content: CharSequence
+
+    open val positiveText: CharSequence? = null
+    open val negativeText: CharSequence? = null
+    open val neutralText: CharSequence? = null
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        super.onCreateView(inflater, container, savedInstanceState)
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root){ view, insets ->
+            val bottomInset = insets.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom
+            val extraPadding = resources.getDimension(R.dimen.padding_16).toInt()
+            view.updatePadding(bottom = bottomInset + extraPadding)
+            insets
+        }
+        val accentColor = monet.getAccentColor(requireContext())
+        binding.bottomSheetPositive.setTextColor(accentColor)
+        binding.bottomSheetNegative.setTextColor(accentColor)
+        binding.bottomSheetNeutral.setTextColor(accentColor)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.bottomSheetTitle.text = title
+        binding.bottomSheetContent.text = content
+        if(positiveText != null){
+            binding.bottomSheetPositive.isVisible = true
+            binding.bottomSheetPositive.text = positiveText
+            binding.bottomSheetPositive.setOnClickListener {
+                onPositiveClicked(dialog as BottomSheetDialog)
+            }
+        }
+        if(negativeText != null){
+            binding.bottomSheetNegative.isVisible = true
+            binding.bottomSheetNegative.text = negativeText
+            binding.bottomSheetNegative.setOnClickListener {
+                onNegativeClicked(dialog as BottomSheetDialog)
+            }
+        }
+        if(neutralText != null){
+            binding.bottomSheetNeutral.isVisible = true
+            binding.bottomSheetNeutral.text = neutralText
+            binding.bottomSheetNeutral.setOnClickListener {
+                onNeutralClicked(dialog as BottomSheetDialog)
+            }
+        }
+    }
+
+    open fun onPositiveClicked(dialog: BottomSheetDialog){
+        dialog.dismiss()
+    }
+
+    open fun onNegativeClicked(dialog: BottomSheetDialog){
+        dialog.dismiss()
+    }
+
+    open fun onNeutralClicked(dialog: BottomSheetDialog){
+        dialog.dismiss()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/base/BaseBottomSheetFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/base/BaseBottomSheetFragment.kt
new file mode 100644
index 0000000..3daffb7
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/base/BaseBottomSheetFragment.kt
@@ -0,0 +1,151 @@
+package com.kieronquinn.app.darq.ui.base
+
+import android.animation.ValueAnimator
+import android.app.Dialog
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.animation.addListener
+import androidx.core.view.*
+import androidx.viewbinding.ViewBinding
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.providers.blur.BlurProvider
+import com.kieronquinn.app.darq.ui.utils.autoCleared
+import com.kieronquinn.app.darq.utils.extensions.isDarkTheme
+import com.kieronquinn.monetcompat.core.MonetCompat
+import org.koin.android.ext.android.inject
+
+abstract class BaseBottomSheetFragment<T: ViewBinding>(private val inflate: (LayoutInflater, ViewGroup?, Boolean) -> T): BottomSheetDialogFragment() {
+
+    internal val monet by lazy {
+        MonetCompat.getInstance()
+    }
+
+    internal var binding by autoCleared<T>()
+
+    private val blurProvider by inject<BlurProvider>()
+    private var isBlurShowing = false
+    private val bottomSheetCallback = object: BottomSheetBehavior.BottomSheetCallback() {
+
+        override fun onStateChanged(bottomSheet: View, newState: Int) {}
+
+        override fun onSlide(bottomSheet: View, slideOffset: Float) {
+            showBlurAnimation?.cancel()
+            applyBlur(1f + slideOffset)
+        }
+
+    }
+
+    open val cancelable: Boolean = true
+    private var behavior: BottomSheetBehavior<*>? = null
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = object : BottomSheetDialog(requireContext(), theme) {
+            override fun onAttachedToWindow() {
+                super.onAttachedToWindow()
+
+                window?.let {
+                    WindowCompat.setDecorFitsSystemWindows(it, false)
+                }
+
+                findViewById<View>(com.google.android.material.R.id.container)?.apply {
+                    fitsSystemWindows = false
+                    val topMargin = marginTop
+                    ViewCompat.setOnApplyWindowInsetsListener(this){ view, insets ->
+                        view.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                            updateMargins(top = topMargin + insets.getInsets(WindowInsetsCompat.Type.systemBars()).top)
+                        }
+                        insets
+                    }
+                }
+
+                findViewById<View>(com.google.android.material.R.id.coordinator)?.fitsSystemWindows = false
+            }
+        }
+        dialog.window?.let {
+            WindowCompat.setDecorFitsSystemWindows(it, false)
+            it.navigationBarColor = Color.TRANSPARENT
+            ViewCompat.setOnApplyWindowInsetsListener(it.decorView) { view, insets ->
+                val navigationInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+                view.updatePadding(left = navigationInsets.left, right = navigationInsets.right)
+                insets
+            }
+        }
+        dialog.setOnShowListener {
+            (binding.root.parent as View).backgroundTintList = ColorStateList.valueOf(monet.getBackgroundColor(requireContext()))
+            behavior = BottomSheetBehavior.from(dialog.findViewById(R.id.design_bottom_sheet)!!).apply {
+                isDraggable = cancelable
+                state = BottomSheetBehavior.STATE_EXPANDED
+                addBottomSheetCallback(bottomSheetCallback)
+            }
+        }
+        isCancelable = cancelable
+        return dialog
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        behavior?.removeBottomSheetCallback(bottomSheetCallback)
+        behavior = null
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+        binding = inflate.invoke(layoutInflater, container, false)
+        dialog?.setOnShowListener {
+            (binding.root.parent as View).backgroundTintList = ColorStateList.valueOf(monet.getBackgroundColor(requireContext()))
+        }
+        return binding.root
+    }
+
+    private var showBlurAnimation: ValueAnimator? = null
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        showBlurAnimation = ValueAnimator.ofFloat(0f, 1f).apply {
+            duration = 250L
+            addUpdateListener {
+                applyBlur(it.animatedValue as Float)
+            }
+            addListener(onEnd = {
+                isBlurShowing = true
+            })
+            start()
+        }
+    }
+
+    private fun applyBlur(ratio: Float){
+        val dialogWindow = dialog?.window ?: return
+        val appWindow = activity?.window ?: return
+        dialogWindow.decorView.post {
+            blurProvider.applyBlur(dialogWindow, appWindow, ratio)
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if(isBlurShowing){
+            view?.post {
+                applyBlur(1f)
+            }
+        }
+    }
+
+    override fun getTheme(): Int {
+        return if(requireContext().isDarkTheme){
+            R.style.BaseBottomSheetDialog_Dark
+        }else{
+            R.style.BaseBottomSheetDialog
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/base/BaseDialogFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/base/BaseDialogFragment.kt
new file mode 100644
index 0000000..d61c7b7
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/base/BaseDialogFragment.kt
@@ -0,0 +1,107 @@
+package com.kieronquinn.app.darq.ui.base
+
+import android.animation.ValueAnimator
+import android.app.Dialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import androidx.core.animation.addListener
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
+import androidx.fragment.app.DialogFragment
+import androidx.viewbinding.ViewBinding
+import com.kieronquinn.app.darq.components.navigation.Navigation
+import com.kieronquinn.app.darq.providers.blur.BlurProvider
+import com.kieronquinn.app.darq.ui.utils.autoCleared
+import com.kieronquinn.monetcompat.core.MonetCompat
+import org.koin.android.ext.android.inject
+
+abstract class BaseDialogFragment<T: ViewBinding>(private val inflate: (LayoutInflater, ViewGroup?, Boolean) -> T): DialogFragment() {
+
+    internal val monet by lazy {
+        MonetCompat.getInstance()
+    }
+
+    internal val navigation by inject<Navigation>()
+
+    internal var binding by autoCleared<T>()
+
+    private val blurProvider by inject<BlurProvider>()
+
+    private var isBlurShowing = false
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        binding = inflate.invoke(layoutInflater, container, false)
+        return binding.root
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+        dialog.window?.let {
+            it.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+            ViewCompat.setOnApplyWindowInsetsListener(it.decorView) { view, insets ->
+                val navigationInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+                view.updatePadding(left = navigationInsets.left, right = navigationInsets.right)
+                insets
+            }
+        }
+        return dialog
+    }
+
+    private var showBlurAnimation: ValueAnimator? = null
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        view.post {
+            showBlurAnimation = ValueAnimator.ofFloat(0f, 1f).apply {
+                duration = 250L
+                addUpdateListener {
+                    val progress = it.animatedValue as Float
+                    dialog?.window?.decorView?.alpha = progress
+                    applyBlur(progress)
+                }
+                addListener(onEnd = {
+                    isBlurShowing = true
+                })
+                start()
+            }
+        }
+    }
+
+    fun dismissWithAnimation(){
+        showBlurAnimation?.cancel()
+        ValueAnimator.ofFloat(1f, 0f).apply {
+            duration = 250L
+            addUpdateListener {
+                val progress = it.animatedValue as Float
+                dialog?.window?.decorView?.alpha = progress
+                applyBlur(progress)
+            }
+            addListener(onEnd = {
+                dismiss()
+            })
+        }.start()
+    }
+
+    private fun applyBlur(ratio: Float){
+        val dialogWindow = dialog?.window ?: return
+        val appWindow = activity?.window ?: return
+        blurProvider.applyBlur(dialogWindow, appWindow, ratio)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if(isBlurShowing){
+            view?.post {
+                applyBlur(1f)
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/base/BoundFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/base/BoundFragment.kt
new file mode 100644
index 0000000..54f778a
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/base/BoundFragment.kt
@@ -0,0 +1,22 @@
+package com.kieronquinn.app.darq.ui.base
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.viewbinding.ViewBinding
+import com.kieronquinn.app.darq.ui.utils.autoCleared
+import com.kieronquinn.monetcompat.app.MonetFragment
+
+abstract class BoundFragment<T: ViewBinding>(private val inflate: (LayoutInflater, ViewGroup?, Boolean) -> T): MonetFragment() {
+
+    internal var binding by autoCleared<T>()
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        super.onCreateView(inflater, container, savedInstanceState)
+        val wrappedInflater = inflater.cloneInContext(requireContext())
+        binding = inflate.invoke(wrappedInflater, container, false)
+        return binding.root
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/base/FragmentOptions.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/base/FragmentOptions.kt
new file mode 100644
index 0000000..9574a01
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/base/FragmentOptions.kt
@@ -0,0 +1,13 @@
+package com.kieronquinn.app.darq.ui.base
+
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+
+interface BackAvailable
+interface AutoExpandOnRotate
+
+interface ProvidesOverflow {
+    fun inflateMenu(menuInflater: MenuInflater, menu: Menu)
+    fun onMenuItemSelected(menuItem: MenuItem): Boolean
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/errors/ServiceTimeoutBottomSheetFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/errors/ServiceTimeoutBottomSheetFragment.kt
new file mode 100644
index 0000000..86ba461
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/errors/ServiceTimeoutBottomSheetFragment.kt
@@ -0,0 +1,28 @@
+package com.kieronquinn.app.darq.ui.screens.bottomsheets.errors
+
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.ui.base.BaseBottomSheetDialogFragment
+
+class ServiceTimeoutBottomSheetFragment: BaseBottomSheetDialogFragment() {
+
+    override val title by lazy {
+        getString(R.string.bottom_sheet_service_timeout_title)
+    }
+
+    override val content by lazy {
+        getString(R.string.bottom_sheet_service_timeout_content)
+    }
+
+    override val positiveText by lazy {
+        getString(R.string.bottom_sheet_service_timeout_positive)
+    }
+
+    override val cancelable = false
+
+    override fun onPositiveClicked(dialog: BottomSheetDialog) {
+        super.onPositiveClicked(dialog)
+        requireActivity().finish()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/errors/ShizkuNotRunningBottomSheetFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/errors/ShizkuNotRunningBottomSheetFragment.kt
new file mode 100644
index 0000000..8dd58fb
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/errors/ShizkuNotRunningBottomSheetFragment.kt
@@ -0,0 +1,39 @@
+package com.kieronquinn.app.darq.ui.screens.bottomsheets.errors
+
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.model.shizuku.ShizukuConstants
+import com.kieronquinn.app.darq.ui.base.BaseBottomSheetDialogFragment
+
+class ShizkuNotRunningBottomSheetFragment: BaseBottomSheetDialogFragment() {
+
+    override val title by lazy {
+        getString(R.string.bottom_sheet_shizuku_not_running_title)
+    }
+
+    override val content by lazy {
+        getString(R.string.bottom_sheet_shizuku_not_running_content)
+    }
+
+    override val positiveText by lazy {
+        getString(R.string.bottom_sheet_shizuku_not_running_positive)
+    }
+
+    override val negativeText by lazy {
+        getString(R.string.bottom_sheet_shizuku_not_running_negative)
+    }
+
+    override val cancelable = false
+
+    override fun onPositiveClicked(dialog: BottomSheetDialog) {
+        super.onPositiveClicked(dialog)
+        val packageManager = requireContext().packageManager
+        startActivity(packageManager.getLaunchIntentForPackage(ShizukuConstants.SHIZUKU_PACKAGE_NAME))
+    }
+
+    override fun onNegativeClicked(dialog: BottomSheetDialog) {
+        super.onNegativeClicked(dialog)
+        requireActivity().finish()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/errors/ShizukuInfoBottomSheetFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/errors/ShizukuInfoBottomSheetFragment.kt
new file mode 100644
index 0000000..52d9763
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/errors/ShizukuInfoBottomSheetFragment.kt
@@ -0,0 +1,20 @@
+package com.kieronquinn.app.darq.ui.screens.bottomsheets.errors
+
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.ui.base.BaseBottomSheetDialogFragment
+
+class ShizukuInfoBottomSheetFragment: BaseBottomSheetDialogFragment() {
+
+    override val title by lazy {
+        getString(R.string.bottom_sheet_shizuku_more_info_title)
+    }
+
+    override val content by lazy {
+        getText(R.string.bottom_sheet_shizuku_more_info_content)
+    }
+
+    override val positiveText by lazy {
+        getString(android.R.string.ok)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/errors/ShizukuNotInstalledBottomSheetFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/errors/ShizukuNotInstalledBottomSheetFragment.kt
new file mode 100644
index 0000000..9ed4170
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/errors/ShizukuNotInstalledBottomSheetFragment.kt
@@ -0,0 +1,72 @@
+package com.kieronquinn.app.darq.ui.screens.bottomsheets.errors
+
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.net.Uri
+import androidx.lifecycle.lifecycleScope
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.model.shizuku.ShizukuConstants
+import com.kieronquinn.app.darq.ui.base.BaseBottomSheetDialogFragment
+
+class ShizukuNotInstalledBottomSheetFragment: BaseBottomSheetDialogFragment() {
+
+    override val title by lazy {
+        getString(R.string.bottom_sheet_shizuku_not_installed_title)
+    }
+
+    override val content by lazy {
+        getString(R.string.bottom_sheet_shizuku_not_installed_content)
+    }
+
+    override val positiveText by lazy {
+        getString(R.string.bottom_sheet_shizuku_not_installed_positive)
+    }
+
+    override val negativeText by lazy {
+        getString(R.string.bottom_sheet_shizuku_not_installed_negative)
+    }
+
+    override val neutralText by lazy {
+        getString(R.string.bottom_sheet_shizuku_not_installed_neutral)
+    }
+
+    override val cancelable = false
+
+    override fun onPositiveClicked(dialog: BottomSheetDialog) {
+        openShizukuPlayStore()
+    }
+
+    override fun onNegativeClicked(dialog: BottomSheetDialog) {
+        super.onNegativeClicked(dialog)
+        requireActivity().finish()
+    }
+
+    override fun onNeutralClicked(dialog: BottomSheetDialog) {
+        lifecycleScope.launchWhenResumed {
+            navigation.navigate(R.id.action_global_shizukuInfoBottomSheetFragment)
+        }
+    }
+
+    private fun openShizukuPlayStore(){
+        val url = "market://details?id=${ShizukuConstants.SHIZUKU_PACKAGE_NAME}"
+        val intent = Intent(Intent.ACTION_VIEW).apply {
+            data = Uri.parse(url)
+        }
+        try {
+            startActivity(intent)
+        }catch (e: ActivityNotFoundException){
+            openShizukuWeb()
+        }
+    }
+
+    private fun openShizukuWeb(){
+        val url = ShizukuConstants.SHIZUKU_WEB
+        Intent(Intent.ACTION_VIEW).apply {
+            data = Uri.parse(url)
+        }.also {
+            startActivity(it)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/update/UpdateAvailableBottomSheetFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/update/UpdateAvailableBottomSheetFragment.kt
new file mode 100644
index 0000000..f0ccdde
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/update/UpdateAvailableBottomSheetFragment.kt
@@ -0,0 +1,59 @@
+package com.kieronquinn.app.darq.ui.screens.bottomsheets.update
+
+import androidx.lifecycle.lifecycleScope
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.ui.base.BaseBottomSheetDialogFragment
+import com.kieronquinn.app.darq.ui.screens.container.ContainerSharedViewModel
+import com.kieronquinn.app.darq.utils.openLink
+import com.kieronquinn.app.darq.utils.extensions.navGraphViewModel
+
+class UpdateAvailableBottomSheetFragment: BaseBottomSheetDialogFragment() {
+
+    private val sharedViewModel by navGraphViewModel<ContainerSharedViewModel>(R.id.nav_graph_main)
+
+    override val cancelable = false
+
+    private val update by lazy {
+        sharedViewModel.getAvailableUpdate()
+    }
+
+    override val title by lazy {
+        getString(R.string.bottom_sheet_update_available_title)
+    }
+
+    override val content by lazy {
+        update?.changelog ?: ""
+    }
+
+    override val positiveText by lazy {
+        getString(R.string.bottom_sheet_update_available_positive)
+    }
+
+    override val negativeText by lazy {
+        getString(R.string.bottom_sheet_update_available_negative)
+    }
+
+    override val neutralText by lazy {
+        getString(R.string.bottom_sheet_update_available_neutral)
+    }
+
+    override fun onNegativeClicked(dialog: BottomSheetDialog) {
+        sharedViewModel.clearUpdate()
+        super.onNegativeClicked(dialog)
+    }
+
+    override fun onPositiveClicked(dialog: BottomSheetDialog) {
+        dismiss()
+        lifecycleScope.launchWhenResumed {
+            navigation.navigate(UpdateAvailableBottomSheetFragmentDirections.actionUpdateAvailableBottomSheetFragmentToUpdateDownloadBottomSheetFragment())
+        }
+    }
+
+    override fun onNeutralClicked(dialog: BottomSheetDialog) {
+        update?.releaseUrl?.let {
+            requireContext().openLink(it)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/update/UpdateDownloadBottomSheetFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/update/UpdateDownloadBottomSheetFragment.kt
new file mode 100644
index 0000000..58b777e
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/update/UpdateDownloadBottomSheetFragment.kt
@@ -0,0 +1,66 @@
+package com.kieronquinn.app.darq.ui.screens.bottomsheets.update
+
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.lifecycle.lifecycleScope
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.databinding.FragmentBottomSheetUpdateDownloadBinding
+import com.kieronquinn.app.darq.ui.base.BaseBottomSheetFragment
+import com.kieronquinn.app.darq.ui.screens.container.ContainerSharedViewModel
+import com.kieronquinn.app.darq.utils.extensions.navGraphViewModel
+import com.kieronquinn.monetcompat.extensions.views.applyMonet
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class UpdateDownloadBottomSheetFragment: BaseBottomSheetFragment<FragmentBottomSheetUpdateDownloadBinding>(FragmentBottomSheetUpdateDownloadBinding::inflate) {
+
+    private val updateViewModel by viewModel<UpdateDownloadBottomSheetViewModel>()
+
+    private val sharedViewModel by navGraphViewModel<ContainerSharedViewModel>(R.id.nav_graph_main)
+
+    override val cancelable = false
+
+    private val update by lazy {
+        sharedViewModel.getAvailableUpdate()
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.fragmentUpdateDownloadCancel.setOnClickListener {
+            updateViewModel.cancelDownload(requireContext())
+            dismiss()
+        }
+        binding.fragmentUpdateDownloadProgress.applyMonet()
+        val accentColor = monet.getAccentColor(requireContext())
+        binding.fragmentUpdateDownloadCancel.setTextColor(accentColor)
+        lifecycleScope.launch {
+            updateViewModel.downloadState.collect {
+                when(it){
+                    is UpdateDownloadBottomSheetViewModel.State.Downloading -> {
+                        if(it.progress > 0) {
+                            binding.fragmentUpdateDownloadProgress.isIndeterminate = false
+                            binding.fragmentUpdateDownloadProgress.progress = it.progress
+                        }
+                    }
+                    is UpdateDownloadBottomSheetViewModel.State.Done -> {
+                        updateViewModel.openPackageInstaller(requireContext(), it.fileUri)
+                        sharedViewModel.clearUpdate()
+                        dismiss()
+                    }
+                    is UpdateDownloadBottomSheetViewModel.State.Failed -> {
+                        Toast.makeText(requireContext(), R.string.bs_update_download_failed, Toast.LENGTH_LONG).show()
+                        dismiss()
+                    }
+                }
+            }
+        }
+        update?.let {
+            updateViewModel.startDownload(requireContext(), it)
+        } ?: run {
+            dismiss()
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/update/UpdateDownloadBottomSheetViewModel.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/update/UpdateDownloadBottomSheetViewModel.kt
new file mode 100644
index 0000000..518be69
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/bottomsheets/update/UpdateDownloadBottomSheetViewModel.kt
@@ -0,0 +1,141 @@
+package com.kieronquinn.app.darq.ui.screens.bottomsheets.update
+
+import android.app.DownloadManager
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.database.ContentObserver
+import android.database.Cursor
+import android.net.Uri
+import android.os.Handler
+import android.os.Looper
+import androidx.core.content.FileProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.kieronquinn.app.darq.BuildConfig
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.components.github.UpdateChecker
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import java.io.File
+import kotlin.math.roundToInt
+
+abstract class UpdateDownloadBottomSheetViewModel: ViewModel() {
+
+    abstract val downloadState: Flow<State>
+
+    abstract fun startDownload(context: Context, update: UpdateChecker.Update)
+    abstract fun cancelDownload(context: Context)
+    abstract fun openPackageInstaller(context: Context, uri: Uri)
+
+    sealed class State {
+        object Idle: State()
+        data class Downloading(val progress: Int): State()
+        data class Done(val fileUri: Uri): State()
+        object Failed: State()
+    }
+
+}
+
+class UpdateDownloadBottomSheetViewModelImpl(private val downloadManager: DownloadManager): UpdateDownloadBottomSheetViewModel() {
+
+    private var requestId: Long? = null
+    private var _downloadState = MutableStateFlow<State>(State.Idle)
+    private var downloadFile: File? = null
+
+    override val downloadState = _downloadState.asStateFlow()
+
+    override fun startDownload(context: Context, update: UpdateChecker.Update) {
+        if(_downloadState.value is State.Idle) {
+            downloadUpdate(context, update.assetUrl, update.assetName)
+        }
+    }
+
+    private val downloadStateReceiver = object: BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent?) {
+            viewModelScope.launch {
+                var success = false
+                val query = DownloadManager.Query().apply {
+                    setFilterById(requestId ?: return@apply)
+                }
+                val cursor = downloadManager.query(query)
+                if (cursor.moveToFirst()) {
+                    val columnIndex = cursor.getColumnIndex(DownloadManager.COLUMN_STATUS)
+                    if (cursor.getInt(columnIndex) == DownloadManager.STATUS_SUCCESSFUL) {
+                        success = true
+                    }
+                }
+                if (success && downloadFile != null) {
+                    val outputUri = FileProvider.getUriForFile(context, BuildConfig.APPLICATION_ID + ".provider", downloadFile!!)
+                    _downloadState.emit(State.Done(outputUri))
+                } else {
+                    _downloadState.emit(State.Failed)
+                }
+            }
+        }
+    }
+
+    override fun openPackageInstaller(context: Context, uri: Uri){
+        Intent(Intent.ACTION_VIEW, uri).apply {
+            putExtra(Intent.EXTRA_NOT_UNKNOWN_SOURCE, true)
+            setDataAndType(uri, "application/vnd.android.package-archive")
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+        }.also {
+            context.startActivity(it)
+        }
+    }
+
+    private val downloadObserver = object: ContentObserver(Handler(Looper.getMainLooper())) {
+        override fun onChange(selfChange: Boolean, uri: Uri?) {
+            super.onChange(selfChange, uri)
+            viewModelScope.launch {
+                val query = DownloadManager.Query()
+                query.setFilterById(requestId ?: return@launch)
+                val c: Cursor = downloadManager.query(query)
+                var progress = 0.0
+                if (c.moveToFirst()) {
+                    val sizeIndex: Int =
+                        c.getColumnIndex(DownloadManager.COLUMN_TOTAL_SIZE_BYTES)
+                    val downloadedIndex: Int =
+                        c.getColumnIndex(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR)
+                    val size = c.getInt(sizeIndex)
+                    val downloaded = c.getInt(downloadedIndex)
+                    if (size != -1) progress = downloaded * 100.0 / size
+                }
+                _downloadState.emit(State.Downloading(progress.roundToInt()))
+            }
+        }
+    }
+
+    private fun downloadUpdate(context: Context, url: String, fileName: String) = viewModelScope.launch {
+        val downloadFolder = File(context.externalCacheDir, "updates").apply {
+            mkdirs()
+        }
+        downloadFile = File(downloadFolder, fileName)
+        context.registerReceiver(downloadStateReceiver, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE))
+        context.contentResolver.registerContentObserver(Uri.parse("content://downloads/my_downloads"), true, downloadObserver)
+        requestId = DownloadManager.Request(Uri.parse(url)).apply {
+            setDescription(context.getString(R.string.download_manager_description))
+            setTitle(context.getString(R.string.app_name))
+            setDestinationUri(Uri.fromFile(downloadFile!!))
+        }.run {
+            downloadManager.enqueue(this)
+        }
+    }
+
+    override fun cancelDownload(context: Context) {
+        viewModelScope.launch {
+            requestId?.let {
+                downloadManager.remove(it)
+            }
+            context.unregisterReceiver(downloadStateReceiver)
+            context.contentResolver.unregisterContentObserver(downloadObserver)
+            _downloadState.emit(State.Idle)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/container/ContainerFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/container/ContainerFragment.kt
new file mode 100644
index 0000000..ac12382
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/container/ContainerFragment.kt
@@ -0,0 +1,334 @@
+package com.kieronquinn.app.darq.ui.screens.container
+
+import android.content.Intent
+import android.content.res.ColorStateList
+import android.os.Bundle
+import android.util.TypedValue
+import android.view.MenuInflater
+import android.view.View
+import android.view.animation.Animation
+import androidx.activity.addCallback
+import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.view.*
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.fragment.NavHostFragment
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.appbar.CollapsingToolbarLayout
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.components.navigation.Navigation
+import com.kieronquinn.app.darq.components.settings.DarqSharedPreferences
+import com.kieronquinn.app.darq.databinding.FragmentContainerBinding
+import com.kieronquinn.app.darq.model.darq.DarqConstants
+import com.kieronquinn.app.darq.providers.DarqServiceConnectionProvider
+import com.kieronquinn.app.darq.service.autodark.DarqAutoDarkForegroundService
+import com.kieronquinn.app.darq.ui.base.*
+import com.kieronquinn.app.darq.utils.extensions.*
+import com.kieronquinn.monetcompat.extensions.views.applyMonet
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.launch
+import org.koin.android.ext.android.inject
+import rikka.shizuku.Shizuku
+import kotlin.math.roundToInt
+
+class ContainerFragment: BoundFragment<FragmentContainerBinding>(FragmentContainerBinding::inflate) {
+
+    internal val settings by inject<DarqSharedPreferences>()
+
+    private val navHostFragment by lazy {
+        childFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
+    }
+
+    private val navController by lazy {
+        navHostFragment.navController
+    }
+
+    private val sharedViewModel by lazy {
+        navGraphViewModel<ContainerSharedViewModel>(R.id.nav_graph_main, navController).value
+    }
+
+    private val navigation by inject<Navigation>()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupBackground()
+        setupInsets()
+        setupToolbar()
+        setupFragmentListener()
+        setupNavigation()
+        setupLoading()
+        setupSnackbar()
+        setupSettingsListener()
+        setupAutoDarkService()
+        setupUpdateChecker()
+        requireActivity().onBackPressedDispatcher.addCallback(this) {
+            lifecycleScope.launch {
+                navigation.navigateBack()
+            }
+        }
+    }
+
+    private fun setupBackground(){
+        binding.root.setBackgroundColor(monet.getBackgroundColor(requireContext()))
+    }
+
+    private fun setupInsets(){
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { view, insets ->
+            val navigationInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            view.updatePadding(left = navigationInsets.left, right = navigationInsets.right)
+            insets
+        }
+        ViewCompat.setOnApplyWindowInsetsListener(binding.collapsingToolbar){ view, insets ->
+            view.updateLayoutParams<AppBarLayout.LayoutParams> {
+                val appBarHeight = view.context.resources.getDimension(R.dimen.app_bar_height)
+                height = (appBarHeight + insets.getInsets(WindowInsetsCompat.Type.statusBars()).top).roundToInt()
+            }
+            insets
+        }
+        ViewCompat.setOnApplyWindowInsetsListener(binding.toolbar){ view, insets ->
+            getToolbarHeight()?.let {
+                val statusInsets = insets.getInsets(WindowInsetsCompat.Type.statusBars())
+                val overflowPadding = resources.getDimension(R.dimen.padding_8)
+                val topInset = statusInsets.top
+                view.updateLayoutParams<CollapsingToolbarLayout.LayoutParams> {
+                    height = it + topInset
+                }
+                view.updatePadding(left = statusInsets.left, top = topInset, right = statusInsets.right + overflowPadding.toInt())
+            }
+            insets
+        }
+    }
+
+    private fun getToolbarHeight(): Int? {
+        val typedValue = TypedValue()
+        return if (requireContext().theme.resolveAttribute(android.R.attr.actionBarSize, typedValue, true)) {
+            TypedValue.complexToDimensionPixelSize(typedValue.data, resources.displayMetrics)
+        }else null
+    }
+
+    private fun setupToolbar(){
+        with(binding){
+            collapsingToolbar.title = getString(R.string.app_name)
+            appBar.setExpanded(!requireContext().isLandscape && getTopFragment() is AutoExpandOnRotate)
+            toolbar.setNavigationOnClickListener {
+                lifecycleScope.launchWhenResumed {
+                    navigation.navigateBack()
+                }
+            }
+            collapsingToolbar.setBackgroundColor(monet.getBackgroundColor(requireContext()))
+            collapsingToolbar.setContentScrimColor(monet.getBackgroundColorSecondary(requireContext()) ?: monet.getBackgroundColor(requireContext()))
+            collapsingToolbar.setExpandedTitleTypeface(ResourcesCompat.getFont(requireContext(), R.font.google_sans_text_medium))
+            collapsingToolbar.setCollapsedTitleTypeface(ResourcesCompat.getFont(requireContext(), R.font.google_sans_text_medium))
+            toolbar.overflowIcon?.setTint(ContextCompat.getColor(requireContext(), R.color.toolbar_overflow))
+        }
+    }
+
+    private fun setupFragmentListener(){
+        navHostFragment.childFragmentManager.addOnBackStackChangedListener {
+            getTopFragment()?.let {
+                onTopFragmentChanged(it)
+            }
+        }
+        binding.navHostFragment.post {
+            onTopFragmentChanged(getTopFragment() ?: return@post)
+        }
+    }
+
+    private fun setupNavigation() = lifecycleScope.launchWhenResumed {
+        navigation.navigationBus.collect {
+            handleNavigationEvent(it)
+        }
+    }
+
+    private fun handleNavigationEvent(navigationEvent: Navigation.NavigationEvent) {
+        when (navigationEvent) {
+            is Navigation.NavigationEvent.Directions -> navController.navigate(navigationEvent.directions)
+            is Navigation.NavigationEvent.Id -> navController.navigate(navigationEvent.id)
+            is Navigation.NavigationEvent.Back -> if(!navController.navigateUp()) activity?.finish()
+            is Navigation.NavigationEvent.PopupTo -> navController.popBackStack(
+                navigationEvent.id,
+                navigationEvent.popInclusive
+            )
+        }
+        if(activity?.isFinishing != true) {
+            binding.appBar.setExpanded(true, true)
+            activity?.hideKeyboard()
+        }
+    }
+
+    private fun setupSnackbar(){
+        ViewCompat.setOnApplyWindowInsetsListener(binding.snackbarContainer){ view, insets ->
+            val bottomInsets = insets.getInsets(WindowInsetsCompat.Type.ime() or WindowInsetsCompat.Type.navigationBars()).bottom
+            view.updatePadding(bottom = bottomInsets)
+            insets
+        }
+        val background = monet.getBackgroundColorSecondary(requireContext()) ?: monet.getBackgroundColor(requireContext())
+        binding.snackbar.backgroundTintList = ColorStateList.valueOf(background)
+        binding.snackbarRoot.snackbarProgress.applyMonet()
+        lifecycleScope.launchWhenResumed {
+            launch {
+                sharedViewModel.showSnackbar.collect {
+                    setSnackbarVisibility(it)
+                }
+            }
+            launch {
+                sharedViewModel.syncState.debounce(DarqConstants.IPC_SYNC_TIMEOUT_LONG).collect {
+                    setSnackbarState(it)
+                }
+            }
+        }
+    }
+
+    private fun setupLoading() = lifecycleScope.launchWhenResumed {
+        //Debounce by 100ms to prevent the 'flash' of the loading screen when resuming and the service is already connected
+        sharedViewModel.loadingState.debounce(DarqConstants.IPC_SYNC_TIMEOUT).collect {
+            handleServiceState(it)
+        }
+    }
+
+    private suspend fun handleServiceState(serviceState: ContainerSharedViewModel.ServiceState) {
+        binding.loadingFragment.isVisible = serviceState is ContainerSharedViewModel.ServiceState.Loading
+        binding.navHostFragment.isVisible = serviceState is ContainerSharedViewModel.ServiceState.Loaded
+        if(serviceState is ContainerSharedViewModel.ServiceState.Error){
+            when(serviceState.error){
+                DarqServiceConnectionProvider.ServiceFailureReason.SHIZUKU_PERMISSION_REQUIRED -> {
+                    if(!requestShizukuPermission()){
+                        //Shizuku not running
+                        showShizukuNotRunningSheet()
+                    }
+                }
+                DarqServiceConnectionProvider.ServiceFailureReason.SHIZUKU_NOT_INSTALLED -> {
+                    showShizukuNotInstalledSheet()
+                }
+                DarqServiceConnectionProvider.ServiceFailureReason.SHIZUKU_NOT_STARTED -> {
+                    showShizukuNotRunningSheet()
+                }
+                DarqServiceConnectionProvider.ServiceFailureReason.TIMEOUT -> {
+                    showTimeoutSheet()
+                }
+            }
+        }
+    }
+
+    private fun onTopFragmentChanged(topFragment: Fragment){
+        val backIcon = if(topFragment is BackAvailable){
+            ContextCompat.getDrawable(requireContext(), R.drawable.ic_back)
+        } else null
+        if(topFragment is ProvidesOverflow){
+            setupMenu(topFragment)
+        }else{
+            setupMenu(null)
+        }
+        binding.toolbar.navigationIcon = backIcon
+        navController.currentDestination?.label?.let {
+            if(it.isBlank()) return@let
+            binding.collapsingToolbar.title = it
+            binding.toolbar.title = it
+        }
+    }
+
+    private fun setupMenu(menuProvider: ProvidesOverflow?){
+        val menu = binding.toolbar.menu
+        val menuInflater = MenuInflater(requireContext())
+        menu.clear()
+        menuProvider?.inflateMenu(menuInflater, menu)
+        binding.toolbar.setOnMenuItemClickListener {
+            menuProvider?.onMenuItemSelected(it) ?: false
+        }
+    }
+
+    private fun getTopFragment(): Fragment? {
+        return navHostFragment.childFragmentManager.fragments.firstOrNull()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        sharedViewModel.loadService()
+    }
+
+    private var snackbarAnimation: Animation? = null
+
+    private fun setSnackbarVisibility(visible: Boolean){
+        snackbarAnimation?.cancel()
+        snackbarAnimation = if(visible) binding.snackbarContainer.slideIn {  }
+        else binding.snackbarContainer.slideOut {  }
+    }
+
+    private fun setSnackbarState(syncState: ContainerSharedViewModel.SyncState){
+        when(syncState){
+            is ContainerSharedViewModel.SyncState.Syncing -> {
+                binding.snackbarRoot.snackbarText.text = getString(R.string.snackbar_syncing_text)
+                binding.snackbarRoot.snackbarAction.isVisible = false
+                binding.snackbarRoot.snackbarProgress.isVisible = true
+            }
+            is ContainerSharedViewModel.SyncState.SyncComplete -> {
+                binding.snackbarRoot.snackbarProgress.isVisible = false
+                if(syncState.success){
+                    binding.snackbarRoot.snackbarText.text = getString(R.string.snackbar_syncing_complete_text)
+                    binding.snackbarRoot.snackbarAction.isVisible = false
+                }else{
+                    binding.snackbarRoot.snackbarText.text = getString(R.string.snackbar_syncing_failed_text)
+                    binding.snackbarRoot.snackbarAction.text = getString(R.string.snackbar_syncing_failed_button)
+                    binding.snackbarRoot.snackbarAction.isVisible = true
+                }
+            }
+        }
+    }
+
+    private fun setupSettingsListener(){
+        lifecycleScope.launchWhenResumed {
+            settings.changed.collect {
+                sharedViewModel.queueIPCSync(it)
+            }
+        }
+    }
+
+    private fun setupAutoDarkService(){
+        lifecycleScope.launchWhenResumed {
+            sharedViewModel.autoDarkServiceStartBus.collect {
+                requireContext().startForegroundService(Intent(requireContext(), DarqAutoDarkForegroundService::class.java).apply {
+                    putExtra(DarqAutoDarkForegroundService.KEY_JUST_RESCHEDULE, true)
+                })
+            }
+        }
+    }
+
+    fun expandAppBar(){
+        binding.appBar.setExpanded(true, true)
+    }
+
+    private fun requestShizukuPermission(): Boolean {
+        return try {
+            Shizuku.requestPermission(0)
+            true
+        }catch (e: IllegalStateException){
+            //Shizuku failed to respond = not running
+            false
+        }
+    }
+
+    private fun setupUpdateChecker(){
+        lifecycleScope.launchWhenResumed {
+            sharedViewModel.update.collect {
+                if(it != null){
+                    navigation.navigate(R.id.action_global_updateAvailableBottomSheetFragment)
+                }
+            }
+        }
+    }
+
+    private fun showShizukuNotRunningSheet() = lifecycleScope.launchWhenResumed {
+        navigation.navigate(R.id.action_global_shizkuNotRunningBottomSheetFragment)
+    }
+
+    private fun showTimeoutSheet() = lifecycleScope.launchWhenResumed {
+        navigation.navigate(R.id.action_global_serviceTimeoutBottomSheetFragment)
+    }
+
+    private fun showShizukuNotInstalledSheet() = lifecycleScope.launchWhenResumed {
+        navigation.navigate(R.id.action_global_shizukuNotInstalledBottomSheetFragment)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/container/ContainerSharedViewModel.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/container/ContainerSharedViewModel.kt
new file mode 100644
index 0000000..6c1e23a
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/container/ContainerSharedViewModel.kt
@@ -0,0 +1,237 @@
+package com.kieronquinn.app.darq.ui.screens.container
+
+import android.content.Context
+import android.os.DeadObjectException
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.components.github.UpdateChecker
+import com.kieronquinn.app.darq.components.settings.DarqSharedPreferences
+import com.kieronquinn.app.darq.model.darq.DarqConstants
+import com.kieronquinn.app.darq.model.settings.IPCSetting
+import com.kieronquinn.app.darq.providers.DarqServiceConnectionProvider
+import com.kieronquinn.app.darq.utils.extensions.isDarkTheme
+import com.kieronquinn.app.darq.utils.extensions.secureSettingIntFlow
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
+import java.util.*
+import kotlin.reflect.KSuspendFunction0
+
+abstract class ContainerSharedViewModel: ViewModel() {
+
+    abstract val loadingState: Flow<ServiceState>
+    abstract fun loadService()
+
+    sealed class ServiceState {
+        object Idle: ServiceState()
+        object Loading: ServiceState()
+        data class Loaded(val serviceCall: KSuspendFunction0<DarqServiceConnectionProvider.ServiceResult>): ServiceState()
+        data class Error(val error: DarqServiceConnectionProvider.ServiceFailureReason): ServiceState()
+    }
+
+    abstract val syncState: Flow<SyncState>
+    abstract val showSnackbar: Flow<Boolean>
+
+    abstract val autoDarkServiceStartBus: Flow<Unit>
+    abstract val autoDarkTheme: Flow<Boolean>
+
+    abstract fun setAutoDarkThemeEnabled(enabled: Boolean)
+
+    sealed class SyncState {
+        object NotSyncing: SyncState()
+        data class Syncing(val syncQueue: Queue<IPCSetting>): SyncState()
+        data class SyncComplete(val success: Boolean): SyncState()
+    }
+
+    abstract fun queueIPCSync(ipcSetting: IPCSetting)
+    abstract suspend fun killOtherInstances(): Boolean
+
+    abstract val darkModeState: Flow<DarkModeState>
+    abstract val currentDarkModeEnabled: Flow<Boolean>
+    abstract val switchWarning: Flow<Int?>
+
+    abstract val update: Flow<UpdateChecker.Update?>
+    abstract fun getAvailableUpdate(): UpdateChecker.Update?
+    abstract fun clearUpdate()
+
+    enum class DarkModeState(val value: Int) {
+        AUTO(0), DISABLED(1), ENABLED(2), CUSTOM(3)
+    }
+
+}
+
+class ContainerSharedViewModelImpl(context: Context, private val serviceProvider: DarqServiceConnectionProvider, private val settings: DarqSharedPreferences, private val updateChecker: UpdateChecker): ContainerSharedViewModel() {
+
+    companion object {
+        private const val TIMEOUT_SYNC_COMPLETE = 2500L
+        private const val SERVICE_START_DEBOUNCE = 500L
+    }
+
+    private val _update = MutableStateFlow<UpdateChecker.Update?>(null).apply {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO){
+                updateChecker.clearCachedDownloads(context)
+            }
+            updateChecker.getLatestRelease().collect {
+                emit(it)
+            }
+        }
+    }
+
+    override val update = _update.asStateFlow()
+
+    override fun getAvailableUpdate(): UpdateChecker.Update? {
+        return _update.value
+    }
+
+    override fun clearUpdate() {
+        viewModelScope.launch {
+            _update.emit(null)
+        }
+    }
+
+    private val _loadingState = MutableStateFlow<ServiceState>(ServiceState.Idle).apply {
+        viewModelScope.launch {
+            collect {
+                when(it){
+                    is ServiceState.Loading -> loadService()
+                }
+            }
+        }
+    }
+
+    private suspend fun MutableStateFlow<ServiceState>.loadService(){
+        when(val result = serviceProvider.getService()){
+            is DarqServiceConnectionProvider.ServiceResult.Success -> {
+                emit(ServiceState.Loaded(serviceProvider::getService))
+            }
+            is DarqServiceConnectionProvider.ServiceResult.Failed -> {
+                emit(ServiceState.Error(result.reason))
+            }
+        }
+    }
+
+    override fun loadService() {
+        viewModelScope.launch {
+            _loadingState.emit(ServiceState.Loading)
+        }
+    }
+
+    override val loadingState = _loadingState.asSharedFlow()
+
+    private val _syncState = MutableStateFlow<SyncState>(SyncState.NotSyncing).apply {
+        viewModelScope.launch {
+            collect {
+                handleLocalSyncChanges(it)
+            }
+        }
+    }
+
+    private var syncCompleteTimeoutJob: Job? = null
+
+    private suspend fun MutableStateFlow<SyncState>.handleLocalSyncChanges(syncState: SyncState) {
+        if(syncState is SyncState.SyncComplete){
+            syncCompleteTimeoutJob = viewModelScope.launch {
+                delay(TIMEOUT_SYNC_COMPLETE)
+                if(value is SyncState.SyncComplete){
+                    syncCompleteTimeoutJob = null
+                    emit(SyncState.NotSyncing)
+                }
+            }
+        }else syncCompleteTimeoutJob?.cancelAndJoin()
+        if(syncState is SyncState.Syncing){
+            runSync()
+        }
+    }
+
+    override fun queueIPCSync(ipcSetting: IPCSetting) {
+        viewModelScope.launch(Dispatchers.IO) {
+            (_syncState.value as? SyncState.Syncing)?.syncQueue?.add(ipcSetting) ?: run {
+                startSyncing(ipcSetting)
+            }
+        }
+    }
+
+    override suspend fun killOtherInstances(): Boolean {
+        val serviceCall = (_loadingState.value as? ServiceState.Loaded) ?: return false
+        val service = serviceCall.serviceCall.invoke()
+        return if(service is DarqServiceConnectionProvider.ServiceResult.Success){
+            try {
+                service.service.killOtherInstances()
+                true
+            }catch (e: DeadObjectException){
+                false
+            }
+        }else false
+    }
+
+    private suspend fun startSyncing(ipcSetting: IPCSetting){
+        _syncState.emit(SyncState.Syncing(ArrayDeque<IPCSetting>().apply {
+            add(ipcSetting)
+        }))
+    }
+
+    private suspend fun runSync(){
+        var syncSuccess = true
+        while(true){
+            val syncQueue = (_syncState.value as? SyncState.Syncing)?.syncQueue ?: break
+            if(syncQueue.size == 0) break
+            val result = syncItem(syncQueue.remove())
+            if(!result){
+                syncSuccess = false
+                break
+            }
+        }
+        _syncState.emit(SyncState.SyncComplete(syncSuccess))
+    }
+
+    private suspend fun syncItem(ipcSetting: IPCSetting): Boolean {
+        val serviceCall = (_loadingState.value as? ServiceState.Loaded) ?: return false
+        val service = serviceCall.serviceCall.invoke()
+        return if(service is DarqServiceConnectionProvider.ServiceResult.Success){
+            try {
+                service.service.notifySettingsChange(ipcSetting)
+                true
+            }catch (e: DeadObjectException){
+                false
+            }
+        }else false
+    }
+
+    override fun setAutoDarkThemeEnabled(enabled: Boolean) {
+        viewModelScope.launch {
+            settings.autoDarkTheme = enabled
+            _autoDarkTheme.emit(enabled)
+        }
+    }
+
+    override val darkModeState = context.secureSettingIntFlow(DarqConstants.SETTINGS_SECURE_UI_MODE, 0).map { setting ->
+        DarkModeState.values().firstOrNull { it.value == setting } ?: DarkModeState.AUTO
+    }
+
+    override val currentDarkModeEnabled = flow {
+        emit(context.isDarkTheme)
+    }
+
+    override val switchWarning = combine(darkModeState, currentDarkModeEnabled){ state, current ->
+        when(state){
+            DarkModeState.DISABLED -> R.string.item_switch_main_subtitle_off
+            else -> {
+                if(current){
+                    null
+                }else{
+                    R.string.item_switch_main_subtitle
+                }
+            }
+        }
+    }
+
+    private val _autoDarkTheme = MutableStateFlow(settings.autoDarkTheme)
+    override val autoDarkTheme = _autoDarkTheme.asStateFlow()
+
+    override val autoDarkServiceStartBus = autoDarkTheme.map { }.debounce(SERVICE_START_DEBOUNCE)
+
+    override val syncState: Flow<SyncState> = _syncState
+    override val showSnackbar: Flow<Boolean> = syncState.map { it !is SyncState.NotSyncing }.distinctUntilChanged { old, new -> old == new }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/dialogs/LocationPermissionDialogFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/dialogs/LocationPermissionDialogFragment.kt
new file mode 100644
index 0000000..08e4af4
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/dialogs/LocationPermissionDialogFragment.kt
@@ -0,0 +1,60 @@
+package com.kieronquinn.app.darq.ui.screens.dialogs
+
+import android.app.Dialog
+import android.content.res.ColorStateList
+import android.os.Bundle
+import android.view.View
+import android.view.WindowManager
+import androidx.core.content.ContextCompat
+import androidx.core.view.WindowCompat
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.databinding.FragmentDialogLocationPermissionBinding
+import com.kieronquinn.app.darq.ui.base.BaseDialogFragment
+import com.kieronquinn.app.darq.ui.screens.container.ContainerSharedViewModel
+import com.kieronquinn.app.darq.utils.extensions.navGraphViewModel
+import com.kieronquinn.monetcompat.extensions.views.overrideRippleColor
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class LocationPermissionDialogFragment: BaseDialogFragment<FragmentDialogLocationPermissionBinding>(FragmentDialogLocationPermissionBinding::inflate) {
+
+    private val sharedViewModel by navGraphViewModel<ContainerSharedViewModel>(R.id.nav_graph_main)
+    private val viewModel by viewModel<LocationPermissionDialogViewModel>()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val background = monet.getBackgroundColorSecondary(requireContext()) ?: monet.getBackgroundColor(requireContext())
+        dialog?.window?.setBackgroundDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.background_dialog_location_permission)?.apply {
+            setTint(background)
+        })
+        val accent = monet.getAccentColor(requireContext())
+        binding.dialogLocationPermissionIcon.imageTintList = ColorStateList.valueOf(accent)
+        binding.dialogLocationPermissionAccept.run {
+            strokeColor = ColorStateList.valueOf(accent)
+            overrideRippleColor(accent)
+            setOnClickListener {
+                viewModel.onUseLocationClicked(sharedViewModel)
+            }
+        }
+        binding.dialogLocationPermissionDeny.run {
+            strokeColor = ColorStateList.valueOf(accent)
+            overrideRippleColor(accent)
+            setOnClickListener {
+                viewModel.onUseTimezoneClicked(sharedViewModel)
+            }
+        }
+        binding.dialogLocationPermissionCancel.setOnClickListener {
+            viewModel.onCancelClicked()
+        }
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+        dialog.window?.let {
+            WindowCompat.setDecorFitsSystemWindows(it, false)
+            it.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+            it.attributes.windowAnimations = R.style.DialogAnimation
+        }
+        return dialog
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/dialogs/LocationPermissionDialogViewModel.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/dialogs/LocationPermissionDialogViewModel.kt
new file mode 100644
index 0000000..a8c2e1b
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/dialogs/LocationPermissionDialogViewModel.kt
@@ -0,0 +1,48 @@
+package com.kieronquinn.app.darq.ui.screens.dialogs
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.kieronquinn.app.darq.components.navigation.Navigation
+import com.kieronquinn.app.darq.components.settings.DarqSharedPreferences
+import com.kieronquinn.app.darq.ui.screens.container.ContainerSharedViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+abstract class LocationPermissionDialogViewModel: ViewModel() {
+
+    abstract fun onUseLocationClicked(sharedViewModel: ContainerSharedViewModel)
+    abstract fun onUseTimezoneClicked(sharedViewModel: ContainerSharedViewModel)
+    abstract fun onCancelClicked()
+
+}
+
+class LocationPermissionDialogViewModelImpl(private val settings: DarqSharedPreferences, private val navigation: Navigation): LocationPermissionDialogViewModel() {
+
+    override fun onUseLocationClicked(sharedViewModel: ContainerSharedViewModel) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO){
+                settings.useLocation = true
+                sharedViewModel.setAutoDarkThemeEnabled(true)
+            }
+            navigation.navigateBack()
+        }
+    }
+
+    override fun onUseTimezoneClicked(sharedViewModel: ContainerSharedViewModel) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO){
+                settings.useLocation = false
+                sharedViewModel.setAutoDarkThemeEnabled(true)
+            }
+            navigation.navigateBack()
+        }
+    }
+
+    override fun onCancelClicked() {
+        viewModelScope.launch {
+            navigation.navigateBack()
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/loading/ServiceConnectFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/loading/ServiceConnectFragment.kt
new file mode 100644
index 0000000..608f5d7
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/loading/ServiceConnectFragment.kt
@@ -0,0 +1,17 @@
+package com.kieronquinn.app.darq.ui.screens.loading
+
+import android.os.Bundle
+import android.view.View
+import com.kieronquinn.app.darq.databinding.FragmentLoadingServiceConnectBinding
+import com.kieronquinn.app.darq.ui.base.AutoExpandOnRotate
+import com.kieronquinn.app.darq.ui.base.BoundFragment
+import com.kieronquinn.monetcompat.extensions.views.applyMonet
+
+class ServiceConnectFragment: BoundFragment<FragmentLoadingServiceConnectBinding>(FragmentLoadingServiceConnectBinding::inflate), AutoExpandOnRotate {
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.loadingProgress.applyMonet()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/BaseSettingsFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/BaseSettingsFragment.kt
new file mode 100644
index 0000000..86880e9
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/BaseSettingsFragment.kt
@@ -0,0 +1,75 @@
+package com.kieronquinn.app.darq.ui.screens.settings
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.components.settings.DarqSharedPreferences
+import com.kieronquinn.app.darq.model.settings.SettingsItem
+import com.kieronquinn.app.darq.ui.base.BoundFragment
+import com.kieronquinn.app.darq.ui.screens.container.ContainerSharedViewModel
+import com.kieronquinn.app.darq.ui.utils.TransitionUtils
+import com.kieronquinn.app.darq.utils.extensions.navGraphViewModel
+import kotlinx.coroutines.flow.collect
+import org.koin.android.ext.android.inject
+
+abstract class BaseSettingsFragment<T: ViewBinding>(inflate: (LayoutInflater, ViewGroup?, Boolean) -> T): BoundFragment<T>(inflate){
+
+    internal val sharedViewModel by navGraphViewModel<ContainerSharedViewModel>(R.id.nav_graph_main)
+    internal abstract val settingsItems: MutableList<SettingsItem>
+    internal val settings by inject<DarqSharedPreferences>()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        exitTransition = TransitionUtils.getMaterialSharedAxis(requireContext(), true, rootViewId = R.id.root)
+        enterTransition = TransitionUtils.getMaterialSharedAxis(requireContext(), true, rootViewId = R.id.root)
+        returnTransition = TransitionUtils.getMaterialSharedAxis(requireContext(), false, rootViewId = R.id.root)
+        reenterTransition = TransitionUtils.getMaterialSharedAxis(requireContext(), false, rootViewId = R.id.root)
+        super.onCreate(savedInstanceState)
+    }
+
+    internal fun setupRecyclerView(recyclerView: RecyclerView, settingsAdapter: SettingsAdapter) {
+        recyclerView.run {
+            layoutManager = LinearLayoutManager(context)
+            adapter = settingsAdapter
+        }
+        ViewCompat.setOnApplyWindowInsetsListener(recyclerView){ view, insets ->
+            val bottomInset = insets.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom
+            view.updatePadding(bottom = bottomInset)
+            insets
+        }
+    }
+
+    internal fun setupSnackbarPadding(recyclerView: RecyclerView){
+        lifecycleScope.launchWhenResumed {
+            sharedViewModel.showSnackbar.collect {
+                if(it){
+                    addSnackbarPadding(recyclerView)
+                }else{
+                    removeSnackbarPadding(recyclerView)
+                }
+            }
+        }
+    }
+
+    private fun addSnackbarPadding(recyclerView: RecyclerView){
+        if(!settingsItems.contains(SettingsItem.SnackbarPadding)){
+            settingsItems.add(SettingsItem.SnackbarPadding)
+            recyclerView.adapter?.notifyItemInserted(settingsItems.size - 1)
+        }
+    }
+
+    private fun removeSnackbarPadding(recyclerView: RecyclerView){
+        if(settingsItems.contains(SettingsItem.SnackbarPadding)){
+            settingsItems.remove(SettingsItem.SnackbarPadding)
+            recyclerView.adapter?.notifyItemRemoved(settingsItems.size)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/SettingsAdapter.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/SettingsAdapter.kt
new file mode 100644
index 0000000..04e43e5
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/SettingsAdapter.kt
@@ -0,0 +1,173 @@
+package com.kieronquinn.app.darq.ui.screens.settings
+
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
+import com.kieronquinn.app.darq.databinding.*
+import com.kieronquinn.app.darq.model.settings.SettingsItem
+import com.kieronquinn.app.darq.model.settings.SettingsItemType
+import com.kieronquinn.app.darq.utils.Links
+import com.kieronquinn.app.darq.ui.utils.MultiTapDetector
+import com.kieronquinn.app.darq.utils.openLink
+import com.kieronquinn.monetcompat.core.MonetCompat
+import com.kieronquinn.monetcompat.extensions.views.applyMonet
+
+class SettingsAdapter(context: Context, private var items: List<SettingsItem>): RecyclerView.Adapter<SettingsAdapter.ViewHolder>() {
+
+    init {
+        setHasStableIds(true)
+    }
+
+    private val layoutInflater by lazy {
+        context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+    }
+
+    private val monet by lazy {
+        MonetCompat.getInstance()
+    }
+
+    private val visibleItems
+        get() = items.filter { it.visible.invoke() }
+
+    override fun getItemCount(): Int = visibleItems.size
+
+    override fun getItemViewType(position: Int): Int {
+        return visibleItems[position].itemType.ordinal
+    }
+
+    override fun getItemId(position: Int): Long {
+        return when(val item = visibleItems[position]){
+            is SettingsItem.SwitchSetting -> item.title.hashCode().toLong()
+            is SettingsItem.Setting -> item.title.hashCode().toLong()
+            is SettingsItem.AboutSetting -> item.title.hashCode().toLong()
+            is SettingsItem.Header -> item.title.hashCode().toLong()
+            is SettingsItem.SnackbarPadding -> 0
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return when(SettingsItemType.values()[viewType]){
+            SettingsItemType.HEADER -> ViewHolder.Header(ItemHeaderBinding.inflate(layoutInflater, parent, false))
+            SettingsItemType.SETTING -> ViewHolder.SettingsSetting(ItemSettingBinding.inflate(layoutInflater, parent, false))
+            SettingsItemType.ABOUT_SETTING -> ViewHolder.SettingsAboutSetting(ItemSettingAboutBinding.inflate(layoutInflater, parent, false))
+            SettingsItemType.SWITCH_SETTING -> ViewHolder.SettingsSwitchSetting(ItemSettingSwitchBinding.inflate(layoutInflater, parent, false))
+            SettingsItemType.SNACKBAR_PADDING -> ViewHolder.SnackbarPadding(ItemSnackbarPaddingBinding.inflate(layoutInflater, parent, false))
+        }
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val item = visibleItems[holder.adapterPosition]
+        when(holder){
+            is ViewHolder.Header -> setupHeader(holder.binding, item as SettingsItem.Header)
+            is ViewHolder.SettingsSetting -> setupSetting(holder.binding, item as SettingsItem.Setting)
+            is ViewHolder.SettingsAboutSetting -> setupTripleTapActionSetting(holder.binding, item as SettingsItem.AboutSetting)
+            is ViewHolder.SettingsSwitchSetting -> setupSettingSwitch(holder.binding, item as SettingsItem.SwitchSetting)
+            is ViewHolder.SnackbarPadding -> {}
+        }
+    }
+
+    private fun setupHeader(binding: ItemHeaderBinding, item: SettingsItem.Header) = with(binding) {
+        itemHeadingTitle.text = item.title
+        itemHeadingTitle.setTextColor(monet.getAccentColor(itemHeadingTitle.context))
+    }
+
+    private fun setupSetting(binding: ItemSettingBinding, item: SettingsItem.Setting) = with(binding) {
+        itemSettingTitle.text = item.title
+        if(item.content.isNullOrEmpty()){
+            itemSettingContent.isVisible = false
+        }else{
+            itemSettingContent.isVisible = true
+            itemSettingContent.text = item.content
+        }
+        if(item.icon != 0) {
+            itemSettingIcon.setImageResource(item.icon)
+        }else{
+            itemSettingIcon.setImageDrawable(ColorDrawable(Color.TRANSPARENT))
+        }
+        item.tapAction?.let { action ->
+            root.setOnClickListener {
+                action.invoke()
+            }
+        }
+    }
+
+    private fun setupTripleTapActionSetting(binding: ItemSettingAboutBinding, item: SettingsItem.AboutSetting) = with(binding) {
+        itemSettingTitle.text = item.title
+        if(item.content.isNullOrEmpty()){
+            itemSettingContent.isVisible = false
+        }else{
+            itemSettingContent.isVisible = true
+            itemSettingContent.text = item.content
+        }
+        if(item.icon != 0) {
+            itemSettingIcon.setImageResource(item.icon)
+        }else{
+            itemSettingIcon.setImageDrawable(ColorDrawable(Color.TRANSPARENT))
+        }
+        item.tripleTapAction?.let { action ->
+            MultiTapDetector(root){ tapCount, lastTap ->
+                if(lastTap && tapCount >= 3){
+                    action.invoke()
+                }
+            }
+        }
+        binding.chipDonate.setOnClickListener {
+            it.context.openLink(Links.LINK_DONATE)
+        }
+        binding.chipTwitter.setOnClickListener {
+            it.context.openLink(Links.LINK_TWITTER)
+        }
+        binding.chipGithub.setOnClickListener {
+            it.context.openLink(Links.LINK_GITHUB)
+        }
+        binding.chipXda.setOnClickListener {
+            it.context.openLink(Links.LINK_XDA)
+        }
+    }
+
+    private fun setupSettingSwitch(binding: ItemSettingSwitchBinding, item: SettingsItem.SwitchSetting) = with(binding) {
+        itemSettingSwitchTitle.text = item.title
+        itemSettingSwitchSwitch.applyMonet()
+        if(item.content.isNullOrEmpty()){
+            itemSettingSwitchContent.isVisible = false
+        }else{
+            itemSettingSwitchContent.isVisible = true
+            itemSettingSwitchContent.text = item.content
+        }
+        if(item.icon != 0) {
+            itemSettingSwitchIcon.setImageResource(item.icon)
+        }else{
+            itemSettingSwitchIcon.setImageDrawable(ColorDrawable(Color.TRANSPARENT))
+        }
+        itemSettingSwitchSwitch.setOnCheckedChangeListener(null)
+        itemSettingSwitchSwitch.isChecked = item.setting.get()
+        itemSettingSwitchSwitch.setOnCheckedChangeListener { button, isChecked ->
+            if(item.tapAction != null){
+                if(item.tapAction.invoke(isChecked)){
+                    item.setting.set(isChecked)
+                }else{
+                    button.isChecked = !isChecked
+                }
+            }else {
+                item.setting.set(isChecked)
+            }
+        }
+        root.setOnClickListener {
+            itemSettingSwitchSwitch.toggle()
+        }
+    }
+
+    sealed class ViewHolder(open val binding: ViewBinding): RecyclerView.ViewHolder(binding.root) {
+        data class Header(override val binding: ItemHeaderBinding): ViewHolder(binding)
+        data class SettingsSetting(override val binding: ItemSettingBinding): ViewHolder(binding)
+        data class SettingsAboutSetting(override val binding: ItemSettingAboutBinding): ViewHolder(binding)
+        data class SettingsSwitchSetting(override val binding: ItemSettingSwitchBinding): ViewHolder(binding)
+        data class SnackbarPadding(override val binding: ItemSnackbarPaddingBinding): ViewHolder(binding)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/SettingsFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/SettingsFragment.kt
new file mode 100644
index 0000000..9337a8f
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/SettingsFragment.kt
@@ -0,0 +1,179 @@
+package com.kieronquinn.app.darq.ui.screens.settings
+
+import android.graphics.Typeface
+import android.os.Bundle
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.SpannableStringBuilder
+import android.text.style.RelativeSizeSpan
+import android.text.style.TypefaceSpan
+import android.view.*
+import androidx.annotation.StringRes
+import androidx.core.content.res.ResourcesCompat
+import androidx.lifecycle.lifecycleScope
+import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
+import com.kieronquinn.app.darq.BuildConfig
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.databinding.FragmentSettingsBinding
+import com.kieronquinn.app.darq.model.settings.SettingsItem
+import com.kieronquinn.app.darq.ui.base.AutoExpandOnRotate
+import com.kieronquinn.app.darq.ui.base.ProvidesOverflow
+import com.kieronquinn.monetcompat.extensions.views.applyMonetRecursively
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class SettingsFragment : BaseSettingsFragment<FragmentSettingsBinding>(FragmentSettingsBinding::inflate), AutoExpandOnRotate, ProvidesOverflow {
+
+    private val viewModel by viewModel<SettingsViewModel>()
+    override val settingsItems by lazy {
+        listOf(
+            SettingsItem.Setting(
+                R.drawable.ic_app_whitelist_round,
+                getString(R.string.item_whitelist_title),
+                getString(R.string.item_whitelist_content),
+                tapAction = viewModel::onAppWhitelistClicked
+            ),
+            SettingsItem.Header(getString(R.string.item_header_options)),
+            SettingsItem.SwitchSetting(
+                R.drawable.ic_oxygen_round,
+                getString(R.string.item_oxygen_force_title),
+                getString(R.string.item_oxygen_force_content),
+                settings::oxygenForceDark,
+                visible = { viewModel.isOxygenForceDarkSupported() }
+            ),
+            SettingsItem.SwitchSetting(
+                R.drawable.ic_day_night_auto_round,
+                getString(R.string.item_day_night_auto_title),
+                getString(R.string.item_day_night_auto_content),
+                settings::autoDarkTheme,
+                tapAction = { checked ->
+                    viewModel.onAutoDarkThemeCheckedChange(checked, sharedViewModel)
+                }
+            ),
+            SettingsItem.Setting(
+                R.drawable.ic_advanced_round,
+                getString(R.string.item_advanced_options_title),
+                getString(R.string.item_advanced_options_content),
+                tapAction = viewModel::onAdvancedOptionsClicked
+            ),
+            SettingsItem.Setting(
+                R.drawable.ic_developer_options_round,
+                getString(R.string.item_developer_options_title),
+                visible = { settings.developerOptions },
+                tapAction = viewModel::onDeveloperOptionsClicked
+            ),
+            SettingsItem.Header(getString(R.string.item_header_about)),
+            SettingsItem.Setting(
+                R.drawable.ic_faq_round,
+                getString(R.string.item_about_faq_title),
+                tapAction = viewModel::onFaqClicked
+            ),
+            SettingsItem.AboutSetting(
+                R.drawable.ic_about_round,
+                getString(R.string.item_about_title, BuildConfig.VERSION_NAME),
+                getString(R.string.item_about_content),
+                tripleTapAction = viewModel::onAboutTripleTapped
+            )
+        ).toMutableList()
+    }
+
+    private val adapter by lazy {
+        SettingsAdapter(requireContext(), settingsItems)
+    }
+
+    private val googleSans by lazy {
+        ResourcesCompat.getFont(requireContext(), R.font.google_sans_text)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val view = super.onCreateView(inflater, container, savedInstanceState)
+        view?.applyMonetRecursively()
+        return view
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupMainSwitch()
+        setupRecyclerView(binding.recyclerView, adapter)
+        setupSnackbarPadding(binding.recyclerView)
+        setupAutoDarkTheme()
+        setupDeveloperOptions()
+    }
+
+    private fun setupMainSwitch() {
+        binding.switchMain.run {
+            mainSwitchSwitch.typeface = ResourcesCompat.getFont(requireContext(), R.font.google_sans_text_medium)
+            mainSwitchSwitch.isChecked = settings.enabled
+            mainSwitchSwitch.setOnCheckedChangeListener { _, isChecked ->
+                settings.enabled = isChecked
+            }
+        }
+        lifecycleScope.launch {
+            sharedViewModel.switchWarning.collect {
+                val update = {
+                    binding.switchMain.mainSwitchSwitch.text = getMainSwitchLabel(it)
+                }
+                if(!isAdded){
+                    lifecycleScope.launchWhenResumed {
+                        update.invoke()
+                    }
+                }else{
+                    update.invoke()
+                }
+            }
+        }
+    }
+
+    //Fragment-level cache to prevent flickering
+    private var isAutoDarkChecked: Boolean? = null
+    private fun setupAutoDarkTheme(){
+        lifecycleScope.launchWhenResumed {
+            sharedViewModel.autoDarkTheme.collect {
+                if(isAutoDarkChecked == it) return@collect
+                isAutoDarkChecked = it
+                adapter.notifyItemChanged(2)
+            }
+        }
+    }
+
+    private fun setupDeveloperOptions(){
+        lifecycleScope.launchWhenResumed {
+            viewModel.developerOptionsVisible.collect {
+                adapter.notifyDataSetChanged()
+            }
+        }
+    }
+
+    private fun getMainSwitchLabel(@StringRes subtitle: Int?): CharSequence {
+        return if(subtitle == null){
+            getString(R.string.item_switch_main_title)
+        }else{
+            val sizeSpan = RelativeSizeSpan(0.75f)
+            val fontSpan = TypefaceSpan(googleSans ?: Typeface.DEFAULT)
+            val secondLine = SpannableString(getString(subtitle)).apply {
+                setSpan(sizeSpan, 0, length, Spannable.SPAN_INCLUSIVE_INCLUSIVE)
+                setSpan(fontSpan, 0, length, Spannable.SPAN_INCLUSIVE_INCLUSIVE)
+            }
+            SpannableStringBuilder().apply {
+                appendLine(getString(R.string.item_switch_main_title))
+                append(secondLine)
+            }
+        }
+    }
+
+    override fun inflateMenu(menuInflater: MenuInflater, menu: Menu) {
+        menuInflater.inflate(R.menu.menu_main, menu)
+    }
+
+    override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+        when(menuItem.itemId){
+            R.id.menu_open_source_libraries -> {
+                OssLicensesMenuActivity.setActivityTitle(getString(R.string.menu_open_source_libraries))
+                viewModel.onOssLicencesClicked()
+            }
+        }
+        return true
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/SettingsViewModel.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/SettingsViewModel.kt
new file mode 100644
index 0000000..cf016c6
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/SettingsViewModel.kt
@@ -0,0 +1,87 @@
+package com.kieronquinn.app.darq.ui.screens.settings
+
+import android.os.Build
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.kieronquinn.app.darq.components.navigation.Navigation
+import com.kieronquinn.app.darq.components.settings.DarqSharedPreferences
+import com.kieronquinn.app.darq.ui.screens.container.ContainerSharedViewModel
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+
+abstract class SettingsViewModel: ViewModel() {
+
+    abstract val developerOptionsVisible: Flow<Boolean>
+
+    abstract fun onAdvancedOptionsClicked()
+    abstract fun onAppWhitelistClicked()
+    abstract fun onDeveloperOptionsClicked()
+    abstract fun onAutoDarkThemeCheckedChange(checked: Boolean, sharedViewModel: ContainerSharedViewModel): Boolean
+    abstract fun onFaqClicked()
+    abstract fun onAboutTripleTapped()
+    abstract fun onOssLicencesClicked()
+    abstract fun isOxygenForceDarkSupported(): Boolean
+
+}
+
+class SettingsViewModelImpl(private val navigation: Navigation, private val settings: DarqSharedPreferences): SettingsViewModel() {
+
+    private val _developerOptionsVisible = MutableStateFlow(settings.developerOptions)
+    override val developerOptionsVisible = _developerOptionsVisible.asStateFlow()
+
+    override fun onAdvancedOptionsClicked() {
+        viewModelScope.launch {
+            navigation.navigate(SettingsFragmentDirections.actionSettingsFragmentToSettingsAdvancedFragment())
+        }
+    }
+
+    override fun onAppWhitelistClicked() {
+        viewModelScope.launch {
+            navigation.navigate(SettingsFragmentDirections.actionSettingsFragmentToSettingsAppPickerFragment())
+        }
+    }
+
+    override fun onDeveloperOptionsClicked() {
+        viewModelScope.launch {
+            navigation.navigate(SettingsFragmentDirections.actionSettingsFragmentToSettingsDeveloperOptionsFragment())
+        }
+    }
+
+    override fun onAutoDarkThemeCheckedChange(checked: Boolean, sharedViewModel: ContainerSharedViewModel): Boolean {
+        if(!checked){
+            sharedViewModel.setAutoDarkThemeEnabled(false)
+            return true
+        }
+        viewModelScope.launch {
+            navigation.navigate(SettingsFragmentDirections.actionSettingsFragmentToLocationPermissionDialogFragment())
+        }
+        return false
+    }
+
+    override fun onFaqClicked() {
+        viewModelScope.launch {
+            navigation.navigate(SettingsFragmentDirections.actionSettingsFragmentToSettingsFaqFragment())
+        }
+    }
+
+    override fun onAboutTripleTapped() {
+        viewModelScope.launch {
+            val newValue = !settings.developerOptions
+            settings.developerOptions = newValue
+            _developerOptionsVisible.emit(newValue)
+        }
+    }
+
+    override fun onOssLicencesClicked() {
+        viewModelScope.launch {
+            navigation.navigate(SettingsFragmentDirections.actionSettingsFragmentToOssLicencesActivity())
+        }
+    }
+
+    override fun isOxygenForceDarkSupported(): Boolean {
+        return Build.MANUFACTURER == "OnePlus" && Build.VERSION.SDK_INT < Build.VERSION_CODES.R
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/advanced/SettingsAdvancedFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/advanced/SettingsAdvancedFragment.kt
new file mode 100644
index 0000000..a5ac827
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/advanced/SettingsAdvancedFragment.kt
@@ -0,0 +1,51 @@
+package com.kieronquinn.app.darq.ui.screens.settings.advanced
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.databinding.FragmentSettingsAdvancedBinding
+import com.kieronquinn.app.darq.model.settings.SettingsItem
+import com.kieronquinn.app.darq.ui.base.AutoExpandOnRotate
+import com.kieronquinn.app.darq.ui.base.BackAvailable
+import com.kieronquinn.app.darq.ui.screens.settings.BaseSettingsFragment
+import com.kieronquinn.app.darq.ui.screens.settings.SettingsAdapter
+import com.kieronquinn.monetcompat.extensions.views.applyMonetRecursively
+
+class SettingsAdvancedFragment : BaseSettingsFragment<FragmentSettingsAdvancedBinding>(FragmentSettingsAdvancedBinding::inflate), AutoExpandOnRotate, BackAvailable {
+
+    override val settingsItems by lazy {
+        listOf<SettingsItem>(
+            SettingsItem.SwitchSetting(
+                R.drawable.ic_advanced_always_use_force_dark,
+                getString(R.string.item_always_use_force_dark_title),
+                getString(R.string.item_always_use_force_dark_content),
+                settings::alwaysForceDark
+            ),
+            SettingsItem.SwitchSetting(
+                R.drawable.ic_advanced_send_app_closes,
+                getString(R.string.item_send_app_closes_title),
+                getString(R.string.item_send_app_closes_content),
+                settings::sendAppCloses
+            )
+        ).toMutableList()
+    }
+
+    private val adapter by lazy {
+        SettingsAdapter(requireContext(), settingsItems)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val view = super.onCreateView(inflater, container, savedInstanceState)
+        view?.applyMonetRecursively()
+        return view
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupRecyclerView(binding.recyclerView, adapter)
+        setupSnackbarPadding(binding.recyclerView)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/apppicker/SettingsAppPickerAdapter.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/apppicker/SettingsAppPickerAdapter.kt
new file mode 100644
index 0000000..5f4bc74
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/apppicker/SettingsAppPickerAdapter.kt
@@ -0,0 +1,108 @@
+package com.kieronquinn.app.darq.ui.screens.settings.apppicker
+
+import android.content.Context
+import android.net.Uri
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.kieronquinn.app.darq.databinding.ItemAppBinding
+import com.kieronquinn.app.darq.databinding.ItemSnackbarPaddingBinding
+import com.kieronquinn.app.darq.model.settings.AppPickerItem
+import com.kieronquinn.app.darq.model.settings.AppPickerItemType
+import com.kieronquinn.app.darq.utils.AppIconRequestHandler
+import com.kieronquinn.monetcompat.extensions.views.applyMonet
+import com.squareup.picasso.Picasso
+
+class SettingsAppPickerAdapter(
+    context: Context,
+    private val items: MutableList<AppPickerItem>,
+    private val onPackageEnabledChanged: (AppPickerItem.App) -> Unit
+): RecyclerView.Adapter<SettingsAppPickerAdapter.ViewHolder>() {
+
+    init {
+        setHasStableIds(true)
+    }
+
+    private val layoutInflater by lazy {
+        context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+    }
+
+    private val picasso by lazy {
+        Picasso.get()
+    }
+
+    override fun getItemCount(): Int {
+        return items.size
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        val item = items[position]
+        return item.itemType.ordinal
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return when(AppPickerItemType.values().find { it.ordinal == viewType }!!){
+            AppPickerItemType.APP -> ViewHolder.ItemAppViewHolder(ItemAppBinding.inflate(layoutInflater, parent, false))
+            AppPickerItemType.SNACKBAR_PADDING -> ViewHolder.ItemSnackbarPaddingViewHolder(ItemSnackbarPaddingBinding.inflate(layoutInflater, parent, false))
+        }
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val item = items[holder.adapterPosition]
+        when(holder){
+            is ViewHolder.ItemAppViewHolder -> setupApp(holder.binding, item as AppPickerItem.App)
+        }
+    }
+
+    private fun setupApp(binding: ItemAppBinding, item: AppPickerItem.App){
+        with(binding){
+            title.text = item.label
+            val uri = Uri.parse("${AppIconRequestHandler.SCHEME_PNAME}:${item.packageName}")
+            picasso.load(uri).into(icon)
+            checkbox.applyMonet()
+            checkbox.setOnCheckedChangeListener(null)
+            checkbox.isChecked = item.enabled
+            checkbox.setOnCheckedChangeListener { _, isChecked ->
+                item.enabled = isChecked
+                onPackageEnabledChanged.invoke(item)
+            }
+            root.setOnClickListener {
+                checkbox.toggle()
+            }
+        }
+    }
+
+    fun setItems(items: List<AppPickerItem>){
+        this.items.clear()
+        this.items.addAll(items)
+        notifyDataSetChanged()
+    }
+
+    override fun getItemId(position: Int): Long {
+        return when(val item = items[position]){
+            is AppPickerItem.App -> item.packageName.hashCode().toLong()
+            is AppPickerItem.SnackbarPadding -> "SnackbarPadding".hashCode().toLong()
+        }
+    }
+
+    fun addSnackbarPadding(){
+        if(!items.contains(AppPickerItem.SnackbarPadding)){
+            items.add(AppPickerItem.SnackbarPadding)
+            notifyItemInserted(items.size - 1)
+        }
+    }
+
+    fun removeSnackbarPadding(){
+        if(items.contains(AppPickerItem.SnackbarPadding)){
+            items.remove(AppPickerItem.SnackbarPadding)
+            notifyItemRemoved(items.size)
+        }
+    }
+
+    sealed class ViewHolder(open val view: View): RecyclerView.ViewHolder(view) {
+        data class ItemAppViewHolder(val binding: ItemAppBinding): ViewHolder(binding.root)
+        data class ItemSnackbarPaddingViewHolder(val binding: ItemSnackbarPaddingBinding): ViewHolder(binding.root)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/apppicker/SettingsAppPickerFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/apppicker/SettingsAppPickerFragment.kt
new file mode 100644
index 0000000..598754a
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/apppicker/SettingsAppPickerFragment.kt
@@ -0,0 +1,192 @@
+package com.kieronquinn.app.darq.ui.screens.settings.apppicker
+
+import android.content.res.ColorStateList
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.*
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.databinding.FragmentAppPickerBinding
+import com.kieronquinn.app.darq.model.settings.AppPickerItem
+import com.kieronquinn.app.darq.ui.base.BackAvailable
+import com.kieronquinn.app.darq.ui.base.BoundFragment
+import com.kieronquinn.app.darq.ui.base.ProvidesOverflow
+import com.kieronquinn.app.darq.ui.screens.container.ContainerSharedViewModel
+import com.kieronquinn.app.darq.ui.utils.TransitionUtils
+import com.kieronquinn.app.darq.utils.extensions.applyMonetToFastScroller
+import com.kieronquinn.app.darq.utils.extensions.expandAppBar
+import com.kieronquinn.app.darq.utils.extensions.navGraphViewModel
+import com.kieronquinn.monetcompat.extensions.views.applyMonetRecursively
+import com.kieronquinn.monetcompat.extensions.views.enableStretchOverscroll
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.launch
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+
+class SettingsAppPickerFragment :
+    BoundFragment<FragmentAppPickerBinding>(FragmentAppPickerBinding::inflate), BackAvailable, ProvidesOverflow {
+
+    private val viewModel by viewModel<SettingsAppPickerViewModel>()
+    private val sharedViewModel by navGraphViewModel<ContainerSharedViewModel>(R.id.nav_graph_main)
+
+    private val adapter by lazy {
+        SettingsAppPickerAdapter(
+            requireContext(),
+            emptyList<AppPickerItem>().toMutableList(),
+            this::onPackageEnabledChanged
+        )
+    }
+
+    private val searchTextWatcher = object : TextWatcher {
+
+        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+            viewModel.setSearchTerm(s?.toString() ?: return)
+        }
+
+        override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+
+        override fun afterTextChanged(s: Editable?) {}
+
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        exitTransition = TransitionUtils.getMaterialSharedAxis(requireContext(), true, rootViewId = R.id.root)
+        enterTransition = TransitionUtils.getMaterialSharedAxis(requireContext(), true, rootViewId = R.id.root)
+        returnTransition = TransitionUtils.getMaterialSharedAxis(requireContext(), false, rootViewId = R.id.root)
+        reenterTransition = TransitionUtils.getMaterialSharedAxis(requireContext(), false, rootViewId = R.id.root)
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val view = super.onCreateView(inflater, container, savedInstanceState)
+        view?.applyMonetRecursively()
+        return view
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setLoadingState(loading = true, isEmpty = false)
+        setupRecyclerView()
+        setupViewModel()
+        setupSearch()
+        setupSnackbarPadding()
+    }
+
+    private fun setupRecyclerView() {
+        with(binding.recyclerView) {
+            layoutManager = LinearLayoutManager(context)
+            adapter = this@SettingsAppPickerFragment.adapter
+            ViewCompat.setOnApplyWindowInsetsListener(this){ view, insets ->
+                val requiredInsets = insets.getInsets(WindowInsetsCompat.Type.ime() or WindowInsetsCompat.Type.navigationBars() or WindowInsetsCompat.Type.statusBars())
+                updatePadding(left = requiredInsets.left, right = requiredInsets.right, bottom = requiredInsets.bottom)
+                insets
+            }
+            enableStretchOverscroll()
+            applyMonetToFastScroller()
+        }
+    }
+
+    private fun setupViewModel() {
+        lifecycleScope.launchWhenResumed {
+            launch {
+                viewModel.loadState.debounce(50).collect {
+                    handleLoadState(it)
+                }
+            }
+        }
+    }
+
+    private fun handleLoadState(loadState: SettingsAppPickerViewModel.LoadState) {
+        setLoadingState(
+            loadState is SettingsAppPickerViewModel.LoadState.Loading,
+            (loadState is SettingsAppPickerViewModel.LoadState.Loaded && loadState.apps.isEmpty())
+        )
+        if (loadState is SettingsAppPickerViewModel.LoadState.Loaded) {
+            adapter.setItems(loadState.apps)
+        }
+    }
+
+    private fun setLoadingState(loading: Boolean, isEmpty: Boolean) {
+        binding.recyclerView.isVisible = !loading && !isEmpty
+        binding.appPickerLoading.isVisible = loading && !isEmpty
+        binding.appPickerEmpty.isVisible = isEmpty
+    }
+
+    private fun setupSearch() {
+        with(binding.appPickerSearch) {
+            val background = monet.getBackgroundColor(requireContext())
+            val secondaryBackground = monet.getBackgroundColorSecondary(requireContext()) ?: background
+            root.setBackgroundColor(background)
+            searchBox.backgroundTintList = ColorStateList.valueOf(secondaryBackground)
+            searchBox.text.run {
+                clear()
+                append(viewModel.getSearchTerm())
+            }
+            searchBox.setOnClickListener {
+                expandAppBar()
+            }
+            lifecycleScope.launchWhenResumed {
+                viewModel.showSearchClearButton.collect {
+                    searchClear.isVisible = it
+                }
+            }
+            searchClear.setOnClickListener {
+                searchBox.text.clear()
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        binding.appPickerSearch.searchBox.addTextChangedListener(searchTextWatcher)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        binding.appPickerSearch.searchBox.removeTextChangedListener(searchTextWatcher)
+    }
+
+    private fun onPackageEnabledChanged(appPickerItem: AppPickerItem.App){
+        viewModel.onPackageEnabledChanged(appPickerItem)
+        sharedViewModel.queueIPCSync(appPickerItem.toIPCSetting())
+    }
+
+    private fun setupSnackbarPadding(){
+        lifecycleScope.launchWhenResumed {
+            sharedViewModel.showSnackbar.collect {
+                if(it){
+                    adapter.addSnackbarPadding()
+                }else{
+                    adapter.removeSnackbarPadding()
+                }
+            }
+        }
+    }
+
+    override fun inflateMenu(menuInflater: MenuInflater, menu: Menu) {
+        menuInflater.inflate(R.menu.menu_app_picker, menu)
+        menu.findItem(R.id.menu_app_picker_show_non_launchable_apps).run {
+            isChecked = viewModel.getShowAllApps()
+        }
+    }
+
+    override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+        if(menuItem.itemId != R.id.menu_app_picker_show_non_launchable_apps) return false
+        toggleLaunchableApps(menuItem)
+        return true
+    }
+
+    private fun toggleLaunchableApps(menuItem: MenuItem){
+        val newState = !menuItem.isChecked
+        menuItem.isChecked = newState
+        viewModel.setShowAllApps(newState)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/apppicker/SettingsAppPickerViewModel.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/apppicker/SettingsAppPickerViewModel.kt
new file mode 100644
index 0000000..03526fe
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/apppicker/SettingsAppPickerViewModel.kt
@@ -0,0 +1,163 @@
+package com.kieronquinn.app.darq.ui.screens.settings.apppicker
+
+import android.content.Context
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.kieronquinn.app.darq.BuildConfig
+import com.kieronquinn.app.darq.components.settings.DarqSharedPreferences
+import com.kieronquinn.app.darq.model.settings.AppPickerItem
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.channels.BufferOverflow
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.util.*
+
+abstract class SettingsAppPickerViewModel : ViewModel() {
+
+    abstract val loadState: Flow<LoadState>
+    abstract val showSearchClearButton: Flow<Boolean>
+
+    abstract fun onPackageEnabledChanged(app: AppPickerItem.App)
+    abstract fun setSearchTerm(searchTerm: String)
+    abstract fun getSearchTerm(): String
+    abstract fun setShowAllApps(showAllApps: Boolean)
+    abstract fun getShowAllApps(): Boolean
+
+    sealed class LoadState {
+        object Loading : LoadState()
+        data class Loaded(val apps: List<AppPickerItem.App>) : LoadState()
+    }
+
+}
+
+class SettingsAppPickerViewModelImpl(
+    context: Context,
+    private val settings: DarqSharedPreferences
+) : SettingsAppPickerViewModel() {
+
+    private val packageManager by lazy {
+        context.packageManager
+    }
+
+    private val allApps = MutableSharedFlow<List<InstalledApp>>(
+        replay = 1,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
+    ).apply {
+        viewModelScope.launch(Dispatchers.IO) {
+            emit(packageManager.getInstalledApplications(0).mapNotNull {
+                if(it.packageName == BuildConfig.APPLICATION_ID) return@mapNotNull null
+                InstalledApp(it.packageName, it.loadLabel(packageManager))
+            })
+        }
+    }
+
+    private val launchableApps = MutableSharedFlow<List<InstalledApp>>(
+        replay = 1,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST
+    ).apply {
+        viewModelScope.launch(Dispatchers.IO){
+            val apps = allApps.map {
+                it.filter { app -> packageManager.getLaunchIntentForPackage(app.packageName) != null }
+            }.first()
+            emit(apps)
+        }
+    }
+
+    private val selectedApps = MutableStateFlow<MutableList<String>?>(null).apply {
+        viewModelScope.launch(Dispatchers.IO) {
+            emit(settings.enabledApps.toMutableList())
+        }
+    }
+
+    private val _loadState = MutableStateFlow<LoadState>(LoadState.Loading)
+    override val loadState = _loadState.asStateFlow()
+
+    private val searchTerm = MutableStateFlow("")
+
+    override val showSearchClearButton: Flow<Boolean> = searchTerm.map { it.isNotEmpty() }
+
+    private val showAllApps = MutableStateFlow(false).apply {
+        viewModelScope.launch {
+            collect {
+                loadApps()
+            }
+        }
+    }
+
+    private suspend fun loadApps() {
+        _loadState.emit(LoadState.Loading)
+        val apps = combine(
+            allApps,
+            launchableApps,
+            selectedApps.filterNotNull(),
+            searchTerm
+        ) { all, launchable, selected, search ->
+            withContext(Dispatchers.IO) {
+                if (showAllApps.value) all.map {
+                    AppPickerItem.App(
+                        it.packageName,
+                        it.label,
+                        selected.contains(it.packageName)
+                    )
+                }
+                else launchable.map {
+                    AppPickerItem.App(
+                        it.packageName,
+                        it.label,
+                        selected.contains(it.packageName)
+                    )
+                }
+            }.sortedBy { it.label.toString().toLowerCase(Locale.getDefault()) }.run {
+                if (search.isNotEmpty()) filter {
+                    it.label.toString().toLowerCase(Locale.getDefault()).contains(
+                        search.toLowerCase(
+                            Locale.getDefault()
+                        )
+                    )
+                }else this
+            }
+        }.first()
+        _loadState.emit(LoadState.Loaded(apps))
+    }
+
+    override fun onPackageEnabledChanged(app: AppPickerItem.App) {
+        viewModelScope.launch(Dispatchers.IO) {
+            val currentSelectedApps = selectedApps.value ?: return@launch
+            if (app.enabled) {
+                if (!currentSelectedApps.contains(app.packageName)) {
+                    currentSelectedApps.add(app.packageName)
+                }
+            } else {
+                if (currentSelectedApps.contains(app.packageName)) {
+                    currentSelectedApps.remove(app.packageName)
+                }
+            }
+            settings.enabledApps = currentSelectedApps.toTypedArray()
+        }
+    }
+
+    override fun setSearchTerm(searchTerm: String) {
+        viewModelScope.launch {
+            this@SettingsAppPickerViewModelImpl.searchTerm.emit(searchTerm)
+            loadApps()
+        }
+    }
+
+    override fun getSearchTerm(): String {
+        return searchTerm.value
+    }
+
+    override fun setShowAllApps(showAllApps: Boolean) {
+        viewModelScope.launch {
+            this@SettingsAppPickerViewModelImpl.showAllApps.emit(showAllApps)
+        }
+    }
+
+    override fun getShowAllApps(): Boolean {
+        return showAllApps.value
+    }
+
+    private data class InstalledApp(val packageName: String, val label: CharSequence)
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/developer/SettingsDeveloperOptionsFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/developer/SettingsDeveloperOptionsFragment.kt
new file mode 100644
index 0000000..c87e3ba
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/developer/SettingsDeveloperOptionsFragment.kt
@@ -0,0 +1,86 @@
+package com.kieronquinn.app.darq.ui.screens.settings.developer
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.lifecycle.lifecycleScope
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.databinding.FragmentSettingsDeveloperOptionsBinding
+import com.kieronquinn.app.darq.model.settings.SettingsItem
+import com.kieronquinn.app.darq.ui.base.AutoExpandOnRotate
+import com.kieronquinn.app.darq.ui.base.BackAvailable
+import com.kieronquinn.app.darq.ui.screens.settings.BaseSettingsFragment
+import com.kieronquinn.app.darq.ui.screens.settings.SettingsAdapter
+import com.kieronquinn.monetcompat.extensions.views.applyMonetRecursively
+import kotlinx.coroutines.flow.collect
+import org.koin.androidx.viewmodel.ext.android.viewModel
+
+class SettingsDeveloperOptionsFragment: BaseSettingsFragment<FragmentSettingsDeveloperOptionsBinding>(FragmentSettingsDeveloperOptionsBinding::inflate), BackAvailable,
+    AutoExpandOnRotate {
+
+    private val viewModel by viewModel<SettingsDeveloperOptionsViewModel>()
+
+    override val settingsItems by lazy {
+        listOf<SettingsItem>(
+            SettingsItem.Setting(
+                R.drawable.ic_monet,
+                getString(R.string.item_developer_options_monet_color_picker_title),
+                getString(R.string.item_developer_options_monet_color_picker_content),
+                tapAction = viewModel::onMonetColorPickerClicked
+            ),
+            SettingsItem.Setting(
+                R.drawable.ic_developer_options_kill,
+                getString(R.string.item_developer_options_kill_service_title),
+                getString(R.string.item_developer_options_kill_service_content),
+                tapAction = this::onKillOtherInstancesClicked
+            ),
+            SettingsItem.Setting(
+                R.drawable.ic_developer_options_service_info,
+                getString(R.string.item_developer_options_service_info)
+            )
+        ).toMutableList()
+    }
+
+    private val adapter by lazy {
+        SettingsAdapter(requireContext(), settingsItems)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val view = super.onCreateView(inflater, container, savedInstanceState)
+        view?.applyMonetRecursively()
+        return view
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupRecyclerView(binding.recyclerView, adapter)
+        setupSnackbarPadding(binding.recyclerView)
+        loadServiceState()
+    }
+
+    private fun loadServiceState(){
+        lifecycleScope.launchWhenResumed {
+            viewModel.getServiceInfo(sharedViewModel).collect {
+                (settingsItems[2] as SettingsItem.Setting).content = if(it.second == null){
+                    getString(it.first)
+                }else{
+                    getString(it.first, it.second)
+                }
+                adapter.notifyItemChanged(2)
+            }
+        }
+    }
+
+    private fun onKillOtherInstancesClicked() {
+        lifecycleScope.launchWhenResumed {
+            if(sharedViewModel.killOtherInstances()){
+                Toast.makeText(requireContext(), R.string.item_developer_options_kill_service_toast_success, Toast.LENGTH_LONG).show()
+            }else{
+                Toast.makeText(requireContext(), R.string.item_developer_options_kill_service_toast_failed, Toast.LENGTH_LONG).show()
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/developer/SettingsDeveloperOptionsViewModel.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/developer/SettingsDeveloperOptionsViewModel.kt
new file mode 100644
index 0000000..7fefb63
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/developer/SettingsDeveloperOptionsViewModel.kt
@@ -0,0 +1,49 @@
+package com.kieronquinn.app.darq.ui.screens.settings.developer
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.components.navigation.Navigation
+import com.kieronquinn.app.darq.providers.DarqServiceConnectionProvider
+import com.kieronquinn.app.darq.ui.screens.container.ContainerSharedViewModel
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+
+abstract class SettingsDeveloperOptionsViewModel: ViewModel() {
+
+    abstract fun getServiceInfo(sharedViewModel: ContainerSharedViewModel): Flow<Pair<Int, String?>>
+    abstract fun onMonetColorPickerClicked()
+
+}
+
+class SettingsDeveloperOptionsViewModelImpl(private val navigation: Navigation): SettingsDeveloperOptionsViewModel() {
+
+    override fun getServiceInfo(sharedViewModel: ContainerSharedViewModel) = sharedViewModel.loadingState.map {
+        if(it is ContainerSharedViewModel.ServiceState.Loaded){
+            val serviceType = getServiceState(it.serviceCall)
+            if(serviceType != null) {
+                Pair(R.string.item_developer_options_service_info_connected, serviceType)
+            }else{
+                Pair(R.string.item_developer_options_service_info_not_connected, null)
+            }
+        }else{
+            Pair(R.string.item_developer_options_service_info_not_connected, null)
+        }
+    }
+
+    private suspend fun getServiceState(serviceCall: suspend () -> DarqServiceConnectionProvider.ServiceResult): String? {
+        val service = serviceCall.invoke()
+        if(service is DarqServiceConnectionProvider.ServiceResult.Success){
+            return service.service.serviceType
+        }
+        return null
+    }
+
+    override fun onMonetColorPickerClicked() {
+        viewModelScope.launch {
+            navigation.navigate(SettingsDeveloperOptionsFragmentDirections.actionSettingsDeveloperOptionsFragmentToColorPickerBottomSheetFragment())
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/developer/colorpicker/ColorPickerAdapter.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/developer/colorpicker/ColorPickerAdapter.kt
new file mode 100644
index 0000000..92fdfa3
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/developer/colorpicker/ColorPickerAdapter.kt
@@ -0,0 +1,36 @@
+package com.kieronquinn.app.darq.ui.screens.settings.developer.colorpicker
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import com.kieronquinn.app.darq.databinding.ItemColorPickerBinding
+
+class ColorPickerAdapter(context: Context, private val selectedColor: Int?, private val colors: List<Int>, private val onColorPicked: (Int) -> Unit): RecyclerView.Adapter<ColorPickerAdapter.ViewHolder>() {
+
+    private val layoutInflater by lazy {
+        context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
+    }
+
+    override fun getItemCount() = colors.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return ViewHolder(ItemColorPickerBinding.inflate(layoutInflater, parent, false))
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val color = colors[position]
+        with(holder.binding){
+            itemColorPickerBackground.backgroundTintList = ColorStateList.valueOf(color)
+            itemColorPickerCheck.isVisible = color == selectedColor
+            itemColorPickerBackground.setOnClickListener {
+                onColorPicked.invoke(color)
+            }
+        }
+    }
+
+    data class ViewHolder(val binding: ItemColorPickerBinding): RecyclerView.ViewHolder(binding.root)
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/developer/colorpicker/ColorPickerBottomSheetFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/developer/colorpicker/ColorPickerBottomSheetFragment.kt
new file mode 100644
index 0000000..7c720c3
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/developer/colorpicker/ColorPickerBottomSheetFragment.kt
@@ -0,0 +1,59 @@
+package com.kieronquinn.app.darq.ui.screens.settings.developer.colorpicker
+
+import android.content.res.ColorStateList
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.components.settings.DarqSharedPreferences
+import com.kieronquinn.app.darq.databinding.FragmentBottomSheetColorPickerBinding
+import com.kieronquinn.app.darq.ui.base.BaseBottomSheetFragment
+import org.koin.android.ext.android.inject
+
+class ColorPickerBottomSheetFragment : BaseBottomSheetFragment<FragmentBottomSheetColorPickerBinding>(FragmentBottomSheetColorPickerBinding::inflate) {
+
+    private val settings by inject<DarqSharedPreferences>()
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        ViewCompat.setOnApplyWindowInsetsListener(view){ _, insets ->
+            val navigationInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars())
+            val extraPadding = resources.getDimension(R.dimen.padding_16).toInt()
+            view.updatePadding(left = navigationInsets.left, right = navigationInsets.right, bottom = navigationInsets.bottom + extraPadding)
+            insets
+        }
+        lifecycleScope.launchWhenResumed {
+            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
+                }
+                root.backgroundTintList = ColorStateList.valueOf(monet.getBackgroundColor(requireContext()))
+                colorPickerList.layoutManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false)
+                colorPickerList.adapter = ColorPickerAdapter(requireContext(), monet.getSelectedWallpaperColor(), availableColors){
+                    onColorPicked(it)
+                }
+                colorPickerOk.setOnClickListener {
+                    dialog?.dismiss()
+                }
+                colorPickerOk.setTextColor(monet.getAccentColor(requireContext()))
+            }
+        }
+    }
+
+    private fun onColorPicked(color: Int) = lifecycleScope.launchWhenResumed {
+        settings.monetColor = color
+        //Trigger a manual update
+        monet.updateMonetColors()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/faq/SettingsFaqFragment.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/faq/SettingsFaqFragment.kt
new file mode 100644
index 0000000..d65e4e8
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/screens/settings/faq/SettingsFaqFragment.kt
@@ -0,0 +1,62 @@
+package com.kieronquinn.app.darq.ui.screens.settings.faq
+
+import android.os.Bundle
+import android.text.style.ForegroundColorSpan
+import android.view.View
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
+import com.kieronquinn.app.darq.R
+import com.kieronquinn.app.darq.databinding.FragmentSettingsFaqBinding
+import com.kieronquinn.app.darq.ui.base.AutoExpandOnRotate
+import com.kieronquinn.app.darq.ui.base.BackAvailable
+import com.kieronquinn.app.darq.ui.base.BoundFragment
+import com.kieronquinn.app.darq.ui.utils.TransitionUtils
+import com.kieronquinn.app.darq.utils.extensions.getColorResCompat
+import com.kieronquinn.monetcompat.extensions.views.enableStretchOverscroll
+import org.commonmark.node.Heading
+import ru.noties.markwon.AbstractMarkwonPlugin
+import ru.noties.markwon.Markwon
+import ru.noties.markwon.MarkwonSpansFactory
+import ru.noties.markwon.core.MarkwonTheme
+
+class SettingsFaqFragment: BoundFragment<FragmentSettingsFaqBinding>(FragmentSettingsFaqBinding::inflate), BackAvailable, AutoExpandOnRotate {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        exitTransition = TransitionUtils.getMaterialSharedAxis(requireContext(), true, rootViewId = R.id.root)
+        enterTransition = TransitionUtils.getMaterialSharedAxis(requireContext(), true, rootViewId = R.id.root)
+        returnTransition = TransitionUtils.getMaterialSharedAxis(requireContext(), false, rootViewId = R.id.root)
+        reenterTransition = TransitionUtils.getMaterialSharedAxis(requireContext(), false, rootViewId = R.id.root)
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val typeface = ResourcesCompat.getFont(requireContext(), R.font.google_sans_text_medium)
+        val markwon = Markwon.builder(requireContext()).usePlugin(object: AbstractMarkwonPlugin() {
+            override fun configureTheme(builder: MarkwonTheme.Builder) {
+                typeface?.let {
+                    builder.headingTypeface(it)
+                    builder.headingBreakHeight(0)
+                }
+            }
+
+            override fun configureSpansFactory(builder: MarkwonSpansFactory.Builder) {
+                val origin = builder.requireFactory(Heading::class.java)
+                builder.setFactory(Heading::class.java) { configuration, props ->
+                    arrayOf(origin.getSpans(configuration, props), ForegroundColorSpan(requireContext().getColorResCompat(android.R.attr.textColorPrimary)))
+                }
+            }
+        }).build()
+        val markdown = requireContext().assets.open("faq.md").bufferedReader().use { it.readText() }
+        binding.markdown.text = markwon.toMarkdown(markdown)
+        ViewCompat.setOnApplyWindowInsetsListener(binding.markdown){ view, insets ->
+            val bottomInset = insets.getInsets(WindowInsetsCompat.Type.navigationBars() or WindowInsetsCompat.Type.ime()).bottom
+            view.updatePadding(bottom = bottomInset)
+            insets
+        }
+        binding.root.enableStretchOverscroll()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/utils/AutoClearedValue.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/utils/AutoClearedValue.kt
new file mode 100644
index 0000000..d6696c3
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/utils/AutoClearedValue.kt
@@ -0,0 +1,62 @@
+package com.kieronquinn.app.darq.ui.utils
+
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.observe
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+/**
+ * A lazy property that gets cleaned up when the fragment's view is destroyed.
+ *
+ * Accessing this variable while the fragment's view is destroyed will throw NPE.
+ */
+class AutoClearedValue<T : Any>(val fragment: Fragment) : ReadWriteProperty<Fragment, T> {
+    private var _value: T? = null
+
+    init {
+        fragment.lifecycle.addObserver(object: DefaultLifecycleObserver {
+            override fun onCreate(owner: LifecycleOwner) {
+                fragment.viewLifecycleOwnerLiveData.observe(fragment) { viewLifecycleOwner ->
+                    viewLifecycleOwner?.lifecycle?.addObserver(object: DefaultLifecycleObserver {
+                        override fun onDestroy(owner: LifecycleOwner) {
+                            _value = null
+                        }
+                    })
+                }
+            }
+        })
+    }
+
+    override fun getValue(thisRef: Fragment, property: KProperty<*>): T {
+        return _value ?: throw IllegalStateException(
+            "should never call auto-cleared-value get when it might not be available"
+        )
+    }
+
+    override fun setValue(thisRef: Fragment, property: KProperty<*>, value: T) {
+        _value = value
+    }
+}
+
+/**
+ * Creates an [AutoClearedValue] associated with this fragment.
+ */
+fun <T : Any> Fragment.autoCleared() = AutoClearedValue<T>(this)
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/utils/DragDisabledAppBarLayoutBehaviour.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/utils/DragDisabledAppBarLayoutBehaviour.kt
new file mode 100644
index 0000000..e565c16
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/utils/DragDisabledAppBarLayoutBehaviour.kt
@@ -0,0 +1,20 @@
+package com.kieronquinn.app.darq.ui.utils
+
+import android.content.Context
+import android.util.AttributeSet
+import com.google.android.material.appbar.AppBarLayout
+
+class DragDisabledAppBarLayoutBehaviour: AppBarLayout.Behavior {
+
+    constructor(): super()
+    constructor(context: Context?, attrs: AttributeSet?): super(context, attrs)
+
+    init {
+        setDragCallback(object: DragCallback() {
+            override fun canDrag(appBarLayout: AppBarLayout): Boolean {
+                return false
+            }
+        })
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/utils/MultiTapDetector.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/utils/MultiTapDetector.kt
new file mode 100644
index 0000000..1ed8c56
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/utils/MultiTapDetector.kt
@@ -0,0 +1,91 @@
+package com.kieronquinn.app.darq.ui.utils
+
+import android.os.Handler
+import android.os.Looper
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewConfiguration
+import kotlin.math.abs
+
+/*
+ * Detects an arbitrary number of taps in rapid succession
+ *
+ * The passed callback will be called for each tap, with two parameters:
+ *  - the number of taps detected in rapid succession so far
+ *  - a boolean flag indicating whether this is last tap of the sequence
+ */
+class MultiTapDetector(view: View, callback: (Int, Boolean) -> Unit) {
+    private var numberOfTaps = 0
+    private val handler = Handler(Looper.getMainLooper())
+
+    private val doubleTapTimeout = ViewConfiguration.getDoubleTapTimeout().toLong()
+    private val tapTimeout = ViewConfiguration.getTapTimeout().toLong()
+    private val longPressTimeout = ViewConfiguration.getLongPressTimeout().toLong()
+
+    private val viewConfig = ViewConfiguration.get(view.context)
+
+    private var downEvent = Event()
+    private var lastTapUpEvent = Event()
+
+    data class Event(var time: Long = 0, var x: Float = 0f, var y: Float = 0f) {
+        fun copyFrom(motionEvent: MotionEvent) {
+            time = motionEvent.eventTime
+            x = motionEvent.x
+            y = motionEvent.y
+        }
+
+        fun clear() {
+            time = 0
+        }
+    }
+
+
+    init {
+         view.setOnTouchListener { v, event ->
+             when(event.action) {
+                 MotionEvent.ACTION_DOWN -> {
+                     if(event.pointerCount == 1) {
+                         downEvent.copyFrom(event)
+                     } else {
+                         downEvent.clear()
+                     }
+                 }
+                 MotionEvent.ACTION_MOVE -> {
+                     // If a move greater than the allowed slop happens before timeout, then this is a scroll and not a tap
+                     if(event.eventTime - event.downTime < tapTimeout
+                             && abs(event.x - downEvent.x) > viewConfig.scaledTouchSlop
+                             && abs(event.y - downEvent.y) > viewConfig.scaledTouchSlop) {
+                         downEvent.clear()
+                     }
+                 }
+                 MotionEvent.ACTION_UP -> {
+                     val downEvent = this.downEvent
+                     val lastTapUpEvent = this.lastTapUpEvent
+
+                     if(downEvent.time > 0 && event.eventTime - event.downTime < longPressTimeout) {
+                         // We have a tap
+                         if(lastTapUpEvent.time > 0
+                                 && event.eventTime - lastTapUpEvent.time < doubleTapTimeout
+                                 && abs(event.x - lastTapUpEvent.x) < viewConfig.scaledDoubleTapSlop
+                                 && abs(event.y - lastTapUpEvent.y) < viewConfig.scaledDoubleTapSlop) {
+                             // Double tap
+                             numberOfTaps++
+                         } else {
+                             numberOfTaps = 1
+                         }
+                         this.lastTapUpEvent.copyFrom(event)
+
+                         // Send event
+                         val taps = numberOfTaps
+                         handler.postDelayed({
+                             // When this callback runs, we know if it is the final tap of a sequence
+                             // if the number of taps has not changed
+                             callback(taps, taps == numberOfTaps)
+                         }, doubleTapTimeout)
+                     }
+                 }
+             }
+             true
+         }
+     }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/ui/utils/TransitionUtils.kt b/app/src/main/java/com/kieronquinn/app/darq/ui/utils/TransitionUtils.kt
new file mode 100644
index 0000000..802dc0d
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/ui/utils/TransitionUtils.kt
@@ -0,0 +1,26 @@
+package com.kieronquinn.app.darq.ui.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.kieronquinn.app.darq.R
+import kotlin.math.roundToInt
+
+object TransitionUtils {
+
+    fun getMaterialSharedAxis(context: Context, forward: Boolean, rootViewId: Int? = null): MaterialSharedAxis {
+        return MaterialSharedAxis(MaterialSharedAxis.X, forward).apply {
+            rootViewId?.let {
+                addTarget(it)
+            }
+            (primaryAnimatorProvider as SlideDistanceProvider).slideDistance =
+                context.resources.getDimension(R.dimen.shared_axis_x_slide_distance).roundToInt()
+            duration = 450L
+            (secondaryAnimatorProvider as FadeThroughProvider).progressThreshold = 0.22f
+            interpolator = AnimationUtils.loadInterpolator(context, R.anim.fast_out_extra_slow_in)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/AppIconRequestHandler.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/AppIconRequestHandler.kt
index 72ae470..42fe274 100644
--- a/app/src/main/java/com/kieronquinn/app/darq/utils/AppIconRequestHandler.kt
+++ b/app/src/main/java/com/kieronquinn/app/darq/utils/AppIconRequestHandler.kt
@@ -25,16 +25,16 @@ import android.content.res.Resources
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
+import android.graphics.drawable.BitmapDrawable
+import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
+import android.graphics.drawable.PictureDrawable
 import android.os.Build
 import android.text.TextUtils
+import com.squareup.picasso.Picasso.LoadedFrom.DISK
 import com.squareup.picasso.Request
 import com.squareup.picasso.RequestHandler
 import java.io.IOException
-import com.squareup.picasso.Picasso.LoadedFrom.DISK
-import android.graphics.drawable.PictureDrawable
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.ColorDrawable
 
 //Based on https://github.com/jaredrummler/AndroidProcesses/blob/master/demo/src/main/java/com/jaredrummler/android/processes/sample/picasso/AppIconRequestHandler.java
 
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/Extensions.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/Extensions.kt
deleted file mode 100644
index ab968c7..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/utils/Extensions.kt
+++ /dev/null
@@ -1,196 +0,0 @@
-package com.kieronquinn.app.darq.utils
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.app.UiModeManager
-import android.content.ComponentName
-import android.content.Context
-import android.content.ContextWrapper
-import android.content.Intent
-import android.content.res.Configuration
-import android.database.Cursor
-import android.net.Uri
-import android.os.Build
-import android.provider.Settings
-import android.text.TextUtils
-import android.util.TypedValue
-import android.view.View
-import android.view.animation.AccelerateInterpolator
-import android.view.animation.AlphaAnimation
-import androidx.annotation.AttrRes
-import androidx.annotation.ColorInt
-import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
-import com.kieronquinn.app.darq.DarqApplication
-import com.kieronquinn.app.darq.providers.SharedPrefsProvider
-import java.io.DataOutputStream
-import java.io.IOException
-import java.io.Serializable
-
-const val KEY_FORCE_DARK = "debug.hwui.force_dark"
-
-/*
-    OEM checks
- */
-
-val isOnePlus : Boolean
-    get() = Build.MANUFACTURER == "OnePlus"
-
-var Activity.hasCheckedRoot : Boolean
-    get() {
-        return (application as? DarqApplication)?.hasCheckedRoot == true
-    }
-    set(value) {
-        (application as? DarqApplication)?.hasCheckedRoot = value
-    }
-
-var Activity.isRoot : Boolean
-    get() {
-        return (application as? DarqApplication)?.isRoot == true
-    }
-    set(value) {
-        (application as? DarqApplication)?.isRoot = value
-    }
-
-var Fragment.isRoot : Boolean
-    get() {
-        return (activity?.application as? DarqApplication)?.isRoot == true
-    }
-    set(value) {
-        (activity?.application as? DarqApplication)?.isRoot = value
-    }
-
-var Activity.uid : String?
-    get() {
-        return (application as? DarqApplication)?.uid
-    }
-    set(value) {
-        (application as? DarqApplication)?.uid = value
-    }
-
-var Fragment.uid : String?
-    get() {
-        return (activity?.application as? DarqApplication)?.uid
-    }
-    set(value) {
-        (activity?.application as? DarqApplication)?.uid = value
-    }
-
-fun getIsForceDarkTheme() : Boolean {
-    return getSystemProperty(KEY_FORCE_DARK) == "true"
-}
-
-fun runRootCommand(command: String) {
-    try {
-        val p = Runtime.getRuntime().exec("su")
-        val os = DataOutputStream(p.outputStream)
-        os.writeBytes(command + "\n")
-        os.writeBytes("exit\n")
-        os.flush()
-    } catch (e: IOException) {
-        e.printStackTrace()
-    }
-}
-
-fun isDarkTheme(activity: Activity): Boolean {
-    return activity.resources.configuration.uiMode and
-            Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
-}
-
-fun ContextWrapper.sendBroadcast(broadcast: String, vararg extras: Pair<String, Serializable>) {
-    val intent = Intent(broadcast)
-    intent.`package` = packageName
-    for(extra in extras){
-        intent.putExtra(extra.first, extra.second)
-    }
-    sendBroadcast(intent)
-}
-
-/**
- * Returns the app's UID
- */
-fun getUID(): Int {
-    return android.os.Process.myUid()
-}
-
-/**
- * Based on [com.android.settingslib.accessibility.AccessibilityUtils.getEnabledServicesFromSettings]
- * @see [AccessibilityUtils](https://github.com/android/platform_frameworks_base/blob/d48e0d44f6676de6fd54fd8a017332edd6a9f096/packages/SettingsLib/src/com/android/settingslib/accessibility/AccessibilityUtils.java.L55)
- */
-fun isAccessibilityServiceEnabled(context: Context, accessibilityService: Class<*>): Boolean {
-    val expectedComponentName = ComponentName(context, accessibilityService)
-
-    val enabledServicesSetting = Settings.Secure.getString(
-        context.contentResolver,
-        Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES
-    )
-        ?: return false
-
-    val colonSplitter = TextUtils.SimpleStringSplitter(':')
-    colonSplitter.setString(enabledServicesSetting)
-
-    while (colonSplitter.hasNext()) {
-        val componentNameString = colonSplitter.next()
-        val enabledService = ComponentName.unflattenFromString(componentNameString)
-
-        if (enabledService != null && enabledService == expectedComponentName)
-            return true
-    }
-
-    return false
-}
-
-/*
-    This works for now but might not in the future. If that happens we'll have to switch to reading the build.prop manually or using the root service
- */
-@SuppressLint("PrivateApi")
-fun getSystemProperty(key: String): String? {
-    var value: String? = null
-    try {
-        value = Class.forName("android.os.SystemProperties").getMethod("get", String::class.java).invoke(null, key) as String
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-    return value
-}
-
-// From https://stackoverflow.com/a/55280832
-@SuppressLint("ResourceAsColor")
-@ColorInt
-fun Context.getColorResCompat(@AttrRes id: Int): Int {
-    val resolvedAttr = TypedValue()
-    this.theme.resolveAttribute(id, resolvedAttr, true)
-    val colorRes = resolvedAttr.run { if (resourceId != 0) resourceId else data }
-    return ContextCompat.getColor(this, colorRes)
-}
-
-//Following methods based off https://code.highspec.ru/Mikanoshi/CustoMIUIzer
-fun stringPrefToUri(name: String, defValue: String): Uri {
-    return Uri.parse("content://" + SharedPrefsProvider.AUTHORITY + "/string/" + name + "/" + defValue)
-}
-
-fun boolPrefToUri(name: String, defValue: Boolean): Uri {
-    return Uri.parse("content://" + SharedPrefsProvider.AUTHORITY + "/boolean/" + name + "/" + if (defValue) '1' else '0')
-}
-
-fun getSharedStringPref(context: Context, name: String, defValue: String): String? {
-    val uri: Uri = stringPrefToUri(name, defValue)
-    val cursor: Cursor? = context.contentResolver.query(uri, null, null, null, null)
-    return if (cursor != null) {
-        cursor.moveToFirst()
-        val prefValue: String = cursor.getString(0)
-        cursor.close()
-        prefValue
-    } else null
-}
-
-fun getSharedBoolPref(context: Context, name: String, defValue: Boolean): Boolean {
-    val uri: Uri = boolPrefToUri(name, defValue)
-    val cursor: Cursor? = context.contentResolver.query(uri, null, null, null, null)
-    return if (cursor != null) {
-        cursor.moveToFirst()
-        val prefValue: Int = cursor.getInt(0)
-        cursor.close()
-        prefValue == 1
-    } else defValue
-}
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/Links.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/Links.kt
index c2d2a08..e9f7daf 100644
--- a/app/src/main/java/com/kieronquinn/app/darq/utils/Links.kt
+++ b/app/src/main/java/com/kieronquinn/app/darq/utils/Links.kt
@@ -1,30 +1,23 @@
 package com.kieronquinn.app.darq.utils
 
+import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import androidx.preference.PreferenceScreen
-import com.kieronquinn.app.darq.preferences.Preference
 
-class Links {
-    companion object {
-        const val LINK_GITHUB = "https://kieronquinn.co.uk/redirect/DarQ/github"
-        const val LINK_XDA = "https://kieronquinn.co.uk/redirect/DarQ/xda"
-        const val LINK_DONATE = "https://kieronquinn.co.uk/redirect/DarQ/donate"
-        const val LINK_TWITTER = "https://kieronquinn.co.uk/redirect/DarQ/twitter"
-        const val LINK_XDA_LABS = "https://kieronquinn.co.uk/redirect/DarQ/xdalabs"
-
-        private fun startLinkIntent(context: Context, link: String){
-            val intent = Intent(Intent.ACTION_VIEW, Uri.parse(link))
-            context.startActivity(intent)
-        }
-
-        fun setupPreference(context: Context, preferenceScreen: PreferenceScreen, preferenceKey: String, link: String){
-            val preference = preferenceScreen.findPreference<Preference>(preferenceKey)
-            preference?.onPreferenceClickListener = androidx.preference.Preference.OnPreferenceClickListener {
-                startLinkIntent(context, link)
-                true
-            }
-        }
+fun Context.openLink(url: String){
+    try {
+        startActivity(Intent(Intent.ACTION_VIEW).apply {
+            data = Uri.parse(url)
+        })
+    }catch (e: ActivityNotFoundException){
+        //No browser
     }
+}
+
+object Links {
+    const val LINK_XDA = "https://kieronquinn.co.uk/redirect/DarQ/xda"
+    const val LINK_TWITTER = "https://kieronquinn.co.uk/redirect/DarQ/twitter"
+    const val LINK_DONATE = "https://kieronquinn.co.uk/redirect/DarQ/donate"
+    const val LINK_GITHUB = "https://kieronquinn.co.uk/redirect/DarQ/github"
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/PreferenceUtils.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/PreferenceUtils.kt
deleted file mode 100644
index d03cbdb..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/utils/PreferenceUtils.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.kieronquinn.app.darq.utils
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.content.pm.PackageManager
-import com.kieronquinn.app.darq.BuildConfig
-import org.json.JSONArray
-
-class PreferenceUtils(context: Context) {
-
-    companion object {
-        const val SHARED_PREFS_NAME = "${BuildConfig.APPLICATION_ID}_preferences"
-        const val KEY_ENABLED_APPS = "enabled_apps"
-        const val KEY_GLOBAL_OVERRIDE = "switch_force_dark_mode"
-    }
-
-    var enabledApps: ArrayList<String> = ArrayList()
-
-    private val sharedPreferences: SharedPreferences = context.getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE)
-
-    val isGlobalForceDark
-        get() = sharedPreferences.getBoolean(KEY_GLOBAL_OVERRIDE, false)
-
-    val isAutoDarkEnabled
-        get() = sharedPreferences.getBoolean("switch_auto_night_dark", false)
-
-    fun getEnabledApps(context: Context) {
-        val packageManager = context.packageManager
-        val rawEnabledApps = sharedPreferences.getString(KEY_ENABLED_APPS, "[]")
-        val enabledAppsArray = JSONArray(rawEnabledApps)
-        val enabledApps = ArrayList<String>()
-        for (i in 0 until enabledAppsArray.length()) {
-            val packageName = enabledAppsArray.getString(i)
-            try {
-                packageManager.getPackageInfo(packageName, 0)
-                enabledApps.add(packageName)
-            } catch (_: PackageManager.NameNotFoundException) {
-                //App is no longer installed
-            }
-        }
-        this.enabledApps = enabledApps
-    }
-
-    fun saveApps(context: Context, packageNames: List<String>) {
-        val jsonArray = JSONArray()
-        for(packageName in packageNames){
-            jsonArray.put(packageName)
-        }
-        sharedPreferences.edit().putString(KEY_ENABLED_APPS, jsonArray.toString()).apply()
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/SettingsContentObserver.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/SettingsContentObserver.kt
deleted file mode 100644
index 645ada3..0000000
--- a/app/src/main/java/com/kieronquinn/app/darq/utils/SettingsContentObserver.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.kieronquinn.app.darq.utils
-
-import android.database.ContentObserver
-import android.net.Uri
-import android.os.Handler
-
-class SettingsContentObserver(handler: Handler, private val uri : Uri, private val listener: (Boolean, Uri) -> Unit) : ContentObserver(handler) {
-
-    override fun onChange(selfChange: Boolean) {
-        super.onChange(selfChange)
-        listener.invoke(selfChange, uri)
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/SystemProperties.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/SystemProperties.kt
new file mode 100644
index 0000000..aa748fc
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/utils/SystemProperties.kt
@@ -0,0 +1,121 @@
+package com.kieronquinn.app.darq.utils
+
+/*
+ * Copyright (C) 2015 Jared Rummler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */ /**
+ * Gives access to the system properties store. The system properties store contains a list of
+ * string key-value pairs.
+ */
+class SystemProperties private constructor() {
+    companion object {
+        private val SP = systemPropertiesClass
+
+        /**
+         * Get the value for the given key.
+         */
+        operator fun get(key: String?): String? {
+            return try {
+                SP!!.getMethod("get", String::class.java).invoke(null, key) as String
+            } catch (e: Exception) {
+                null
+            }
+        }
+
+        /**
+         * Get the value for the given key.
+         *
+         * @return if the key isn't found, return def if it isn't null, or an empty string otherwise
+         */
+        operator fun get(key: String?, def: String): String {
+            return try {
+                SP!!.getMethod("get", String::class.java, String::class.java)
+                    .invoke(null, key, def) as String
+            } catch (e: Exception) {
+                def
+            }
+        }
+
+        /**
+         * Set the value for the given key.
+         */
+        operator fun set(key: String?, value: String) {
+            try {
+                SP!!.getMethod("set", String::class.java, String::class.java)
+                    .invoke(null, key, value)
+            } catch (e: Exception) {
+                null
+            }
+        }
+
+        /**
+         * Get the value for the given key, returned as a boolean. Values 'n', 'no', '0', 'false' or
+         * 'off' are considered false. Values 'y', 'yes', '1', 'true' or 'on' are considered true. (case
+         * sensitive). If the key does not exist, or has any other value, then the default result is
+         * returned.
+         *
+         * @param key the key to lookup
+         * @param def a default value to return
+         * @return the key parsed as a boolean, or def if the key isn't found or is not able to be
+         * parsed as a boolean.
+         */
+        fun getBoolean(key: String?, def: Boolean): Boolean {
+            return try {
+                SP!!.getMethod("getBoolean", String::class.java, Boolean::class.javaPrimitiveType)
+                    .invoke(null, key, def) as Boolean
+            } catch (e: Exception) {
+                def
+            }
+        }
+
+        /**
+         * Get the value for the given key, and return as an integer.
+         *
+         * @param key the key to lookup
+         * @param def a default value to return
+         * @return the key parsed as an integer, or def if the key isn't found or cannot be parsed
+         */
+        fun getInt(key: String?, def: Int): Int {
+            return try {
+                SP!!.getMethod("getInt", String::class.java, Int::class.javaPrimitiveType)
+                    .invoke(null, key, def) as Int
+            } catch (e: Exception) {
+                def
+            }
+        }
+
+        /**
+         * Get the value for the given key, and return as a long.
+         *
+         * @param key the key to lookup
+         * @param def a default value to return
+         * @return the key parsed as a long, or def if the key isn't found or cannot be parsed
+         */
+        fun getLong(key: String?, def: Long): Long {
+            return try {
+                SP!!.getMethod("getLong", String::class.java, Long::class.javaPrimitiveType)
+                    .invoke(null, key, def) as Long
+            } catch (e: Exception) {
+                def
+            }
+        }
+
+        private val systemPropertiesClass: Class<*>?
+            private get() = try {
+                Class.forName("android.os.SystemProperties")
+            } catch (shouldNotHappen: ClassNotFoundException) {
+                null
+            }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/TimeZoneUtils.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/TimeZoneUtils.kt
index 533aaef..607877d 100644
--- a/app/src/main/java/com/kieronquinn/app/darq/utils/TimeZoneUtils.kt
+++ b/app/src/main/java/com/kieronquinn/app/darq/utils/TimeZoneUtils.kt
@@ -1,6 +1,7 @@
 package com.kieronquinn.app.darq.utils
 
 import android.content.Context
+import com.kieronquinn.app.darq.model.location.LatLng
 import java.util.*
 import kotlin.math.abs
 import kotlin.math.sign
@@ -9,7 +10,7 @@ class TimeZoneUtils {
 
     companion object {
 
-        fun getLatLngForTimezone(context: Context, timeZone: TimeZone): Pair<Double, Double>? {
+        fun getLatLngForTimezone(context: Context, timeZone: TimeZone): LatLng? {
             val assets = context.assets
             val zoneTab = assets.open("zone.tab").bufferedReader().use { it.readText() }
             val lines = zoneTab.split("\n")
@@ -72,7 +73,7 @@ class TimeZoneUtils {
                         sign(latSplits.first.toDouble()) * (abs(latSplits.first.toDouble()) + (latSplits.second.toDouble() / 60.0) + (latSplits.third.toDouble() / 3600.0))
                     val lng =
                         sign(lngSplits.first.toDouble()) * (abs(lngSplits.first.toDouble()) + (lngSplits.second.toDouble() / 60.0) + (lngSplits.third.toDouble() / 3600.0))
-                    return Pair(lat, lng)
+                    return LatLng(lat, lng)
                 }
             }
 
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Activity.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Activity.kt
new file mode 100644
index 0000000..35d858f
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Activity.kt
@@ -0,0 +1,12 @@
+package com.kieronquinn.app.darq.utils.extensions
+
+import android.app.Activity
+import android.content.Context
+import android.view.inputmethod.InputMethodManager
+
+fun Activity.hideKeyboard(){
+    this.currentFocus?.let { view ->
+        val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
+        imm?.hideSoftInputFromWindow(view.windowToken, 0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+By.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+By.kt
new file mode 100644
index 0000000..175ab24
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+By.kt
@@ -0,0 +1,29 @@
+package com.kieronquinn.app.darq.utils.extensions
+
+import kotlin.properties.ReadOnlyProperty
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+inline fun <T> ReadWriteProperty(crossinline getValue: () -> T, crossinline setValue: (T) -> Unit): ReadWriteProperty<Any?, T> {
+    return object: ReadWriteProperty<Any?, T> {
+
+        override operator fun getValue(thisRef: Any?, property: KProperty<*>): T {
+            return getValue.invoke()
+        }
+
+        override operator fun setValue(thisRef: Any?, property: KProperty<*>, value: T) {
+            setValue.invoke(value)
+        }
+
+    }
+}
+
+inline fun <T> ReadOnlyProperty(crossinline getValue: () -> T): ReadOnlyProperty<Any?, T> {
+    return object: ReadOnlyProperty<Any?, T> {
+
+        override operator fun getValue(thisRef: Any?, property: KProperty<*>): T {
+            return getValue.invoke()
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Color.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Color.kt
new file mode 100644
index 0000000..abc7c58
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Color.kt
@@ -0,0 +1,13 @@
+package com.kieronquinn.app.darq.utils.extensions
+
+import android.graphics.Color
+import kotlin.math.roundToInt
+
+fun getColorWithAlpha(color: Int, ratio: Float): Int {
+    return Color.argb(
+        (Color.alpha(color) * ratio).roundToInt(),
+        Color.red(color),
+        Color.green(color),
+        Color.blue(color)
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Context.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Context.kt
new file mode 100644
index 0000000..49631ae
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Context.kt
@@ -0,0 +1,30 @@
+package com.kieronquinn.app.darq.utils.extensions
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.res.Configuration
+import android.util.TypedValue
+import androidx.annotation.AttrRes
+import androidx.annotation.ColorInt
+import androidx.core.content.ContextCompat
+
+val Context.isDarkTheme: Boolean
+    get() {
+        return resources.configuration.uiMode and
+                Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_YES
+    }
+
+val Context.isLandscape: Boolean
+    get() {
+        return resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
+    }
+
+// From https://stackoverflow.com/a/55280832
+@SuppressLint("ResourceAsColor")
+@ColorInt
+fun Context.getColorResCompat(@AttrRes id: Int): Int {
+    val resolvedAttr = TypedValue()
+    this.theme.resolveAttribute(id, resolvedAttr, true)
+    val colorRes = resolvedAttr.run { if (resourceId != 0) resourceId else data }
+    return ContextCompat.getColor(this, colorRes)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Coroutines.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Coroutines.kt
new file mode 100644
index 0000000..7cdd1e4
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Coroutines.kt
@@ -0,0 +1,13 @@
+package com.kieronquinn.app.darq.utils.extensions
+
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withTimeoutOrNull
+import kotlin.coroutines.Continuation
+
+suspend inline fun <T> suspendCoroutineWithTimeout(timeout: Long, crossinline block: (Continuation<T>) -> Unit) : T? {
+    var finalValue : T? = null
+    withTimeoutOrNull(timeout) {
+        finalValue = suspendCancellableCoroutine(block = block)
+    }
+    return finalValue
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Flow.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Flow.kt
new file mode 100644
index 0000000..98c50a3
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Flow.kt
@@ -0,0 +1,22 @@
+package com.kieronquinn.app.darq.utils.extensions
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.channelFlow
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+
+inline fun <reified T> instantCombine(vararg flows: Flow<T>) = channelFlow {
+
+    val array = Array(flows.size) {
+        false to (null as T?)
+    }
+
+    flows.forEachIndexed { index, flow ->
+        launch {
+            flow.collect { emittedElement ->
+                array[index] = true to emittedElement
+                send(array.filter { it.first }.map { it.second })
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Fragment.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Fragment.kt
new file mode 100644
index 0000000..37d370e
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Fragment.kt
@@ -0,0 +1,8 @@
+package com.kieronquinn.app.darq.utils.extensions
+
+import androidx.fragment.app.Fragment
+import com.kieronquinn.app.darq.ui.screens.container.ContainerFragment
+
+fun Fragment.expandAppBar(){
+    (parentFragment as? ContainerFragment)?.expandAppBar()
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Koin.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Koin.kt
new file mode 100644
index 0000000..98fc979
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Koin.kt
@@ -0,0 +1,32 @@
+package com.kieronquinn.app.darq.utils.extensions
+
+import androidx.annotation.IdRes
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModel
+import androidx.navigation.NavController
+import androidx.navigation.NavGraph
+import androidx.navigation.fragment.findNavController
+import org.koin.androidx.viewmodel.ViewModelOwner
+import org.koin.androidx.viewmodel.koin.getViewModel
+import org.koin.androidx.viewmodel.scope.BundleDefinition
+import org.koin.core.context.GlobalContext
+import org.koin.core.parameter.ParametersDefinition
+import org.koin.core.qualifier.Qualifier
+
+inline fun <reified T : ViewModel> Fragment.navGraphViewModel(
+    @IdRes navGraphId: Int,
+    navController: NavController? = null,
+    qualifier: Qualifier? = null,
+    noinline state: BundleDefinition? = null,
+    noinline parameters: ParametersDefinition? = null
+): Lazy<T> {
+    return lazy(LazyThreadSafetyMode.NONE) {
+        val navBackStackEntry = (navController ?: findNavController()).getBackStackEntry(navGraphId)
+
+        require(navBackStackEntry.destination is NavGraph) {
+            ("No NavGraph with ID $navGraphId is on the NavController's back stack")
+        }
+
+        GlobalContext.get().getViewModel(qualifier, state, { ViewModelOwner.from(navBackStackEntry, navBackStackEntry) }, T::class, parameters)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+PackageManager.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+PackageManager.kt
new file mode 100644
index 0000000..8a7fd9f
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+PackageManager.kt
@@ -0,0 +1,11 @@
+package com.kieronquinn.app.darq.utils.extensions
+
+import android.content.pm.PackageManager
+
+fun PackageManager.isAppInstalled(packageName: String): Boolean {
+    return try {
+        getApplicationInfo(packageName, 0) != null
+    }catch (e: PackageManager.NameNotFoundException) {
+        false
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+RecyclerView.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+RecyclerView.kt
new file mode 100644
index 0000000..5448683
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+RecyclerView.kt
@@ -0,0 +1,31 @@
+package com.kieronquinn.app.darq.utils.extensions
+
+import android.content.res.ColorStateList
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.StateListDrawable
+import androidx.recyclerview.widget.RecyclerView
+import com.kieronquinn.monetcompat.core.MonetCompat
+
+fun RecyclerView.applyMonetToFastScroller() {
+    val monet = MonetCompat.getInstance()
+    val fastScrollerClass = Class.forName("androidx.recyclerview.widget.FastScroller")
+    for (i in 0 until itemDecorationCount) {
+        val decoration = getItemDecorationAt(i)
+        if (decoration::class.java == fastScrollerClass) {
+            val mVerticalThumbDrawable =
+                fastScrollerClass.getDeclaredField("mVerticalThumbDrawable").apply {
+                    isAccessible = true
+                }.get(decoration) as StateListDrawable
+            val mVerticalTrackDrawable =
+                fastScrollerClass.getDeclaredField("mVerticalTrackDrawable").apply {
+                    isAccessible = true
+                }.get(decoration) as Drawable
+            mVerticalThumbDrawable.setTintList(ColorStateList.valueOf(monet.getAccentColor(context)))
+            mVerticalTrackDrawable.setTintList(
+                ColorStateList.valueOf(
+                    monet.getBackgroundColorSecondary(context) ?: monet.getBackgroundColor(context)
+                )
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Settings.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Settings.kt
new file mode 100644
index 0000000..8bcc72b
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Settings.kt
@@ -0,0 +1,27 @@
+package com.kieronquinn.app.darq.utils.extensions
+
+import android.content.Context
+import android.database.ContentObserver
+import android.os.Handler
+import android.os.Looper
+import android.provider.Settings
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.callbackFlow
+
+fun Context.secureSettingIntFlow(setting: String, default: Int) = callbackFlow {
+    val uri = Settings.Secure.getUriFor(setting)
+    val onChange = {
+        this.trySend(Settings.Secure.getInt(contentResolver, setting, default))
+    }
+    val contentObserver = object: ContentObserver(Handler(Looper.myLooper()!!)) {
+        override fun onChange(selfChange: Boolean) {
+            super.onChange(selfChange)
+            onChange.invoke()
+        }
+    }
+    contentResolver.registerContentObserver(uri, true, contentObserver)
+    onChange.invoke()
+    awaitClose {
+        contentResolver.unregisterContentObserver(contentObserver)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Shizuku.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Shizuku.kt
new file mode 100644
index 0000000..fb970b4
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+Shizuku.kt
@@ -0,0 +1,24 @@
+package com.kieronquinn.app.darq.utils.extensions
+
+import android.content.Context
+import com.kieronquinn.app.darq.model.shizuku.ShizukuConstants
+import kotlinx.coroutines.suspendCancellableCoroutine
+import rikka.shizuku.Shizuku
+import kotlin.coroutines.resume
+
+fun Context.isShizukuInstalled(): Boolean {
+    return packageManager.isAppInstalled(ShizukuConstants.SHIZUKU_PACKAGE_NAME)
+}
+
+suspend fun Shizuku_awaitBinderReceived() = suspendCancellableCoroutine<Unit> {
+    val receiver = object: Shizuku.OnBinderReceivedListener {
+        override fun onBinderReceived() {
+            Shizuku.removeBinderReceivedListener(this)
+            it.resume(Unit)
+        }
+    }
+    Shizuku.addBinderReceivedListener(receiver)
+    it.invokeOnCancellation {
+        Shizuku.removeBinderReceivedListener(receiver)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+View.kt b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+View.kt
new file mode 100644
index 0000000..45c8285
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/utils/extensions/Extensions+View.kt
@@ -0,0 +1,41 @@
+package com.kieronquinn.app.darq.utils.extensions
+
+import android.view.View
+import android.view.animation.Animation
+import android.view.animation.AnimationUtils
+import androidx.core.view.isVisible
+import com.kieronquinn.app.darq.R
+
+fun View.slideOut(callback: () -> Unit): Animation {
+    AnimationUtils.loadAnimation(context, R.anim.slide_out_bottom).apply {
+        onEnd {
+            isVisible = false
+            callback.invoke()
+        }
+    }.also {
+        startAnimation(it)
+        return it
+    }
+}
+
+fun View.slideIn(callback: () -> Unit): Animation {
+    isVisible = true
+    AnimationUtils.loadAnimation(context, R.anim.slide_in_bottom).apply {
+        onEnd {
+            callback.invoke()
+        }
+    }.also {
+        startAnimation(it)
+        return it
+    }
+}
+
+fun Animation.onEnd(callback: () -> Unit){
+    setAnimationListener(object: Animation.AnimationListener {
+        override fun onAnimationRepeat(animation: Animation?) {}
+        override fun onAnimationStart(animation: Animation?) {}
+        override fun onAnimationEnd(animation: Animation?) {
+            callback.invoke()
+        }
+    })
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/kieronquinn/app/darq/work/DarqSunriseSunsetWork.kt b/app/src/main/java/com/kieronquinn/app/darq/work/DarqSunriseSunsetWork.kt
new file mode 100644
index 0000000..e7ba8df
--- /dev/null
+++ b/app/src/main/java/com/kieronquinn/app/darq/work/DarqSunriseSunsetWork.kt
@@ -0,0 +1,26 @@
+package com.kieronquinn.app.darq.work
+
+import android.content.Context
+import android.content.Intent
+import androidx.work.Worker
+import androidx.work.WorkerParameters
+import com.kieronquinn.app.darq.service.autodark.DarqAutoDarkForegroundService
+
+class DarqSunriseSunsetWork(private val context: Context, workerParams: WorkerParameters): Worker(context, workerParams) {
+
+    companion object {
+        const val TAG_SUNRISE = "work_sunrise"
+        const val TAG_SUNSET = "work_sunset"
+    }
+
+    private val isDarkMode = workerParams.tags.first() == TAG_SUNSET
+
+    override fun doWork(): Result {
+        //Start the foreground service
+        context.startForegroundService(Intent(context, DarqAutoDarkForegroundService::class.java).apply {
+            putExtra(DarqAutoDarkForegroundService.KEY_ENABLE_DARK, isDarkMode)
+        })
+        return Result.success()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/anim/fade_in.xml b/app/src/main/res/anim/fade_in.xml
new file mode 100644
index 0000000..6501b13
--- /dev/null
+++ b/app/src/main/res/anim/fade_in.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/res/anim/fade_in.xml
+**
+** Copyright 2007, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/decelerate_quad"
+    android:fromAlpha="0.0" android:toAlpha="1.0"
+    android:duration="@android:integer/config_shortAnimTime" />
diff --git a/app/src/main/res/anim/fade_out.xml b/app/src/main/res/anim/fade_out.xml
new file mode 100644
index 0000000..58c832f
--- /dev/null
+++ b/app/src/main/res/anim/fade_out.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/res/anim/fade_out.xml
+**
+** Copyright 2007, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<alpha xmlns:android="http://schemas.android.com/apk/res/android" android:interpolator="@android:interpolator/accelerate_quad"
+    android:fromAlpha="1.0"
+    android:toAlpha="0.0"
+    android:duration="@android:integer/config_shortAnimTime"
+    />
diff --git a/app/src/main/res/anim/fast_out_extra_slow_in.xml b/app/src/main/res/anim/fast_out_extra_slow_in.xml
new file mode 100644
index 0000000..aea3140
--- /dev/null
+++ b/app/src/main/res/anim/fast_out_extra_slow_in.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<pathInterpolator android:pathData="M 0,0 C 0.05, 0, 0.133333, 0.06, 0.166666, 0.4 C 0.208333, 0.82, 0.25, 1, 1, 1" xmlns:android="http://schemas.android.com/apk/res/android"/>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_in_bottom.xml b/app/src/main/res/anim/slide_in_bottom.xml
new file mode 100644
index 0000000..6bb53fd
--- /dev/null
+++ b/app/src/main/res/anim/slide_in_bottom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/res/anim/slide_in_left.xml
+**
+** Copyright 2007, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fillAfter="true">
+    <translate android:fromYDelta="25%p" android:toYDelta="0"
+        android:duration="@android:integer/config_shortAnimTime"/>
+    <alpha android:fromAlpha="0.0" android:toAlpha="1.0"
+        android:duration="@android:integer/config_shortAnimTime" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_out_bottom.xml b/app/src/main/res/anim/slide_out_bottom.xml
new file mode 100644
index 0000000..193186e
--- /dev/null
+++ b/app/src/main/res/anim/slide_out_bottom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/* //device/apps/common/res/anim/slide_in_left.xml
+**
+** Copyright 2007, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fillAfter="true">
+    <translate android:fromYDelta="0" android:toYDelta="25%p"
+        android:duration="@android:integer/config_shortAnimTime"/>
+    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
+        android:duration="@android:integer/config_shortAnimTime" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-nodpi/ic_bug.xml b/app/src/main/res/drawable-nodpi/ic_bug.xml
deleted file mode 100644
index adc651f..0000000
--- a/app/src/main/res/drawable-nodpi/ic_bug.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?android:textColorPrimary" android:pathData="M20,8H17.19C16.74,7.2 16.12,6.5 15.37,6L17,4.41L15.59,3L13.42,5.17C12.96,5.06 12.5,5 12,5C11.5,5 11.05,5.06 10.59,5.17L8.41,3L7,4.41L8.62,6C7.87,6.5 7.26,7.21 6.81,8H4V10H6.09C6.03,10.33 6,10.66 6,11V12H4V14H6V15C6,15.34 6.03,15.67 6.09,16H4V18H6.81C8.47,20.87 12.14,21.84 15,20.18C15.91,19.66 16.67,18.9 17.19,18H20V16H17.91C17.97,15.67 18,15.34 18,15V14H20V12H18V11C18,10.66 17.97,10.33 17.91,10H20V8M16,15A4,4 0 0,1 12,19A4,4 0 0,1 8,15V11A4,4 0 0,1 12,7A4,4 0 0,1 16,11V15M14,10V12H10V10H14M10,14H14V16H10V14Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-nodpi/ic_chevron_down.xml b/app/src/main/res/drawable-nodpi/ic_chevron_down.xml
deleted file mode 100644
index ab23459..0000000
--- a/app/src/main/res/drawable-nodpi/ic_chevron_down.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="580"
-    android:viewportWidth="580" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?android:textColorPrimary" android:pathData="m453.272,206.358c-12.037,-12.037 -31.481,-12.037 -43.519,0l-119.753,119.753l-119.753,-119.753c-12.037,-12.037 -31.481,-12.037 -43.519,0c-12.037,12.037 -12.037,31.481 -0,43.519l141.667,141.667c12.037,12.037 31.481,12.037 43.519,0l141.667,-141.667c11.728,-11.728 11.728,-31.481 -0.309,-43.519z"/>
-</vector>
diff --git a/app/src/main/res/drawable-nodpi/ic_close.xml b/app/src/main/res/drawable-nodpi/ic_close.xml
deleted file mode 100644
index f1b228a..0000000
--- a/app/src/main/res/drawable-nodpi/ic_close.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/close.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?android:textColorPrimary" android:pathData="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-nodpi/ic_dark_theme.xml b/app/src/main/res/drawable-nodpi/ic_dark_theme.xml
deleted file mode 100644
index 6b76a35..0000000
--- a/app/src/main/res/drawable-nodpi/ic_dark_theme.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="?android:textColorPrimary"
-        android:strokeWidth="1"
-        android:pathData="M12.000001,20.906253c4.916251,0 8.906253,-3.990001 8.906253,-8.906253c0,-4.916251 -3.990001,-8.906253 -8.906253,-8.906253c-4.916251,0 -8.906253,3.990001 -8.906253,8.906253c0,4.916251 3.990001,8.906253 8.906253,8.906253zm0,-16.106958c3.463642,0 7.125002,3.566954 7.125002,7.200705c0,3.633751 -3.497485,7.117877 -7.060877,7.117877l-0.064125,-14.318582z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-nodpi/ic_donate.xml b/app/src/main/res/drawable-nodpi/ic_donate.xml
deleted file mode 100644
index 9ee86ce..0000000
--- a/app/src/main/res/drawable-nodpi/ic_donate.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/paypal.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?android:textColorPrimary" android:pathData="M8.32,21.97C8.21,21.92 8.08,21.76 8.06,21.65C8.03,21.5 8,21.76 8.66,17.56C9.26,13.76 9.25,13.82 9.33,13.71C9.46,13.54 9.44,13.54 10.94,13.53C12.26,13.5 12.54,13.5 13.13,13.41C16.38,12.96 18.39,11.05 19.09,7.75C19.13,7.53 19.17,7.34 19.18,7.34C19.18,7.33 19.25,7.38 19.33,7.44C20.36,8.22 20.71,9.66 20.32,11.58C19.86,13.87 18.64,15.39 16.74,16.04C15.93,16.32 15.25,16.43 14.05,16.46C13.25,16.5 13.23,16.5 13,16.65C12.83,16.82 12.84,16.79 12.45,19.2C12.18,20.9 12.08,21.45 12.04,21.55C11.97,21.71 11.83,21.85 11.67,21.93L11.56,22H10C8.71,22 8.38,22 8.32,21.97V21.97M3.82,19.74C3.63,19.64 3.5,19.47 3.5,19.27C3.5,19 6.11,2.68 6.18,2.5C6.27,2.32 6.5,2.13 6.68,2.06L6.83,2H10.36C14.27,2 14.12,2 15,2.2C17.62,2.75 18.82,4.5 18.37,7.13C17.87,10.06 16.39,11.8 13.87,12.43C13,12.64 12.39,12.7 10.73,12.7C9.42,12.7 9.32,12.71 9.06,12.85C8.8,13 8.59,13.27 8.5,13.6C8.46,13.67 8.23,15.07 7.97,16.7C7.71,18.33 7.5,19.69 7.5,19.72L7.47,19.78H5.69C4.11,19.78 3.89,19.78 3.82,19.74V19.74Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-nodpi/ic_dots.xml b/app/src/main/res/drawable-nodpi/ic_dots.xml
deleted file mode 100644
index ef83093..0000000
--- a/app/src/main/res/drawable-nodpi/ic_dots.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/dots_vertical.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?android:textColorPrimary" android:pathData="M12,16A2,2 0 0,1 14,18A2,2 0 0,1 12,20A2,2 0 0,1 10,18A2,2 0 0,1 12,16M12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12A2,2 0 0,1 12,10M12,4A2,2 0 0,1 14,6A2,2 0 0,1 12,8A2,2 0 0,1 10,6A2,2 0 0,1 12,4Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-nodpi/ic_github.xml b/app/src/main/res/drawable-nodpi/ic_github.xml
deleted file mode 100644
index 4843236..0000000
--- a/app/src/main/res/drawable-nodpi/ic_github.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/github_circle.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?android:textColorPrimary" android:pathData="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-nodpi/ic_help.xml b/app/src/main/res/drawable-nodpi/ic_help.xml
deleted file mode 100644
index 1f5c12c..0000000
--- a/app/src/main/res/drawable-nodpi/ic_help.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/help_circle_outline.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?android:textColorPrimary" android:pathData="M11,18H13V16H11V18M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,6A4,4 0 0,0 8,10H10A2,2 0 0,1 12,8A2,2 0 0,1 14,10C14,12 11,11.75 11,15H13C13,12.75 16,12.5 16,10A4,4 0 0,0 12,6Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-nodpi/ic_laptop.xml b/app/src/main/res/drawable-nodpi/ic_laptop.xml
deleted file mode 100644
index b4cc2dc..0000000
--- a/app/src/main/res/drawable-nodpi/ic_laptop.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/laptop_windows.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?android:textColorPrimary" android:pathData="M3,4H21A1,1 0 0,1 22,5V16A1,1 0 0,1 21,17H22L24,20V21H0V20L2,17H3A1,1 0 0,1 2,16V5A1,1 0 0,1 3,4M4,6V15H20V6H4Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-nodpi/ic_libraries.xml b/app/src/main/res/drawable-nodpi/ic_libraries.xml
deleted file mode 100644
index a378c6f..0000000
--- a/app/src/main/res/drawable-nodpi/ic_libraries.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/book_outline.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?android:textColorPrimary" android:pathData="M18,2A2,2 0 0,1 20,4V20A2,2 0 0,1 18,22H6A2,2 0 0,1 4,20V4A2,2 0 0,1 6,2H18M18,4H13V12L10.5,9.75L8,12V4H6V20H18V4Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-nodpi/ic_oxygen.xml b/app/src/main/res/drawable-nodpi/ic_oxygen.xml
deleted file mode 100644
index 5166753..0000000
--- a/app/src/main/res/drawable-nodpi/ic_oxygen.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
- <path
-     android:fillColor="?android:textColorPrimary"
-     android:strokeWidth="1"
-     android:pathData="M 0 0 L 23.976562 0 L 23.976562 23.910156 L 0 23.910156 L 0 0 M 11.28125 6.042969 C 10.117188 6.183594 9.015625 6.691406 8.117188 7.4375 C 7.90625 7.65625 7.6875 7.871094 7.472656 8.089844 C 6.796875 8.917969 6.304688 9.910156 6.140625 10.972656 C 6.148438 11.179688 6.054688 11.378906 6.078125 11.585938 C 6.097656 11.949219 6.039062 12.324219 6.109375 12.679688 C 6.351562 14.902344 7.976562 16.894531 10.097656 17.585938 C 10.496094 17.691406 10.890625 17.828125 11.308594 17.839844 C 11.640625 17.925781 11.988281 17.875 12.328125 17.890625 C 12.5 17.90625 12.664062 17.832031 12.835938 17.832031 C 13.3125 17.796875 13.765625 17.628906 14.21875 17.472656 C 14.808594 17.191406 15.417969 16.910156 15.886719 16.441406 C 15.96875 16.351562 16.078125 16.300781 16.164062 16.214844 C 16.554688 15.769531 16.953125 15.324219 17.222656 14.796875 C 17.53125 14.1875 17.796875 13.535156 17.867188 12.847656 C 17.894531 12.652344 17.917969 12.457031 17.953125 12.265625 C 17.988281 11.207031 17.769531 10.125 17.257812 9.1875 C 17.050781 8.71875 16.710938 8.324219 16.390625 7.917969 C 15.953125 7.445312 15.425781 7.070312 14.875 6.734375 C 14.175781 6.351562 13.398438 6.132812 12.609375 6.019531 C 12.164062 6.03125 11.71875 5.992188 11.28125 6.042969 Z M 11.28125 6.042969" />
- <path
-     android:fillColor="?android:textColorPrimary"
-     android:strokeWidth="1"
-     android:pathData="M 11.445312 8.402344 C 11.773438 8.359375 12.109375 8.394531 12.4375 8.382812 C 13.085938 8.464844 13.710938 8.726562 14.222656 9.128906 C 14.378906 9.273438 14.523438 9.429688 14.679688 9.578125 C 15.140625 10.046875 15.40625 10.675781 15.53125 11.3125 C 15.75 12.34375 15.414062 13.433594 14.761719 14.246094 C 14.488281 14.519531 14.226562 14.8125 13.886719 15.007812 C 13.453125 15.292969 12.945312 15.441406 12.4375 15.523438 C 12.171875 15.535156 11.914062 15.527344 11.648438 15.527344 C 10.933594 15.4375 10.222656 15.171875 9.6875 14.675781 C 9.375 14.484375 9.195312 14.148438 8.96875 13.871094 C 8.699219 13.394531 8.476562 12.875 8.441406 12.324219 C 8.453125 12.027344 8.425781 11.726562 8.453125 11.433594 C 8.648438 9.914062 9.929688 8.617188 11.445312 8.402344 Z M 11.445312 8.402344" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-nodpi/ic_search.xml b/app/src/main/res/drawable-nodpi/ic_search.xml
deleted file mode 100644
index 7d0144b..0000000
--- a/app/src/main/res/drawable-nodpi/ic_search.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/magnify.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?android:textColorPrimary" android:pathData="M9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.44,13.73L14.71,14H15.5L20.5,19L19,20.5L14,15.5V14.71L13.73,14.44C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3M9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-nodpi/ic_theme_light_dark.xml b/app/src/main/res/drawable-nodpi/ic_theme_light_dark.xml
deleted file mode 100644
index 654816a..0000000
--- a/app/src/main/res/drawable-nodpi/ic_theme_light_dark.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?android:textColorPrimary" android:pathData="M7.5,2C5.71,3.15 4.5,5.18 4.5,7.5C4.5,9.82 5.71,11.85 7.53,13C4.46,13 2,10.54 2,7.5A5.5,5.5 0 0,1 7.5,2M19.07,3.5L20.5,4.93L4.93,20.5L3.5,19.07L19.07,3.5M12.89,5.93L11.41,5L9.97,6L10.39,4.3L9,3.24L10.75,3.12L11.33,1.47L12,3.1L13.73,3.13L12.38,4.26L12.89,5.93M9.59,9.54L8.43,8.81L7.31,9.59L7.65,8.27L6.56,7.44L7.92,7.35L8.37,6.06L8.88,7.33L10.24,7.36L9.19,8.23L9.59,9.54M19,13.5A5.5,5.5 0 0,1 13.5,19C12.28,19 11.15,18.6 10.24,17.93L17.93,10.24C18.6,11.15 19,12.28 19,13.5M14.6,20.08L17.37,18.93L17.13,22.28L14.6,20.08M18.93,17.38L20.08,14.61L22.28,17.15L18.93,17.38M20.08,12.42L18.94,9.64L22.28,9.88L20.08,12.42M9.63,18.93L12.4,20.08L9.87,22.27L9.63,18.93Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-nodpi/ic_twitter.xml b/app/src/main/res/drawable-nodpi/ic_twitter.xml
deleted file mode 100644
index d67e909..0000000
--- a/app/src/main/res/drawable-nodpi/ic_twitter.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/ic_twitter.xmlxml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?android:textColorPrimary" android:pathData="M22.46,6C21.69,6.35 20.86,6.58 20,6.69C20.88,6.16 21.56,5.32 21.88,4.31C21.05,4.81 20.13,5.16 19.16,5.36C18.37,4.5 17.26,4 16,4C13.65,4 11.73,5.92 11.73,8.29C11.73,8.63 11.77,8.96 11.84,9.27C8.28,9.09 5.11,7.38 3,4.79C2.63,5.42 2.42,6.16 2.42,6.94C2.42,8.43 3.17,9.75 4.33,10.5C3.62,10.5 2.96,10.3 2.38,10C2.38,10 2.38,10 2.38,10.03C2.38,12.11 3.86,13.85 5.82,14.24C5.46,14.34 5.08,14.39 4.69,14.39C4.42,14.39 4.15,14.36 3.89,14.31C4.43,16 6,17.26 7.89,17.29C6.43,18.45 4.58,19.13 2.56,19.13C2.22,19.13 1.88,19.11 1.54,19.07C3.44,20.29 5.7,21 8.12,21C16,21 20.33,14.46 20.33,8.79C20.33,8.6 20.33,8.42 20.32,8.23C21.16,7.63 21.88,6.87 22.46,6Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-nodpi/ic_warning.xml b/app/src/main/res/drawable-nodpi/ic_warning.xml
deleted file mode 100644
index f883b23..0000000
--- a/app/src/main/res/drawable-nodpi/ic_warning.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M4.47,21h15.06c1.54,0 2.5,-1.67 1.73,-3L13.73,4.99c-0.77,-1.33 -2.69,-1.33 -3.46,0L2.74,18c-0.77,1.33 0.19,3 1.73,3zM12,14c-0.55,0 -1,-0.45 -1,-1v-2c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v2c0,0.55 -0.45,1 -1,1zM13,18h-2v-2h2v2z"/>
-</vector>
diff --git a/app/src/main/res/drawable-nodpi/ic_xda.xml b/app/src/main/res/drawable-nodpi/ic_xda.xml
deleted file mode 100644
index 0b5ab67..0000000
--- a/app/src/main/res/drawable-nodpi/ic_xda.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- drawable/xda.xml -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="?android:textColorPrimary" android:pathData="M-0.05,16.79L3.19,12.97L-0.05,9.15L1.5,7.86L4.5,11.41L7.5,7.86L9.05,9.15L5.81,12.97L9.05,16.79L7.5,18.07L4.5,14.5L1.5,18.07L-0.05,16.79M24,17A1,1 0 0,1 23,18H20A2,2 0 0,1 18,16V14A2,2 0 0,1 20,12H22V10H18V8H23A1,1 0 0,1 24,9M22,14H20V16H22V14M16,17A1,1 0 0,1 15,18H12A2,2 0 0,1 10,16V10A2,2 0 0,1 12,8H14V5H16V17M14,16V10H12V16H14Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/dark_mode_warning_background.xml b/app/src/main/res/drawable/background_dialog_location_permission.xml
similarity index 50%
rename from app/src/main/res/drawable/dark_mode_warning_background.xml
rename to app/src/main/res/drawable/background_dialog_location_permission.xml
index 39db84c..dc58161 100644
--- a/app/src/main/res/drawable/dark_mode_warning_background.xml
+++ b/app/src/main/res/drawable/background_dialog_location_permission.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/dark_mode_warning_red"/>
-    <corners android:radius="@dimen/margin_small"/>
+    <solid android:color="@color/background"/>
+    <corners android:radius="32dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
new file mode 100644
index 0000000..c2d7f69
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/icon_inside_7"
+        android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_about_round.xml b/app/src/main/res/drawable/ic_about_round.xml
new file mode 100644
index 0000000..47f118d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about_round.xml
@@ -0,0 +1,17 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid
+                android:color="@color/icon_circle_7" />
+            <size
+                android:width="36dp"
+                android:height="36dp" />
+        </shape>
+    </item>
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:start="6dp"
+        android:top="6dp"
+        android:drawable="@drawable/ic_about" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_advanced.xml b/app/src/main/res/drawable/ic_advanced.xml
new file mode 100644
index 0000000..2749e5b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_advanced.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/icon_inside_0"
+        android:pathData="M12.09,2.91C10.08,0.9 7.07,0.49 4.65,1.67L8.28,5.3c0.39,0.39 0.39,1.02 0,1.41L6.69,8.3c-0.39,0.4 -1.02,0.4 -1.41,0L1.65,4.67C0.48,7.1 0.89,10.09 2.9,12.1c1.86,1.86 4.58,2.35 6.89,1.48l7.96,7.96c1.03,1.03 2.69,1.03 3.71,0 1.03,-1.03 1.03,-2.69 0,-3.71L13.54,9.9c0.92,-2.34 0.44,-5.1 -1.45,-6.99z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_advanced_always_use_force_dark.xml b/app/src/main/res/drawable/ic_advanced_always_use_force_dark.xml
new file mode 100644
index 0000000..b0c1d14
--- /dev/null
+++ b/app/src/main/res/drawable/ic_advanced_always_use_force_dark.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.75"
+        android:scaleY="0.75">
+        <path
+            android:fillColor="?android:textColorPrimary"
+            android:pathData="M19,8h-1.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96l0.93,-0.93c0.39,-0.39 0.39,-1.02 0,-1.41 -0.39,-0.39 -1.02,-0.39 -1.41,0l-1.47,1.47C12.96,5.06 12.49,5 12,5s-0.96,0.06 -1.41,0.17L9.11,3.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41l0.92,0.93C7.88,6.55 7.26,7.22 6.81,8L5,8c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h1.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L5,12c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h1v1c0,0.34 0.04,0.67 0.09,1L5,16c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h1.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L19,18c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1h-1.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h1c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1h-1v-1c0,-0.34 -0.04,-0.67 -0.09,-1L19,10c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1zM13,16h-2c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h2c0.55,0 1,0.45 1,1s-0.45,1 -1,1zM13,12h-2c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h2c0.55,0 1,0.45 1,1s-0.45,1 -1,1z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_advanced_round.xml b/app/src/main/res/drawable/ic_advanced_round.xml
new file mode 100644
index 0000000..0273462
--- /dev/null
+++ b/app/src/main/res/drawable/ic_advanced_round.xml
@@ -0,0 +1,17 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid
+                android:color="@color/icon_circle_0" />
+            <size
+                android:width="36dp"
+                android:height="36dp" />
+        </shape>
+    </item>
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:start="6dp"
+        android:top="6dp"
+        android:drawable="@drawable/ic_advanced" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_advanced_send_app_closes.xml b/app/src/main/res/drawable/ic_advanced_send_app_closes.xml
new file mode 100644
index 0000000..ffd385c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_advanced_send_app_closes.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.75"
+        android:scaleY="0.75">
+        <path
+            android:fillColor="?android:textColorPrimary"
+            android:pathData="M12.5,7.7c-0.28,-0.28 -0.72,-0.28 -1,0L8,11.2 4.5,7.7c-0.28,-0.28 -0.72,-0.28 -1,0s-0.28,0.72 0,1L7,12.2l-3.5,3.5c-0.28,0.28 -0.28,0.72 0,1s0.72,0.28 1,0L8,13.2l3.5,3.5c0.28,0.28 0.72,0.28 1,0s0.28,-0.72 0,-1L9,12.2l3.5,-3.5c0.28,-0.28 0.28,-0.72 0,-1zM19,1H9c-1.1,0 -2,0.9 -2,2v2c0,0.55 0.45,1 1,1s1,-0.45 1,-1V4h10v16H9v-1c0,-0.55 -0.45,-1 -1,-1s-1,0.45 -1,1v2c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-2 -2,-2z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_app_whitelist.xml b/app/src/main/res/drawable/ic_app_whitelist.xml
new file mode 100644
index 0000000..8f18eac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_app_whitelist.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/icon_inside_3"
+        android:pathData="M11.01,3.05C6.51,3.54 3,7.36 3,12c0,4.97 4.03,9 9,9c4.63,0 8.45,-3.5 8.95,-8c0.09,-0.79 -0.78,-1.42 -1.54,-0.95c-0.84,0.54 -1.84,0.85 -2.91,0.85c-2.98,0 -5.4,-2.42 -5.4,-5.4c0,-1.06 0.31,-2.06 0.84,-2.89C12.39,3.94 11.9,2.98 11.01,3.05z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_app_whitelist_round.xml b/app/src/main/res/drawable/ic_app_whitelist_round.xml
new file mode 100644
index 0000000..b42df61
--- /dev/null
+++ b/app/src/main/res/drawable/ic_app_whitelist_round.xml
@@ -0,0 +1,17 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid
+                android:color="@color/icon_circle_3" />
+            <size
+                android:width="36dp"
+                android:height="36dp" />
+        </shape>
+    </item>
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:start="6dp"
+        android:top="6dp"
+        android:drawable="@drawable/ic_app_whitelist" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
new file mode 100644
index 0000000..36732af
--- /dev/null
+++ b/app/src/main/res/drawable/ic_back.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:autoMirrored="true">
+    <path
+        android:fillColor="?android:textColorPrimary"
+        android:pathData="M19,11H7.83l4.88,-4.88c0.39,-0.39 0.39,-1.03 0,-1.42 -0.39,-0.39 -1.02,-0.39 -1.41,0l-6.59,6.59c-0.39,0.39 -0.39,1.02 0,1.41l6.59,6.59c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L7.83,13H19c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
new file mode 100644
index 0000000..196970e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?android:textColorPrimary"
+        android:pathData="M9,16.17L5.53,12.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41l4.18,4.18c0.39,0.39 1.02,0.39 1.41,0L20.29,7.71c0.39,-0.39 0.39,-1.02 0,-1.41 -0.39,-0.39 -1.02,-0.39 -1.41,0L9,16.17z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
new file mode 100644
index 0000000..b4c88df
--- /dev/null
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:textColorPrimary" android:pathData="M18.3,5.71c-0.39,-0.39 -1.02,-0.39 -1.41,0L12,10.59 7.11,5.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41L10.59,12 5.7,16.89c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L12,13.41l4.89,4.89c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L13.41,12l4.89,-4.89c0.38,-0.38 0.38,-1.02 0,-1.4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_day_night_auto.xml b/app/src/main/res/drawable/ic_day_night_auto.xml
new file mode 100644
index 0000000..2e72213
--- /dev/null
+++ b/app/src/main/res/drawable/ic_day_night_auto.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/icon_inside_11" android:pathData="M11.1,12.08c-2,-3.88 -0.92,-7.36 0.07,-9.27c0.19,-0.36 -0.12,-0.77 -0.53,-0.72C5.62,2.77 1.78,7.16 1.99,12.41c0.01,0 0.01,0 0.01,0.01C2.62,12.15 3.29,12 4,12c1.66,0 3.18,0.83 4.1,2.15C9.77,14.63 11,16.17 11,18c0,1.52 -0.87,2.83 -2.12,3.51c0.98,0.32 2.03,0.5 3.11,0.5c3.13,0 5.92,-1.44 7.76,-3.69c0.26,-0.32 0.04,-0.79 -0.37,-0.82C16.89,17.37 13.1,15.97 11.1,12.08z"/>
+    <path android:fillColor="@color/icon_inside_11" android:pathData="M7,16l-0.18,0C6.4,14.84 5.3,14 4,14c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.62,0 2.49,0 3,0c1.1,0 2,-0.9 2,-2C9,16.9 8.1,16 7,16z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_day_night_auto_round.xml b/app/src/main/res/drawable/ic_day_night_auto_round.xml
new file mode 100644
index 0000000..04ca722
--- /dev/null
+++ b/app/src/main/res/drawable/ic_day_night_auto_round.xml
@@ -0,0 +1,17 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid
+                android:color="@color/icon_circle_11" />
+            <size
+                android:width="36dp"
+                android:height="36dp" />
+        </shape>
+    </item>
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:start="6dp"
+        android:top="6dp"
+        android:drawable="@drawable/ic_day_night_auto" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_developer_options.xml b/app/src/main/res/drawable/ic_developer_options.xml
new file mode 100644
index 0000000..90865da
--- /dev/null
+++ b/app/src/main/res/drawable/ic_developer_options.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/icon_inside_4"
+        android:pathData="M8.7,15.9L4.8,12l3.9,-3.9c0.39,-0.39 0.39,-1.01 0,-1.4 -0.39,-0.39 -1.01,-0.39 -1.4,0l-4.59,4.59c-0.39,0.39 -0.39,1.02 0,1.41l4.59,4.6c0.39,0.39 1.01,0.39 1.4,0 0.39,-0.39 0.39,-1.01 0,-1.4zM15.3,15.9l3.9,-3.9 -3.9,-3.9c-0.39,-0.39 -0.39,-1.01 0,-1.4 0.39,-0.39 1.01,-0.39 1.4,0l4.59,4.59c0.39,0.39 0.39,1.02 0,1.41l-4.59,4.6c-0.39,0.39 -1.01,0.39 -1.4,0 -0.39,-0.39 -0.39,-1.01 0,-1.4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_developer_options_kill.xml b/app/src/main/res/drawable/ic_developer_options_kill.xml
new file mode 100644
index 0000000..f6110e9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_developer_options_kill.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.75"
+        android:scaleY="0.75">
+        <path
+            android:fillColor="?android:textColorPrimary"
+            android:pathData="M6,13h12c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L6,11c-0.55,0 -1,0.45 -1,1s0.45,1 1,1zM4,17h12c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L4,15c-0.55,0 -1,0.45 -1,1s0.45,1 1,1zM7,8c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L8,7c-0.55,0 -1,0.45 -1,1z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_developer_options_round.xml b/app/src/main/res/drawable/ic_developer_options_round.xml
new file mode 100644
index 0000000..1f1a7e8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_developer_options_round.xml
@@ -0,0 +1,17 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid
+                android:color="@color/icon_circle_4" />
+            <size
+                android:width="36dp"
+                android:height="36dp" />
+        </shape>
+    </item>
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:start="6dp"
+        android:top="6dp"
+        android:drawable="@drawable/ic_developer_options" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_developer_options_service_info.xml b/app/src/main/res/drawable/ic_developer_options_service_info.xml
new file mode 100644
index 0000000..dccf1db
--- /dev/null
+++ b/app/src/main/res/drawable/ic_developer_options_service_info.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.75"
+        android:scaleY="0.75">
+        <path
+            android:fillColor="?android:textColorPrimary"
+            android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_donate.xml b/app/src/main/res/drawable/ic_donate.xml
new file mode 100644
index 0000000..62441ad
--- /dev/null
+++ b/app/src/main/res/drawable/ic_donate.xml
@@ -0,0 +1,25 @@
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M18.3203,1.9141C17.2305,0.6445 15.3242,0 12.6602,0L5.9805,0C5.1367,0 4.4258,0.6133 4.2969,1.4609L1.5156,19.4609C1.457,19.8477 1.5703,20.2422 1.8242,20.5391C2.0742,20.832 2.4414,21 2.8242,21L7.5898,21L8.6914,13.8555C8.7148,13.7578 8.7969,13.6836 8.8906,13.6836L10.8477,13.6836C15.6094,13.6836 18.4648,11.3906 19.3281,6.8672L19.4023,6.4336C19.6875,4.4766 19.3672,3.1289 18.3203,1.9141ZM17.9219,6.1992L17.8555,6.582C17.1367,10.3516 14.8438,12.1836 10.8516,12.1836L8.8906,12.1836C8.1172,12.1836 7.4609,12.6992 7.2539,13.4336L7.2422,13.4297L7.2109,13.6367C7.207,13.6367 7.207,13.6367 7.207,13.6406L6.3047,19.5L3.0273,19.5L5.7773,1.6875C5.793,1.5781 5.8789,1.5 5.9805,1.5L12.6563,1.5C14.8672,1.5 16.3906,1.9688 17.1875,2.8945C17.9375,3.7656 18.1406,4.6953 17.9219,6.1992ZM17.9219,6.1992"
+        android:fillColor="@color/icon_inside_7"
+        android:fillAlpha="1"
+        android:fillType="nonZero"
+        android:strokeColor="@color/icon_inside_7"/>
+    <path
+        android:pathData="M10.207,16.6484L10.2344,16.4375L11.7227,16.6523L11.6914,16.8594ZM10.207,16.6484"
+        android:fillColor="@color/icon_inside_7"
+        android:fillAlpha="1"
+        android:fillType="nonZero"
+        android:strokeColor="@color/icon_inside_7"/>
+    <path
+        android:pathData="M21.3242,4.9063C20.7344,4.2266 19.8984,3.7227 18.8438,3.4063L18.4141,4.8438C19.1914,5.0781 19.7891,5.4297 20.1914,5.8906C20.9336,6.7539 21.1406,7.7148 20.9219,9.1914C20.9219,9.1914 20.8789,9.4336 20.8477,9.582C20.1367,13.3477 17.8477,15.1797 13.8438,15.1797L11.8945,15.1797C11.0547,15.1797 10.3438,15.793 10.207,16.6406L9.3008,22.5L6.0195,22.5L6.3516,20.3633L4.8672,20.1367L4.5039,22.4805C4.457,22.8711 4.5781,23.2617 4.8359,23.5547C5.0859,23.8398 5.4453,24 5.8203,24L10.5898,24L11.6875,16.875C11.707,16.7773 11.7813,16.6797 11.8945,16.6797L13.8438,16.6797C18.6172,16.6797 21.4688,14.3867 22.3125,9.8867C22.3477,9.7383 22.3984,9.4414 22.4023,9.4258C22.6914,7.5039 22.3594,6.1133 21.3242,4.9063ZM21.3242,4.9063"
+        android:fillColor="@color/icon_inside_7"
+        android:fillAlpha="1"
+        android:fillType="nonZero"
+        android:strokeColor="@color/icon_inside_7"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_faq.xml b/app/src/main/res/drawable/ic_faq.xml
new file mode 100644
index 0000000..05f0394
--- /dev/null
+++ b/app/src/main/res/drawable/ic_faq.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/icon_inside_5"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,16h2v2h-2zM12.61,6.04c-2.06,-0.3 -3.88,0.97 -4.43,2.79 -0.18,0.58 0.26,1.17 0.87,1.17h0.2c0.41,0 0.74,-0.29 0.88,-0.67 0.32,-0.89 1.27,-1.5 2.3,-1.28 0.95,0.2 1.65,1.13 1.57,2.1 -0.1,1.34 -1.62,1.63 -2.45,2.88 0,0.01 -0.01,0.01 -0.01,0.02 -0.01,0.02 -0.02,0.03 -0.03,0.05 -0.09,0.15 -0.18,0.32 -0.25,0.5 -0.01,0.03 -0.03,0.05 -0.04,0.08 -0.01,0.02 -0.01,0.04 -0.02,0.07 -0.12,0.34 -0.2,0.75 -0.2,1.25h2c0,-0.42 0.11,-0.77 0.28,-1.07 0.02,-0.03 0.03,-0.06 0.05,-0.09 0.08,-0.14 0.18,-0.27 0.28,-0.39 0.01,-0.01 0.02,-0.03 0.03,-0.04 0.1,-0.12 0.21,-0.23 0.33,-0.34 0.96,-0.91 2.26,-1.65 1.99,-3.56 -0.24,-1.74 -1.61,-3.21 -3.35,-3.47z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_faq_round.xml b/app/src/main/res/drawable/ic_faq_round.xml
new file mode 100644
index 0000000..9480447
--- /dev/null
+++ b/app/src/main/res/drawable/ic_faq_round.xml
@@ -0,0 +1,17 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid
+                android:color="@color/icon_circle_5" />
+            <size
+                android:width="36dp"
+                android:height="36dp" />
+        </shape>
+    </item>
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:start="6dp"
+        android:top="6dp"
+        android:drawable="@drawable/ic_faq" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml
new file mode 100644
index 0000000..6de1b37
--- /dev/null
+++ b/app/src/main/res/drawable/ic_github.xml
@@ -0,0 +1,8 @@
+<!-- drawable/github_circle.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_inside_6" android:pathData="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 72a862d..69cad0f 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="40dp"
@@ -9,20 +10,7 @@
         android:translateY="8">
         <path
             android:fillColor="#000"
-            android:pathData="M3.1,12c0,4.2 3,7.8 6.9,8.7c0,-5.8 0,-11.6 0,-17.3C6,4.2 3.1,7.8 3.1,12z">
-            <aapt:attr name="android:fillColor">
-                <gradient
-                    android:type="radial"
-                    android:centerX="20"
-                    android:centerY="20"
-                    android:gradientRadius="76.37">
-                    <item android:offset="0.0" android:color="#26000000" />
-                    <item android:offset="0.32" android:color="#26000000" />
-                    <item android:offset="0.62" android:color="#05000000" />
-                    <item android:offset="1.0" android:color="#00000000" />
-                </gradient>
-            </aapt:attr>
-        </path>
+            android:pathData="M3.1,12c0,4.2 3,7.8 6.9,8.7c0,-5.8 0,-11.6 0,-17.3C6,4.2 3.1,7.8 3.1,12z"/>
         <path
             android:fillColor="#fafafa"
             android:pathData="M12,3.1c-0.7,0 -1.4,0.1 -2,0.2c0,5.8 0,11.6 0,17.3c0.6,0.1 1.3,0.2 2,0.2c4.9,0 8.9,-4 8.9,-8.9S16.9,3.1 12,3.1zM12.1,19.1L12,4.8c3.5,0 7.1,3.6 7.1,7.2S15.6,19.1 12.1,19.1z" />
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
new file mode 100644
index 0000000..f35a2be
--- /dev/null
+++ b/app/src/main/res/drawable/ic_location.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:textColorPrimary" android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM7,9c0,-2.76 2.24,-5 5,-5s5,2.24 5,5c0,2.88 -2.88,7.19 -5,9.88C9.92,16.21 7,11.85 7,9z"/>
+    <path android:fillColor="?android:textColorPrimary" android:pathData="M12,9m-2.5,0a2.5,2.5 0,1 1,5 0a2.5,2.5 0,1 1,-5 0"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_monet.xml b/app/src/main/res/drawable/ic_monet.xml
new file mode 100644
index 0000000..59e548c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_monet.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24.0dp"
+    android:height="24.0dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.75"
+        android:scaleY="0.75">
+        <path
+            android:fillColor="?android:textColorPrimary"
+            android:pathData="M4,2v9c0,1.65 1.35,3 3,3h2v6c0,1.1 0.9,2 2,2h2c1.1,0 2,-0.9 2,-2v-6h2c1.65,0 3,-1.35 3,-3V2C20,2 4,2 4,2zM11,20v-6h2v6H11zM18,11c0,0.55 -0.45,1 -1,1h-2H9H7c-0.55,0 -1,-0.45 -1,-1v-0.93h12V11zM18,8.07H6V4h2.81v2.15h2V4h2.38v2.15h2V4H18V8.07z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml
new file mode 100644
index 0000000..0431a31
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notification.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+    <group
+        android:scaleX="1.75"
+        android:scaleY="1.75"
+        android:translateX="-0.75"
+        android:translateY="-0.75">
+        <path
+            android:fillColor="#000"
+            android:pathData="M3.1,12c0,4.2 3,7.8 6.9,8.7c0,-5.8 0,-11.6 0,-17.3C6,4.2 3.1,7.8 3.1,12z"/>
+        <path
+            android:fillColor="#fafafa"
+            android:pathData="M12,3.1c-0.7,0 -1.4,0.1 -2,0.2c0,5.8 0,11.6 0,17.3c0.6,0.1 1.3,0.2 2,0.2c4.9,0 8.9,-4 8.9,-8.9S16.9,3.1 12,3.1zM12.1,19.1L12,4.8c3.5,0 7.1,3.6 7.1,7.2S15.6,19.1 12.1,19.1z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_oxygen.xml b/app/src/main/res/drawable/ic_oxygen.xml
new file mode 100644
index 0000000..a9be013
--- /dev/null
+++ b/app/src/main/res/drawable/ic_oxygen.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.75"
+        android:scaleY="0.75">
+
+        <path
+            android:fillColor="@color/icon_inside_1"
+            android:pathData="M 0 0 L 23.976562 0 L 23.976562 23.910156 L 0 23.910156 L 0 0 M 11.28125 6.042969 C 10.117188 6.183594 9.015625 6.691406 8.117188 7.4375 C 7.90625 7.65625 7.6875 7.871094 7.472656 8.089844 C 6.796875 8.917969 6.304688 9.910156 6.140625 10.972656 C 6.148438 11.179688 6.054688 11.378906 6.078125 11.585938 C 6.097656 11.949219 6.039062 12.324219 6.109375 12.679688 C 6.351562 14.902344 7.976562 16.894531 10.097656 17.585938 C 10.496094 17.691406 10.890625 17.828125 11.308594 17.839844 C 11.640625 17.925781 11.988281 17.875 12.328125 17.890625 C 12.5 17.90625 12.664062 17.832031 12.835938 17.832031 C 13.3125 17.796875 13.765625 17.628906 14.21875 17.472656 C 14.808594 17.191406 15.417969 16.910156 15.886719 16.441406 C 15.96875 16.351562 16.078125 16.300781 16.164062 16.214844 C 16.554688 15.769531 16.953125 15.324219 17.222656 14.796875 C 17.53125 14.1875 17.796875 13.535156 17.867188 12.847656 C 17.894531 12.652344 17.917969 12.457031 17.953125 12.265625 C 17.988281 11.207031 17.769531 10.125 17.257812 9.1875 C 17.050781 8.71875 16.710938 8.324219 16.390625 7.917969 C 15.953125 7.445312 15.425781 7.070312 14.875 6.734375 C 14.175781 6.351562 13.398438 6.132812 12.609375 6.019531 C 12.164062 6.03125 11.71875 5.992188 11.28125 6.042969 Z M 11.28125 6.042969"
+            android:strokeWidth="1" />
+        <path
+            android:fillColor="@color/icon_inside_1"
+            android:pathData="M 11.445312 8.402344 C 11.773438 8.359375 12.109375 8.394531 12.4375 8.382812 C 13.085938 8.464844 13.710938 8.726562 14.222656 9.128906 C 14.378906 9.273438 14.523438 9.429688 14.679688 9.578125 C 15.140625 10.046875 15.40625 10.675781 15.53125 11.3125 C 15.75 12.34375 15.414062 13.433594 14.761719 14.246094 C 14.488281 14.519531 14.226562 14.8125 13.886719 15.007812 C 13.453125 15.292969 12.945312 15.441406 12.4375 15.523438 C 12.171875 15.535156 11.914062 15.527344 11.648438 15.527344 C 10.933594 15.4375 10.222656 15.171875 9.6875 14.675781 C 9.375 14.484375 9.195312 14.148438 8.96875 13.871094 C 8.699219 13.394531 8.476562 12.875 8.441406 12.324219 C 8.453125 12.027344 8.425781 11.726562 8.453125 11.433594 C 8.648438 9.914062 9.929688 8.617188 11.445312 8.402344 Z M 11.445312 8.402344"
+            android:strokeWidth="1" />
+
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_oxygen_round.xml b/app/src/main/res/drawable/ic_oxygen_round.xml
new file mode 100644
index 0000000..4ad42ed
--- /dev/null
+++ b/app/src/main/res/drawable/ic_oxygen_round.xml
@@ -0,0 +1,17 @@
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid
+                android:color="@color/icon_circle_1" />
+            <size
+                android:width="36dp"
+                android:height="36dp" />
+        </shape>
+    </item>
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:start="6dp"
+        android:top="6dp"
+        android:drawable="@drawable/ic_oxygen" />
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
new file mode 100644
index 0000000..2732555
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:textColorPrimary" android:pathData="M15.5,14h-0.79l-0.28,-0.27c1.2,-1.4 1.82,-3.31 1.48,-5.34 -0.47,-2.78 -2.79,-5 -5.59,-5.34 -4.23,-0.52 -7.79,3.04 -7.27,7.27 0.34,2.8 2.56,5.12 5.34,5.59 2.03,0.34 3.94,-0.28 5.34,-1.48l0.27,0.28v0.79l4.25,4.25c0.41,0.41 1.08,0.41 1.49,0 0.41,-0.41 0.41,-1.08 0,-1.49L15.5,14zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_twitter.xml b/app/src/main/res/drawable/ic_twitter.xml
new file mode 100644
index 0000000..a4bcb59
--- /dev/null
+++ b/app/src/main/res/drawable/ic_twitter.xml
@@ -0,0 +1,8 @@
+<!-- drawable/ic_twitter.xmlxml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="@color/icon_inside_8" android:pathData="M22.46,6C21.69,6.35 20.86,6.58 20,6.69C20.88,6.16 21.56,5.32 21.88,4.31C21.05,4.81 20.13,5.16 19.16,5.36C18.37,4.5 17.26,4 16,4C13.65,4 11.73,5.92 11.73,8.29C11.73,8.63 11.77,8.96 11.84,9.27C8.28,9.09 5.11,7.38 3,4.79C2.63,5.42 2.42,6.16 2.42,6.94C2.42,8.43 3.17,9.75 4.33,10.5C3.62,10.5 2.96,10.3 2.38,10C2.38,10 2.38,10 2.38,10.03C2.38,12.11 3.86,13.85 5.82,14.24C5.46,14.34 5.08,14.39 4.69,14.39C4.42,14.39 4.15,14.36 3.89,14.31C4.43,16 6,17.26 7.89,17.29C6.43,18.45 4.58,19.13 2.56,19.13C2.22,19.13 1.88,19.11 1.54,19.07C3.44,20.29 5.7,21 8.12,21C16,21 20.33,14.46 20.33,8.79C20.33,8.6 20.33,8.42 20.32,8.23C21.16,7.63 21.88,6.87 22.46,6Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_xda.xml b/app/src/main/res/drawable/ic_xda.xml
new file mode 100644
index 0000000..72e94ef
--- /dev/null
+++ b/app/src/main/res/drawable/ic_xda.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/icon_inside_5"
+        android:strokeWidth="1"
+        android:pathData="M 8.242188 9.253906 L 8.289062 9.195312 L 8.519531 8.933594 L 7.175781 8.933594 L 5.269531 11.207031 L 3.351562 8.933594 L 2.007812 8.945312 L 2.246094 9.199219 L 4.59375 12 L 2.246094 14.800781 L 2.007812 15.066406 L 3.351562 15.066406 L 5.269531 12.792969 L 7.175781 15.066406 L 8.519531 15.054688 L 8.289062 14.800781 L 5.929688 12 Z M 8.242188 9.253906" />
+    <path
+        android:fillColor="@color/icon_inside_5"
+        android:strokeWidth="1"
+        android:pathData="M 14.058594 8.933594 L 9.082031 8.933594 L 9.082031 15.066406 L 14.058594 15.066406 C 14.363281 15.070312 14.660156 14.945312 14.871094 14.730469 C 15.09375 14.519531 15.210938 14.222656 15.207031 13.917969 L 15.207031 10.089844 C 15.210938 9.78125 15.089844 9.488281 14.871094 9.277344 C 14.660156 9.054688 14.363281 8.929688 14.058594 8.933594 Z M 10.105469 10.089844 C 10.105469 10.054688 10.117188 10.023438 10.140625 10 C 10.164062 9.976562 10.195312 9.957031 10.230469 9.957031 L 14.058594 9.957031 C 14.09375 9.957031 14.125 9.96875 14.148438 10 C 14.171875 10.023438 14.183594 10.054688 14.183594 10.089844 L 14.183594 13.917969 C 14.183594 13.953125 14.171875 13.980469 14.148438 14.007812 C 14.125 14.03125 14.09375 14.042969 14.058594 14.042969 L 10.230469 14.042969 C 10.195312 14.042969 10.164062 14.03125 10.140625 14.007812 C 10.117188 13.980469 10.105469 13.953125 10.105469 13.917969 Z M 10.105469 10.089844" />
+    <path
+        android:fillColor="@color/icon_inside_5"
+        android:strokeWidth="1"
+        android:pathData="M 21.664062 9.277344 C 21.453125 9.058594 21.160156 8.933594 20.851562 8.941406 L 17.019531 8.941406 C 16.710938 8.933594 16.417969 9.058594 16.207031 9.277344 C 15.988281 9.488281 15.863281 9.78125 15.871094 10.089844 L 15.871094 15.066406 L 16.894531 15.066406 L 16.894531 12.964844 L 20.976562 12.964844 L 20.976562 15.066406 L 22 15.066406 L 22 10.089844 C 22 9.78125 21.882812 9.488281 21.664062 9.277344 Z M 16.886719 10.089844 C 16.886719 10.054688 16.898438 10.023438 16.929688 10 C 16.953125 9.976562 16.980469 9.957031 17.011719 9.957031 L 20.847656 9.957031 C 20.875 9.957031 20.910156 9.976562 20.929688 10 C 20.957031 10.023438 20.96875 10.054688 20.96875 10.089844 L 20.96875 11.941406 L 16.886719 11.941406 Z M 16.886719 10.089844" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/monet_color_picker_circle_background.xml b/app/src/main/res/drawable/monet_color_picker_circle_background.xml
new file mode 100644
index 0000000..a3961d6
--- /dev/null
+++ b/app/src/main/res/drawable/monet_color_picker_circle_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="32dp"/>
+    <solid android:color="@android:color/white"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rounded_ripple.xml b/app/src/main/res/drawable/rounded_ripple.xml
deleted file mode 100644
index 8a2e485..0000000
--- a/app/src/main/res/drawable/rounded_ripple.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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="28dp"/>
-        </shape>
-        <color android:color="@android:color/white"/>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/snackbar_background.xml b/app/src/main/res/drawable/snackbar_background.xml
new file mode 100644
index 0000000..173d245
--- /dev/null
+++ b/app/src/main/res/drawable/snackbar_background.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/toolbar"/>
+    <corners android:radius="@dimen/padding_8"/>
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/splash_background.xml b/app/src/main/res/drawable/splash_background.xml
new file mode 100644
index 0000000..6f05fb6
--- /dev/null
+++ b/app/src/main/res/drawable/splash_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <color android:color="@color/toolbar_dark"/>
+    </item>
+    <item android:drawable="@drawable/ic_launcher_foreground"
+        android:width="300dp"
+        android:height="300dp"
+        android:gravity="center"/>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/font/google_sans_text.xml b/app/src/main/res/font/google_sans_text.xml
new file mode 100644
index 0000000..f7425c1
--- /dev/null
+++ b/app/src/main/res/font/google_sans_text.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <font
+        android:font="@font/google_sans_text_regular"
+        app:fontWeight="400"
+        android:fontWeight="400" />
+    <font
+        android:font="@font/google_sans_text_italic"
+        android:fontStyle="italic"
+        app:fontWeight="400"
+        android:fontWeight="400" />
+    <font
+        android:font="@font/google_sans_text_medium"
+        app:fontWeight="500"
+        android:fontWeight="500" />
+    <font
+        android:font="@font/google_sans_text_medium_italic"
+        android:fontStyle="italic"
+        app:fontWeight="500"
+        android:fontWeight="500" />
+    <font
+        android:font="@font/google_sans_text_bold"
+        app:fontWeight="700"
+        android:fontWeight="700" />
+    <font
+        android:font="@font/google_sans_text_bold_italic"
+        android:fontStyle="italic"
+        app:fontWeight="700"
+        android:fontWeight="700" />
+</font-family>
\ No newline at end of file
diff --git a/app/src/main/res/font/google_sans_text_bold.ttf b/app/src/main/res/font/google_sans_text_bold.ttf
new file mode 100644
index 0000000..a583deb
Binary files /dev/null and b/app/src/main/res/font/google_sans_text_bold.ttf differ
diff --git a/app/src/main/res/font/google_sans_text_bold_italic.ttf b/app/src/main/res/font/google_sans_text_bold_italic.ttf
new file mode 100644
index 0000000..4b759da
Binary files /dev/null and b/app/src/main/res/font/google_sans_text_bold_italic.ttf differ
diff --git a/app/src/main/res/font/google_sans_text_italic.ttf b/app/src/main/res/font/google_sans_text_italic.ttf
new file mode 100644
index 0000000..1c27d84
Binary files /dev/null and b/app/src/main/res/font/google_sans_text_italic.ttf differ
diff --git a/app/src/main/res/font/google_sans_text_medium.ttf b/app/src/main/res/font/google_sans_text_medium.ttf
new file mode 100644
index 0000000..e7066dc
Binary files /dev/null and b/app/src/main/res/font/google_sans_text_medium.ttf differ
diff --git a/app/src/main/res/font/google_sans_text_medium_italic.ttf b/app/src/main/res/font/google_sans_text_medium_italic.ttf
new file mode 100644
index 0000000..b86aeff
Binary files /dev/null and b/app/src/main/res/font/google_sans_text_medium_italic.ttf differ
diff --git a/app/src/main/res/font/google_sans_text_regular.ttf b/app/src/main/res/font/google_sans_text_regular.ttf
new file mode 100644
index 0000000..a3ae8a6
Binary files /dev/null and b/app/src/main/res/font/google_sans_text_regular.ttf differ
diff --git a/app/src/main/res/font/hkgrotesk.ttf b/app/src/main/res/font/hkgrotesk.ttf
deleted file mode 100644
index 75ef599..0000000
Binary files a/app/src/main/res/font/hkgrotesk.ttf and /dev/null differ
diff --git a/app/src/main/res/layout/activity_darq.xml b/app/src/main/res/layout/activity_darq.xml
new file mode 100644
index 0000000..0d4a731
--- /dev/null
+++ b/app/src/main/res/layout/activity_darq.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/root">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/container_fragment"
+        android:name="com.kieronquinn.app.darq.ui.screens.container.ContainerFragment"/>
+
+</FrameLayout>
\ 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
deleted file mode 100644
index 237ff6f..0000000
--- a/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 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="match_parent"
-    android:animateLayoutChanges="true"
-    android:id="@+id/root"
-    tools:context=".activities.MainActivity">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?actionBarSize"
-        android:elevation="4dp"
-        android:outlineProvider="bounds"
-        app:contentInsetStart="0dp">
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:animateLayoutChanges="true">
-
-            <View
-                android:id="@+id/toolbar_background"
-                android:layout_width="match_parent"
-                android:background="?toolbarColor"
-                android:elevation="4dp"
-                android:layout_height="match_parent" />
-
-            <View
-                android:id="@+id/toolbar_background_dark"
-                android:layout_width="match_parent"
-                android:background="@color/toolbar_dark"
-                android:elevation="4dp"
-                android:visibility="gone"
-                android:layout_height="match_parent" />
-
-            <View
-                android:id="@+id/toolbar_background_light"
-                android:layout_width="match_parent"
-                android:visibility="gone"
-                android:elevation="4dp"
-                android:background="@android:color/white"
-                android:layout_height="match_parent" />
-
-            <TextView
-                android:id="@+id/toolbar_title"
-                android:layout_width="wrap_content"
-                android:layout_height="?actionBarSize"
-                android:gravity="center"
-                android:layout_gravity="bottom|center_horizontal"
-                android:fontFamily="@font/hkgrotesk"
-                android:text="@string/app_name"
-                android:elevation="4dp"
-                android:textAppearance="@style/Base.TextAppearance.Widget.AppCompat.Toolbar.Title" />
-
-            <ImageView
-                android:layout_width="?actionBarSize"
-                android:layout_height="?actionBarSize"
-                android:layout_gravity="bottom"
-                android:id="@+id/home"
-                app:tint="@android:color/black"
-                android:src="?attr/homeAsUpIndicator"
-                android:padding="@dimen/activity_padding"
-                android:foreground="@drawable/rounded_ripple"
-                android:clickable="true"
-                android:focusable="true"
-                android:elevation="4dp"/>
-
-            <ImageView
-                android:layout_width="?actionBarSize"
-                android:layout_height="?actionBarSize"
-                android:layout_gravity="bottom|end"
-                android:id="@+id/menu"
-                app:tint="@android:color/black"
-                android:src="@drawable/ic_dots"
-                android:padding="@dimen/activity_padding"
-                android:foreground="@drawable/rounded_ripple"
-                android:clickable="true"
-                android:focusable="true"
-                android:elevation="4dp"/>
-
-        </FrameLayout>
-
-
-    </androidx.appcompat.widget.Toolbar>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/loadingState"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:fitsSystemWindows="true"
-        android:orientation="vertical">
-
-        <View
-            android:id="@+id/lightAnimationReveal"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/windowBackground"
-            android:visibility="invisible" />
-
-        <View
-            android:id="@+id/darkAnimationReveal"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@android:color/black"
-            android:visibility="invisible" />
-
-        <com.airbnb.lottie.LottieAnimationView
-            android:id="@+id/lottie"
-            android:layout_width="200dp"
-            android:layout_height="100dp"
-            android:layout_marginTop="?actionBarSize"
-            android:scaleType="centerCrop"
-            app:layout_constraintBottom_toTopOf="@id/loading_text"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="packed"
-            app:lottie_loop="true"
-            app:lottie_rawRes="@raw/daynight" />
-
-        <TextView
-            android:id="@+id/loading_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:fontFamily="@font/hkgrotesk"
-            android:paddingTop="16dp"
-            android:text="@string/loading"
-            android:textColor="?android:textColorPrimary"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/lottie" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <LinearLayout
-        android:id="@+id/fragment_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fitsSystemWindows="false"
-        android:layout_marginTop="?actionBarSize"
-        android:orientation="vertical"
-        android:animateLayoutChanges="true"
-        android:visibility="gone">
-
-        <include layout="@layout/include_dark_mode_warning"/>
-
-        <fragment
-            android:id="@+id/nav_host_fragment"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:defaultNavHost="true"
-            app:navGraph="@navigation/nav_graph" />
-
-    </LinearLayout>
-
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_modal_faq.xml b/app/src/main/res/layout/activity_modal_faq.xml
deleted file mode 100644
index 5b04bd8..0000000
--- a/app/src/main/res/layout/activity_modal_faq.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 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="match_parent"
-    android:animateLayoutChanges="true"
-    android:id="@+id/root"
-    tools:context=".activities.MainActivity">
-
-    <androidx.appcompat.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?actionBarSize"
-        android:elevation="4dp"
-        android:outlineProvider="bounds"
-        app:contentInsetStart="0dp">
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:animateLayoutChanges="true">
-
-            <View
-                android:id="@+id/toolbar_background"
-                android:layout_width="match_parent"
-                android:background="?toolbarColor"
-                android:elevation="4dp"
-                android:layout_height="match_parent" />
-
-            <View
-                android:id="@+id/toolbar_background_dark"
-                android:layout_width="match_parent"
-                android:background="@color/toolbar_dark"
-                android:elevation="4dp"
-                android:visibility="gone"
-                android:layout_height="match_parent" />
-
-            <View
-                android:id="@+id/toolbar_background_light"
-                android:layout_width="match_parent"
-                android:visibility="gone"
-                android:elevation="4dp"
-                android:background="@android:color/white"
-                android:layout_height="match_parent" />
-
-            <TextView
-                android:id="@+id/toolbar_title"
-                android:layout_width="wrap_content"
-                android:layout_height="?actionBarSize"
-                android:gravity="center"
-                android:layout_gravity="bottom|center_horizontal"
-                android:fontFamily="@font/hkgrotesk"
-                android:text="@string/app_name"
-                android:elevation="4dp"
-                android:textAppearance="@style/Base.TextAppearance.Widget.AppCompat.Toolbar.Title" />
-
-            <ImageView
-                android:layout_width="?actionBarSize"
-                android:layout_height="?actionBarSize"
-                android:layout_gravity="bottom"
-                android:id="@+id/home"
-                app:tint="@android:color/black"
-                android:src="?attr/homeAsUpIndicator"
-                android:padding="@dimen/activity_padding"
-                android:foreground="@drawable/rounded_ripple"
-                android:clickable="true"
-                android:focusable="true"
-                android:elevation="4dp"/>
-
-        </FrameLayout>
-
-
-    </androidx.appcompat.widget.Toolbar>
-
-    <fragment
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="?actionBarSize"
-        android:id="@+id/faqFragment"
-        class="com.kieronquinn.app.darq.fragments.NonRootFaqFragment"/>
-    
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_accessibility.xml b/app/src/main/res/layout/bottom_sheet_accessibility.xml
deleted file mode 100644
index c99d04e..0000000
--- a/app/src/main/res/layout/bottom_sheet_accessibility.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large.Darq"
-        android:text="@string/bottom_sheet_accessibility_service"
-        android:paddingTop="@dimen/activity_padding"
-        android:paddingStart="@dimen/activity_padding"
-        android:paddingEnd="@dimen/activity_padding" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_small"
-        android:paddingStart="@dimen/activity_padding"
-        android:paddingEnd="@dimen/activity_padding"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:text="@string/bottom_sheet_accessibility_service_desc"/>
-
-    <include layout="@layout/bottom_sheet_buttons" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_accessibility_not_running.xml b/app/src/main/res/layout/bottom_sheet_accessibility_not_running.xml
deleted file mode 100644
index 23cd53a..0000000
--- a/app/src/main/res/layout/bottom_sheet_accessibility_not_running.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large.Darq"
-        android:text="@string/bottom_sheet_accessibility_service_not_running_title"
-        android:paddingTop="@dimen/activity_padding"
-        android:paddingStart="@dimen/activity_padding"
-        android:paddingEnd="@dimen/activity_padding" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_small"
-        android:paddingStart="@dimen/activity_padding"
-        android:paddingEnd="@dimen/activity_padding"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:text="@string/bottom_sheet_accessibility_service_not_running_desc"/>
-
-    <include layout="@layout/bottom_sheet_buttons" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_auto_dark_permission.xml b/app/src/main/res/layout/bottom_sheet_auto_dark_permission.xml
deleted file mode 100644
index 9aaef27..0000000
--- a/app/src/main/res/layout/bottom_sheet_auto_dark_permission.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large.Darq"
-        android:text="@string/bottom_sheet_auto_dark_title"
-        android:paddingTop="@dimen/activity_padding"
-        android:paddingStart="@dimen/activity_padding"
-        android:paddingEnd="@dimen/activity_padding" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_small"
-        android:paddingStart="@dimen/activity_padding"
-        android:paddingEnd="@dimen/activity_padding"
-        android:id="@android:id/content"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:text="@string/bottom_sheet_auto_dark_desc"/>
-
-    <include layout="@layout/bottom_sheet_buttons" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_buttons.xml b/app/src/main/res/layout/bottom_sheet_buttons.xml
deleted file mode 100644
index 04d9507..0000000
--- a/app/src/main/res/layout/bottom_sheet_buttons.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_small"
-    android:layout_marginBottom="@dimen/margin_small">
-
-    <com.google.android.material.button.MaterialButton
-        android:layout_width="wrap_content"
-        android:layout_height="64dp"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:visibility="gone"
-        tools:visibility="visible"
-        android:id="@+id/bottom_sheet_neutral"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small.Darq"
-        android:textColor="?android:textColorPrimary"
-        android:textAllCaps="false"
-        android:text="@android:string/cancel"/>
-
-    <View android:layout_width="0dp" android:layout_height="0dp"
-          android:layout_weight="1"/>
-
-    <com.google.android.material.button.MaterialButton
-        android:layout_width="wrap_content"
-        android:layout_height="64dp"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:visibility="gone"
-        tools:visibility="visible"
-        android:id="@+id/bottom_sheet_cancel"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small.Darq"
-        android:textColor="?android:textColorPrimary"
-        android:textAllCaps="false"
-        android:text="@android:string/cancel"/>
-
-    <com.google.android.material.button.MaterialButton
-        android:layout_width="wrap_content"
-        android:layout_height="64dp"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:visibility="gone"
-        tools:visibility="visible"
-        android:layout_marginEnd="@dimen/margin_small"
-        android:id="@+id/bottom_sheet_ok"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small.Darq"
-        android:textColor="?android:textColorPrimary"
-        android:textAllCaps="false"
-        android:text="@android:string/ok"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_no_service.xml b/app/src/main/res/layout/bottom_sheet_no_service.xml
deleted file mode 100644
index b3732cd..0000000
--- a/app/src/main/res/layout/bottom_sheet_no_service.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large.Darq"
-        android:text="@string/bottom_sheet_no_service_title"
-        android:paddingTop="@dimen/activity_padding"
-        android:paddingStart="@dimen/activity_padding"
-        android:paddingEnd="@dimen/activity_padding" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_small"
-        android:paddingStart="@dimen/activity_padding"
-        android:paddingEnd="@dimen/activity_padding"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:text="@string/bottom_sheet_no_service_desc"/>
-
-    <include layout="@layout/bottom_sheet_buttons" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_no_service_root.xml b/app/src/main/res/layout/bottom_sheet_no_service_root.xml
deleted file mode 100644
index a3823ab..0000000
--- a/app/src/main/res/layout/bottom_sheet_no_service_root.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.AppCompat.Large.Darq"
-        android:text="@string/bottom_sheet_no_service_root_title"
-        android:paddingTop="@dimen/activity_padding"
-        android:paddingStart="@dimen/activity_padding"
-        android:paddingEnd="@dimen/activity_padding" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_small"
-        android:paddingStart="@dimen/activity_padding"
-        android:paddingEnd="@dimen/activity_padding"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:text="@string/bottom_sheet_no_service_root_desc"/>
-
-    <include layout="@layout/bottom_sheet_buttons" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_app_picker.xml b/app/src/main/res/layout/fragment_app_picker.xml
new file mode 100644
index 0000000..a4bd1a9
--- /dev/null
+++ b/app/src/main/res/layout/fragment_app_picker.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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="match_parent"
+    android:id="@+id/root">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include layout="@layout/include_search"
+            android:id="@+id/app_picker_search" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            tools:listitem="@layout/item_app"
+            app:fastScrollEnabled="true"
+            app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
+            app:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
+            app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
+            app:fastScrollVerticalTrackDrawable="@drawable/line_drawable"
+            android:paddingTop="@dimen/padding_8"
+            android:paddingBottom="@dimen/padding_8" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/app_picker_loading"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_marginTop="120dp"
+        android:orientation="vertical"
+        android:visibility="invisible"
+        tools:visibility="visible">
+
+        <com.google.android.material.progressindicator.LinearProgressIndicator
+            android:layout_width="200dp"
+            android:layout_height="wrap_content"
+            android:indeterminate="true"
+            app:trackCornerRadius="8dp"
+            app:trackThickness="8dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/padding_16"
+            android:text="@string/loading_apps"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium.Darq"
+            android:textColor="?android:textColorPrimary" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/app_picker_empty"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_marginTop="120dp"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <ImageView
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:src="@drawable/ic_search" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/padding_16"
+            android:text="@string/app_search_empty"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium.Darq"
+            android:textColor="?android:textColorPrimary" />
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_apps.xml b/app/src/main/res/layout/fragment_apps.xml
deleted file mode 100644
index 9872c0a..0000000
--- a/app/src/main/res/layout/fragment_apps.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout 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:orientation="vertical"
-    android:elevation="@dimen/toolbar_elevation"
-    android:animateLayoutChanges="true"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <FrameLayout
-        app:layout_constraintTop_toTopOf="parent"
-        android:elevation="@dimen/toolbar_elevation"
-        android:id="@+id/search_container"
-        android:outlineProvider="background"
-        android:background="?toolbarColor"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <EditText
-            android:layout_width="match_parent"
-            android:drawableStart="@drawable/ic_search"
-            android:paddingStart="@dimen/activity_padding"
-            android:paddingEnd="52dp"
-            android:hint="@string/search"
-            android:fontFamily="@font/hkgrotesk"
-            android:drawablePadding="@dimen/activity_padding"
-            android:layout_marginStart="@dimen/activity_padding"
-            android:layout_marginEnd="@dimen/activity_padding"
-            android:layout_marginTop="@dimen/margin_small"
-            android:layout_marginBottom="@dimen/margin_small"
-            android:layout_height="@dimen/search_box_height"
-            android:background="@drawable/search_box_background"
-            android:imeOptions="actionSearch"
-            android:inputType="text"
-            android:id="@+id/searchBox"/>
-
-        <ImageView
-            android:src="@drawable/ic_close"
-            android:padding="@dimen/margin_small"
-            android:clickable="true"
-            android:focusable="true"
-            android:id="@+id/search_clear"
-            android:foreground="@drawable/rounded_ripple_36"
-            android:layout_gravity="end|center_vertical"
-            android:layout_marginEnd="24dp"
-            android:layout_width="@dimen/clear_button_size"
-            android:layout_height="@dimen/clear_button_size"/>
-
-    </FrameLayout>
-
-    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-        android:id="@+id/swipeRefreshLayout"
-        app:layout_constraintTop_toBottomOf="@id/search_container"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:animateLayoutChanges="false"
-        android:layout_width="match_parent"
-        android:layout_height="0dp">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipToPadding="false"
-            android:orientation="vertical"
-            android:overScrollMode="never"
-            android:paddingTop="@dimen/margin_small"
-            android:paddingBottom="@dimen/margin_small"
-            app:fastScrollEnabled="true"
-            app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable"
-            app:fastScrollHorizontalTrackDrawable="@drawable/line_drawable"
-            app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable"
-            app:fastScrollVerticalTrackDrawable="@drawable/line_drawable"
-            tools:listitem="@layout/item_app" />
-
-    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:gravity="center"
-        android:id="@+id/empty_list"
-        android:visibility="gone"
-        tools:visibility="visible"
-        android:layout_width="match_parent"
-        app:layout_constraintTop_toBottomOf="@id/search_container"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_height="0dp">
-
-        <ImageView
-            android:layout_width="56dp"
-            android:layout_height="56dp"
-            android:src="@drawable/ic_search"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/margin_small"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium.Darq"
-            android:text="@string/nothing_found"/>
-
-    </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_bottom_sheet.xml b/app/src/main/res/layout/fragment_bottom_sheet.xml
new file mode 100644
index 0000000..2fca34c
--- /dev/null
+++ b/app/src/main/res/layout/fragment_bottom_sheet.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    android:clipToPadding="false"
+    android:paddingTop="@dimen/padding_8"
+    android:paddingBottom="@dimen/padding_16"
+    tools:layout_gravity="bottom"
+    tools:background="@drawable/bottom_sheet_rounded_bg_dark">
+
+    <TextView
+        android:id="@+id/bottom_sheet_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:paddingTop="@dimen/padding_16"
+        android:paddingBottom="@dimen/padding_16"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large.Darq"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Title"
+        tools:textColor="@android:color/white" />
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/bottom_sheet_content_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/bottom_sheet_title">
+
+        <TextView
+            android:id="@+id/bottom_sheet_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingStart="@dimen/padding_16"
+            android:paddingEnd="@dimen/padding_16"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small.Darq"
+            android:textColor="?android:textColorPrimary"
+            tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc tempus gravida augue, vehicula fermentum lectus sodales sit amet. Pellentesque pulvinar semper lectus, ac elementum ex. Curabitur posuere id nunc sed malesuada. Pellentesque quis sollicitudin mauris. Morbi elit turpis, ultricies non."
+            tools:textColor="@android:color/white" />
+
+    </androidx.core.widget.NestedScrollView>
+
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/bottom_sheet_positive"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/padding_8"
+        android:layout_marginEnd="@dimen/padding_16"
+        android:fontFamily="@font/google_sans_text_medium"
+        android:textAllCaps="false"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/bottom_sheet_content_container"
+        tools:text="Positive"
+        tools:textColor="@android:color/white"
+        tools:visibility="visible" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/bottom_sheet_negative"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/padding_8"
+        android:layout_marginEnd="@dimen/padding_16"
+        android:fontFamily="@font/google_sans_text_medium"
+        android:textAllCaps="false"
+        android:visibility="gone"
+        app:layout_constraintEnd_toStartOf="@id/bottom_sheet_positive"
+        app:layout_constraintTop_toBottomOf="@id/bottom_sheet_content_container"
+        tools:text="Negative"
+        tools:textColor="@android:color/white"
+        tools:visibility="visible" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/bottom_sheet_neutral"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/padding_8"
+        android:layout_marginTop="@dimen/padding_8"
+        android:layout_marginEnd="@dimen/padding_16"
+        android:fontFamily="@font/google_sans_text_medium"
+        android:textAllCaps="false"
+        android:visibility="gone"
+        app:layout_constraintEnd_toStartOf="@id/bottom_sheet_negative"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/bottom_sheet_content_container"
+        tools:text="Neutral"
+        tools:textColor="@android:color/white"
+        tools:visibility="visible" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_bottom_sheet_color_picker.xml b/app/src/main/res/layout/fragment_bottom_sheet_color_picker.xml
new file mode 100644
index 0000000..fdce048
--- /dev/null
+++ b/app/src/main/res/layout/fragment_bottom_sheet_color_picker.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    tools:layout_gravity="bottom"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/color_picker_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/padding_16"
+        android:paddingTop="@dimen/padding_8"
+        android:paddingBottom="@dimen/padding_8"
+        android:text="@string/item_developer_options_monet_color_picker_title"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large.Darq"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/color_picker_list"
+        android:layout_width="match_parent"
+        android:layout_height="72dp"
+        android:layout_marginTop="@dimen/padding_16"
+        android:paddingStart="@dimen/padding_16"
+        android:paddingEnd="@dimen/padding_16"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/color_picker_title"
+        tools:itemCount="3"
+        tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:listitem="@layout/item_color_picker"
+        tools:orientation="horizontal" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/color_picker_ok"
+        style="@style/Widget.AppCompat.Button.Borderless.Colored"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/padding_8"
+        android:text="@android:string/ok"
+        android:fontFamily="@font/google_sans_text_medium"
+        android:textAllCaps="false"
+        android:layout_marginEnd="@dimen/padding_16"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/color_picker_list" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_bottom_sheet_update_download.xml b/app/src/main/res/layout/fragment_bottom_sheet_update_download.xml
new file mode 100644
index 0000000..e3991d6
--- /dev/null
+++ b/app/src/main/res/layout/fragment_bottom_sheet_update_download.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    tools:layout_gravity="bottom">
+
+    <TextView
+        android:id="@+id/fragment_update_download_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/padding_16"
+        android:paddingTop="@dimen/padding_8"
+        android:paddingBottom="@dimen/padding_8"
+        android:text="@string/download_manager_description"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large.Darq"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.progressindicator.LinearProgressIndicator
+        android:id="@+id/fragment_update_download_progress"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/padding_16"
+        android:indeterminate="true"
+        app:indicatorColor="@color/accent"
+        app:layout_constraintTop_toBottomOf="@id/fragment_update_download_title"
+        app:trackCornerRadius="4dp"
+        app:trackThickness="8dp"
+        tools:progress="50" />
+
+    <androidx.appcompat.widget.AppCompatButton
+        android:id="@+id/fragment_update_download_cancel"
+        style="@style/Widget.AppCompat.Button.Borderless.Colored"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/padding_16"
+        android:layout_marginEnd="@dimen/padding_16"
+        android:layout_marginBottom="@dimen/padding_16"
+        android:fontFamily="@font/google_sans_text_medium"
+        android:text="@android:string/cancel"
+        android:textAllCaps="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/fragment_update_download_progress" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_container.xml b/app/src/main/res/layout/fragment_container.xml
new file mode 100644
index 0000000..93d4074
--- /dev/null
+++ b/app/src/main/res/layout/fragment_container.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-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">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/app_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_behavior=".ui.utils.DragDisabledAppBarLayoutBehaviour"
+        app:elevation="0dp"
+        app:toolbarId="@id/toolbar">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/collapsing_toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/app_bar_height"
+            app:maxLines="2"
+            app:contentScrim="?attr/colorPrimaryVariant"
+            app:statusBarScrim="@android:color/transparent"
+            app:titleCollapseMode="fade"
+            app:scrimAnimationDuration="@android:integer/config_shortAnimTime"
+            app:scrimVisibleHeightTrigger="@dimen/toolbar_scrim_visible_height"
+            app:expandedTitleMarginStart="@dimen/toolbar_expanded_title_margin"
+            app:expandedTitleMarginEnd="@dimen/toolbar_expanded_title_margin"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:layout_width="match_parent"
+                android:layout_height="?android:actionBarSize"
+                android:outlineProvider="none"
+                app:layout_collapseMode="pin"
+                android:id="@+id/toolbar"/>
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/nav_host_fragment"
+        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:defaultNavHost="true"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+        app:navGraph="@navigation/nav_graph_main" />
+
+    <androidx.fragment.app.FragmentContainerView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/loading_fragment"
+        android:visibility="gone"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+        android:name="com.kieronquinn.app.darq.ui.screens.loading.ServiceConnectFragment"/>
+
+    <FrameLayout
+        android:id="@+id/snackbar_container"
+        android:layout_gravity="bottom"
+        android:clipToPadding="false"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <FrameLayout
+            android:id="@+id/snackbar"
+            android:animateLayoutChanges="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/padding_16"
+            android:background="@drawable/snackbar_background"
+            android:elevation="8dp"
+            android:outlineProvider="background">
+
+            <include
+                android:id="@+id/snackbar_root"
+                layout="@layout/include_snackbar" />
+
+        </FrameLayout>
+
+    </FrameLayout>
+
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_dialog_location_permission.xml b/app/src/main/res/layout/fragment_dialog_location_permission.xml
new file mode 100644
index 0000000..afe712d
--- /dev/null
+++ b/app/src/main/res/layout/fragment_dialog_location_permission.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout 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="wrap_content"
+    android:layout_height="wrap_content"
+    android:clipToPadding="false"
+    tools:background="@drawable/background_dialog_location_permission"
+    tools:elevation="8dp"
+    tools:layout_gravity="center">
+
+    <ImageView
+        android:id="@+id/dialog_location_permission_icon"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_margin="@dimen/padding_16"
+        android:src="@drawable/ic_location"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="@color/accent" />
+
+    <TextView
+        android:id="@+id/dialog_location_permission_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/padding_16"
+        android:gravity="center_horizontal"
+        android:text="@string/dialog_location_permission_text"
+        android:textAppearance="@style/TextAppearance.AppCompat.Large.Darq.Lighter"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/dialog_location_permission_icon"
+        app:layout_constraintWidth_min="300dp" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/dialog_location_permission_accept"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        android:layout_width="0dp"
+        android:layout_height="64dp"
+        android:layout_marginStart="@dimen/padding_16"
+        android:layout_marginTop="@dimen/padding_8"
+        android:layout_marginEnd="@dimen/padding_16"
+        android:fontFamily="@font/google_sans_text_medium"
+        android:text="@string/dialog_location_permission_use_location"
+        android:textAllCaps="false"
+        android:textColor="?android:textColorPrimary"
+        app:cornerRadius="10dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/dialog_location_permission_text"
+        app:strokeColor="@color/accent" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/dialog_location_permission_deny"
+        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        android:layout_width="0dp"
+        android:layout_height="64dp"
+        android:layout_marginStart="@dimen/padding_16"
+        android:layout_marginEnd="@dimen/padding_16"
+        android:fontFamily="@font/google_sans_text_medium"
+        android:text="@string/dialog_location_permission_use_timezone"
+        android:textAllCaps="false"
+        android:textColor="?android:textColorPrimary"
+        app:cornerRadius="10dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/dialog_location_permission_accept"
+        app:strokeColor="@color/accent" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/dialog_location_permission_cancel"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/padding_8"
+        android:paddingBottom="@dimen/padding_8"
+        android:text="@android:string/cancel"
+        android:textAllCaps="false"
+        android:textColor="?android:textColorPrimary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/dialog_location_permission_deny"
+        app:rippleColor="@android:color/transparent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_faq.xml b/app/src/main/res/layout/fragment_faq.xml
deleted file mode 100644
index 04e8baf..0000000
--- a/app/src/main/res/layout/fragment_faq.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="@dimen/activity_padding"
-    android:clipToPadding="false"
-    android:id="@+id/markdown" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_loading_service_connect.xml b/app/src/main/res/layout/fragment_loading_service_connect.xml
new file mode 100644
index 0000000..53f18c9
--- /dev/null
+++ b/app/src/main/res/layout/fragment_loading_service_connect.xml
@@ -0,0 +1,27 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:gravity="center"
+    android:layout_marginTop="32dp"
+    android:orientation="vertical">
+
+    <com.google.android.material.progressindicator.LinearProgressIndicator
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:indeterminate="true"
+        android:id="@+id/loading_progress"
+        app:trackCornerRadius="8dp"
+        app:trackThickness="8dp" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/padding_16"
+        android:text="@string/loading_service_connect"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium.Darq"
+        android:textColor="?android:textColorPrimary" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
new file mode 100644
index 0000000..3824ead
--- /dev/null
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:id="@+id/root">
+
+    <include layout="@layout/include_switch_main"
+        android:id="@+id/switch_main"/>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/padding_8"
+        android:paddingBottom="@dimen/padding_8"
+        android:clipToPadding="false"
+        android:overScrollMode="never" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_settings_advanced.xml b/app/src/main/res/layout/fragment_settings_advanced.xml
new file mode 100644
index 0000000..da9f577
--- /dev/null
+++ b/app/src/main/res/layout/fragment_settings_advanced.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:id="@+id/root">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/padding_8"
+        android:paddingBottom="@dimen/padding_8"
+        android:clipToPadding="false"
+        android:overScrollMode="never" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_settings_developer_options.xml b/app/src/main/res/layout/fragment_settings_developer_options.xml
new file mode 100644
index 0000000..da9f577
--- /dev/null
+++ b/app/src/main/res/layout/fragment_settings_developer_options.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:id="@+id/root">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/padding_8"
+        android:paddingBottom="@dimen/padding_8"
+        android:clipToPadding="false"
+        android:overScrollMode="never" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_settings_faq.xml b/app/src/main/res/layout/fragment_settings_faq.xml
new file mode 100644
index 0000000..3201d2c
--- /dev/null
+++ b/app/src/main/res/layout/fragment_settings_faq.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:padding="@dimen/padding_16"
+    android:id="@+id/root"
+    android:clipToPadding="false">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fontFamily="@font/google_sans_text"
+        tools:text="FAQ"
+        android:id="@+id/markdown"/>
+
+</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_dark_mode_warning.xml b/app/src/main/res/layout/include_dark_mode_warning.xml
deleted file mode 100644
index 5489703..0000000
--- a/app/src/main/res/layout/include_dark_mode_warning.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/dark_mode_warning"
-    android:background="@drawable/dark_mode_warning_background"
-    android:orientation="horizontal"
-    android:padding="@dimen/margin_small"
-    android:visibility="gone"
-    android:layout_margin="@dimen/activity_padding">
-
-    <ImageView
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:src="@drawable/ic_warning"
-        android:layout_gravity="center_vertical"
-        app:tint="@android:color/white"/>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_gravity="center_vertical"
-        android:textColor="@android:color/white"
-        android:text="@string/dark_mode_warning"
-        android:fontFamily="@font/hkgrotesk"
-        android:layout_marginStart="@dimen/margin_small"
-        android:layout_height="wrap_content" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_search.xml b/app/src/main/res/layout/include_search.xml
new file mode 100644
index 0000000..4abcd8e
--- /dev/null
+++ b/app/src/main/res/layout/include_search.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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/search_container"
+    app:layout_constraintTop_toTopOf="parent"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:elevation="8dp"
+    android:outlineProvider="none"
+    android:animateLayoutChanges="true">
+
+    <EditText
+        android:id="@+id/searchBox"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/search_box_height"
+        android:layout_marginStart="@dimen/padding_16"
+        android:layout_marginTop="@dimen/padding_8"
+        android:layout_marginEnd="@dimen/padding_16"
+        android:layout_marginBottom="@dimen/padding_8"
+        android:background="@drawable/search_box_background"
+        android:drawableStart="@drawable/ic_search"
+        android:drawablePadding="@dimen/padding_16"
+        android:hint="@string/search"
+        android:fontFamily="@font/google_sans_text"
+        android:imeOptions="actionSearch"
+        android:inputType="text"
+        android:paddingStart="@dimen/padding_16"
+        android:paddingEnd="52dp" />
+
+    <ImageView
+        android:id="@+id/search_clear"
+        android:layout_width="@dimen/clear_button_size"
+        android:layout_height="@dimen/clear_button_size"
+        android:layout_gravity="end|center_vertical"
+        android:layout_marginEnd="24dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:foreground="@drawable/rounded_ripple_36"
+        android:padding="@dimen/padding_8"
+        android:src="@drawable/ic_close" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_snackbar.xml b/app/src/main/res/layout/include_snackbar.xml
new file mode 100644
index 0000000..a729b00
--- /dev/null
+++ b/app/src/main/res/layout/include_snackbar.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/padding_8"
+    android:paddingEnd="@dimen/padding_8"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <TextView
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/snackbar_barrier"
+        app:layout_constraintHorizontal_bias="0"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintHeight_max="64dp"
+        android:maxLines="2"
+        android:ellipsize="end"
+        android:padding="@dimen/padding_8"
+        android:layout_marginTop="@dimen/padding_8"
+        android:layout_marginBottom="@dimen/padding_8"
+        android:id="@+id/snackbar_text"
+        android:textColor="?android:textColorPrimary"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small.Darq"
+        android:fontFamily="@font/google_sans_text_medium"
+        tools:text="@string/snackbar_syncing_failed_text"/>
+
+    <androidx.constraintlayout.widget.Barrier
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:id="@+id/snackbar_barrier"
+        app:constraint_referenced_ids="snackbar_action,snackbar_progress"
+        app:barrierDirection="start"/>
+
+    <com.google.android.material.button.MaterialButton
+        android:layout_width="wrap_content"
+        android:layout_height="0dp"
+        android:minHeight="0dp"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:id="@+id/snackbar_action"
+        android:text="More Info"
+        android:visibility="gone"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small.Darq"
+        android:fontFamily="@font/google_sans_text_medium"/>
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:indeterminate="true"
+        app:trackCornerRadius="4dp"
+        app:indicatorSize="32dp"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:id="@+id/snackbar_progress"
+        android:layout_marginEnd="@dimen/padding_8"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/include_switch_main.xml b/app/src/main/res/layout/include_switch_main.xml
new file mode 100644
index 0000000..12af2e2
--- /dev/null
+++ b/app/src/main/res/layout/include_switch_main.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.kieronquinn.monetcompat.view.MonetSwitch 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="wrap_content"
+    android:id="@+id/mainSwitchSwitch"
+    android:layout_marginStart="@dimen/padding_16"
+    android:layout_marginEnd="@dimen/padding_16"
+    android:layout_marginTop="@dimen/padding_8"
+    android:layout_marginBottom="@dimen/padding_8"
+    android:text="@string/item_switch_main_title" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_app.xml b/app/src/main/res/layout/item_app.xml
index 6596234..0f56dc4 100644
--- a/app/src/main/res/layout/item_app.xml
+++ b/app/src/main/res/layout/item_app.xml
@@ -2,18 +2,18 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/item_height"
+    android:layout_height="@dimen/item_app_height"
     android:foreground="?selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
     android:orientation="horizontal">
 
     <ImageView
-        android:layout_width="@dimen/item_height"
+        android:layout_width="@dimen/item_app_height"
         android:layout_height="match_parent"
         android:adjustViewBounds="true"
-        android:padding="@dimen/margin_small"
-        android:layout_marginStart="@dimen/margin_small"
+        android:padding="@dimen/padding_8"
+        android:layout_marginStart="@dimen/padding_8"
         android:id="@+id/icon"
         tools:src="@mipmap/ic_launcher" />
 
@@ -24,8 +24,8 @@
         android:layout_gravity="center_vertical"
         tools:text="App Name"
         android:textColor="?android:textColorPrimary"
-        android:layout_marginStart="@dimen/margin_small"
-        android:layout_marginEnd="@dimen/margin_small"
+        android:layout_marginStart="@dimen/padding_8"
+        android:layout_marginEnd="@dimen/padding_8"
         android:id="@+id/title"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium.Darq"/>
 
@@ -34,6 +34,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:id="@+id/checkbox"
-        android:layout_marginEnd="@dimen/activity_padding"/>
+        android:layout_marginEnd="@dimen/padding_8"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_color_picker.xml b/app/src/main/res/layout/item_color_picker.xml
new file mode 100644
index 0000000..04f3514
--- /dev/null
+++ b/app/src/main/res/layout/item_color_picker.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="72dp"
+    android:layout_height="72dp"
+    android:clipToPadding="false"
+    android:padding="8dp">
+
+    <View
+        android:id="@+id/item_color_picker_background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="@drawable/monet_color_picker_circle_background"
+        android:elevation="4dp"
+        tools:backgroundTint="@color/material_on_primary_disabled" />
+
+    <ImageView
+        android:id="@+id/item_color_picker_check"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:padding="@dimen/padding_16"
+        android:src="@drawable/ic_check"
+        android:elevation="4dp"
+        android:outlineProvider="none"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_header.xml b/app/src/main/res/layout/item_header.xml
new file mode 100644
index 0000000..9341a23
--- /dev/null
+++ b/app/src/main/res/layout/item_header.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:paddingStart="@dimen/padding_16"
+    android:paddingEnd="@dimen/padding_16"
+    android:paddingTop="@dimen/padding_8"
+    android:paddingBottom="@dimen/padding_8"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/item_heading_title"
+        tools:text="Heading Title"
+        android:textAppearance="@style/TextAppearance.AppCompat.Small.Darq.Medium"
+        android:textColor="?android:colorAccent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_setting.xml b/app/src/main/res/layout/item_setting.xml
new file mode 100644
index 0000000..b2c9d30
--- /dev/null
+++ b/app/src/main/res/layout/item_setting.xml
@@ -0,0 +1,53 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:minHeight="72dp"
+    android:foreground="?android:selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        tools:src="@drawable/ic_app_whitelist_round"
+        android:padding="12dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:id="@+id/item_setting_icon"/>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/padding_8"
+        android:paddingBottom="@dimen/padding_8"
+        android:layout_marginEnd="@dimen/padding_16"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/item_setting_title"
+            tools:text="Setting Title"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium.Darq"
+            android:textColor="?android:textColorPrimary" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            tools:visibility="visible"
+            tools:text="Setting Content"
+            android:id="@+id/item_setting_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small.Darq"
+            android:textColor="?android:textColorPrimary" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_setting_about.xml b/app/src/main/res/layout/item_setting_about.xml
new file mode 100644
index 0000000..fcc2deb
--- /dev/null
+++ b/app/src/main/res/layout/item_setting_about.xml
@@ -0,0 +1,113 @@
+<?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"
+    android:clickable="true"
+    android:focusable="true"
+    android:foreground="?android:selectableItemBackground"
+    android:minHeight="72dp"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/item_setting_icon"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:padding="12dp"
+        tools:src="@drawable/ic_app_whitelist_round" />
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/padding_16"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:paddingTop="@dimen/padding_8"
+        android:paddingBottom="@dimen/padding_8">
+
+        <TextView
+            android:id="@+id/item_setting_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium.Darq"
+            android:textColor="?android:textColorPrimary"
+            tools:text="Setting Title" />
+
+        <TextView
+            android:id="@+id/item_setting_content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/padding_8"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small.Darq"
+            android:textColor="?android:textColorPrimary"
+            android:visibility="gone"
+            tools:text="Setting Content"
+            tools:visibility="visible" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <com.google.android.material.chip.Chip
+                android:id="@+id/chip_donate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/padding_16"
+                android:text="@string/chip_donate"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small.Darq.Medium"
+                app:chipBackgroundColor="@color/icon_circle_7"
+                app:chipIcon="@drawable/ic_donate"
+                app:chipIconTint="@color/icon_inside_7"
+                app:chipStartPadding="8dp" />
+
+            <com.google.android.material.chip.Chip
+                android:id="@+id/chip_twitter"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/chip_twitter"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small.Darq.Medium"
+                app:chipBackgroundColor="@color/icon_circle_8"
+                app:chipIcon="@drawable/ic_twitter"
+                app:chipIconTint="@color/icon_inside_8"
+                app:chipStartPadding="8dp" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <com.google.android.material.chip.Chip
+                android:id="@+id/chip_github"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/padding_16"
+                android:text="@string/chip_github"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small.Darq.Medium"
+                app:chipBackgroundColor="@color/icon_circle_6"
+                app:chipIcon="@drawable/ic_github"
+                app:chipIconTint="@color/icon_inside_6"
+                app:chipStartPadding="8dp" />
+
+            <com.google.android.material.chip.Chip
+                android:id="@+id/chip_xda"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/chip_xda"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small.Darq.Medium"
+                app:chipBackgroundColor="@color/icon_circle_5"
+                app:chipIcon="@drawable/ic_xda"
+                app:chipIconTint="@color/icon_inside_5"
+                app:chipStartPadding="8dp" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_setting_switch.xml b/app/src/main/res/layout/item_setting_switch.xml
new file mode 100644
index 0000000..c1edb4f
--- /dev/null
+++ b/app/src/main/res/layout/item_setting_switch.xml
@@ -0,0 +1,59 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:minHeight="72dp"
+    android:foreground="?android:selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        tools:src="@drawable/ic_app_whitelist_round"
+        android:padding="12dp"
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:id="@+id/item_setting_switch_icon"/>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/padding_8"
+        android:paddingBottom="@dimen/padding_8"
+        android:layout_marginEnd="@dimen/padding_16"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
+
+        <TextView
+            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.Darq"
+            android:textColor="?android:textColorPrimary" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            tools:visibility="visible"
+            tools:text="Setting Content"
+            android:id="@+id/item_setting_switch_content"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small.Darq"
+            android:textColor="?android:textColorPrimary" />
+
+    </LinearLayout>
+
+    <androidx.appcompat.widget.SwitchCompat
+        android:layout_marginEnd="@dimen/padding_16"
+        android:id="@+id/item_setting_switch_switch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_snackbar_padding.xml b/app/src/main/res/layout/item_snackbar_padding.xml
new file mode 100644
index 0000000..16349f9
--- /dev/null
+++ b/app/src/main/res/layout/item_snackbar_padding.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/snackbar_max_height"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/switch_item.xml b/app/src/main/res/layout/switch_item.xml
deleted file mode 100644
index 42f92c3..0000000
--- a/app/src/main/res/layout/switch_item.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <CheckBox
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true" />
-</RelativeLayout>
diff --git a/app/src/main/res/menu/menu_apps.xml b/app/src/main/res/menu/menu_app_picker.xml
similarity index 58%
rename from app/src/main/res/menu/menu_apps.xml
rename to app/src/main/res/menu/menu_app_picker.xml
index b6a41b4..8742d01 100644
--- a/app/src/main/res/menu/menu_apps.xml
+++ b/app/src/main/res/menu/menu_app_picker.xml
@@ -2,8 +2,8 @@
 <menu xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item
-        android:id="@+id/menu_show_system"
-        android:title="@string/show_system_apps"
+    <item android:title="@string/menu_app_picker_show_non_launchable_apps"
+        android:id="@+id/menu_app_picker_show_non_launchable_apps"
         android:checkable="true" />
+
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
new file mode 100644
index 0000000..79235fd
--- /dev/null
+++ b/app/src/main/res/menu/menu_main.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:title="@string/menu_open_source_libraries"
+        android:id="@+id/menu_open_source_libraries" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap/ic_launcher.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to app/src/main/res/mipmap/ic_launcher.xml
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
deleted file mode 100644
index ff4f1e1..0000000
--- a/app/src/main/res/navigation/nav_graph.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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"
-    app:startDestination="@id/mainFragment">
-
-    <fragment
-        android:id="@+id/mainFragment"
-        android:name="com.kieronquinn.app.darq.fragments.MainFragment"
-        android:label="@string/app_name">
-        <action
-            android:id="@+id/action_mainFragment_to_appsFragment"
-            app:destination="@id/appsFragment"
-            app:enterAnim="@anim/slide_in_right"
-            app:exitAnim="@anim/slide_out_left"
-            app:popEnterAnim="@anim/slide_in_left"
-            app:popExitAnim="@anim/slide_out_right"/>
-        <action
-            android:id="@+id/action_mainFragment_to_faqFragment"
-            app:destination="@id/faqFragment"
-            app:enterAnim="@anim/slide_in_right"
-            app:exitAnim="@anim/slide_out_left"
-            app:popEnterAnim="@anim/slide_in_left"
-            app:popExitAnim="@anim/slide_out_right" />
-    </fragment>
-    <fragment
-        android:id="@+id/appsFragment"
-        android:name="com.kieronquinn.app.darq.fragments.AppsFragment"
-        android:label="@string/setting_whitelist_title"
-        tools:layout="@layout/fragment_apps" />
-    <fragment
-        android:id="@+id/faqFragment"
-        android:name="com.kieronquinn.app.darq.fragments.FaqFragment"
-        tools:layout="@layout/fragment_faq"
-        android:label="@string/setting_faq_title" />
-
-</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/nav_graph_main.xml b/app/src/main/res/navigation/nav_graph_main.xml
new file mode 100644
index 0000000..584134e
--- /dev/null
+++ b/app/src/main/res/navigation/nav_graph_main.xml
@@ -0,0 +1,131 @@
+<?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_main"
+    app:startDestination="@id/settingsFragment">
+
+    <fragment
+        android:id="@+id/settingsFragment"
+        android:name="com.kieronquinn.app.darq.ui.screens.settings.SettingsFragment"
+        android:label="@string/app_name"
+        tools:layout="@layout/fragment_settings">
+        <action
+            android:id="@+id/action_settingsFragment_to_settingsAdvancedFragment"
+            app:destination="@id/settingsAdvancedFragment" />
+        <action
+            android:id="@+id/action_settingsFragment_to_settingsAppPickerFragment"
+            app:destination="@id/settingsAppPickerFragment" />
+        <action
+            android:id="@+id/action_settingsFragment_to_locationPermissionDialogFragment"
+            app:destination="@id/locationPermissionDialogFragment"
+            app:enterAnim="@android:anim/fade_in"
+            app:exitAnim="@android:anim/fade_out" />
+        <action
+            android:id="@+id/action_settingsFragment_to_settingsDeveloperOptionsFragment"
+            app:destination="@id/settingsDeveloperOptionsFragment" />
+        <action
+            android:id="@+id/action_settingsFragment_to_settingsFaqFragment"
+            app:destination="@id/settingsFaqFragment" />
+        <action
+            android:id="@+id/action_settingsFragment_to_ossLicencesActivity"
+            app:destination="@id/ossLicencesActivity"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/slide_out_left"
+            app:popEnterAnim="@anim/slide_in_left"
+            app:popExitAnim="@anim/slide_out_right" />
+    </fragment>
+    <fragment
+        android:id="@+id/settingsAdvancedFragment"
+        android:name="com.kieronquinn.app.darq.ui.screens.settings.advanced.SettingsAdvancedFragment"
+        android:label="@string/item_advanced_options_title"
+        tools:layout="@layout/fragment_settings_advanced" />
+
+    <fragment
+        android:id="@+id/settingsAppPickerFragment"
+        android:name="com.kieronquinn.app.darq.ui.screens.settings.apppicker.SettingsAppPickerFragment"
+        android:label="@string/item_whitelist_title"
+        tools:layout="@layout/fragment_app_picker" />
+
+    <dialog
+        android:id="@+id/shizkuNotRunningBottomSheetFragment"
+        android:name="com.kieronquinn.app.darq.ui.screens.bottomsheets.errors.ShizkuNotRunningBottomSheetFragment"
+        android:label=" "
+        tools:layout="@layout/fragment_bottom_sheet" />
+    <action
+        android:id="@+id/action_global_shizkuNotRunningBottomSheetFragment"
+        app:destination="@id/shizkuNotRunningBottomSheetFragment" />
+    <dialog
+        android:id="@+id/serviceTimeoutBottomSheetFragment"
+        android:name="com.kieronquinn.app.darq.ui.screens.bottomsheets.errors.ServiceTimeoutBottomSheetFragment"
+        android:label=" "
+        tools:layout="@layout/fragment_bottom_sheet" />
+    <action
+        android:id="@+id/action_global_serviceTimeoutBottomSheetFragment"
+        app:destination="@id/serviceTimeoutBottomSheetFragment" />
+    <dialog
+        android:id="@+id/shizukuNotInstalledBottomSheetFragment"
+        android:name="com.kieronquinn.app.darq.ui.screens.bottomsheets.errors.ShizukuNotInstalledBottomSheetFragment"
+        android:label=" "
+        tools:layout="@layout/fragment_bottom_sheet" />
+    <action
+        android:id="@+id/action_global_shizukuNotInstalledBottomSheetFragment"
+        app:destination="@id/shizukuNotInstalledBottomSheetFragment" />
+    <dialog
+        android:id="@+id/shizukuInfoBottomSheetFragment"
+        android:name="com.kieronquinn.app.darq.ui.screens.bottomsheets.errors.ShizukuInfoBottomSheetFragment"
+        android:label=" "
+        tools:layout="@layout/fragment_bottom_sheet" />
+    <action
+        android:id="@+id/action_global_shizukuInfoBottomSheetFragment"
+        app:destination="@id/shizukuInfoBottomSheetFragment" />
+
+    <dialog
+        android:id="@+id/locationPermissionDialogFragment"
+        android:name="com.kieronquinn.app.darq.ui.screens.dialogs.LocationPermissionDialogFragment"
+        android:label=" "
+        tools:layout="@layout/fragment_dialog_location_permission" />
+
+    <fragment
+        android:id="@+id/settingsDeveloperOptionsFragment"
+        android:name="com.kieronquinn.app.darq.ui.screens.settings.developer.SettingsDeveloperOptionsFragment"
+        android:label="@string/item_developer_options_title"
+        tools:layout="@layout/fragment_settings_developer_options" >
+        <action
+            android:id="@+id/action_settingsDeveloperOptionsFragment_to_colorPickerBottomSheetFragment"
+            app:destination="@id/colorPickerBottomSheetFragment" />
+    </fragment>
+    <dialog
+        android:id="@+id/colorPickerBottomSheetFragment"
+        android:name="com.kieronquinn.app.darq.ui.screens.settings.developer.colorpicker.ColorPickerBottomSheetFragment"
+        android:label=" "
+        tools:layout="@layout/fragment_bottom_sheet_color_picker" />
+    <fragment
+        android:id="@+id/settingsFaqFragment"
+        android:name="com.kieronquinn.app.darq.ui.screens.settings.faq.SettingsFaqFragment"
+        android:label="@string/item_about_faq_title"
+        tools:layout="@layout/fragment_settings_faq" />
+
+    <activity
+        android:id="@+id/ossLicencesActivity"
+        android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
+        android:label=" " />
+    <dialog
+        android:id="@+id/updateAvailableBottomSheetFragment"
+        android:name="com.kieronquinn.app.darq.ui.screens.bottomsheets.update.UpdateAvailableBottomSheetFragment"
+        android:label=" "
+        tools:layout="@layout/fragment_bottom_sheet">
+        <action
+            android:id="@+id/action_updateAvailableBottomSheetFragment_to_updateDownloadBottomSheetFragment"
+            app:destination="@id/updateDownloadBottomSheetFragment" />
+    </dialog>
+    <action
+        android:id="@+id/action_global_updateAvailableBottomSheetFragment"
+        app:destination="@id/updateAvailableBottomSheetFragment" />
+    <dialog
+        android:id="@+id/updateDownloadBottomSheetFragment"
+        android:name="com.kieronquinn.app.darq.ui.screens.bottomsheets.update.UpdateDownloadBottomSheetFragment"
+        android:label=" "
+        tools:layout="@layout/fragment_bottom_sheet_update_download"/>
+
+</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/raw/daynight.json b/app/src/main/res/raw/daynight.json
deleted file mode 100644
index e76ef28..0000000
--- a/app/src/main/res/raw/daynight.json
+++ /dev/null
@@ -1 +0,0 @@
-{"v":"5.3.4","fr":24,"ip":0,"op":96,"w":500,"h":500,"nm":"Toggle","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shutting Star","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-11.168,-2.743],[-25,-28]],"o":[[28.5,7],[28.361,31.764]],"v":[[-126,-24.5],[-27,37.5]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":32,"s":[0],"e":[100]},{"t":40}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":30,"s":[0],"e":[100]},{"t":37}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0.933333333333,0.992156862745,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1,"ix":5},"lc":2,"lj":2,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":30,"op":41,"st":30,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Moon","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":0,"s":[-175.595],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":24,"s":[0],"e":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":48,"s":[0],"e":[-175.595]},{"t":72}],"ix":10},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":0,"s":[170],"e":[330]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":24,"s":[330],"e":[330]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":48,"s":[330],"e":[170]},{"t":72}],"ix":3},"y":{"a":0,"k":250,"ix":4}},"a":{"a":0,"k":[60.25,60.25,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.981,1.834],[0,7.828],[11.632,0],[2.39,-0.941],[-1.477,0],[0,-11.632],[6.338,-3.63],[0,-5.618],[4.49,-2.06],[0,6.513]],"o":[[6.338,-3.63],[0,-11.632],[-2.724,0],[1.391,-0.289],[11.632,0],[0,7.828],[4.981,1.834],[0,5.263],[6.24,-0.973],[0,-5.619]],"v":[[3.775,7.124],[14.388,-11.16],[-6.674,-32.221],[-14.388,-30.757],[-10.079,-31.2],[10.983,-10.137],[0.37,8.146],[8.911,20.374],[1.297,32.221],[12.317,19.353]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[1.534,0],[0,5.888],[-1.927,1.929],[0,-4.354],[-5.888,0],[-1.93,1.933]],"o":[[-5.887,0],[0,-2.941],[-3.74,1.656],[0,5.887],[2.946,0],[-1.319,0.584]],"v":[[-57.252,37.674],[-67.912,27.014],[-64.794,19.481],[-71.147,29.228],[-60.487,39.888],[-52.944,36.76]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":0,"s":[1,0.940106153488,0.53420650959,1],"e":[0.783999992819,0.944999964097,0.969000004787,1]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":24,"s":[0.783999992819,0.944999964097,0.969000004787,1],"e":[0.783999992819,0.944999964097,0.969000004787,1]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":48,"s":[0.783999992819,0.944999964097,0.969000004787,1],"e":[1,0.940106153488,0.53420650959,1]},{"t":72}],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[86.845,53.361],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shadow","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.981,1.834],[0,7.828],[11.632,0],[0,-11.632],[-10.302,-1.374],[0,-3.827],[-7.202,0],[0,7.202]],"o":[[6.338,-3.63],[0,-11.632],[-11.632,0],[0,10.679],[-2.624,2.386],[0,7.202],[7.203,0],[0,-5.619]],"v":[[10.449,7.038],[21.061,-11.246],[0,-32.307],[-21.061,-11.246],[-2.81,9.623],[-7.092,19.266],[5.949,32.307],[18.991,19.266]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,-5.888],[5.887,0],[0,5.887],[-5.888,0]],"o":[[0,5.887],[-5.888,0],[0,-5.888],[5.887,0]],"v":[[-43.153,29.141],[-53.813,39.801],[-64.473,29.141],[-53.813,18.481]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":0,"s":[1,0.940106153488,0.53420650959,1],"e":[0.862999949736,0.957000014361,0.969000004787,1]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":24,"s":[0.862999949736,0.957000014361,0.969000004787,1],"e":[0.862999949736,0.957000014361,0.969000004787,1]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":48,"s":[0.862999949736,0.957000014361,0.969000004787,1],"e":[1,0.940106153488,0.53420650959,1]},{"t":72}],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[80.171,53.448],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Crater","np":3,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-33.137],[33.137,0],[0,33.137],[-33.137,0]],"o":[[0,33.137],[-33.137,0],[0,-33.137],[33.137,0]],"v":[[60,0],[0,60],[-60,0],[0,-60]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":0,"s":[1,0.940106153488,0.53420650959,1],"e":[0.933000033509,0.991999966491,1,1]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":24,"s":[0.933000033509,0.991999966491,1,1],"e":[0.933000033509,0.991999966491,1,1]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":48,"s":[0.933000033509,0.991999966491,1,1],"e":[1,0.940106153488,0.53420650959,1]},{"t":72}],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[60.25,60.25],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Moon","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":1224,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Stars","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":11,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":13,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":59,"s":[100],"e":[0]},{"t":61}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0.101],"y":[0.954]},"o":{"x":[0.9],"y":[0]},"n":["0p101_0p954_0p9_0"],"t":0,"s":[304.75],"e":[190.55]},{"i":{"x":[0.438],"y":[0.439]},"o":{"x":[0.397],"y":[0.396]},"n":["0p438_0p439_0p397_0p396"],"t":24,"s":[190.55],"e":[184.75]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.899],"y":[-0.043]},"n":["0p1_1_0p899_-0p043"],"t":48,"s":[184.75],"e":[304.75]},{"t":72}],"ix":3},"y":{"a":0,"k":212.75,"ix":4}},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[10,10],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":32,"ix":5},"lc":1,"lj":1,"ml":4,"ml2":{"a":0,"k":4,"ix":8},"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":true},{"ty":"fl","c":{"a":0,"k":[0.933333333333,0.992156862745,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-32.5,65],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Star 03","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[6,6],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":32,"ix":5},"lc":1,"lj":1,"ml":4,"ml2":{"a":0,"k":4,"ix":8},"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":true},{"ty":"fl","c":{"a":0,"k":[0.933333333333,0.992156862745,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[47.5,45],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Star 02","np":3,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[8,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":32,"ix":5},"lc":1,"lj":1,"ml":4,"ml2":{"a":0,"k":4,"ix":8},"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":true},{"ty":"fl","c":{"a":0,"k":[0.933333333333,0.992156862745,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Star 01","np":3,"cix":2,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":96,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Cloud 1","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":11,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":13,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":59,"s":[0],"e":[100]},{"t":61}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":0,"s":[275.5],"e":[184]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":24,"s":[184],"e":[184]},{"i":{"x":[0.102],"y":[0.92]},"o":{"x":[0.9],"y":[0]},"n":["0p102_0p92_0p9_0"],"t":48,"s":[184],"e":[269.054]},{"i":{"x":[0.731],"y":[1]},"o":{"x":[0.225],"y":[0.253]},"n":["0p731_1_0p225_0p253"],"t":72,"s":[269.054],"e":[275.5]},{"t":95}],"ix":3},"y":{"a":0,"k":220,"ix":4}},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.193,0.263],[4.158,0],[0,0],[0.688,-3.952],[0,0],[0,-4.43],[0,0],[-4.43,0],[0,0],[0,4.43],[0,0]],"o":[[-0.677,-3.965],[0,0],[-4.149,0],[0,0],[-4.43,0],[0,0],[0,4.43],[0,0],[4.43,0],[0,0],[0,-4.259]],"v":[[11.887,-4.516],[3.601,-11.5],[3.601,-11.5],[-4.68,-4.542],[-11.38,-4.542],[-19.401,3.479],[-19.401,3.479],[-11.38,11.5],[11.38,11.5],[19.401,3.479],[19.401,3.479]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":32,"ix":5},"lc":1,"lj":1,"ml":4,"ml2":{"a":0,"k":4,"ix":8},"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":true},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":96,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Cloud 2","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":11,"s":[100],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":13,"s":[0],"e":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":59,"s":[0],"e":[100]},{"t":61}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":0,"s":[330.5],"e":[167.5]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":24,"s":[167.5],"e":[167.5]},{"i":{"x":[0.101],"y":[0.95]},"o":{"x":[0.9],"y":[0]},"n":["0p101_0p95_0p9_0"],"t":48,"s":[167.5],"e":[324.054]},{"i":{"x":[0.731],"y":[1]},"o":{"x":[0.218],"y":[0.284]},"n":["0p731_1_0p218_0p284"],"t":72,"s":[324.054],"e":[330.5]},{"t":95}],"ix":3},"y":{"a":0,"k":265,"ix":4}},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[6.375,0.399],[6.322,0],[0,0],[1.046,-6.009],[0,0],[0,-6.736],[0,0],[-6.736,0],[0,0],[0,6.736],[0,0]],"o":[[-1.03,-6.029],[0,0],[-6.308,0],[0,0],[-6.736,0],[0,0],[0,6.736],[0,0],[6.736,0],[0,0],[0,-6.476]],"v":[[16.075,-1.367],[3.476,-11.986],[3.476,-11.986],[-9.116,-1.406],[-19.304,-1.406],[-31.5,10.79],[-31.5,10.79],[-19.304,22.986],[15.304,22.986],[27.5,10.79],[27.5,10.79]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":32,"ix":5},"lc":1,"lj":1,"ml":4,"ml2":{"a":0,"k":4,"ix":8},"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":true},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":96,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"Shadow","sr":1,"ks":{"o":{"a":0,"k":15,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,180,0],"ix":2},"a":{"a":0,"k":[0,-37.154,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[37.432,0],[0,0],[0,-37.432],[0,0],[-0.021,-0.694],[-36.733,0],[0,0],[-1.105,-36.465],[0,0.699],[0,0]],"o":[[0,0],[-37.432,0],[0,0],[0,0.699],[1.105,-36.465],[0,0],[36.733,0],[0.021,-0.694],[0,0],[0,-37.432]],"v":[[82.223,-37.154],[-82.223,-37.154],[-150,30.623],[-150,35.069],[-149.947,37.154],[-82.223,-28.538],[82.223,-28.538],[149.947,37.154],[150,35.069],[150,30.623]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.933333333333,0.992156862745,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1,"ix":5},"lc":1,"lj":1,"ml":4,"ml2":{"a":0,"k":4,"ix":8},"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":true},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":96,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"Base","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,180,0],"ix":2},"a":{"a":0,"k":[0,-70,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[300,140],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":320,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":0,"s":[0.413832724094,0.784281790257,1,1],"e":[0.0580506064,0.077281616628,0.256188720465,1]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":24,"s":[0.0580506064,0.077281616628,0.256188720465,1],"e":[0.0580506064,0.077281616628,0.256188720465,1]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.9],"y":[0]},"n":["0p1_1_0p9_0"],"t":48,"s":[0.0580506064,0.077281616628,0.256188720465,1],"e":[0.413832724094,0.784281790257,1,1]},{"t":72}],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":96,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
new file mode 100644
index 0000000..285569a
--- /dev/null
+++ b/app/src/main/res/values-land/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="app_bar_height">120dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/bools.xml b/app/src/main/res/values-night/bools.xml
new file mode 100644
index 0000000..91c9383
--- /dev/null
+++ b/app/src/main/res/values-night/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="lightStatusNav">false</bool>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..1f6c5c1
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="background">#202124</color>
+    <color name="toolbar">#3C4043</color>
+    <color name="search_box_background">#757575</color>
+    <color name="toolbar_overflow">@android:color/white</color>
+
+    <color name="icon_circle_0">#27303F</color>
+    <color name="icon_circle_1">#3C282E</color>
+    <color name="icon_circle_2">#3C2F2A</color>
+    <color name="icon_circle_3">#273D35</color>
+    <color name="icon_circle_4">#3C3B2A</color>
+    <color name="icon_circle_5">#5C4B34</color>
+    <color name="icon_circle_6">#1c1b1b</color>
+    <color name="icon_circle_7">#232d36</color>
+    <color name="icon_circle_8">#1D2C36</color>
+    <color name="icon_circle_9">#3C283A</color>
+    <color name="icon_circle_10">#3C3B2A</color>
+    <color name="icon_circle_11">#a23900</color>
+    <color name="icon_circle_12">#003A3D</color>
+    <color name="icon_circle_13">#6c0000</color>
+    <color name="icon_circle_14">#4c3c63</color>
+    <color name="icon_circle_15">#003A69</color>
+
+    <color name="icon_inside_0">#7EABF5</color>
+    <color name="icon_inside_1">#F57E96</color>
+    <color name="icon_inside_2">#F5A77E</color>
+    <color name="icon_inside_3">#7EF5BD</color>
+    <color name="icon_inside_4">#F5E87E</color>
+    <color name="icon_inside_5">#F5C37E</color>
+    <color name="icon_inside_6">#f2f2f2</color>
+    <color name="icon_inside_7">#3C5F7C</color>
+    <color name="icon_inside_8">#80C7F2</color>
+    <color name="icon_inside_9">#F57ED7</color>
+    <color name="icon_inside_10">#ffc77d</color>
+    <color name="icon_inside_11">#ffbc57</color>
+    <color name="icon_inside_13">#e2463a</color>
+    <color name="icon_inside_14">#e48bf3</color>
+    <color name="icon_inside_15">#00acfc</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 4bcb68f..a281def 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <declare-styleable name="AppTheme">
-        <attr name="toolbarColor" format="reference" />
-        <attr name="toolbarTitleColor" format="reference" />
-        <attr name="toolbarMenuTheme" format="reference" />
         <attr name="searchBoxBackground" format="reference" />
     </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
new file mode 100644
index 0000000..197cd20
--- /dev/null
+++ b/app/src/main/res/values/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="lightStatusNav">true</bool>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c0f5760..8911f8c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,18 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="background">@android:color/white</color>
     <color name="primary">#2196F3</color>
     <color name="primary_dark">#1976D2</color>
     <color name="primary_light">#BBDEFB</color>
     <color name="accent">#03A9F4</color>
-    <color name="primary_text">#212121</color>
-    <color name="secondary_text">#757575</color>
-    <color name="icons">#FFFFFF</color>
-    <color name="divider">#BDBDBD</color>
-    <color name="background_dark">#202124</color>
     <color name="toolbar_dark">#3C4043</color>
-    <color name="windowBackground">#FAFAFA</color>
-    <color name="dark_mode_warning_red">#F44336</color>
-    <color name="statusBarColorBottomSheetLight">#666666</color>
-    <color name="search_box_background_light">#F5F5F5</color>
-    <color name="search_box_background_dark">#757575</color>
+
+    <color name="toolbar">@android:color/white</color>
+    <color name="search_box_background">#F5F5F5</color>
+    <color name="toolbar_overflow">@android:color/black</color>
+
+    <color name="icon_circle_0">#D7E5F8</color>
+    <color name="icon_circle_1">#F8D7DF</color>
+    <color name="icon_circle_2">#F8E0D7</color>
+    <color name="icon_circle_3">#D7F8E7</color>
+    <color name="icon_circle_4">#F8F3D7</color>
+    <color name="icon_circle_5">#F7E9D5</color>
+    <color name="icon_circle_6">#E8E8E8</color>
+    <color name="icon_circle_7">#DAD7F8</color>
+    <color name="icon_circle_8">#D7F8F8</color>
+    <color name="icon_circle_9">#EDD7F8</color>
+    <color name="icon_circle_10">#ffddb0</color>
+    <color name="icon_circle_11">#ffe2b6</color>
+    <color name="icon_circle_12">#b2ebf2</color>
+    <color name="icon_circle_13">#ffc8b9</color>
+    <color name="icon_circle_14">#f2bcf8</color>
+    <color name="icon_circle_15">#e1f5fe</color>
+
+    <color name="icon_inside_0">#1A6CD9</color>
+    <color name="icon_inside_1">#D91A4A</color>
+    <color name="icon_inside_2">#D9521A</color>
+    <color name="icon_inside_3">#1AD975</color>
+    <color name="icon_inside_4">#D9BA1A</color>
+    <color name="icon_inside_5">#f59714</color>
+    <color name="icon_inside_6">#333</color>
+    <color name="icon_inside_7">#2F1AD9</color>
+    <color name="icon_inside_8">#1AD5D9</color>
+    <color name="icon_inside_9">#981AD9</color>
+    <color name="icon_inside_10">#ffaf49</color>
+    <color name="icon_inside_11">#ffbc57</color>
+    <color name="icon_inside_13">#ee0202</color>
+    <color name="icon_inside_14">#cd00ea</color>
+    <color name="icon_inside_15">#03A9F4</color>
+
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 0daaafd..b145bb0 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,11 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="activity_padding">16dp</dimen>
-    <dimen name="margin_small">8dp</dimen>
-    <dimen name="item_height">56dp</dimen>
+
+    <dimen name="padding_8">8dp</dimen>
+    <dimen name="padding_16">16dp</dimen>
+    <dimen name="padding_24">24dp</dimen>
+    <dimen name="padding_32">32dp</dimen>
+
+    <dimen name="app_bar_height">200dp</dimen>
+    <dimen name="toolbar_expanded_height">226dp</dimen>
+    <dimen name="toolbar_scrim_visible_height">174dp</dimen>
+    <dimen name="toolbar_expanded_title_margin">16dp</dimen>
+
+    <dimen name="shared_axis_x_slide_distance">96dp</dimen>
+
     <dimen name="bottom_sheet_corner_radius">16dp</dimen>
+    <dimen name="snackbar_max_height">72dp</dimen>
+
+    <dimen name="item_app_height">56dp</dimen>
     <dimen name="search_box_height">48dp</dimen>
     <dimen name="search_box_corners">24dp</dimen>
-    <dimen name="toolbar_elevation">4dp</dimen>
     <dimen name="clear_button_size">36dp</dimen>
+
+    <dimen name="min_window_blur_radius">1px</dimen>
+    <dimen name="max_window_blur_radius">150px</dimen>
+    <!-- TODO move to values-31 eventually -->
+    <dimen name="min_window_blur_radius_31">1px</dimen>
+    <dimen name="max_window_blur_radius_31">32px</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml
deleted file mode 100644
index 29bdbaa..0000000
--- a/app/src/main/res/values/plurals.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <plurals name="setting_whitelist_desc">
-        <item quantity="one">%1d app will have force dark applied automatically</item>
-        <item quantity="other">%1d apps will have force dark applied automatically</item>
-    </plurals>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 87b4d40..e00970a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,48 +1,88 @@
 <resources>
     <string name="app_name">DarQ</string>
-    <string name="accessibility_service_description">DarQ Accessibility Service\n\nRequired for the app to work, allows it to monitor apps running and enable/disable the force-dark setting accordingly. Enable it and return the app to continue.\n\nPLEASE NOTE:\nAs of Android 10, when enabling an accessibility service, no matter how minor its access, you will be warned that the service can read the screen and act on behalf of you, and that it is not appropriate for most apps. This is normal, please just tap \'Ok\'. If you wish to view what DarQ is doing (and more importantly, not doing) programmatically, you can view its source on GitHub.\n\nNote for non-root users:\nEnabling or disabling this toggle will require you to run the script from your computer again.</string>
-    <string name="setting_dark_mode_title">Enable Dark Theme</string>
-    <string name="setting_dark_mode_desc">Toggle the main system dark theme</string>
-    <string name="setting_force_dark_mode_title">Force Dark Theme</string>
-    <string name="setting_force_dark_mode_desc">Enable the force dark theme setting globally. This overrides the enabled apps list.</string>
-    <string name="setting_force_dark_mode_snackbar">Restart any apps to apply this change</string>
-    <string name="setting_day_night_auto_title">Auto Dark Theme</string>
-    <string name="setting_day_night_auto_desc">Automatically enable dark theme at sunset and disable at sunrise</string>
-    <string name="setting_oxygen_force_title">Oxygen OS Force Dark</string>
-    <string name="setting_oxygen_force_desc">Enable the Oxygen OS \"Entire World\" force dark (applies to most apps)</string>
-    <string name="setting_whitelist_title">Enabled Apps</string>
-    <string name="setting_faq_about_toggle">FAQ &amp; About</string>
-    <string name="setting_non_root_faq">Non-Root Instructions &amp; FAQ</string>
-    <string name="setting_non_root_faq_desc">View the instructions and FAQ on running DarQ without root</string>
-    <string name="setting_faq_title">Frequently Asked Questions</string>
-    <string name="setting_xda_thread_title">XDA Thread</string>
-    <string name="setting_twitter_title">Follow me on Twitter</string>
-    <string name="setting_github_title">View source on GitHub</string>
-    <string name="setting_donate_title">Donate</string>
-    <string name="setting_licences_title">Licences</string>
-    <string name="setting_about_title">About</string>
-    <string name="setting_about_desc">DarQ version %1s\n© 2020 Kieron Quinn</string>
-    <string name="checking_root">Checking root…</string>
-    <string name="checking_service">Connecting to service…</string>
-    <string name="loading">Loading…</string>
+    <string name="xposed_desc">Prevent apps from disabling the use of Force Dark</string>
+    <string name="item_switch_main_title">Enable DarQ</string>
+    <string name="item_switch_main_subtitle">DarQ only works while the system is in dark mode</string>
+    <string name="item_switch_main_subtitle_off">DarQ requires the system dark mode be enabled to work</string>
+    <string name="item_whitelist_title">Force Dark Apps</string>
+    <string name="item_whitelist_content">Select apps to have Force Dark enabled</string>
+    <string name="item_header_options">Options</string>
+    <string name="item_oxygen_force_title">Oxygen OS Force Dark</string>
+    <string name="item_oxygen_force_content">Enable the Oxygen OS \"Entire World\" force dark (applies to most apps)</string>
+    <string name="item_day_night_auto_title">Auto Dark Theme</string>
+    <string name="item_day_night_auto_content">Automatically enable dark theme at sunset and disable at sunrise</string>
+    <string name="item_advanced_options_title">Advanced Options</string>
+    <string name="item_advanced_options_content">Change settings for always using force dark and app switching</string>
+    <string name="item_always_use_force_dark_title">Always use Force Dark</string>
+    <string name="item_always_use_force_dark_content">Ignore the list of Force Dark apps and instead have Force Dark <b>always enabled</b>, for all apps.</string>
+    <string name="item_send_app_closes_title">Listen for App Closes</string>
+    <string name="item_send_app_closes_content">Disables Force Dark when an app in the Force Dark list is closed. This leads to more instances where Force Dark may not be applied quickly enough to an app when switching between apps.</string>
+    <string name="item_header_about">About</string>
+    <string name="item_about_faq_title">Frequently Asked Questions</string>
+    <string name="item_about_title">DarQ v%1s</string>
+    <string name="item_about_content">Created by Kieron Quinn / Quinny899 @ XDA</string>
+    <string name="item_developer_options_title">Developer Options</string>
+    <string name="item_developer_options_monet_color_picker_title">Monet Color Picker</string>
+    <string name="item_developer_options_monet_color_picker_content">Pick a color to use from your wallpaper</string>
+    <string name="item_developer_options_kill_service_title">Kill duplicate services</string>
+    <string name="item_developer_options_kill_service_content">Kill any duplicate DarQ services, this shouldn\'t be required due to how the service is handled, but may be if you switch between Shizuku and root modes.</string>
+    <string name="item_developer_options_kill_service_toast_success">Success</string>
+    <string name="item_developer_options_kill_service_toast_failed">Failed</string>
+    <string name="item_developer_options_service_info">Service Info</string>
+    <string name="item_developer_options_service_info_not_connected">Not Connected</string>
+    <string name="item_developer_options_service_info_connected">Connected, service type: %1s</string>
+    <string name="color_picker_unavailable">Monet Color Picker unavailable for the currently selected wallpaper</string>
+    <string name="loading_service_connect">Connecting to service…</string>
+    <string name="snackbar_syncing_text">Syncing changes with service…</string>
+    <string name="snackbar_syncing_complete_text">Changes synced with service.</string>
+    <string name="snackbar_syncing_failed_text">Failed to sync changes. Changes will be applied on next restart.</string>
+    <string name="snackbar_syncing_failed_button">More Info</string>
     <string name="loading_apps">Loading apps…</string>
-    <string name="bottom_sheet_no_service_title">Service not Running</string>
-    <string name="bottom_sheet_no_service_desc">The Accessibility Service is running, but DarQ was unable to connect to the service running from ADB. Please follow the steps at the link below to enable it, and if this issue persists try restarting the app or rebooting your device and running the tool on your computer again.</string>
-    <string name="bottom_sheet_no_service_steps">Steps to Enable…</string>
-    <string name="bottom_sheet_no_service_root_title">Service not Running</string>
-    <string name="bottom_sheet_no_service_root_desc">The Accessibility Service is running, but DarQ was unable to connect to the root service. Please try restarting the app or, if the issue persists, rebooting your device.</string>
-    <string name="bottom_sheet_accessibility_service">Enable Accessibility Service</string>
-    <string name="bottom_sheet_accessibility_service_desc">DarQ requires the use of an accessibility to reliably and quickly respond to apps opening and closing. Please enable it from Android\'s Accessibility Settings.</string>
-    <string name="bottom_sheet_accessibility_service_not_running_title">Accessibility Service not running</string>
-    <string name="bottom_sheet_accessibility_service_not_running_desc">DarQ\'s accessibility service is not currently running, please try disabling it and re-enabling it in Android\'s Accessibility Settings. If that doesn\'t work, please try rebooting your device.</string>
-    <string name="bottom_sheet_auto_dark_title">Location Permission</string>
-    <string name="bottom_sheet_auto_dark_desc">Auto dark theme uses dynamic sunrise and sunset calculation, based on your location. This can either be obtained using the location permission (more accurate) or by your timezone city. Your timezone is currently set to %1s.\n\nNote: Due to changes in Android 10, you have the choice of only allowing the permission when the app is running. As DarQ runs in the background, please select "Allow all the time" on the permission prompt.</string>
-    <string name="bottom_sheet_auto_dark_timezone">Timezone</string>
-    <string name="bottom_sheet_auto_dark_location">Location</string>
-    <string name="dark_mode_warning">Force dark requires the system dark theme to be enabled to work. Please enable it below to see changes in apps.</string>
-    <string name="permission_failed">Permission denied, please grant manually in your device\'s app settings</string>
-    <string name="show_system_apps">Show system apps</string>
     <string name="search">Search</string>
-    <string name="nothing_found">Nothing found</string>
-    <string name="xposed_desc">Prevent selected apps from disabling force dark (uses same list of apps as normal force dark)</string>
+    <string name="app_search_empty">Nothing found</string>
+    <string name="menu_app_picker_show_non_launchable_apps">Show non-launchable apps\t</string>
+    <string name="bottom_sheet_shizuku_not_running_title">Shizuku Not Running</string>
+    <string name="bottom_sheet_shizuku_not_running_content">Shizuku is installed but the service has not been started. Open Shizuku and start the service via ADB to continue.</string>
+    <string name="bottom_sheet_shizuku_not_running_positive">Launch Shizuku</string>
+    <string name="bottom_sheet_shizuku_not_running_negative">Close</string>
+    <string name="bottom_sheet_service_timeout_title">Service Timeout</string>
+    <string name="bottom_sheet_service_timeout_content">Timed out starting/connecting to the DarQ service. Try rebooting your device.</string>
+    <string name="bottom_sheet_service_timeout_positive">Close</string>
+    <string name="bottom_sheet_shizuku_not_installed_title">Shizuku Not Installed</string>
+    <string name="bottom_sheet_shizuku_not_installed_content">Shizuku is not installed and your device is not rooted (or you denied root permissions). Please install Shizuku to use DarQ without root.</string>
+    <string name="bottom_sheet_shizuku_not_installed_positive">Get Shizuku</string>
+    <string name="bottom_sheet_shizuku_not_installed_negative">Close</string>
+    <string name="bottom_sheet_shizuku_not_installed_neutral">More Info</string>
+    <string name="bottom_sheet_shizuku_more_info_title">Shizuku</string>
+    <string name="bottom_sheet_shizuku_more_info_content"><b>Shizuku</b> is an app and framework for apps to run code with ADB permissions.\nMuch like the ADB script used in previous versions of DarQ, you must start its service once per boot.\nHowever, unlike the script, Shizuku allows apps that have your permission (and implement the framework, like DarQ does), to start their own services off it, without needing another command. This is very similar to root apps and Superuser, in fact Shizuku is basically that - a Superuser-like framework for running elevated code.\nShizuku also allows you to use Wireless Debugging on Android 11 and above to connect <i>to your own device</i> and start the service <b>without needing a PC.</b></string>
+    <string name="boot_foreground_service_notification_title">DarQ</string>
+    <string name="boot_foreground_service_notification_content">Starting DarQ service…</string>
+    <string name="boot_foreground_service_notification_failed_title">Failed to start DarQ service</string>
+    <string name="boot_foreground_service_notification_failed_content">Tap to open DarQ and try again</string>
+    <string name="boot_foreground_service_notification_shizuku_title">DarQ Shizuku Service</string>
+    <string name="boot_foreground_service_notification_shizuku_content">DarQ requires Shizuku\'s service to be started to work after a reboot, tap to open Shizuku</string>
+    <string name="notification_channel_boot_startup_title">Start up</string>
+    <string name="notification_channel_boot_startup_description">Notifications shown during start up on boot process</string>
+    <string name="notification_channel_boot_auto_dark_title">Auto Dark</string>
+    <string name="notification_channel_boot_auto_dark_description">Notification shown when switching to/from dark mode automatically at sunrise/sunset</string>
+    <string name="auto_dark_foreground_notification_title">DarQ Auto Dark Theme</string>
+    <string name="auto_dark_foreground_notification_content">Applying theme change…</string>
+    <string name="auto_dark_foreground_notification_content_changes">Applying changes…</string>
+    <string name="auto_dark_foreground_notification_failed_title">DarQ Auto Dark Theme</string>
+    <string name="auto_dark_foreground_notification_failed_content">Failed to apply theme, try rebooting your device.</string>
+    <string name="dialog_location_permission_text">Allow <b>DarQ</b> to use your location to get sunrise &amp; sunset times?</string>
+    <string name="dialog_location_permission_use_location">Use Location</string>
+    <string name="dialog_location_permission_use_timezone">Use Time Zone\n<small>(less accurate)</small></string>
+    <string name="chip_donate">Donate</string>
+    <string name="chip_twitter">Follow me on Twitter</string>
+    <string name="chip_github">GitHub</string>
+    <string name="chip_xda">XDA Thread</string>
+    <string name="menu_open_source_libraries">Open source libraries</string>
+    <string name="bottom_sheet_update_available_title">Update Available</string>
+    <string name="bottom_sheet_update_available_positive">Download</string>
+    <string name="bottom_sheet_update_available_negative">Close</string>
+    <string name="bottom_sheet_update_available_neutral">View on GitHub</string>
+    <string name="download_manager_description">Downloading update…</string>
+    <string name="bs_update_download_failed">Download failed</string>
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e5eeb7d..ebdf69f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,38 +1,39 @@
 <resources>
 
-    <style name="AppTheme.Initial" parent="Theme.MaterialComponents.DayNight" />
-
-    <style name="AppTheme.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">@color/primary_dark</item>
-        <item name="colorAccent">@color/accent</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:windowLightNavigationBar">true</item>
-        <item name="toolbarColor">@android:color/white</item>
-        <item name="searchBoxBackground">@color/search_box_background_light</item>
-    </style>
-
-    <style name="AppTheme.Dark" parent="Theme.MaterialComponents.NoActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorAccent">@color/accent</item>
-        <item name="android:windowBackground">@color/background_dark</item>
+        <item name="android:windowBackground">@drawable/splash_background</item>
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:windowLightNavigationBar">false</item>
-        <item name="toolbarColor">@color/toolbar_dark</item>
-        <item name="searchBoxBackground">@color/search_box_background_dark</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="searchBoxBackground">@color/search_box_background</item>
+        <item name="textAppearanceLargePopupMenu">@style/AppTheme.TextAppearance.Popup</item>
     </style>
 
     <style name="TextAppearance.AppCompat.Small.Darq" parent="TextAppearance.AppCompat.Small">
-        <item name="android:fontFamily">@font/hkgrotesk</item>
+        <item name="android:fontFamily">@font/google_sans_text</item>
+    </style>
+
+    <style name="TextAppearance.AppCompat.Small.Darq.Medium" parent="TextAppearance.AppCompat.Small">
+        <item name="android:fontFamily">@font/google_sans_text</item>
+        <item name="android:textFontWeight">500</item>
     </style>
 
     <style name="TextAppearance.AppCompat.Medium.Darq" parent="TextAppearance.AppCompat.Medium">
-        <item name="android:fontFamily">@font/hkgrotesk</item>
+        <item name="android:fontFamily">@font/google_sans_text</item>
+        <item name="android:textFontWeight">500</item>
     </style>
 
     <style name="TextAppearance.AppCompat.Large.Darq" parent="TextAppearance.AppCompat.Large">
-        <item name="android:fontFamily">@font/hkgrotesk</item>
+        <item name="android:fontFamily">@font/google_sans_text</item>
+        <item name="android:textFontWeight">500</item>
+    </style>
+
+    <style name="TextAppearance.AppCompat.Large.Darq.Lighter" parent="TextAppearance.AppCompat.Large.Darq">
+        <item name="android:textFontWeight">400</item>
     </style>
 
     <style name="BaseBottomSheetDialog" parent="@style/Theme.Design.Light.BottomSheetDialog">
@@ -59,4 +60,39 @@
         <item name="android:background">@drawable/bottom_sheet_rounded_bg_dark</item>
     </style>
 
+    <style name="AppTheme.TextAppearance.Popup" parent="TextAppearance.AppCompat.Widget.TextView.SpinnerItem">
+        <item name="fontFamily">@font/google_sans_text</item>
+    </style>
+
+    <style name="DialogAnimation">
+        <item name="android:windowEnterAnimation">@anim/fade_in</item>
+        <item name="android:windowExitAnimation">@anim/fade_out</item>
+    </style>
+
+    <style name="AppTheme.ThirdPartyLicences" parent="Theme.MaterialComponents.DayNight">
+        <item name="actionBarStyle">@style/ThirdPartyLicencesToolbarTheme</item>
+        <item name="android:statusBarColor">?android:windowBackground</item>
+        <item name="android:windowLightStatusBar">@bool/lightStatusNav</item>
+        <item name="android:textViewStyle">@style/ThirdPartyLicencesTextViewStyle</item>
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primary</item>
+        <item name="colorAccent">@color/accent</item>
+    </style>
+
+    <style name="ThirdPartyLicencesToolbarTheme" parent="@style/Widget.AppCompat.Light.ActionBar.Solid">
+        <item name="background">?android:windowBackground</item>
+        <item name="titleTextStyle">@style/ThirdPartyLicencesToolbarTitleStyle</item>
+        <item name="colorControlNormal">@android:color/black</item>
+        <item name="homeAsUpIndicator">@drawable/ic_back</item>
+    </style>
+
+    <style name="ThirdPartyLicencesToolbarTitleStyle" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
+        <item name="android:textColor">@android:color/black</item>
+        <item name="android:fontFamily">@font/google_sans_text_medium</item>
+    </style>
+
+    <style name="ThirdPartyLicencesTextViewStyle" parent="android:Widget.TextView">
+        <item name="android:fontFamily">@font/google_sans_text</item>
+    </style>
+
 </resources>
diff --git a/app/src/main/res/xml/accessibilityservice.xml b/app/src/main/res/xml/accessibilityservice.xml
deleted file mode 100644
index a947b83..0000000
--- a/app/src/main/res/xml/accessibilityservice.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accessibilityEventTypes="typeWindowContentChanged"
-    android:accessibilityFeedbackType="feedbackGeneric"
-    android:accessibilityFlags="flagReportViewIds"
-    android:canRetrieveWindowContent="true"
-    android:description="@string/accessibility_service_description" />
\ No newline at end of file
diff --git a/app/src/main/res/xml/faq_about_preferences.xml b/app/src/main/res/xml/faq_about_preferences.xml
deleted file mode 100644
index ce2924a..0000000
--- a/app/src/main/res/xml/faq_about_preferences.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <com.kieronquinn.app.darq.preferences.Preference
-            android:key="faq"
-            android:icon="@drawable/ic_help"
-            android:title="@string/setting_faq_title" />
-    <com.kieronquinn.app.darq.preferences.Preference
-            android:key="xda_thread"
-            android:icon="@drawable/ic_xda"
-            android:title="@string/setting_xda_thread_title" />
-    <com.kieronquinn.app.darq.preferences.Preference
-            android:key="twitter"
-            android:icon="@drawable/ic_twitter"
-            android:title="@string/setting_twitter_title" />
-    <com.kieronquinn.app.darq.preferences.Preference
-            android:key="donate"
-            android:icon="@drawable/ic_donate"
-            android:title="@string/setting_donate_title" />
-    <com.kieronquinn.app.darq.preferences.Preference
-            android:key="github"
-            android:icon="@drawable/ic_github"
-            android:title="@string/setting_github_title" />
-    <com.kieronquinn.app.darq.preferences.Preference
-            android:key="licences"
-            android:icon="@drawable/ic_libraries"
-            android:title="@string/setting_licences_title" />
-    <com.kieronquinn.app.darq.preferences.Preference
-            android:key="about"
-            android:title="@string/setting_about_title"
-            android:summary="@string/setting_about_desc" />
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
deleted file mode 100644
index 68b3703..0000000
--- a/app/src/main/res/xml/main_preferences.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <com.kieronquinn.app.darq.preferences.SwitchPreference
-        android:defaultValue="false"
-        android:key="switch_dark_mode"
-        android:icon="@drawable/ic_dark_theme"
-        android:title="@string/setting_dark_mode_title"
-        android:summary="@string/setting_dark_mode_desc" />
-    <com.kieronquinn.app.darq.preferences.SwitchPreference
-        android:defaultValue="false"
-        android:key="switch_force_dark_mode"
-        android:icon="@drawable/ic_bug"
-        android:title="@string/setting_force_dark_mode_title"
-        android:summary="@string/setting_force_dark_mode_desc" />
-    <com.kieronquinn.app.darq.preferences.SwitchPreference
-        android:defaultValue="false"
-        android:key="oxygen_os_toggle"
-        android:icon="@drawable/ic_oxygen"
-        android:title="@string/setting_oxygen_force_title"
-        android:summary="@string/setting_oxygen_force_desc" />
-    <com.kieronquinn.app.darq.preferences.SwitchPreference
-        android:defaultValue="false"
-        android:key="switch_auto_night_dark"
-        android:icon="@drawable/ic_theme_light_dark"
-        android:title="@string/setting_day_night_auto_title"
-        android:summary="@string/setting_day_night_auto_desc" />
-    <com.kieronquinn.app.darq.preferences.Preference
-        android:key="preference_whitelist"
-        android:title="@string/setting_whitelist_title"
-        android:summary="@plurals/setting_whitelist_desc" />
-    <com.kieronquinn.app.darq.preferences.Preference
-        android:key="preference_non_root_faq"
-        android:icon="@drawable/ic_laptop"
-        android:title="@string/setting_non_root_faq"
-        android:summary="@string/setting_non_root_faq_desc" />
-    <com.kieronquinn.app.darq.preferences.Preference
-        android:defaultValue="false"
-        android:key="debug"
-        android:title="Debug"
-        android:visibility="gone"
-        android:summary="" />
-    <com.kieronquinn.app.darq.preferences.Preference
-        android:key="preference_faq_about"
-        android:icon="@drawable/ic_chevron_down"
-        android:title="@string/setting_faq_about_toggle" />
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
new file mode 100644
index 0000000..c8bba9e
--- /dev/null
+++ b/app/src/main/res/xml/provider_paths.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <external-cache-path name="cached_files" path="." />
+</paths>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 168ffb1..a19806f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,17 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = '1.5.20'
+    ext.nav_version = "2.3.5"
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.android.gms:oss-licenses-plugin:0.10.2'
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
+        classpath 'com.google.android.gms:oss-licenses-plugin:0.10.4'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -18,8 +20,10 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         maven { url 'https://jitpack.io' }
+        //Jcenter is still required for Xposed
+        jcenter()
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b939ce4..d8701d8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
diff --git a/settings.gradle b/settings.gradle
index e7b4def..a2a582b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
 include ':app'
+include ':systemstubs'
diff --git a/systemstubs/.gitignore b/systemstubs/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/systemstubs/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/systemstubs/build.gradle b/systemstubs/build.gradle
new file mode 100644
index 0000000..323c692
--- /dev/null
+++ b/systemstubs/build.gradle
@@ -0,0 +1,34 @@
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        minSdkVersion 30
+        targetSdkVersion 30
+        versionCode 1
+        versionName "1.0"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+}
\ No newline at end of file
diff --git a/systemstubs/consumer-rules.pro b/systemstubs/consumer-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/systemstubs/proguard-rules.pro b/systemstubs/proguard-rules.pro
new file mode 100644
index 0000000..481bb43
--- /dev/null
+++ b/systemstubs/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/systemstubs/src/main/AndroidManifest.xml b/systemstubs/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..5cae4b8
--- /dev/null
+++ b/systemstubs/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.kieronquinn.systemstubs"/>
\ No newline at end of file
diff --git a/systemstubs/src/main/aidl/android/app/ActivityManager.aidl b/systemstubs/src/main/aidl/android/app/ActivityManager.aidl
new file mode 100644
index 0000000..01a96cc
--- /dev/null
+++ b/systemstubs/src/main/aidl/android/app/ActivityManager.aidl
@@ -0,0 +1,4 @@
+// ActivityManager.aidl
+package android.app;
+
+parcelable ActivityManager.RunningAppProcessInfo;
\ No newline at end of file
diff --git a/systemstubs/src/main/aidl/android/app/IActivityManager.aidl b/systemstubs/src/main/aidl/android/app/IActivityManager.aidl
new file mode 100644
index 0000000..0708461
--- /dev/null
+++ b/systemstubs/src/main/aidl/android/app/IActivityManager.aidl
@@ -0,0 +1,13 @@
+// IActivityManager.aidl
+package android.app;
+
+import android.app.IProcessObserver;
+import android.app.ActivityManager;
+
+interface IActivityManager {
+
+    void registerProcessObserver(in IProcessObserver observer);
+    void unregisterProcessObserver(in IProcessObserver observer);
+    List<ActivityManager.RunningAppProcessInfo> getRunningAppProcesses();
+
+}
\ No newline at end of file
diff --git a/systemstubs/src/main/aidl/android/app/IProcessObserver.aidl b/systemstubs/src/main/aidl/android/app/IProcessObserver.aidl
new file mode 100644
index 0000000..5845a35
--- /dev/null
+++ b/systemstubs/src/main/aidl/android/app/IProcessObserver.aidl
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.app;
+interface IProcessObserver {
+
+    void onForegroundActivitiesChanged(int pid, int uid, boolean foregroundActivities);
+    void onForegroundServicesChanged(int pid, int uid, int serviceTypes);
+    void onProcessDied(int pid, int uid);
+
+}
\ No newline at end of file
diff --git a/systemstubs/src/main/aidl/android/app/IUiModeManager.aidl b/systemstubs/src/main/aidl/android/app/IUiModeManager.aidl
new file mode 100644
index 0000000..273d978
--- /dev/null
+++ b/systemstubs/src/main/aidl/android/app/IUiModeManager.aidl
@@ -0,0 +1,15 @@
+// IUiModeManager.aidl
+package android.app;
+
+interface IUiModeManager {
+
+    /**
+     * Sets the night mode.
+     * The mode can be one of:
+     *   1 - notnight mode
+     *   2 - night mode
+     *   3 - automatic mode switching
+     */
+    void setNightMode(int mode);
+
+}
\ No newline at end of file
diff --git a/systemstubs/src/main/aidl/android/location/ILocationManager.aidl b/systemstubs/src/main/aidl/android/location/ILocationManager.aidl
new file mode 100644
index 0000000..4593e2c
--- /dev/null
+++ b/systemstubs/src/main/aidl/android/location/ILocationManager.aidl
@@ -0,0 +1,15 @@
+// ILocationManager.aidl
+package android.location;
+
+import android.location.Location;
+import android.location.LocationRequest;
+
+interface ILocationManager {
+
+    //Android 11+
+    Location getLastLocation(in LocationRequest request, String packageName, String featureId);
+
+    //Android 10
+    //Location getLastLocation(in LocationRequest request, String packageName) = 2;
+
+}
\ No newline at end of file
diff --git a/systemstubs/src/main/aidl/android/location/Location.aidl b/systemstubs/src/main/aidl/android/location/Location.aidl
new file mode 100644
index 0000000..f36d597
--- /dev/null
+++ b/systemstubs/src/main/aidl/android/location/Location.aidl
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2007, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.location;
+
+parcelable Location;
\ No newline at end of file
diff --git a/systemstubs/src/main/aidl/android/location/LocationRequest.aidl b/systemstubs/src/main/aidl/android/location/LocationRequest.aidl
new file mode 100644
index 0000000..bc3c299
--- /dev/null
+++ b/systemstubs/src/main/aidl/android/location/LocationRequest.aidl
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2012, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.location;
+
+parcelable LocationRequest;
\ No newline at end of file
diff --git a/systemstubs/src/main/java/android/view/ViewRootImpl.java b/systemstubs/src/main/java/android/view/ViewRootImpl.java
new file mode 100644
index 0000000..ec24878
--- /dev/null
+++ b/systemstubs/src/main/java/android/view/ViewRootImpl.java
@@ -0,0 +1,9 @@
+package android.view;
+
+public class ViewRootImpl {
+
+    public SurfaceControl getSurfaceControl() {
+        throw new RuntimeException("Stub");
+    }
+
+}