diff --git a/res/raw/lineage_wizard_script.xml b/res/raw/lineage_wizard_script.xml
index becca1dba8ab1ffce3fc7e860e77656bb127209a..2f37668f154204bc346baa9ac37be18fb34a7cda 100644
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -70,6 +70,12 @@
 -->
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end" id="navigation_settings">
+        <result wizard:action="e_find_my_device_settings" />
+    </WizardAction>
+
+    <WizardAction
+        wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_FIND_MY_DEVICE_SETTINGS;end"
+        id="e_find_my_device_settings">
         <result wizard:action="biometric_settings" />
     </WizardAction>
 
@@ -81,12 +87,6 @@
         <result wizard:action="e_account_manager_settings" />
     </WizardAction>
 
-    <WizardAction
-        wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_FIND_MY_DEVICE_SETTINGS;end"
-        id="e_find_my_device_settings">
-        <result wizard:action="theme_settings" />
-    </WizardAction>
-	
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.E_ACCOUNT_MANAGER_SETTINGS;end" id="e_account_manager_settings">
         <result wizard:action="finish" />
     </WizardAction>
diff --git a/src/org/lineageos/setupwizard/FindMyDeviceActivity.java b/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
index 8317c3a6e0c2de40674e70f19f657189e1d104c4..bb9a36805319112bba2ff94dd9b4472c29b3f5e9 100644
--- a/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
+++ b/src/org/lineageos/setupwizard/FindMyDeviceActivity.java
@@ -37,7 +37,6 @@ public class FindMyDeviceActivity extends SubBaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         if (!SetupWizardUtils.hasTelephony(this)) {
             Log.v(TAG, "Has no telephony support");
             hasTelephonySupport = false;
@@ -51,7 +50,6 @@ public class FindMyDeviceActivity extends SubBaseActivity {
     @Override
     public void onRestart() {
         super.onRestart();
-        
         if (!hasTelephonySupport) {
             onNavigateNext();
             return;