diff --git a/modules/launcher/services/Actions.qml b/modules/launcher/services/Actions.qml
index 4ec249da..634b3e6a 100644
--- a/modules/launcher/services/Actions.qml
+++ b/modules/launcher/services/Actions.qml
@@ -20,7 +20,7 @@ Searcher {
     Variants {
         id: variants
 
-        model: Config.launcher.actions.filter(a => (a.enabled ?? true) && (GlobalConfig.launcher.enableDangerousActions || !(a.dangerous ?? false)))
+        model: GlobalConfig.launcher.actions.filter(a => (a.enabled ?? true) && (GlobalConfig.launcher.enableDangerousActions || !(a.dangerous ?? false)))
 
         Action {}
     }
diff --git a/modules/lock/NotifGroup.qml b/modules/lock/NotifGroup.qml
index 50ea168d..14afc8bd 100644
--- a/modules/lock/NotifGroup.qml
+++ b/modules/lock/NotifGroup.qml
@@ -64,8 +64,8 @@ StyledRect {
 
         Item {
             Layout.alignment: Qt.AlignLeft | Qt.AlignTop
-            implicitWidth: Tokens.sizes.notifs.image
-            implicitHeight: Tokens.sizes.notifs.image
+            implicitWidth: TokenConfig.sizes.notifs.image
+            implicitHeight: TokenConfig.sizes.notifs.image
 
             Component {
                 id: imageComp
@@ -73,12 +73,12 @@ StyledRect {
                 Image {
                     source: Qt.resolvedUrl(root.image)
                     fillMode: Image.PreserveAspectCrop
-                    sourceSize.width: Tokens.sizes.notifs.image
-                    sourceSize.height: Tokens.sizes.notifs.image
+                    sourceSize.width: TokenConfig.sizes.notifs.image
+                    sourceSize.height: TokenConfig.sizes.notifs.image
                     cache: false
                     asynchronous: true
-                    width: Tokens.sizes.notifs.image
-                    height: Tokens.sizes.notifs.image
+                    width: TokenConfig.sizes.notifs.image
+                    height: TokenConfig.sizes.notifs.image
                 }
             }
 
@@ -86,7 +86,7 @@ StyledRect {
                 id: appIconComp
 
                 ColouredIcon {
-                    implicitSize: Math.round(Tokens.sizes.notifs.image * 0.6)
+                    implicitSize: Math.round(TokenConfig.sizes.notifs.image * 0.6)
                     source: Quickshell.iconPath(root.appIcon)
                     colour: root.urgency === "critical" ? Colours.palette.m3onError : root.urgency === "low" ? Colours.palette.m3onSurface : Colours.palette.m3onSecondaryContainer
                     layer.enabled: root.appIcon.endsWith("symbolic")
diff --git a/modules/notifications/Content.qml b/modules/notifications/Content.qml
index fcbf41f2..aeaa7dea 100644
--- a/modules/notifications/Content.qml
+++ b/modules/notifications/Content.qml
@@ -170,7 +170,7 @@ Item {
             Anim {
                 target: notif
                 property: "x"
-                to: (notif.x >= 0 ? Tokens.sizes.notifs.width : -Tokens.sizes.notifs.width) * 2
+                to: (notif.x >= 0 ? wrapper.Tokens.sizes.notifs.width : -wrapper.Tokens.sizes.notifs.width) * 2
                 duration: Tokens.anim.durations.normal
                 easing: Tokens.anim.emphasized
             }
diff --git a/modules/notifications/Notification.qml b/modules/notifications/Notification.qml
index 55dea458..73c7c287 100644
--- a/modules/notifications/Notification.qml
+++ b/modules/notifications/Notification.qml
@@ -114,21 +114,21 @@ StyledRect {
 
                 anchors.left: parent.left
                 anchors.top: parent.top
-                width: Tokens.sizes.notifs.image
-                height: Tokens.sizes.notifs.image
+                width: TokenConfig.sizes.notifs.image
+                height: TokenConfig.sizes.notifs.image
                 visible: root.hasImage || root.hasAppIcon
 
                 sourceComponent: ClippingRectangle {
                     radius: Tokens.rounding.full
-                    implicitWidth: Tokens.sizes.notifs.image
-                    implicitHeight: Tokens.sizes.notifs.image
+                    implicitWidth: TokenConfig.sizes.notifs.image
+                    implicitHeight: TokenConfig.sizes.notifs.image
 
                     Image {
                         anchors.fill: parent
                         source: Qt.resolvedUrl(root.modelData.image)
                         fillMode: Image.PreserveAspectCrop
-                        sourceSize.width: Tokens.sizes.notifs.image
-                        sourceSize.height: Tokens.sizes.notifs.image
+                        sourceSize.width: TokenConfig.sizes.notifs.image
+                        sourceSize.height: TokenConfig.sizes.notifs.image
                         cache: false
                         asynchronous: true
                     }
@@ -149,8 +149,8 @@ StyledRect {
                 sourceComponent: StyledRect {
                     radius: Tokens.rounding.full
                     color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3error : root.modelData.urgency === NotificationUrgency.Low ? Colours.layer(Colours.palette.m3surfaceContainerHighest, 2) : Colours.palette.m3secondaryContainer
-                    implicitWidth: root.hasImage ? Tokens.sizes.notifs.badge : Tokens.sizes.notifs.image
-                    implicitHeight: root.hasImage ? Tokens.sizes.notifs.badge : Tokens.sizes.notifs.image
+                    implicitWidth: root.hasImage ? Tokens.sizes.notifs.badge : TokenConfig.sizes.notifs.image
+                    implicitHeight: root.hasImage ? Tokens.sizes.notifs.badge : TokenConfig.sizes.notifs.image
 
                     Loader {
                         id: icon
@@ -251,7 +251,7 @@ StyledRect {
                 font.family: appName.font.family
                 font.pointSize: appName.font.pointSize
                 elide: Text.ElideRight
-                elideWidth: expandBtn.x - time.width - timeSep.width - summary.x - Tokens.spacing.small * 3
+                elideWidth: expandBtn.x - time.width - timeSep.width - summary.x - root.Tokens.spacing.small * 3
             }
 
             StyledText {
@@ -303,7 +303,7 @@ StyledRect {
                 font.family: summary.font.family
                 font.pointSize: summary.font.pointSize
                 elide: Text.ElideRight
-                elideWidth: expandBtn.x - time.width - timeSep.width - summary.x - Tokens.spacing.small * 3
+                elideWidth: expandBtn.x - time.width - timeSep.width - summary.x - root.Tokens.spacing.small * 3
             }
 
             StyledText {
@@ -516,7 +516,7 @@ StyledRect {
             elide: Text.ElideRight
             elideWidth: {
                 const numActions = root.modelData.actions.length + 1;
-                return (inner.width - actions.spacing * (numActions - 1)) / numActions - Tokens.padding.normal * 2;
+                return (inner.width - actions.spacing * (numActions - 1)) / numActions - root.Tokens.padding.normal * 2;
             }
         }
     }
diff --git a/modules/sidebar/NotifGroup.qml b/modules/sidebar/NotifGroup.qml
index dee6f20b..8c9429bb 100644
--- a/modules/sidebar/NotifGroup.qml
+++ b/modules/sidebar/NotifGroup.qml
@@ -53,7 +53,7 @@ StyledRect {
     readonly property int nonAnimHeight: {
         const headerHeight = header.implicitHeight + (root.expanded ? Math.round(Tokens.spacing.small / 2) : 0);
         const columnHeight = headerHeight + notifList.layoutHeight + column.Layout.topMargin + column.Layout.bottomMargin;
-        return Math.round(Math.max(Tokens.sizes.notifs.image, columnHeight) + Tokens.padding.normal * 2);
+        return Math.round(Math.max(TokenConfig.sizes.notifs.image, columnHeight) + Tokens.padding.normal * 2);
     }
     readonly property bool expanded: props.expandedNotifs.includes(modelData)
 
@@ -91,8 +91,8 @@ StyledRect {
 
         Item {
             Layout.alignment: Qt.AlignLeft | Qt.AlignTop
-            implicitWidth: Tokens.sizes.notifs.image
-            implicitHeight: Tokens.sizes.notifs.image
+            implicitWidth: TokenConfig.sizes.notifs.image
+            implicitHeight: TokenConfig.sizes.notifs.image
 
             Component {
                 id: imageComp
@@ -100,12 +100,12 @@ StyledRect {
                 Image {
                     source: Qt.resolvedUrl(root.image)
                     fillMode: Image.PreserveAspectCrop
-                    sourceSize.width: Tokens.sizes.notifs.image
-                    sourceSize.height: Tokens.sizes.notifs.image
+                    sourceSize.width: TokenConfig.sizes.notifs.image
+                    sourceSize.height: TokenConfig.sizes.notifs.image
                     cache: false
                     asynchronous: true
-                    width: Tokens.sizes.notifs.image
-                    height: Tokens.sizes.notifs.image
+                    width: TokenConfig.sizes.notifs.image
+                    height: TokenConfig.sizes.notifs.image
                 }
             }
 
@@ -113,7 +113,7 @@ StyledRect {
                 id: appIconComp
 
                 ColouredIcon {
-                    implicitSize: Math.round(Tokens.sizes.notifs.image * 0.6)
+                    implicitSize: Math.round(TokenConfig.sizes.notifs.image * 0.6)
                     source: Quickshell.iconPath(root.appIcon)
                     colour: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : root.urgency === NotificationUrgency.Low ? Colours.palette.m3onSurface : Colours.palette.m3onSecondaryContainer
                     layer.enabled: root.appIcon.endsWith("symbolic")
diff --git a/plugin/src/Caelestia/Config/tokens.hpp b/plugin/src/Caelestia/Config/tokens.hpp
index de0a7c26..5ff1ce5e 100644
--- a/plugin/src/Caelestia/Config/tokens.hpp
+++ b/plugin/src/Caelestia/Config/tokens.hpp
@@ -194,7 +194,7 @@ class NotifsTokens : public ConfigObject {
     QML_ANONYMOUS
 
     CONFIG_PROPERTY(int, width, 400)
-    CONFIG_PROPERTY(int, image, 41)
+    CONFIG_GLOBAL_PROPERTY(int, image, 41)
     CONFIG_PROPERTY(int, badge, 20)
 
 public:
diff --git a/services/NotifData.qml b/services/NotifData.qml
index c92a3ad7..6f470038 100644
--- a/services/NotifData.qml
+++ b/services/NotifData.qml
@@ -54,14 +54,14 @@ QtObject {
         // qmllint disable uncreatable-type
         PanelWindow {
             // qmllint enable uncreatable-type
-            implicitWidth: Tokens.sizes.notifs.image
-            implicitHeight: Tokens.sizes.notifs.image
+            implicitWidth: TokenConfig.sizes.notifs.image
+            implicitHeight: TokenConfig.sizes.notifs.image
             color: "transparent"
             mask: Region {}
 
             Image {
                 function tryCache(): void {
-                    if (status !== Image.Ready || width != Tokens.sizes.notifs.image || height != Tokens.sizes.notifs.image)
+                    if (status !== Image.Ready || width != TokenConfig.sizes.notifs.image || height != TokenConfig.sizes.notifs.image)
                         return;
 
                     const cacheKey = notif.appName + notif.summary + notif.id;