diff --git a/Modules/Panels/Settings/Tabs/GeneralTab.qml b/Modules/Panels/Settings/Tabs/GeneralTab.qml
index c5de3c6c..c3bdfa99 100644
--- a/Modules/Panels/Settings/Tabs/GeneralTab.qml
+++ b/Modules/Panels/Settings/Tabs/GeneralTab.qml
@@ -4,6 +4,7 @@ import QtQuick.Layouts
 import Quickshell
 import qs.Commons
 import qs.Services.System
+import qs.Services.UI
 import qs.Widgets
 
 ColumnLayout {
diff --git a/Modules/Panels/SetupWizard/SetupWizard.qml b/Modules/Panels/SetupWizard/SetupWizard.qml
index f8ee4df6..e6955fb3 100644
--- a/Modules/Panels/SetupWizard/SetupWizard.qml
+++ b/Modules/Panels/SetupWizard/SetupWizard.qml
@@ -182,7 +182,12 @@ SmartPanel {
               }
             }
 
-            // Step 2: UI Configuration
+            // Step 2: Appearance - Dark mode and color source
+            SetupAppearanceStep {
+              id: step3
+            }
+
+            // Step 3: UI Configuration
             SetupCustomizeStep {
               id: step2
               selectedScaleRatio: root.selectedScaleRatio
@@ -197,15 +202,10 @@ SmartPanel {
               }
             }
 
-            // Step 3: Dock Setup
+            // Step 4: Dock Setup
             SetupDockStep {
               id: stepDock
             }
-
-            // Step 4: Appearance - Dark mode and color source
-            SetupAppearanceStep {
-              id: step3
-            }
           }
         }
 
@@ -233,15 +233,15 @@ SmartPanel {
                 }, {
                   "icon": "image",
                   "label": "Wallpaper"
+                }, {
+                  "icon": "palette",
+                  "label": "Appearance"
                 }, {
                   "icon": "settings",
                   "label": "Customize"
                 }, {
                   "icon": "device-desktop",
                   "label": "Dock"
-                }, {
-                  "icon": "palette",
-                  "label": "Appearance"
                 }]
               delegate: RowLayout {
                 spacing: Style.marginS