diff --git a/Modules/Bar/BluetoothPanel.qml b/Modules/Bar/BluetoothPanel.qml
index eeb4c7f..b583897 100644
--- a/Modules/Bar/BluetoothPanel.qml
+++ b/Modules/Bar/BluetoothPanel.qml
@@ -118,7 +118,7 @@ NPanel {
               radius: Style.radiusM * scaling
               color: {
                 if (availableDeviceArea.containsMouse && !isBusy)
-                  return Color.mTertiary
+                  return Color.mSecondary
 
                 if (modelData.pairing || modelData.state === BluetoothDeviceState.Connecting)
                   return Color.mPrimary
diff --git a/Modules/Bar/TrayMenu.qml b/Modules/Bar/TrayMenu.qml
index a3a24fd..699d8d1 100644
--- a/Modules/Bar/TrayMenu.qml
+++ b/Modules/Bar/TrayMenu.qml
@@ -134,7 +134,7 @@ PopupWindow {
 
           Rectangle {
             anchors.fill: parent
-            color: mouseArea.containsMouse ? Color.mTertiary : Color.transparent
+            color: mouseArea.containsMouse ? Color.mSecondary : Color.transparent
             radius: Style.radiusS * scaling
             visible: !(modelData?.isSeparator ?? false)
 
diff --git a/Modules/Bar/WiFiPanel.qml b/Modules/Bar/WiFiPanel.qml
index 8d88cd9..ce5acef 100644
--- a/Modules/Bar/WiFiPanel.qml
+++ b/Modules/Bar/WiFiPanel.qml
@@ -147,7 +147,7 @@ NPanel {
                 Layout.fillWidth: true
                 Layout.preferredHeight: Style.baseWidgetSize * 1.5 * scaling
                 radius: Style.radiusS * scaling
-                color: modelData.connected ? Color.mPrimary : (networkMouseArea.containsMouse ? Color.mTertiary : Color.transparent)
+                color: modelData.connected ? Color.mPrimary : (networkMouseArea.containsMouse ? Color.mSecondary : Color.transparent)
 
                 RowLayout {
                   anchors.fill: parent
diff --git a/Modules/Launcher/Launcher.qml b/Modules/Launcher/Launcher.qml
index 39ebc6b..4679200 100644
--- a/Modules/Launcher/Launcher.qml
+++ b/Modules/Launcher/Launcher.qml
@@ -225,7 +225,7 @@ NPanel {
         Layout.bottomMargin: Style.marginM * scaling
         radius: Style.radiusM * scaling
         color: Color.mSurface
-        border.color: searchInput.activeFocus ? Color.mTertiary : Color.mOutline
+        border.color: searchInput.activeFocus ? Color.mSecondary : Color.mOutline
         border.width: Math.max(1, searchInput.activeFocus ? Style.borderM * scaling : Style.borderS * scaling)
 
         Item {
@@ -355,7 +355,7 @@ NPanel {
           height: 65 * scaling
           radius: Style.radiusM * scaling
           property bool isSelected: index === selectedIndex
-          color: (appCardArea.containsMouse || isSelected) ? Color.mTertiary : Color.mSurface
+          color: (appCardArea.containsMouse || isSelected) ? Color.mSecondary : Color.mSurface
 
           Behavior on color {
             ColorAnimation {
diff --git a/Modules/Notification/NotificationHistoryPanel.qml b/Modules/Notification/NotificationHistoryPanel.qml
index 915c1a4..74eb075 100644
--- a/Modules/Notification/NotificationHistoryPanel.qml
+++ b/Modules/Notification/NotificationHistoryPanel.qml
@@ -111,7 +111,7 @@ NPanel {
           width: notificationList ? notificationList.width : 380 * scaling
           height: Math.max(80, notificationContent.height + 30)
           radius: Style.radiusM * scaling
-          color: notificationMouseArea.containsMouse ? Color.mTertiary : Color.mSurfaceVariant
+          color: notificationMouseArea.containsMouse ? Color.mSecondary : Color.mSurfaceVariant
 
           RowLayout {
             anchors {
diff --git a/Modules/PowerPanel/PowerPanel.qml b/Modules/PowerPanel/PowerPanel.qml
index a32211e..9066444 100644
--- a/Modules/PowerPanel/PowerPanel.qml
+++ b/Modules/PowerPanel/PowerPanel.qml
@@ -215,7 +215,7 @@ NPanel {
       if (pending)
         return Color.applyOpacity(Color.mPrimary, "20")
       if (mouseArea.containsMouse)
-        return Color.mTertiary
+        return Color.mSecondary
       return Color.transparent
     }
 
diff --git a/Modules/SettingsPanel/SettingsPanel.qml b/Modules/SettingsPanel/SettingsPanel.qml
index 2df15d9..73c4293 100644
--- a/Modules/SettingsPanel/SettingsPanel.qml
+++ b/Modules/SettingsPanel/SettingsPanel.qml
@@ -202,7 +202,7 @@ NPanel {
               width: parent.width
               height: 32 * scaling
               radius: Style.radiusS * scaling
-              color: selected ? Color.mPrimary : (tabItem.hovering ? Color.mTertiary : Color.transparent)
+              color: selected ? Color.mPrimary : (tabItem.hovering ? Color.mSecondary : Color.transparent)
               readonly property bool selected: index === currentTabIndex
               property bool hovering: false
               property color tabTextColor: selected ? Color.mOnPrimary : (tabItem.hovering ? Color.mOnTertiary : Color.mOnSurface)
diff --git a/Modules/SettingsPanel/Tabs/AboutTab.qml b/Modules/SettingsPanel/Tabs/AboutTab.qml
index 405ed1b..5ae5d12 100644
--- a/Modules/SettingsPanel/Tabs/AboutTab.qml
+++ b/Modules/SettingsPanel/Tabs/AboutTab.qml
@@ -199,7 +199,7 @@ ColumnLayout {
             width: contributorsGrid.cellWidth - Style.marginL * scaling
             height: contributorsGrid.cellHeight - Style.marginXS * scaling
             radius: Style.radiusL * scaling
-            color: contributorArea.containsMouse ? Color.mTertiary : Color.transparent
+            color: contributorArea.containsMouse ? Color.mSecondary : Color.transparent
 
             RowLayout {
               anchors.fill: parent
diff --git a/Modules/SidePanel/Cards/MediaCard.qml b/Modules/SidePanel/Cards/MediaCard.qml
index 3c3d2ce..7809a5f 100644
--- a/Modules/SidePanel/Cards/MediaCard.qml
+++ b/Modules/SidePanel/Cards/MediaCard.qml
@@ -76,7 +76,7 @@ NBox {
           // implicitWidth: 120 * scaling
           // implicitHeight: 30 * scaling
           color: Color.transparent
-          border.color: playerSelector.activeFocus ? Color.mTertiary : Color.mOutline
+          border.color: playerSelector.activeFocus ? Color.mSecondary : Color.mOutline
           border.width: Math.max(1, Style.borderS * scaling)
           radius: Style.radiusM * scaling
         }
@@ -138,7 +138,7 @@ NBox {
 
           background: Rectangle {
             width: popup.width - Style.marginS * scaling * 2
-            color: highlighted ? Color.mTertiary : Color.transparent
+            color: highlighted ? Color.mSecondary : Color.transparent
             radius: Style.radiusXS * scaling
           }
         }
diff --git a/Services/ColorSchemeService.qml b/Services/ColorSchemeService.qml
index b4b52ce..0847f07 100644
--- a/Services/ColorSchemeService.qml
+++ b/Services/ColorSchemeService.qml
@@ -90,6 +90,7 @@ Singleton {
     id: colorsWriter
     path: colorsJsonFilePath
     onSaved: {
+
       // Logger.log("ColorScheme", "Colors saved")
     }
     JsonAdapter {
diff --git a/Widgets/NComboBox.qml b/Widgets/NComboBox.qml
index 29fa6e6..9ec2aaf 100644
--- a/Widgets/NComboBox.qml
+++ b/Widgets/NComboBox.qml
@@ -50,7 +50,7 @@ ColumnLayout {
       implicitWidth: Style.baseWidgetSize * 3.75 * scaling
       implicitHeight: preferredHeight
       color: Color.mSurface
-      border.color: combo.activeFocus ? Color.mTertiary : Color.mOutline
+      border.color: combo.activeFocus ? Color.mSecondary : Color.mOutline
       border.width: Math.max(1, Style.borderS * scaling)
       radius: Style.radiusM * scaling
     }
@@ -112,7 +112,7 @@ ColumnLayout {
 
           background: Rectangle {
             width: combo.width - Style.marginM * scaling * 3
-            color: highlighted ? Color.mTertiary : Color.transparent
+            color: highlighted ? Color.mSecondary : Color.transparent
             radius: Style.radiusS * scaling
           }
         }
diff --git a/Widgets/NTextInput.qml b/Widgets/NTextInput.qml
index 1d9a138..bc1a955 100644
--- a/Widgets/NTextInput.qml
+++ b/Widgets/NTextInput.qml
@@ -46,7 +46,7 @@ Item {
         anchors.fill: parent
         radius: frame.radius
         color: Color.transparent
-        border.color: input.activeFocus ? Color.mTertiary : Color.transparent
+        border.color: input.activeFocus ? Color.mSecondary : Color.transparent
         border.width: input.activeFocus ? Math.max(1, Style.borderS * scaling) : 0
       }