diff --git a/.config/quickshell/ii/modules/bar/BatteryPopup.qml b/.config/quickshell/ii/modules/bar/BatteryPopup.qml
index 985873d8..4138aad8 100644
--- a/.config/quickshell/ii/modules/bar/BatteryPopup.qml
+++ b/.config/quickshell/ii/modules/bar/BatteryPopup.qml
@@ -10,10 +10,8 @@ Rectangle {
     readonly property real margin: 10
     implicitWidth: columnLayout.implicitWidth + margin * 2
     implicitHeight: columnLayout.implicitHeight + margin * 2
-    color: Appearance.colors.colLayer0
+    color: Appearance.colors.colTooltip
     radius: Appearance.rounding.small
-    border.width: 1
-    border.color: Appearance.colors.colLayer0Border
     clip: true
 
     ColumnLayout {
@@ -34,12 +32,12 @@ Rectangle {
             opacity: rowVisible ? 1 : 0
             Behavior on opacity { NumberAnimation { duration: 500 } }
 
-            MaterialSymbol { text: "schedule"; color: Appearance.m3colors.m3onSecondaryContainer }
-            StyledText { text: Battery.isCharging ? Translation.tr("Time to full:") : Translation.tr("Time to empty:"); color: Appearance.colors.colOnLayer1 }
+            MaterialSymbol { text: "schedule"; color: Appearance.colors.colOnTooltip }
+            StyledText { text: Battery.isCharging ? Translation.tr("Time to full:") : Translation.tr("Time to empty:"); color: Appearance.colors.colOnTooltip }
             StyledText {
                 Layout.fillWidth: true
                 horizontalAlignment: Text.AlignRight
-                color: Appearance.colors.colOnLayer1
+                color: Appearance.colors.colOnTooltip
                 text: {
                     function formatTime(seconds) {
                         var h = Math.floor(seconds / 3600);
@@ -82,7 +80,7 @@ Rectangle {
                         return "battery_0_bar";
                     }
                 }
-                color: Appearance.m3colors.m3onSecondaryContainer
+                color: Appearance.colors.colOnTooltip
             }
 
 
@@ -96,13 +94,13 @@ Rectangle {
                         return Translation.tr("Discharging:");
                     }
                 }
-                color: Appearance.colors.colOnLayer1
+                color: Appearance.colors.colOnTooltip
             }
 
             StyledText {
                 Layout.fillWidth: true
                 horizontalAlignment: Text.AlignRight
-                color: Appearance.colors.colOnLayer1
+                color: Appearance.colors.colOnTooltip
                 text: {
                     if (Battery.chargeState == 4) {
                         return "";
diff --git a/.config/quickshell/ii/modules/bar/ClockWidget.qml b/.config/quickshell/ii/modules/bar/ClockWidget.qml
index c7ffeed3..9242519d 100644
--- a/.config/quickshell/ii/modules/bar/ClockWidget.qml
+++ b/.config/quickshell/ii/modules/bar/ClockWidget.qml
@@ -53,10 +53,8 @@ Item {
             readonly property real margin: 12
             implicitWidth: columnLayout.implicitWidth + margin * 2
             implicitHeight: columnLayout.implicitHeight + margin * 2
-            color: Appearance.colors.colLayer0
+            color: Appearance.colors.colTooltip
             radius: Appearance.rounding.small
-            border.width: 1
-            border.color: Appearance.colors.colLayer0Border
             clip: true
 
             ColumnLayout {
@@ -71,7 +69,7 @@ Item {
                     StyledText {
                         Layout.fillWidth: true
                         horizontalAlignment: Text.AlignLeft
-                        color: Appearance.colors.colOnLayer1
+                        color: Appearance.colors.colOnTooltip
                         text: `${root.formattedDate} • ${root.formattedTime}`
                     }
                 }
@@ -80,12 +78,12 @@ Item {
                 RowLayout {
                     spacing: 5
                     Layout.fillWidth: true
-                    MaterialSymbol { text: "timelapse"; color: Appearance.m3colors.m3onSecondaryContainer }
-                    StyledText { text: Translation.tr("Uptime:"); color: Appearance.colors.colOnLayer1 }
+                    MaterialSymbol { text: "timelapse"; color: Appearance.colors.colOnTooltip }
+                    StyledText { text: Translation.tr("Uptime:"); color: Appearance.colors.colOnTooltip }
                     StyledText {
                         Layout.fillWidth: true
                         horizontalAlignment: Text.AlignRight
-                        color: Appearance.colors.colOnLayer1
+                        color: Appearance.colors.colOnTooltip
                         text: root.formattedUptime
                     }
                 }
@@ -98,8 +96,8 @@ Item {
                     RowLayout {
                         spacing: 5
                         Layout.fillWidth: true
-                        MaterialSymbol { text: "checklist"; color: Appearance.m3colors.m3onSecondaryContainer }
-                        StyledText { text: Translation.tr("Upcoming Tasks:"); color: Appearance.colors.colOnLayer1 }
+                        MaterialSymbol { text: "checklist"; color: Appearance.colors.colOnTooltip }
+                        StyledText { text: Translation.tr("Upcoming Tasks:"); color: Appearance.colors.colOnTooltip }
                     }
 
                     StyledText {
@@ -107,7 +105,7 @@ Item {
                         topPadding: 5
                         horizontalAlignment: Text.AlignLeft
                         wrapMode: Text.Wrap
-                        color: Appearance.colors.colOnLayer1
+                        color: Appearance.colors.colOnTooltip
                         text: root.todosSection
                     }
                 }
diff --git a/.config/quickshell/ii/modules/bar/Resource.qml b/.config/quickshell/ii/modules/bar/Resource.qml
index a352e0eb..fbd25937 100644
--- a/.config/quickshell/ii/modules/bar/Resource.qml
+++ b/.config/quickshell/ii/modules/bar/Resource.qml
@@ -75,10 +75,8 @@ Item {
             readonly property real margin: 10
             implicitWidth: columnLayout.implicitWidth + margin * 2
             implicitHeight: columnLayout.implicitHeight + margin * 2
-            color: Appearance.colors.colLayer0
+            color: Appearance.colors.colTooltip
             radius: Appearance.rounding.small
-            border.width: 1
-            border.color: Appearance.colors.colLayer0Border
             clip: true
 
             ColumnLayout {
@@ -94,17 +92,17 @@ Item {
 
                         MaterialSymbol {
                             text: modelData.icon
-                            color: Appearance.m3colors.m3onSecondaryContainer
+                            color: Appearance.colors.colOnTooltip
                         }
                         StyledText {
                             text: modelData.label
-                            color: Appearance.colors.colOnLayer1
+                            color: Appearance.colors.colOnTooltip
                         }
                         StyledText {
                             Layout.fillWidth: true
                             horizontalAlignment: Text.AlignRight
                             visible: modelData.value !== ""
-                            color: Appearance.colors.colOnLayer1
+                            color: Appearance.colors.colOnTooltip
                             text: modelData.value
                         }
                     }
diff --git a/.config/quickshell/ii/modules/bar/weather/WeatherCard.qml b/.config/quickshell/ii/modules/bar/weather/WeatherCard.qml
index a85ed8ca..03b9a189 100644
--- a/.config/quickshell/ii/modules/bar/weather/WeatherCard.qml
+++ b/.config/quickshell/ii/modules/bar/weather/WeatherCard.qml
@@ -7,9 +7,9 @@ import qs.modules.common.widgets
 Rectangle {
     id: root
     radius: Appearance.rounding.small
-    color: Appearance.colors.colLayer1
-    implicitWidth: columnLayout.implicitWidth * 2
-    implicitHeight: columnLayout.implicitHeight * 2
+    color: Appearance.colors.colTooltip
+    implicitWidth: columnLayout.implicitWidth + 14 * 2
+    implicitHeight: columnLayout.implicitHeight + 14 * 2
     Layout.fillWidth: parent
 
     property alias title: title.text
@@ -26,18 +26,19 @@ Rectangle {
                 id: symbol
                 fill: 0
                 iconSize: Appearance.font.pixelSize.normal
+                color: Appearance.colors.colOnTooltip
             }
             StyledText {
                 id: title
                 font.pixelSize: Appearance.font.pixelSize.smaller
-                color: Appearance.colors.colOnLayer1
+                color: Appearance.colors.colOnTooltip
             }
         }
         StyledText {
             id: value
             Layout.alignment: Qt.AlignHCenter
-            font.pixelSize: Appearance.font.pixelSize.normal
-            color: Appearance.colors.colOnLayer1
+            font.pixelSize: Appearance.font.pixelSize.small
+            color: Appearance.colors.colOnTooltip
         }
     }
 }
diff --git a/.config/quickshell/ii/modules/bar/weather/WeatherPopup.qml b/.config/quickshell/ii/modules/bar/weather/WeatherPopup.qml
index 827abea4..91269e2a 100644
--- a/.config/quickshell/ii/modules/bar/weather/WeatherPopup.qml
+++ b/.config/quickshell/ii/modules/bar/weather/WeatherPopup.qml
@@ -11,10 +11,8 @@ Rectangle {
     readonly property real margin: 10
     implicitWidth: columnLayout.implicitWidth + margin * 2
     implicitHeight: columnLayout.implicitHeight + margin * 2
-    color: Appearance.colors.colLayer0
+    color: Appearance.colors.colTooltip
     radius: Appearance.rounding.small
-    border.width: 1
-    border.color: Appearance.colors.colLayer0Border
     clip: true
 
     ColumnLayout {
@@ -34,13 +32,14 @@ Rectangle {
                 fill: 0
                 text: "location_on"
                 iconSize: Appearance.font.pixelSize.huge
+                color: Appearance.colors.colOnTooltip
             }
 
             StyledText {
                 text: Weather.data.city
                 font.pixelSize: Appearance.font.pixelSize.title
                 font.family: Appearance.font.family.title
-                color: Appearance.colors.colOnLayer0
+                color: Appearance.colors.colOnTooltip
             }
         }
 
diff --git a/.config/quickshell/ii/modules/common/widgets/StyledPopup.qml b/.config/quickshell/ii/modules/common/widgets/StyledPopup.qml
index df5bdec1..85ca0c53 100644
--- a/.config/quickshell/ii/modules/common/widgets/StyledPopup.qml
+++ b/.config/quickshell/ii/modules/common/widgets/StyledPopup.qml
@@ -36,7 +36,7 @@ LazyLoader {
             top: Appearance.sizes.hyprlandGapsOut
             bottom: Appearance.sizes.hyprlandGapsOut
         }
-        WlrLayershell.namespace: "quickshell:popup" //maybe this can fix with the popups not showing ?
+        WlrLayershell.namespace: "quickshell:popup"
         WlrLayershell.layer: WlrLayer.Overlay
 
         Loader {