diff --git a/Modules/SettingsPanel/Tabs/BrightnessTab.qml b/Modules/SettingsPanel/Tabs/BrightnessTab.qml
index 3b61e7b..cc4ce78 100644
--- a/Modules/SettingsPanel/Tabs/BrightnessTab.qml
+++ b/Modules/SettingsPanel/Tabs/BrightnessTab.qml
@@ -6,25 +6,31 @@ import qs.Commons
 import qs.Services
 import qs.Widgets
 
-Item {
-  property real scaling: 1
+ColumnLayout {
+  id: root
+  spacing: 0
+
   readonly property string tabIcon: "brightness_6"
   readonly property string tabLabel: "Brightness"
-  Layout.fillWidth: true
-  Layout.fillHeight: true
 
   ScrollView {
-    anchors.fill: parent
+    id: scrollView
+    Layout.fillWidth: true
+    Layout.fillHeight: true
+    padding: Style.marginM * scaling
     clip: true
+
+    ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
     ScrollBar.vertical.policy: ScrollBar.AsNeeded
-    ScrollBar.horizontal.policy: ScrollBar.AsNeeded
-    contentWidth: parent.width
 
     ColumnLayout {
-      width: parent.width
+      width: scrollView.availableWidth
+      spacing: 0
+
       ColumnLayout {
+
+        width: scrollView.availableWidth
         spacing: Style.marginL * scaling
-        Layout.margins: Style.marginL * scaling
         Layout.fillWidth: true
 
         NText {
diff --git a/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml b/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml
index c7343b6..7274ca3 100644
--- a/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml
+++ b/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml
@@ -107,6 +107,13 @@ ColumnLayout {
         spacing: Style.marginL * scaling
         Layout.fillWidth: true
 
+        NText {
+          text: "Colors Settings"
+          font.pointSize: Style.fontSizeXXL * scaling
+          font.weight: Style.fontWeightBold
+          color: Color.mOnSurface
+        }
+
         // Dark Mode Toggle (affects both Matugen and predefined schemes that provide variants)
         NToggle {
           label: "Dark Mode"
@@ -163,22 +170,28 @@ ColumnLayout {
           Layout.bottomMargin: Style.marginL * scaling
         }
 
+        NText {
+          text: "Predefined Color Schemes"
+          font.pointSize: Style.fontSizeXXL * scaling
+          font.weight: Style.fontWeightBold
+          color: Color.mOnSurface
+        }
+
         ColumnLayout {
           spacing: Style.marginXXS * scaling
           Layout.fillWidth: true
 
-          NText {
-            text: "Predefined Color Schemes"
-            font.pointSize: Style.fontSizeL * scaling
-            font.weight: Style.fontWeightBold
-            color: Color.mOnSurface
-            Layout.fillWidth: true
-          }
-
+          // NText {
+          //   text: "Predefined Color Schemes"
+          //   font.pointSize: Style.fontSizeL * scaling
+          //   font.weight: Style.fontWeightBold
+          //   color: Color.mOnSurface
+          //   Layout.fillWidth: true
+          // }
           NText {
             text: "These color schemes only apply when 'Use Matugen' is disabled. When enabled, Matugen will generate colors based on your wallpaper instead. You can toggle between light and dark themes when using Matugen."
             font.pointSize: Style.fontSizeXS * scaling
-            color: Color.mOnSurface
+            color: Color.mOnSurfaceVariant
             Layout.fillWidth: true
             wrapMode: Text.WordWrap
           }