diff --git a/Modules/Bar/Widgets/CustomButton.qml b/Modules/Bar/Widgets/CustomButton.qml
index dd1c6cc1..29514254 100644
--- a/Modules/Bar/Widgets/CustomButton.qml
+++ b/Modules/Bar/Widgets/CustomButton.qml
@@ -99,7 +99,7 @@ Item {
 
   SplitParser {
     id: textStdoutSplit
-    onRead: function(line) {
+    onRead: function (line) {
       var lineStr = String(line || "").trim()
       var shouldCollapse = false
 
diff --git a/Modules/Bar/Widgets/Taskbar.qml b/Modules/Bar/Widgets/Taskbar.qml
index 73764b4e..959dc2df 100644
--- a/Modules/Bar/Widgets/Taskbar.qml
+++ b/Modules/Bar/Widgets/Taskbar.qml
@@ -136,7 +136,7 @@ Rectangle {
           // Apply dock shader to all taskbar icons
           layer.enabled: widgetSettings.colorizeIcons !== false
           layer.effect: ShaderEffect {
-            property color targetColor: Settings.data.colorSchemes.darkMode ? Color.mSurface : Color.mSurfaceVariant
+            property color targetColor: Settings.data.colorSchemes.darkMode ? Color.mOnSurface : Color.mSurfaceVariant
             property real colorizeMode: 0.0 // Dock mode (grayscale)
 
             fragmentShader: Qt.resolvedUrl(Quickshell.shellDir + "/Shaders/qsb/appicon_colorize.frag.qsb")
diff --git a/Modules/Bar/Widgets/Tray.qml b/Modules/Bar/Widgets/Tray.qml
index 36bc2f57..07e7b755 100644
--- a/Modules/Bar/Widgets/Tray.qml
+++ b/Modules/Bar/Widgets/Tray.qml
@@ -194,8 +194,8 @@ Rectangle {
 
           layer.enabled: widgetSettings.colorizeIcons !== false
           layer.effect: ShaderEffect {
-            property color targetColor: Settings.data.colorSchemes.darkMode ? Color.mSurface : Color.mSurfaceVariant
-            property real colorizeMode: 1.0 // Tray mode (intensity-based)
+            property color targetColor: Settings.data.colorSchemes.darkMode ? Color.mOnSurface : Color.mSurfaceVariant
+            property real colorizeMode: 1.0
 
             fragmentShader: Qt.resolvedUrl(Quickshell.shellDir + "/Shaders/qsb/appicon_colorize.frag.qsb")
           }
diff --git a/Services/SystemStatService.qml b/Services/SystemStatService.qml
index cf58b75a..24ce5e5f 100644
--- a/Services/SystemStatService.qml
+++ b/Services/SystemStatService.qml
@@ -101,7 +101,7 @@ Singleton {
         const lines = text.trim().split('\n')
         const newPercents = {}
         // Start from line 1 (skip header)
-        for (let i = 1; i < lines.length; i++) {
+        for (var i = 1; i < lines.length; i++) {
           const parts = lines[i].trim().split(/\s+/)
           if (parts.length >= 2) {
             const target = parts[0]