diff --git a/Modules/SettingsPanel/Tabs/AudioTab.qml b/Modules/SettingsPanel/Tabs/AudioTab.qml
index 27aca33..c7755d0 100644
--- a/Modules/SettingsPanel/Tabs/AudioTab.qml
+++ b/Modules/SettingsPanel/Tabs/AudioTab.qml
@@ -12,7 +12,7 @@ ColumnLayout {
 
   NHeader {
     label: "Volumes"
-    description: "Configure system audio, devices, and media player preferences."
+    description: "Configure volume controls and audio levels."
   }
 
   property real localVolume: AudioService.volume
@@ -25,9 +25,9 @@ ColumnLayout {
   }
 
   // Master Volume
-    ColumnLayout {
-      spacing: Style.marginXXS * scaling
-      Layout.fillWidth: true
+  ColumnLayout {
+    spacing: Style.marginXXS * scaling
+    Layout.fillWidth: true
 
     NLabel {
       label: "Output Volume"
@@ -162,6 +162,7 @@ ColumnLayout {
 
     NHeader {
       label: "Audio Devices"
+      description: "Configure audio input and output devices."
     }
 
     // -------------------------------
@@ -233,6 +234,7 @@ ColumnLayout {
 
     NHeader {
       label: "Media Player"
+      description: "Configure your favorite media players."
     }
 
     // Preferred player
@@ -355,6 +357,7 @@ ColumnLayout {
 
     NHeader {
       label: "Audio Visualizer"
+      description: "Customize visual effects that respond to audio playback."
     }
 
     // AudioService Visualizer section
diff --git a/Modules/SettingsPanel/Tabs/BarTab.qml b/Modules/SettingsPanel/Tabs/BarTab.qml
index a38d5d3..c9d24d5 100644
--- a/Modules/SettingsPanel/Tabs/BarTab.qml
+++ b/Modules/SettingsPanel/Tabs/BarTab.qml
@@ -9,11 +9,8 @@ import qs.Modules.SettingsPanel.Bar
 
 ColumnLayout {
   id: root
+  spacing: Style.marginL * scaling
 
-  NHeader {
-    label: "Appearance"
-    description: "Configure bar appearance and positioning."
-  }
 
   // Helper functions to update arrays immutably
   function addMonitor(list, name) {
@@ -43,9 +40,12 @@ ColumnLayout {
       panel.enableBackgroundClick()
     }
   }
+  
+  NHeader {
+    label: "Appearance"
+    description: "Configure bar appearance and positioning."
+  }
 
-  ColumnLayout {
-    spacing: Style.marginL * scaling
 
     RowLayout {
       NComboBox {
@@ -75,34 +75,34 @@ ColumnLayout {
       }
     }
 
-        ColumnLayout {
+    ColumnLayout {
       spacing: Style.marginXXS * scaling
       Layout.fillWidth: true
 
-    NLabel {
-      label: "Background Opacity"
-      description: "Adjust the background opacity of the bar."
-    }
-
-    RowLayout {
-      NSlider {
-        Layout.fillWidth: true
-        from: 0
-        to: 1
-        stepSize: 0.01
-        value: Settings.data.bar.backgroundOpacity
-        onMoved: Settings.data.bar.backgroundOpacity = value
-        cutoutColor: Color.mSurface
+      NLabel {
+        label: "Background Opacity"
+        description: "Adjust the background opacity of the bar."
       }
 
-      NText {
-        text: Math.floor(Settings.data.bar.backgroundOpacity * 100) + "%"
-        Layout.alignment: Qt.AlignVCenter
-        Layout.leftMargin: Style.marginS * scaling
-        color: Color.mOnSurface
-      }
-    }
+      RowLayout {
+        NSlider {
+          Layout.fillWidth: true
+          from: 0
+          to: 1
+          stepSize: 0.01
+          value: Settings.data.bar.backgroundOpacity
+          onMoved: Settings.data.bar.backgroundOpacity = value
+          cutoutColor: Color.mSurface
         }
+
+        NText {
+          text: Math.floor(Settings.data.bar.backgroundOpacity * 100) + "%"
+          Layout.alignment: Qt.AlignVCenter
+          Layout.leftMargin: Style.marginS * scaling
+          color: Color.mOnSurface
+        }
+      }
+    }
     NToggle {
       Layout.fillWidth: true
       label: "Floating Bar"
@@ -189,7 +189,7 @@ ColumnLayout {
         }
       }
     }
-  }
+  
 
   NDivider {
     Layout.fillWidth: true
diff --git a/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml b/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml
index 3270fde..f20b711 100644
--- a/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml
+++ b/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml
@@ -8,12 +8,9 @@ import qs.Widgets
 
 ColumnLayout {
   id: root
-  spacing: 0
+  spacing: Style.marginL * scaling
+
 
-  NHeader {
-    label: "Behavior"
-    description: "Main settings for Noctalia's colors."
-  }
 
   // Cache for scheme JSON (can be flat or {dark, light})
   property var schemeColorsCache: ({})
@@ -109,10 +106,12 @@ ColumnLayout {
     }
   }
 
+
   // Main Toggles - Dark Mode / Matugen
-  ColumnLayout {
-    spacing: Style.marginL * scaling
-    Layout.fillWidth: true
+  NHeader {
+    label: "Behavior"
+    description: "Main settings for Noctalia's colors."
+  }
 
     // Dark Mode Toggle (affects both Matugen and predefined schemes that provide variants)
     NToggle {
@@ -143,7 +142,7 @@ ColumnLayout {
                    }
                  }
     }
-  }
+ 
 
   NDivider {
     Layout.fillWidth: true
diff --git a/Modules/SettingsPanel/Tabs/DisplayTab.qml b/Modules/SettingsPanel/Tabs/DisplayTab.qml
index 37ad166..f360e1c 100644
--- a/Modules/SettingsPanel/Tabs/DisplayTab.qml
+++ b/Modules/SettingsPanel/Tabs/DisplayTab.qml
@@ -220,6 +220,7 @@ ColumnLayout {
 
     NHeader {
       label: "Brightness"
+      description: "Adjust brightness related settings."
     }
 
     // Brightness Step Section
@@ -230,7 +231,7 @@ ColumnLayout {
       NSpinBox {
         Layout.fillWidth: true
         label: "Brightness Step Size"
-        description: "Adjust the step size for brightness changes (scroll wheel, keyboard shortcuts)."
+        description: "Adjust the step size for brightness changes (scroll wheel and keyboard shortcuts)."
         minimum: 1
         maximum: 50
         value: Settings.data.brightness.brightnessStep
diff --git a/Modules/SettingsPanel/Tabs/DockTab.qml b/Modules/SettingsPanel/Tabs/DockTab.qml
index 9854a83..7324838 100644
--- a/Modules/SettingsPanel/Tabs/DockTab.qml
+++ b/Modules/SettingsPanel/Tabs/DockTab.qml
@@ -10,10 +10,7 @@ ColumnLayout {
   id: root
   spacing: Style.marginL * scaling
 
-  NHeader {
-    label: "Appearance"
-    description: "Configure dock behavior and appearance."
-  }
+
 
   // Helper functions to update arrays immutably
   function addMonitor(list, name) {
@@ -28,6 +25,11 @@ ColumnLayout {
     })
   }
 
+  NHeader {
+    label: "Appearance"
+    description: "Configure dock behavior and appearance."
+  }
+
   NToggle {
     label: "Auto-hide"
     description: "Automatically hide when not in use."
diff --git a/Modules/SettingsPanel/Tabs/LauncherTab.qml b/Modules/SettingsPanel/Tabs/LauncherTab.qml
index 99f7994..6427918 100644
--- a/Modules/SettingsPanel/Tabs/LauncherTab.qml
+++ b/Modules/SettingsPanel/Tabs/LauncherTab.qml
@@ -7,15 +7,13 @@ import qs.Widgets
 
 ColumnLayout {
   id: root
+  spacing: Style.marginL * scaling
 
   NHeader {
     label: "Appearance"
     description: "Configure the launcher behavior and appearance."
   }
 
-  ColumnLayout {
-    spacing: Style.marginL * scaling
-
     NComboBox {
       id: launcherPosition
       label: "Position"
@@ -110,7 +108,7 @@ ColumnLayout {
       checked: Settings.data.appLauncher.useApp2Unit
       onToggled: checked => Settings.data.appLauncher.useApp2Unit = checked
     }
-  }
+  
 
   NDivider {
     Layout.fillWidth: true
diff --git a/Modules/SettingsPanel/Tabs/WallpaperSelectorTab.qml b/Modules/SettingsPanel/Tabs/WallpaperSelectorTab.qml
index c9a4ecc..a6d340a 100644
--- a/Modules/SettingsPanel/Tabs/WallpaperSelectorTab.qml
+++ b/Modules/SettingsPanel/Tabs/WallpaperSelectorTab.qml
@@ -11,7 +11,6 @@ ColumnLayout {
   width: parent.width
   spacing: Style.marginL * scaling
 
-
   property list<string> wallpapersList: []
   property string currentWallpaper: ""
 
diff --git a/Modules/SettingsPanel/Tabs/WallpaperTab.qml b/Modules/SettingsPanel/Tabs/WallpaperTab.qml
index 95ac775..f36c462 100644
--- a/Modules/SettingsPanel/Tabs/WallpaperTab.qml
+++ b/Modules/SettingsPanel/Tabs/WallpaperTab.qml
@@ -9,10 +9,11 @@ import qs.Widgets
 
 ColumnLayout {
   id: root
+  spacing: Style.marginL * scaling
 
   NHeader {
-    label: "Wallpaper Management"
-    description: "Configure wallpaper settings, automation, and appearance options."
+    label: "Wallpaper Settings"
+    description: "Control how wallpapers are managed and displayed."
   }
 
   NToggle {
@@ -27,6 +28,7 @@ ColumnLayout {
     visible: Settings.data.wallpaper.enabled
     spacing: Style.marginL * scaling
     Layout.fillWidth: true
+    
     NTextInput {
       label: "Wallpaper Directory"
       description: "Path to your common wallpaper directory."
@@ -66,7 +68,7 @@ ColumnLayout {
           delegate: RowLayout {
             NText {
               text: (modelData.name || "Unknown")
-              color: Color.mSecondary
+              color: Color.mPrimary
               font.weight: Style.fontWeightBold
               Layout.preferredWidth: 90 * scaling
             }
diff --git a/Modules/SettingsPanel/Tabs/WeatherTab.qml b/Modules/SettingsPanel/Tabs/WeatherTab.qml
index 36daf22..dbf9f5f 100644
--- a/Modules/SettingsPanel/Tabs/WeatherTab.qml
+++ b/Modules/SettingsPanel/Tabs/WeatherTab.qml
@@ -7,10 +7,11 @@ import qs.Widgets
 
 ColumnLayout {
   id: root
+  spacing: Style.marginL * scaling
 
   NHeader {
- label: "Your Location" 
-  description: "Set your location for weather, time zones, and scheduling."
+    label: "Your Location"
+    description: "Set your location for weather, time zones, and scheduling."
   }
 
   // Location section
@@ -64,6 +65,7 @@ ColumnLayout {
 
     NHeader {
       label: "Weather"
+      description: "Configure weather display preferences and temperature units."
     }
 
     NToggle {