Main Settings: cleaned tabs since we removed many settings

Modules/SettingsPanel/Bar/BarSectionEditor.qml

@@ -65,7 +65,7 @@ NBox {
         text: sectionName + " Section"
         font.pointSize: Style.fontSizeL * scaling
         font.weight: Style.fontWeightBold
-        color: Color.mSecondary
+        color: Color.mOnSurface
         Layout.alignment: Qt.AlignVCenter
       }
 

Modules/SettingsPanel/Tabs/AudioTab.qml

@@ -242,21 +242,7 @@ ColumnLayout {
       Layout.bottomMargin: Style.marginS * scaling
     }
 
-    // Miniplayer section
+    // Preferred player
-    NToggle {
-      label: "Show Album Art In Bar Media Player"
-      description: "Show the album art of the currently playing song next to the title."
-      checked: Settings.data.audio.showMiniplayerAlbumArt
-      onToggled: checked => Settings.data.audio.showMiniplayerAlbumArt = checked
-    }
-
-    NToggle {
-      label: "Show Audio Visualizer In Bar Media Player"
-      description: "Shows an audio visualizer in the background of the miniplayer."
-      checked: Settings.data.audio.showMiniplayerCava
-      onToggled: checked => Settings.data.audio.showMiniplayerCava = checked
-    }
-    // Preferred player (persistent)
     NTextInput {
       label: "Preferred Player"
       description: "Substring to match MPRIS player (identity/bus/desktop)."

Modules/SettingsPanel/Tabs/BarTab.qml

@@ -87,7 +87,7 @@ ColumnLayout {
       text: "Widgets Positioning"
       font.pointSize: Style.fontSizeXXL * scaling
       font.weight: Style.fontWeightBold
-      color: Color.mOnSurface
+      color: Color.mSecondary
       Layout.bottomMargin: Style.marginS * scaling
     }
 

Modules/SettingsPanel/Tabs/ColorSchemeTab.qml

@@ -8,6 +8,7 @@ import qs.Widgets
 
 ColumnLayout {
   id: root
+  spacing: 0
 
   // Cache for scheme JSON (can be flat or {dark, light})
   property var schemeColorsCache: ({})
@@ -103,14 +104,8 @@ ColumnLayout {
     }
   }
 
-  ColumnLayout {
-    spacing: 0
-
-    Item {
-      Layout.fillWidth: true
-      Layout.preferredHeight: 0
-    }
 
+    // Main Toggles - Dark Mode / Matugen
     ColumnLayout {
       spacing: Style.marginL * scaling
       Layout.fillWidth: true
@@ -144,190 +139,194 @@ ColumnLayout {
                      }
                    }
       }
+    }
 
-      NDivider {
+    NDivider {
-        Layout.fillWidth: true
+      Layout.fillWidth: true
-        Layout.topMargin: Style.marginXL * scaling
+      Layout.topMargin: Style.marginXL * scaling
-        Layout.bottomMargin: Style.marginXL * scaling
+      Layout.bottomMargin: Style.marginXL * scaling
+    }
+
+    // Predefined Color Schemes
+    ColumnLayout {
+      spacing: Style.marginM * scaling
+      Layout.fillWidth: true
+
+      NText {
+        text: "Predefined Color Schemes"
+        font.pointSize: Style.fontSizeXXL * scaling
+        font.weight: Style.fontWeightBold
+        color: Color.mSecondary
       }
 
-      ColumnLayout {
+      NText {
-        spacing: Style.marginS * scaling
+        text: "To use these color schemes, you must turn off Matugen. With Matugen enabled, colors are automatically generated from your wallpaper."
+        font.pointSize: Style.fontSizeM * scaling
+        color: Color.mOnSurfaceVariant
         Layout.fillWidth: true
+        wrapMode: Text.WordWrap
+      }
 
-        NText {
+          // Color Schemes Grid
-          text: "Predefined Color Schemes"
+    GridLayout {
-          font.pointSize: Style.fontSizeXXL * scaling
+      columns: 3
-          font.weight: Style.fontWeightBold
+      rowSpacing: Style.marginM * scaling
-          color: Color.mSecondary
+      columnSpacing: Style.marginM * scaling
-        }
+      Layout.fillWidth: true
+
+      Repeater {
+        model: ColorSchemeService.schemes
+
+        Rectangle {
+          id: schemeCard
+
+          property string schemePath: modelData
 
-        NText {
-          text: "These color schemes are only active when 'Use Matugen' is turned off. With Matugen enabled, colors will be automatically generated from your wallpaper. You can still switch between light and dark themes while using Matugen."
-          font.pointSize: Style.fontSizeM * scaling
-          color: Color.mOnSurfaceVariant
           Layout.fillWidth: true
-          wrapMode: Text.WordWrap
+          Layout.preferredHeight: 120 * scaling
-        }
+          radius: Style.radiusM * scaling
-      }
+          color: getSchemeColor(modelData, "mSurface")
+          border.width: Math.max(1, Style.borderL * scaling)
+          border.color: (!Settings.data.colorSchemes.useWallpaperColors
+                          && (Settings.data.colorSchemes.predefinedScheme === modelData)) ? Color.mPrimary : Color.mOutline
+          scale: root.cardScaleLow
 
-      // Color Schemes Grid
+          // Mouse area for selection
-      GridLayout {
+          MouseArea {
-        columns: 3
+            anchors.fill: parent
-        rowSpacing: Style.marginM * scaling
+            onClicked: {
-        columnSpacing: Style.marginM * scaling
+              // Disable useWallpaperColors when picking a predefined color scheme
-        Layout.fillWidth: true
+              Settings.data.colorSchemes.useWallpaperColors = false
+              Logger.log("ColorSchemeTab", "Disabled matugen setting")
 
-        Repeater {
+              Settings.data.colorSchemes.predefinedScheme = schemePath
-          model: ColorSchemeService.schemes
+              ColorSchemeService.applyScheme(schemePath)
+            }
+            hoverEnabled: true
+            cursorShape: Qt.PointingHandCursor
 
-          Rectangle {
+            onEntered: {
-            id: schemeCard
+              schemeCard.scale = root.cardScaleHigh
-
-            property string schemePath: modelData
-
-            Layout.fillWidth: true
-            Layout.preferredHeight: 120 * scaling
-            radius: Style.radiusM * scaling
-            color: getSchemeColor(modelData, "mSurface")
-            border.width: Math.max(1, Style.borderL * scaling)
-            border.color: (!Settings.data.colorSchemes.useWallpaperColors
-                           && (Settings.data.colorSchemes.predefinedScheme === modelData)) ? Color.mPrimary : Color.mOutline
-            scale: root.cardScaleLow
-
-            // Mouse area for selection
-            MouseArea {
-              anchors.fill: parent
-              onClicked: {
-                // Disable useWallpaperColors when picking a predefined color scheme
-                Settings.data.colorSchemes.useWallpaperColors = false
-                Logger.log("ColorSchemeTab", "Disabled matugen setting")
-
-                Settings.data.colorSchemes.predefinedScheme = schemePath
-                ColorSchemeService.applyScheme(schemePath)
-              }
-              hoverEnabled: true
-              cursorShape: Qt.PointingHandCursor
-
-              onEntered: {
-                schemeCard.scale = root.cardScaleHigh
-              }
-
-              onExited: {
-                schemeCard.scale = root.cardScaleLow
-              }
             }
 
-            // Card content
+            onExited: {
-            ColumnLayout {
+              schemeCard.scale = root.cardScaleLow
-              anchors.fill: parent
+            }
-              anchors.margins: Style.marginXL * scaling
+          }
+
+          // Card content
+          ColumnLayout {
+            anchors.fill: parent
+            anchors.margins: Style.marginXL * scaling
+            spacing: Style.marginS * scaling
+
+            // Scheme name
+            NText {
+              text: {
+                // Remove json and the full path
+                var chunks = schemePath.replace(".json", "").split("/")
+                return chunks[chunks.length - 1]
+              }
+              font.pointSize: Style.fontSizeM * scaling
+              font.weight: Style.fontWeightBold
+              color: getSchemeColor(modelData, "mOnSurface")
+              Layout.fillWidth: true
+              elide: Text.ElideRight
+              horizontalAlignment: Text.AlignHCenter
+            }
+
+            // Color swatches
+            RowLayout {
+              id: swatches
+
               spacing: Style.marginS * scaling
+              Layout.fillWidth: true
+              Layout.alignment: Qt.AlignHCenter
 
-              // Scheme name
+              readonly property int swatchSize: 20 * scaling
-              NText {
+
-                text: {
+              // Primary color swatch
-                  // Remove json and the full path
+              Rectangle {
-                  var chunks = schemePath.replace(".json", "").split("/")
+                width: swatches.swatchSize
-                  return chunks[chunks.length - 1]
+                height: swatches.swatchSize
-                }
+                radius: width * 0.5
-                font.pointSize: Style.fontSizeM * scaling
+                color: getSchemeColor(modelData, "mPrimary")
-                font.weight: Style.fontWeightBold
-                color: getSchemeColor(modelData, "mOnSurface")
-                Layout.fillWidth: true
-                elide: Text.ElideRight
-                horizontalAlignment: Text.AlignHCenter
               }
 
-              // Color swatches
+              // Secondary color swatch
-              RowLayout {
+              Rectangle {
-                id: swatches
+                width: swatches.swatchSize
+                height: swatches.swatchSize
+                radius: width * 0.5
+                color: getSchemeColor(modelData, "mSecondary")
+              }
 
-                spacing: Style.marginS * scaling
+              // Tertiary color swatch
-                Layout.fillWidth: true
+              Rectangle {
-                Layout.alignment: Qt.AlignHCenter
+                width: swatches.swatchSize
+                height: swatches.swatchSize
+                radius: width * 0.5
+                color: getSchemeColor(modelData, "mTertiary")
+              }
 
-                readonly property int swatchSize: 20 * scaling
+              // Error color swatch
-
+              Rectangle {
-                // Primary color swatch
+                width: swatches.swatchSize
-                Rectangle {
+                height: swatches.swatchSize
-                  width: swatches.swatchSize
+                radius: width * 0.5
-                  height: swatches.swatchSize
+                color: getSchemeColor(modelData, "mError")
-                  radius: width * 0.5
-                  color: getSchemeColor(modelData, "mPrimary")
-                }
-
-                // Secondary color swatch
-                Rectangle {
-                  width: swatches.swatchSize
-                  height: swatches.swatchSize
-                  radius: width * 0.5
-                  color: getSchemeColor(modelData, "mSecondary")
-                }
-
-                // Tertiary color swatch
-                Rectangle {
-                  width: swatches.swatchSize
-                  height: swatches.swatchSize
-                  radius: width * 0.5
-                  color: getSchemeColor(modelData, "mTertiary")
-                }
-
-                // Error color swatch
-                Rectangle {
-                  width: swatches.swatchSize
-                  height: swatches.swatchSize
-                  radius: width * 0.5
-                  color: getSchemeColor(modelData, "mError")
-                }
               }
             }
+          }
 
-            // Selection indicator (Checkmark)
+          // Selection indicator (Checkmark)
-            Rectangle {
+          Rectangle {
-              visible: !Settings.data.colorSchemes.useWallpaperColors
+            visible: !Settings.data.colorSchemes.useWallpaperColors
-                       && (Settings.data.colorSchemes.predefinedScheme === schemePath)
+                      && (Settings.data.colorSchemes.predefinedScheme === schemePath)
-              anchors.right: parent.right
+            anchors.right: parent.right
-              anchors.top: parent.top
+            anchors.top: parent.top
-              anchors.margins: Style.marginS * scaling
+            anchors.margins: Style.marginS * scaling
-              width: 24 * scaling
+            width: 24 * scaling
-              height: 24 * scaling
+            height: 24 * scaling
-              radius: width * 0.5
+            radius: width * 0.5
-              color: Color.mPrimary
+            color: Color.mPrimary
 
-              NText {
+            NText {
-                anchors.centerIn: parent
+              anchors.centerIn: parent
-                text: "✓"
+              text: "✓"
-                font.pointSize: Style.fontSizeXS * scaling
+              font.pointSize: Style.fontSizeXS * scaling
-                font.weight: Style.fontWeightBold
+              font.weight: Style.fontWeightBold
-                color: Color.mOnPrimary
+              color: Color.mOnPrimary
-              }
             }
+          }
 
-            // Smooth animations
+          // Smooth animations
-            Behavior on scale {
+          Behavior on scale {
-              NumberAnimation {
+            NumberAnimation {
-                duration: Style.animationNormal
+              duration: Style.animationNormal
-                easing.type: Easing.OutCubic
+              easing.type: Easing.OutCubic
-              }
             }
+          }
 
-            Behavior on border.color {
+          Behavior on border.color {
-              ColorAnimation {
+            ColorAnimation {
-                duration: Style.animationNormal
+              duration: Style.animationNormal
-              }
             }
+          }
 
-            Behavior on border.width {
+          Behavior on border.width {
-              NumberAnimation {
+            NumberAnimation {
-                duration: Style.animationFast
+              duration: Style.animationFast
-              }
             }
           }
         }
       }
     }
-  }
+    }
+
+
+ 
+
 
   NDivider {
     Layout.fillWidth: true

Modules/SettingsPanel/Tabs/GeneralTab.qml

@@ -70,52 +70,6 @@ ColumnLayout {
       onToggled: checked => Settings.data.general.dimDesktop = checked
     }
 
-    NToggle {
-      label: "Auto-hide Dock"
-      description: "Automatically hide the dock when not in use."
-      checked: Settings.data.dock.autoHide
-      onToggled: checked => Settings.data.dock.autoHide = checked
-    }
-
-    ColumnLayout {
-      spacing: Style.marginXXS * scaling
-      Layout.fillWidth: true
-
-      NText {
-        text: "Dock Background Opacity"
-        font.pointSize: Style.fontSizeL * scaling
-        font.weight: Style.fontWeightBold
-        color: Color.mOnSurface
-      }
-
-      NText {
-        text: "Adjust the background opacity of the dock."
-        font.pointSize: Style.fontSizeXS * scaling
-        color: Color.mOnSurfaceVariant
-        wrapMode: Text.WordWrap
-        Layout.fillWidth: true
-      }
-
-      RowLayout {
-        NSlider {
-          Layout.fillWidth: true
-          from: 0
-          to: 1
-          stepSize: 0.01
-          value: Settings.data.dock.backgroundOpacity
-          onMoved: Settings.data.dock.backgroundOpacity = value
-          cutoutColor: Color.mSurface
-        }
-
-        NText {
-          text: Math.floor(Settings.data.dock.backgroundOpacity * 100) + "%"
-          Layout.alignment: Qt.AlignVCenter
-          Layout.leftMargin: Style.marginS * scaling
-          color: Color.mOnSurface
-        }
-      }
-    }
-
     ColumnLayout {
       spacing: Style.marginXXS * scaling
       Layout.fillWidth: true
@@ -175,7 +129,70 @@ ColumnLayout {
       }
     }
   }
+  NDivider {
+    Layout.fillWidth: true
+    Layout.topMargin: Style.marginXL * scaling
+    Layout.bottomMargin: Style.marginXL * scaling
+  }
 
+  // Dock
+  ColumnLayout {
+    spacing: Style.marginL * scaling
+    Layout.fillWidth: true
+    NText {
+      text: "Dock"
+      font.pointSize: Style.fontSizeXXL * scaling
+      font.weight: Style.fontWeightBold
+      color: Color.mSecondary
+      Layout.bottomMargin: Style.marginS * scaling
+    }
+
+    NToggle {
+      label: "Auto-hide Dock"
+      description: "Automatically hide the dock when not in use."
+      checked: Settings.data.dock.autoHide
+      onToggled: checked => Settings.data.dock.autoHide = checked
+    }
+
+    ColumnLayout {
+      spacing: Style.marginXXS * scaling
+      Layout.fillWidth: true
+
+      NText {
+        text: "Dock Background Opacity"
+        font.pointSize: Style.fontSizeL * scaling
+        font.weight: Style.fontWeightBold
+        color: Color.mOnSurface
+      }
+
+      NText {
+        text: "Adjust the background opacity of the dock."
+        font.pointSize: Style.fontSizeXS * scaling
+        color: Color.mOnSurfaceVariant
+        wrapMode: Text.WordWrap
+        Layout.fillWidth: true
+      }
+
+      RowLayout {
+        NSlider {
+          Layout.fillWidth: true
+          from: 0
+          to: 1
+          stepSize: 0.01
+          value: Settings.data.dock.backgroundOpacity
+          onMoved: Settings.data.dock.backgroundOpacity = value
+          cutoutColor: Color.mSurface
+        }
+
+        NText {
+          text: Math.floor(Settings.data.dock.backgroundOpacity * 100) + "%"
+          Layout.alignment: Qt.AlignVCenter
+          Layout.leftMargin: Style.marginS * scaling
+          color: Color.mOnSurface
+        }
+      }
+    }
+  }
   NDivider {
     Layout.fillWidth: true
     Layout.topMargin: Style.marginXL * scaling

Modules/SettingsPanel/Tabs/LauncherTab.qml

@@ -52,21 +52,7 @@ ColumnLayout {
       }
     }
 
-    NToggle {
+        ColumnLayout {
-      label: "Enable Clipboard History"
-      description: "Show clipboard history in the launcher."
-      checked: Settings.data.appLauncher.enableClipboardHistory
-      onToggled: checked => Settings.data.appLauncher.enableClipboardHistory = checked
-    }
-
-    NToggle {
-      label: "Use App2Unit for Launching"
-      description: "Use app2unit -- 'desktop-entry' when launching applications for better systemd integration."
-      checked: Settings.data.appLauncher.useApp2Unit
-      onToggled: checked => Settings.data.appLauncher.useApp2Unit = checked
-    }
-
-    ColumnLayout {
       spacing: Style.marginXXS * scaling
       Layout.fillWidth: true
 
@@ -105,6 +91,22 @@ ColumnLayout {
         }
       }
     }
+
+    NToggle {
+      label: "Enable Clipboard History"
+      description: "Show clipboard history in the launcher."
+      checked: Settings.data.appLauncher.enableClipboardHistory
+      onToggled: checked => Settings.data.appLauncher.enableClipboardHistory = checked
+    }
+
+    NToggle {
+      label: "Use App2Unit for Launching"
+      description: "Use app2unit -- 'desktop-entry' when launching applications for better systemd integration."
+      checked: Settings.data.appLauncher.useApp2Unit
+      onToggled: checked => Settings.data.appLauncher.useApp2Unit = checked
+    }
+
+
   }
 
   NDivider {