diff --git a/Commons/Color.qml b/Commons/Color.qml
index 4b5884a5..ccbd906b 100644
--- a/Commons/Color.qml
+++ b/Commons/Color.qml
@@ -44,6 +44,10 @@ Singleton {
 
   property color transparent: "transparent"
 
+  // Extra colors that are auto generated
+  readonly property color mHover: Settings.data.colorSchemes.darkMode ? Qt.darker(mOnSurface, 1.25) : Qt.lighter(mOnSurface, 3.0)
+  readonly property color mOnHover: Settings.data.colorSchemes.darkMode ? Qt.darker(mSurface, 1.25) : Qt.lighter(mSurface, 3.0)
+
   // --------------------------------
   // Default colors: RosePine
   QtObject {
diff --git a/Modules/Bar/Extras/BarPillHorizontal.qml b/Modules/Bar/Extras/BarPillHorizontal.qml
index e5e5ccda..c9d84869 100644
--- a/Modules/Bar/Extras/BarPillHorizontal.qml
+++ b/Modules/Bar/Extras/BarPillHorizontal.qml
@@ -135,7 +135,7 @@ Item {
     width: pillHeight
     height: pillHeight
     radius: width * 0.5
-    color: hovered ? Color.mTertiary : Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent
+    color: hovered ? Color.mHover : Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent
     anchors.verticalCenter: parent.verticalCenter
 
     x: oppositeDirection ? 0 : (parent.width - width)
@@ -151,7 +151,7 @@ Item {
       icon: root.icon
       pointSize: iconSize
       applyUiScale: false
-      color: hovered ? Color.mOnTertiary : Color.mOnSurface
+      color: hovered ? Color.mOnHover : Color.mOnSurface
       // Center horizontally
       x: (iconCircle.width - width) / 2
       // Center vertically accounting for font metrics
diff --git a/Modules/Bar/Extras/BarPillVertical.qml b/Modules/Bar/Extras/BarPillVertical.qml
index fe94a534..492ec735 100644
--- a/Modules/Bar/Extras/BarPillVertical.qml
+++ b/Modules/Bar/Extras/BarPillVertical.qml
@@ -156,7 +156,7 @@ Item {
     width: buttonSize
     height: buttonSize
     radius: width * 0.5
-    color: hovered ? Color.mTertiary : Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent
+    color: hovered ? Color.mHover : Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent
 
     // Icon positioning based on direction
     x: 0
@@ -174,7 +174,7 @@ Item {
       icon: root.icon
       pointSize: iconSize
       applyUiScale: false
-      color: hovered ? Color.mOnTertiary : Color.mOnSurface
+      color: hovered ? Color.mOnHover : Color.mOnSurface
       // Center horizontally
       x: (iconCircle.width - width) / 2
       // Center vertically accounting for font metrics
diff --git a/Modules/Bar/Extras/TrayMenu.qml b/Modules/Bar/Extras/TrayMenu.qml
index 4a66ccb6..22860079 100644
--- a/Modules/Bar/Extras/TrayMenu.qml
+++ b/Modules/Bar/Extras/TrayMenu.qml
@@ -134,7 +134,7 @@ PopupWindow {
 
           Rectangle {
             anchors.fill: parent
-            color: mouseArea.containsMouse ? Color.mTertiary : Color.transparent
+            color: mouseArea.containsMouse ? Color.mHover : Color.transparent
             radius: Style.radiusS
             visible: !(modelData?.isSeparator ?? false)
 
@@ -147,7 +147,7 @@ PopupWindow {
               NText {
                 id: text
                 Layout.fillWidth: true
-                color: (modelData?.enabled ?? true) ? (mouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface) : Color.mOnSurfaceVariant
+                color: (modelData?.enabled ?? true) ? (mouseArea.containsMouse ? Color.mOnHover : Color.mOnSurface) : Color.mOnSurfaceVariant
                 text: modelData?.text !== "" ? modelData?.text.replace(/[\n\r]+/g, ' ') : "..."
                 pointSize: Style.fontSizeS
                 verticalAlignment: Text.AlignVCenter
@@ -168,7 +168,7 @@ PopupWindow {
                 applyUiScale: false
                 verticalAlignment: Text.AlignVCenter
                 visible: modelData?.hasChildren ?? false
-                color: (mouseArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface)
+                color: (mouseArea.containsMouse ? Color.mOnHover : Color.mOnSurface)
               }
             }
 
diff --git a/Modules/Bar/Widgets/ControlCenter.qml b/Modules/Bar/Widgets/ControlCenter.qml
index be793115..9e08fa84 100644
--- a/Modules/Bar/Widgets/ControlCenter.qml
+++ b/Modules/Bar/Widgets/ControlCenter.qml
@@ -41,9 +41,9 @@ NIconButton {
   density: Settings.data.bar.density
   colorBg: (Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent)
   colorFg: Color.mOnSurface
-  colorBgHover: useDistroLogo ? Color.mSurfaceVariant : Color.mTertiary
+  colorBgHover: useDistroLogo ? Color.mSurfaceVariant : Color.mHover
   colorBorder: Color.transparent
-  colorBorderHover: useDistroLogo ? Color.mTertiary : Color.transparent
+  colorBorderHover: useDistroLogo ? Color.mHover : Color.transparent
   onClicked: PanelService.getPanel("controlCenterPanel")?.toggle(this)
   onRightClicked: PanelService.getPanel("settingsPanel")?.toggle()
 
diff --git a/Modules/ControlCenter/Cards/AudioCard.qml b/Modules/ControlCenter/Cards/AudioCard.qml
index 95d33803..3370b71f 100644
--- a/Modules/ControlCenter/Cards/AudioCard.qml
+++ b/Modules/ControlCenter/Cards/AudioCard.qml
@@ -72,8 +72,8 @@ NBox {
           baseSize: Style.baseWidgetSize * 0.5
           colorFg: AudioService.muted ? Color.mError : Color.mOnSurface
           colorBg: Color.transparent
-          colorBgHover: Color.mTertiary
-          colorFgHover: Color.mOnTertiary
+          colorBgHover: Color.mHover
+          colorFgHover: Color.mOnHover
           onClicked: {
             if (AudioService.sink && AudioService.sink.audio) {
               AudioService.sink.audio.muted = !AudioService.muted
@@ -124,8 +124,8 @@ NBox {
           baseSize: Style.baseWidgetSize * 0.5
           colorFg: AudioService.inputMuted ? Color.mError : Color.mOnSurface
           colorBg: Color.transparent
-          colorBgHover: Color.mTertiary
-          colorFgHover: Color.mOnTertiary
+          colorBgHover: Color.mHover
+          colorFgHover: Color.mOnHover
           onClicked: AudioService.setInputMuted(!AudioService.inputMuted)
         }
 
diff --git a/Modules/Dock/DockMenu.qml b/Modules/Dock/DockMenu.qml
index c495cbac..060caa44 100644
--- a/Modules/Dock/DockMenu.qml
+++ b/Modules/Dock/DockMenu.qml
@@ -255,7 +255,7 @@ PopupWindow {
         Rectangle {
           Layout.fillWidth: true
           height: 32
-          color: root.hoveredItem === index ? Color.mTertiary : Color.transparent
+          color: root.hoveredItem === index ? Color.mHover : Color.transparent
           radius: Style.radiusXS
 
           RowLayout {
@@ -267,14 +267,14 @@ PopupWindow {
             NIcon {
               icon: modelData.icon
               pointSize: Style.fontSizeL
-              color: root.hoveredItem === index ? Color.mOnTertiary : Color.mOnSurfaceVariant
+              color: root.hoveredItem === index ? Color.mOnHover : Color.mOnSurfaceVariant
               Layout.alignment: Qt.AlignVCenter
             }
 
             NText {
               text: modelData.text
               pointSize: Style.fontSizeS
-              color: root.hoveredItem === index ? Color.mOnTertiary : Color.mOnSurfaceVariant
+              color: root.hoveredItem === index ? Color.mOnHover : Color.mOnSurfaceVariant
               Layout.alignment: Qt.AlignVCenter
               elide: Text.ElideRight
             }
diff --git a/Modules/Launcher/Launcher.qml b/Modules/Launcher/Launcher.qml
index fdb87bde..03c6f0af 100644
--- a/Modules/Launcher/Launcher.qml
+++ b/Modules/Launcher/Launcher.qml
@@ -416,7 +416,7 @@ NPanel {
           width: resultsList.width - Style.marginS
           implicitHeight: entryHeight
           radius: Style.radiusM
-          color: entry.isSelected ? Color.mTertiary : Color.mSurface
+          color: entry.isSelected ? Color.mHover : Color.mSurface
 
           Behavior on color {
             ColorAnimation {
@@ -548,7 +548,7 @@ NPanel {
                   text: modelData.name || "Unknown"
                   pointSize: Style.fontSizeL
                   font.weight: Style.fontWeightBold
-                  color: entry.isSelected ? Color.mOnTertiary : Color.mOnSurface
+                  color: entry.isSelected ? Color.mOnHover : Color.mOnSurface
                   elide: Text.ElideRight
                   Layout.fillWidth: true
                 }
@@ -556,7 +556,7 @@ NPanel {
                 NText {
                   text: modelData.description || ""
                   pointSize: Style.fontSizeS
-                  color: entry.isSelected ? Color.mOnTertiary : Color.mOnSurfaceVariant
+                  color: entry.isSelected ? Color.mOnHover : Color.mOnSurfaceVariant
                   elide: Text.ElideRight
                   Layout.fillWidth: true
                   visible: text !== ""
diff --git a/Modules/LockScreen/LockScreen.qml b/Modules/LockScreen/LockScreen.qml
index 7967f780..61c16980 100644
--- a/Modules/LockScreen/LockScreen.qml
+++ b/Modules/LockScreen/LockScreen.qml
@@ -1089,7 +1089,7 @@ Loader {
                     Layout.fillWidth: true
                     Layout.preferredHeight: Settings.data.general.compactLockScreen ? 36 : 48
                     radius: Settings.data.general.compactLockScreen ? 18 : 24
-                    color: logoutButtonArea.containsMouse ? Color.mTertiary : "transparent"
+                    color: logoutButtonArea.containsMouse ? Color.mHover : "transparent"
                     border.color: Color.mOutline
                     border.width: 1
 
@@ -1100,13 +1100,13 @@ Loader {
                       NIcon {
                         icon: "logout"
                         pointSize: Settings.data.general.compactLockScreen ? Style.fontSizeM : Style.fontSizeL
-                        color: logoutButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurfaceVariant
+                        color: logoutButtonArea.containsMouse ? Color.mOnHover : Color.mOnSurfaceVariant
                       }
 
                       NText {
                         text: I18n.tr("session-menu.logout")
-                        color: logoutButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurfaceVariant
                         pointSize: Settings.data.general.compactLockScreen ? Style.fontSizeS : Style.fontSizeM
+                        color: logoutButtonArea.containsMouse ? Color.mOnHover : Color.mOnSurfaceVariant
                         font.weight: Font.Medium
                       }
                     }
@@ -1137,7 +1137,7 @@ Loader {
                     Layout.fillWidth: true
                     Layout.preferredHeight: Settings.data.general.compactLockScreen ? 36 : 48
                     radius: Settings.data.general.compactLockScreen ? 18 : 24
-                    color: suspendButtonArea.containsMouse ? Color.mTertiary : "transparent"
+                    color: suspendButtonArea.containsMouse ? Color.mHover : "transparent"
                     border.color: Color.mOutline
                     border.width: 1
 
@@ -1148,13 +1148,13 @@ Loader {
                       NIcon {
                         icon: "suspend"
                         pointSize: Settings.data.general.compactLockScreen ? Style.fontSizeM : Style.fontSizeL
-                        color: suspendButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurfaceVariant
+                        color: suspendButtonArea.containsMouse ? Color.mOnHover : Color.mOnSurfaceVariant
                       }
 
                       NText {
                         text: I18n.tr("session-menu.suspend")
-                        color: suspendButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurfaceVariant
                         pointSize: Settings.data.general.compactLockScreen ? Style.fontSizeS : Style.fontSizeM
+                        color: suspendButtonArea.containsMouse ? Color.mOnHover : Color.mOnSurfaceVariant
                         font.weight: Font.Medium
                       }
                     }
@@ -1185,7 +1185,7 @@ Loader {
                     Layout.fillWidth: true
                     Layout.preferredHeight: Settings.data.general.compactLockScreen ? 36 : 48
                     radius: Settings.data.general.compactLockScreen ? 18 : 24
-                    color: rebootButtonArea.containsMouse ? Color.mTertiary : "transparent"
+                    color: rebootButtonArea.containsMouse ? Color.mHover : "transparent"
                     border.color: Color.mOutline
                     border.width: 1
 
@@ -1196,13 +1196,13 @@ Loader {
                       NIcon {
                         icon: "reboot"
                         pointSize: Settings.data.general.compactLockScreen ? Style.fontSizeM : Style.fontSizeL
-                        color: rebootButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurfaceVariant
+                        color: rebootButtonArea.containsMouse ? Color.mOnHover : Color.mOnSurfaceVariant
                       }
 
                       NText {
                         text: I18n.tr("session-menu.reboot")
-                        color: rebootButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurfaceVariant
                         pointSize: Settings.data.general.compactLockScreen ? Style.fontSizeS : Style.fontSizeM
+                        color: rebootButtonArea.containsMouse ? Color.mOnHover : Color.mOnSurfaceVariant
                         font.weight: Font.Medium
                       }
                     }
diff --git a/Modules/Notification/Notification.qml b/Modules/Notification/Notification.qml
index dae29334..5da60b98 100644
--- a/Modules/Notification/Notification.qml
+++ b/Modules/Notification/Notification.qml
@@ -538,8 +538,8 @@ Variants {
                         }
                         fontSize: Style.fontSizeS
                         backgroundColor: Color.mPrimary
-                        textColor: hovered ? Color.mOnTertiary : Color.mOnPrimary
-                        hoverColor: Color.mTertiary
+                        textColor: hovered ? Color.mOnHover : Color.mOnPrimary
+                        hoverColor: Color.mHover
                         outlined: false
                         implicitHeight: 24
                         onClicked: {
diff --git a/Modules/SessionMenu/SessionMenu.qml b/Modules/SessionMenu/SessionMenu.qml
index 01ebbccb..623a93c5 100644
--- a/Modules/SessionMenu/SessionMenu.qml
+++ b/Modules/SessionMenu/SessionMenu.qml
@@ -357,7 +357,7 @@ NPanel {
         return Qt.alpha(Color.mPrimary, 0.08)
       }
       if (isSelected || mouseArea.containsMouse) {
-        return Color.mTertiary
+        return Color.mHover
       }
       return Color.transparent
     }
@@ -388,7 +388,7 @@ NPanel {
           if (buttonRoot.isShutdown && !buttonRoot.isSelected && !mouseArea.containsMouse)
             return Color.mError
           if (buttonRoot.isSelected || mouseArea.containsMouse)
-            return Color.mOnTertiary
+            return Color.mOnHover
           return Color.mOnSurface
         }
         pointSize: Style.fontSizeXXL
@@ -423,7 +423,7 @@ NPanel {
             if (buttonRoot.isShutdown && !buttonRoot.isSelected && !mouseArea.containsMouse)
               return Color.mError
             if (buttonRoot.isSelected || mouseArea.containsMouse)
-              return Color.mOnTertiary
+              return Color.mOnHover
             return Color.mOnSurface
           }
 
diff --git a/Modules/Settings/SettingsPanel.qml b/Modules/Settings/SettingsPanel.qml
index 212c5248..a8fc5bce 100644
--- a/Modules/Settings/SettingsPanel.qml
+++ b/Modules/Settings/SettingsPanel.qml
@@ -399,10 +399,10 @@ NPanel {
                 Layout.fillWidth: true
                 Layout.preferredHeight: tabEntryRow.implicitHeight + Style.marginM * 2
                 radius: Style.radiusS
-                color: selected ? Color.mPrimary : (tabItem.hovering ? Color.mTertiary : Color.transparent)
+                color: selected ? Color.mPrimary : (tabItem.hovering ? Color.mHover : Color.transparent)
                 readonly property bool selected: index === currentTabIndex
                 property bool hovering: false
-                property color tabTextColor: selected ? Color.mOnPrimary : (tabItem.hovering ? Color.mOnTertiary : Color.mOnSurface)
+                property color tabTextColor: selected ? Color.mOnPrimary : (tabItem.hovering ? Color.mOnHover : Color.mOnSurface)
 
                 Behavior on color {
                   ColorAnimation {
diff --git a/Modules/Settings/Tabs/AboutTab.qml b/Modules/Settings/Tabs/AboutTab.qml
index 445b7287..087b712b 100644
--- a/Modules/Settings/Tabs/AboutTab.qml
+++ b/Modules/Settings/Tabs/AboutTab.qml
@@ -170,7 +170,7 @@ ColumnLayout {
       width: contributorsGrid.cellWidth - Style.marginM
       height: contributorsGrid.cellHeight - Style.marginM
       radius: Style.radiusL
-      color: contributorArea.containsMouse ? Color.mTertiary : Color.transparent
+      color: contributorArea.containsMouse ? Color.mHover : Color.transparent
 
       Behavior on color {
         ColorAnimation {
@@ -193,7 +193,7 @@ ColumnLayout {
             anchors.fill: parent
             anchors.margins: Style.marginXS
             fallbackIcon: "person"
-            borderColor: contributorArea.containsMouse ? Color.mOnTertiary : Color.mPrimary
+            borderColor: contributorArea.containsMouse ? Color.mOnHover : Color.mPrimary
             borderWidth: Style.borderM
 
             Behavior on borderColor {
@@ -212,7 +212,7 @@ ColumnLayout {
           NText {
             text: modelData.login || "Unknown"
             font.weight: Style.fontWeightBold
-            color: contributorArea.containsMouse ? Color.mOnTertiary : Color.mOnSurface
+            color: contributorArea.containsMouse ? Color.mOnHover : Color.mOnSurface
             elide: Text.ElideRight
             Layout.fillWidth: true
           }
@@ -220,7 +220,7 @@ ColumnLayout {
           NText {
             text: (modelData.contributions || 0) + " " + ((modelData.contributions || 0) === 1 ? "commit" : "commits")
             pointSize: Style.fontSizeXS
-            color: contributorArea.containsMouse ? Color.mOnTertiary : Color.mOnSurfaceVariant
+            color: contributorArea.containsMouse ? Color.mOnHover : Color.mOnSurfaceVariant
           }
         }
       }
diff --git a/Modules/Settings/Tabs/ColorSchemeTab.qml b/Modules/Settings/Tabs/ColorSchemeTab.qml
index d1e3dcd9..f08cdb25 100644
--- a/Modules/Settings/Tabs/ColorSchemeTab.qml
+++ b/Modules/Settings/Tabs/ColorSchemeTab.qml
@@ -344,7 +344,7 @@ ColumnLayout {
               return Color.mSecondary
             }
             if (itemMouseArea.containsMouse) {
-              return Color.mTertiary
+              return Color.mHover
             }
             return Color.mOutline
           }
diff --git a/Modules/SetupWizard/SetupAppearanceStep.qml b/Modules/SetupWizard/SetupAppearanceStep.qml
index 8ff52102..7a2df8c0 100644
--- a/Modules/SetupWizard/SetupAppearanceStep.qml
+++ b/Modules/SetupWizard/SetupAppearanceStep.qml
@@ -418,7 +418,7 @@ ColumnLayout {
               radius: Style.radiusS
               color: root.cacheVersion >= 0 ? root.getSchemeColor(schemeName, "mSurface") : root.getSchemeColor(schemeName, "mSurface")
               border.width: Style.borderL
-              border.color: itemMouseArea.containsMouse ? Color.mTertiary : (Settings.data.colorSchemes.predefinedScheme === schemeName ? Color.mSecondary : Color.mOutline)
+              border.color: itemMouseArea.containsMouse ? Color.mHover : (Settings.data.colorSchemes.predefinedScheme === schemeName ? Color.mSecondary : Color.mOutline)
 
               RowLayout {
                 anchors.fill: parent
diff --git a/Modules/Wallpaper/WallpaperPanel.qml b/Modules/Wallpaper/WallpaperPanel.qml
index bc2726c8..2a1f6d57 100644
--- a/Modules/Wallpaper/WallpaperPanel.qml
+++ b/Modules/Wallpaper/WallpaperPanel.qml
@@ -402,7 +402,7 @@ NPanel {
                   return Color.mSecondary
                 }
                 if (wallpaperGridView.currentIndex === index) {
-                  return Color.mTertiary
+                  return Color.mHover
                 }
                 return Color.mSurface
               }
diff --git a/Widgets/NButton.qml b/Widgets/NButton.qml
index 0e4fd6e3..aed27ab7 100644
--- a/Widgets/NButton.qml
+++ b/Widgets/NButton.qml
@@ -13,7 +13,7 @@ Rectangle {
   property string tooltipText
   property color backgroundColor: Color.mPrimary
   property color textColor: Color.mOnPrimary
-  property color hoverColor: Color.mTertiary
+  property color hoverColor: Color.mHover
   property bool enabled: true
   property real fontSize: Style.fontSizeM
   property int fontWeight: Style.fontWeightBold
diff --git a/Widgets/NComboBox.qml b/Widgets/NComboBox.qml
index f73eb68d..0104640f 100644
--- a/Widgets/NComboBox.qml
+++ b/Widgets/NComboBox.qml
@@ -147,7 +147,7 @@ RowLayout {
 
           background: Rectangle {
             width: parentComboBox ? parentComboBox.width - Style.marginM * 3 : 0
-            color: highlighted ? Color.mTertiary : Color.transparent
+            color: highlighted ? Color.mHover : Color.transparent
             radius: Style.radiusS
             Behavior on color {
               ColorAnimation {
@@ -162,7 +162,7 @@ RowLayout {
               return item && item.name ? item.name : ""
             }
             pointSize: Style.fontSizeM
-            color: highlighted ? Color.mOnTertiary : Color.mOnSurface
+            color: highlighted ? Color.mOnHover : Color.mOnSurface
             verticalAlignment: Text.AlignVCenter
             elide: Text.ElideRight
             Behavior on color {
diff --git a/Widgets/NContextMenu.qml b/Widgets/NContextMenu.qml
index 342f6215..cbfca5a0 100644
--- a/Widgets/NContextMenu.qml
+++ b/Widgets/NContextMenu.qml
@@ -44,7 +44,7 @@ Popup {
       property var popup: root
 
       background: Rectangle {
-        color: menuItem.hovered && menuItem.enabled ? Color.mTertiary : Color.transparent
+        color: menuItem.hovered && menuItem.enabled ? Color.mHover : Color.transparent
         radius: Style.radiusS
 
         Behavior on color {
@@ -62,7 +62,7 @@ Popup {
           visible: modelData.icon !== undefined
           icon: modelData.icon || ""
           pointSize: Style.fontSizeM
-          color: menuItem.hovered && menuItem.enabled ? Color.mOnTertiary : Color.mOnSurface
+          color: menuItem.hovered && menuItem.enabled ? Color.mOnHover : Color.mOnSurface
           Layout.leftMargin: root.itemPadding
 
           Behavior on color {
@@ -75,7 +75,7 @@ Popup {
         NText {
           text: modelData.label || modelData.text || ""
           pointSize: Style.fontSizeM
-          color: menuItem.hovered && menuItem.enabled ? Color.mOnTertiary : Color.mOnSurface
+          color: menuItem.hovered && menuItem.enabled ? Color.mOnHover : Color.mOnSurface
           verticalAlignment: Text.AlignVCenter
           Layout.fillWidth: true
           Layout.leftMargin: modelData.icon === undefined ? root.itemPadding : 0
diff --git a/Widgets/NFilePicker.qml b/Widgets/NFilePicker.qml
index e8ea9212..9489d114 100644
--- a/Widgets/NFilePicker.qml
+++ b/Widgets/NFilePicker.qml
@@ -423,7 +423,7 @@ Popup {
               implicitWidth: 6
               implicitHeight: 100
               radius: Style.radiusM
-              color: parent.pressed ? Qt.alpha(Color.mTertiary, 0.8) : parent.hovered ? Qt.alpha(Color.mTertiary, 0.8) : Qt.alpha(Color.mTertiary, 0.8)
+              color: Qt.alpha(Color.mHover, 0.8)
               opacity: parent.policy === ScrollBar.AlwaysOn || parent.active ? 1.0 : 0.0
               Behavior on opacity {
                 NumberAnimation {
@@ -503,9 +503,9 @@ Popup {
 
             Rectangle {
               anchors.fill: parent
-              color: (mouseArea.containsMouse && !isSelected) ? Color.mTertiary : Color.transparent
+              color: (mouseArea.containsMouse && !isSelected) ? Color.mHover : Color.transparent
               radius: parent.radius
-              border.color: (mouseArea.containsMouse && !isSelected) ? Color.mTertiary : Color.transparent
+              border.color: (mouseArea.containsMouse && !isSelected) ? Color.mHover : Color.transparent
               border.width: Style.borderS
               Behavior on color {
                 ColorAnimation {
@@ -575,7 +575,7 @@ Popup {
                     if (isSelected)
                       return Color.mSecondary
                     else if (mouseArea.containsMouse)
-                      return model.fileIsDir ? Color.mOnTertiary : Color.mOnTertiary
+                      return Color.mOnHover
                     else
                       return model.fileIsDir ? Color.mPrimary : Color.mOnSurfaceVariant
                   }
@@ -609,7 +609,7 @@ Popup {
                   if (isSelected)
                     return Color.mSecondary
                   else if (mouseArea.containsMouse)
-                    return Color.mOnTertiary
+                    return Color.mOnHover
                   else
                     return Color.mOnSurfaceVariant
                 }
@@ -681,7 +681,7 @@ Popup {
               if (filePickerPanel.currentSelection.includes(model.filePath))
                 return Color.mSecondary
               if (mouseArea.containsMouse)
-                return Color.mTertiary
+                return Color.mHover
               return Color.transparent
             }
             radius: Style.radiusS
diff --git a/Widgets/NIconButton.qml b/Widgets/NIconButton.qml
index c6b095e4..2fd507e5 100644
--- a/Widgets/NIconButton.qml
+++ b/Widgets/NIconButton.qml
@@ -20,8 +20,8 @@ Rectangle {
 
   property color colorBg: Color.mSurfaceVariant
   property color colorFg: Color.mPrimary
-  property color colorBgHover: Color.mTertiary
-  property color colorFgHover: Color.mOnTertiary
+  property color colorBgHover: Color.mHover
+  property color colorFgHover: Color.mOnHover
   property color colorBorder: Color.mOutline
   property color colorBorderHover: Color.mOutline
 
diff --git a/Widgets/NIconButtonHot.qml b/Widgets/NIconButtonHot.qml
index 6107c3f2..ff80b3ef 100644
--- a/Widgets/NIconButtonHot.qml
+++ b/Widgets/NIconButtonHot.qml
@@ -26,8 +26,8 @@ Rectangle {
   // Color properties
   property color colorBg: Color.mSurfaceVariant
   property color colorFg: Color.mPrimary
-  property color colorBgHover: Color.mTertiary
-  property color colorFgHover: Color.mOnTertiary
+  property color colorBgHover: Color.mHover
+  property color colorFgHover: Color.mOnHover
   property color colorBorder: Color.mOutline
   property color colorBorderHover: Color.mOutline
 
diff --git a/Widgets/NInputAction.qml b/Widgets/NInputAction.qml
index a1e683da..b4b86879 100644
--- a/Widgets/NInputAction.qml
+++ b/Widgets/NInputAction.qml
@@ -45,7 +45,7 @@ RowLayout {
     icon: root.actionButtonIcon
     backgroundColor: Color.mSecondary
     textColor: Color.mOnSecondary
-    hoverColor: Color.mTertiary
+    hoverColor: Color.mHover
     enabled: root.actionButtonEnabled
 
     onClicked: {
diff --git a/Widgets/NListView.qml b/Widgets/NListView.qml
index 115bac49..9545bd2e 100644
--- a/Widgets/NListView.qml
+++ b/Widgets/NListView.qml
@@ -6,7 +6,7 @@ import qs.Commons
 Item {
   id: root
 
-  property color handleColor: Qt.alpha(Color.mTertiary, 0.8)
+  property color handleColor: Qt.alpha(Color.mHover, 0.8)
   property color handleHoverColor: handleColor
   property color handlePressedColor: handleColor
   property color trackColor: Color.transparent
diff --git a/Widgets/NPanel.qml b/Widgets/NPanel.qml
index a1be153c..0f0f8c6d 100644
--- a/Widgets/NPanel.qml
+++ b/Widgets/NPanel.qml
@@ -608,7 +608,7 @@ Loader {
           anchors.fill: parent
           anchors.margins: 0
           color: Color.transparent
-          border.color: Color.mTertiary
+          border.color: Color.mPrimary
           border.width: Style.borderM
           radius: Style.radiusL
           visible: panelBackground.isDragged && dragHandler.active
@@ -620,7 +620,7 @@ Loader {
             anchors.fill: parent
             anchors.margins: 0
             color: Color.transparent
-            border.color: Color.mTertiary
+            border.color: Color.mPrimary
             border.width: Style.borderS
             radius: Style.radiusL
             opacity: 0.3
diff --git a/Widgets/NScrollView.qml b/Widgets/NScrollView.qml
index af5371d9..0352492b 100644
--- a/Widgets/NScrollView.qml
+++ b/Widgets/NScrollView.qml
@@ -6,7 +6,7 @@ import qs.Commons
 T.ScrollView {
   id: root
 
-  property color handleColor: Qt.alpha(Color.mTertiary, 0.8)
+  property color handleColor: Qt.alpha(Color.mHover, 0.8)
   property color handleHoverColor: handleColor
   property color handlePressedColor: handleColor
   property color trackColor: Color.transparent
diff --git a/Widgets/NSearchableComboBox.qml b/Widgets/NSearchableComboBox.qml
index aacd6a0c..b4c82b52 100644
--- a/Widgets/NSearchableComboBox.qml
+++ b/Widgets/NSearchableComboBox.qml
@@ -218,7 +218,7 @@ RowLayout {
                 NText {
                   text: name
                   pointSize: Style.fontSizeM
-                  color: highlighted ? Color.mOnTertiary : Color.mOnSurface
+                  color: highlighted ? Color.mOnHover : Color.mOnSurface
                   verticalAlignment: Text.AlignVCenter
                   elide: Text.ElideRight
                   Layout.fillWidth: true
@@ -245,7 +245,7 @@ RowLayout {
                         text: modelData
                         pointSize: Style.fontSizeXXS
                         font.weight: Style.fontWeightBold
-                        color: highlighted ? Color.mOnTertiary : Color.mOnSurface
+                        color: highlighted ? Color.mOnHover : Color.mOnSurface
                       }
                     }
                   }
@@ -253,7 +253,7 @@ RowLayout {
               }
               background: Rectangle {
                 width: listView.width
-                color: highlighted ? Color.mTertiary : Color.transparent
+                color: highlighted ? Color.mHover : Color.transparent
                 radius: Style.radiusS
                 Behavior on color {
                   ColorAnimation {
diff --git a/Widgets/NSlider.qml b/Widgets/NSlider.qml
index dbcb2230..c2570386 100644
--- a/Widgets/NSlider.qml
+++ b/Widgets/NSlider.qml
@@ -117,7 +117,7 @@ Slider {
       implicitWidth: knobDiameter
       implicitHeight: knobDiameter
       radius: width / 2
-      color: root.pressed ? Color.mTertiary : Color.mSurface
+      color: root.pressed ? Color.mHover : Color.mSurface
       border.color: Color.mPrimary
       border.width: Style.borderL
       anchors.centerIn: parent
diff --git a/Widgets/NSpinBox.qml b/Widgets/NSpinBox.qml
index 51310439..a0fdbc16 100644
--- a/Widgets/NSpinBox.qml
+++ b/Widgets/NSpinBox.qml
@@ -42,7 +42,7 @@ RowLayout {
     implicitHeight: (root.baseSize - 4)
     radius: height * 0.5
     color: Color.mSurfaceVariant
-    border.color: (root.hovering || decreaseArea.containsMouse || increaseArea.containsMouse) ? Color.mTertiary : Color.mOutline
+    border.color: (root.hovering || decreaseArea.containsMouse || increaseArea.containsMouse) ? Color.mHover : Color.mOutline
     border.width: 1
 
     Behavior on border.color {
@@ -96,7 +96,7 @@ RowLayout {
           height: parent.height
           radius: width / 2
           anchors.left: parent.left
-          color: decreaseArea.containsMouse ? Color.mTertiary : Color.transparent
+          color: decreaseArea.containsMouse ? Color.mHover : Color.transparent
           Behavior on color {
             ColorAnimation {
               duration: Style.animationFast
@@ -119,7 +119,7 @@ RowLayout {
           height: 100
           radius: width / 4
 
-          color: decreaseArea.containsMouse ? Color.mTertiary : Color.transparent
+          color: decreaseArea.containsMouse ? Color.mHover : Color.transparent
           Behavior on color {
             ColorAnimation {
               duration: Style.animationFast
@@ -154,7 +154,7 @@ RowLayout {
         anchors.verticalCenter: parent.verticalCenter
         icon: "chevron-left"
         pointSize: Style.fontSizeS
-        color: decreaseArea.containsMouse ? Color.mOnTertiary : Color.mPrimary
+        color: decreaseArea.containsMouse ? Color.mOnHover : Color.mPrimary
       }
 
       MouseArea {
@@ -191,7 +191,7 @@ RowLayout {
           height: parent.height
           radius: width / 2
           anchors.right: parent.right
-          color: increaseArea.containsMouse ? Color.mTertiary : Color.transparent
+          color: increaseArea.containsMouse ? Color.mHover : Color.transparent
           Behavior on color {
             ColorAnimation {
               duration: Style.animationFast
@@ -214,7 +214,7 @@ RowLayout {
           height: 100
           radius: width / 4
 
-          color: increaseArea.containsMouse ? Color.mTertiary : Color.transparent
+          color: increaseArea.containsMouse ? Color.mHover : Color.transparent
           Behavior on color {
             ColorAnimation {
               duration: Style.animationFast
@@ -249,7 +249,7 @@ RowLayout {
         anchors.verticalCenter: parent.verticalCenter
         icon: "chevron-right"
         pointSize: Style.fontSizeS
-        color: increaseArea.containsMouse ? Color.mOnTertiary : Color.mPrimary
+        color: increaseArea.containsMouse ? Color.mOnHover : Color.mPrimary
       }
 
       MouseArea {