diff --git a/components/SectionContainer.qml b/components/SectionContainer.qml
index 7aa3f13f..23767984 100644
--- a/components/SectionContainer.qml
+++ b/components/SectionContainer.qml
@@ -14,7 +14,7 @@ StyledRect {
     Layout.fillWidth: true
     implicitHeight: contentColumn.implicitHeight + Tokens.padding.large * 2
 
-    radius: Tokens.rounding.normal
+    radius: Tokens.rounding.large
     color: Colours.transparency.enabled ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : Colours.palette.m3surfaceContainerHigh
 
     ColumnLayout {
diff --git a/components/controls/CollapsibleSection.qml b/components/controls/CollapsibleSection.qml
index 80ea8fe8..14c690e8 100644
--- a/components/controls/CollapsibleSection.qml
+++ b/components/controls/CollapsibleSection.qml
@@ -63,7 +63,7 @@ ColumnLayout {
         StateLayer {
             anchors.fill: parent
             color: Colours.palette.m3onSurface
-            radius: Tokens.rounding.normal
+            radius: Tokens.rounding.large
             showHoverBackground: false
             onClicked: {
                 root.toggleRequested();
@@ -87,7 +87,7 @@ ColumnLayout {
             id: backgroundRect
 
             anchors.fill: parent
-            radius: Tokens.rounding.normal
+            radius: Tokens.rounding.large
             color: Colours.transparency.enabled ? Colours.layer(Colours.palette.m3surfaceContainer, root.nested ? 3 : 2) : (root.nested ? Colours.palette.m3surfaceContainerHigh : Colours.palette.m3surfaceContainer)
             opacity: root.showBackground && root.expanded ? 1.0 : 0.0
             visible: root.showBackground
diff --git a/components/controls/CustomSpinBox.qml b/components/controls/CustomSpinBox.qml
index d7885c30..f2c98120 100644
--- a/components/controls/CustomSpinBox.qml
+++ b/components/controls/CustomSpinBox.qml
@@ -79,13 +79,13 @@ RowLayout {
 
         background: StyledRect {
             implicitWidth: 100
-            radius: Tokens.rounding.small
+            radius: Tokens.rounding.medium
             color: Colours.tPalette.m3surfaceContainerHigh
         }
     }
 
     StyledRect {
-        radius: Tokens.rounding.small
+        radius: Tokens.rounding.medium
         color: Colours.palette.m3primary
 
         implicitWidth: implicitHeight
@@ -120,7 +120,7 @@ RowLayout {
     }
 
     StyledRect {
-        radius: Tokens.rounding.small
+        radius: Tokens.rounding.medium
         color: Colours.palette.m3primary
 
         implicitWidth: implicitHeight
diff --git a/components/controls/IconButton.qml b/components/controls/IconButton.qml
index 58af806a..2ab02837 100644
--- a/components/controls/IconButton.qml
+++ b/components/controls/IconButton.qml
@@ -44,7 +44,7 @@ StyledRect {
 
     onCheckedChanged: internalChecked = checked
 
-    radius: internalChecked ? Tokens.rounding.small : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
+    radius: internalChecked ? Tokens.rounding.medium : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
     color: type === IconButton.Text ? "transparent" : disabled ? disabledColour : internalChecked ? activeColour : inactiveColour
 
     implicitWidth: implicitHeight
diff --git a/components/controls/IconTextButton.qml b/components/controls/IconTextButton.qml
index 2a1dacec..44a3aa35 100644
--- a/components/controls/IconTextButton.qml
+++ b/components/controls/IconTextButton.qml
@@ -36,7 +36,7 @@ StyledRect {
 
     onCheckedChanged: internalChecked = checked
 
-    radius: internalChecked ? Tokens.rounding.small : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
+    radius: internalChecked ? Tokens.rounding.medium : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
     color: type === IconTextButton.Text ? "transparent" : internalChecked ? activeColour : inactiveColour
 
     implicitWidth: row.implicitWidth + horizontalPadding * 2
diff --git a/components/controls/Menu.qml b/components/controls/Menu.qml
index 482a4d40..dbf01ce7 100644
--- a/components/controls/Menu.qml
+++ b/components/controls/Menu.qml
@@ -79,7 +79,7 @@ MouseArea {
             return item.mapToItem(root.parent, 0, off).y + root.marginY;
         }
 
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
         level: 2
 
         implicitWidth: Math.max(200, column.implicitWidth + column.anchors.margins * 2)
@@ -124,11 +124,11 @@ MouseArea {
                         implicitWidth: menuOptionRow.implicitWidth + Tokens.padding.normal * 2
                         implicitHeight: menuOptionRow.implicitHeight + Tokens.padding.normal * 2
 
-                        radius: active ? 12 : Tokens.rounding.extraSmall // This should use a token, but tokens are currently extremely scuffed
-                        topLeftRadius: index === 0 ? Tokens.rounding.small : radius
-                        topRightRadius: index === 0 ? Tokens.rounding.small : radius
-                        bottomLeftRadius: index === repeater.count - 1 ? Tokens.rounding.small : radius
-                        bottomRightRadius: index === repeater.count - 1 ? Tokens.rounding.small : radius
+                        radius: active ? Tokens.rounding.medium : Tokens.rounding.extraSmall
+                        topLeftRadius: index === 0 ? Tokens.rounding.medium : radius
+                        topRightRadius: index === 0 ? Tokens.rounding.medium : radius
+                        bottomLeftRadius: index === repeater.count - 1 ? Tokens.rounding.medium : radius
+                        bottomRightRadius: index === repeater.count - 1 ? Tokens.rounding.medium : radius
 
                         color: Qt.alpha(Colours.palette.m3tertiaryContainer, active ? 1 : 0)
 
diff --git a/components/controls/SpinBoxRow.qml b/components/controls/SpinBoxRow.qml
index dc52c19c..e11d73b9 100644
--- a/components/controls/SpinBoxRow.qml
+++ b/components/controls/SpinBoxRow.qml
@@ -16,7 +16,7 @@ StyledRect {
 
     Layout.fillWidth: true
     implicitHeight: row.implicitHeight + Tokens.padding.large * 2
-    radius: Tokens.rounding.normal
+    radius: Tokens.rounding.large
     color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
     Behavior on implicitHeight {
diff --git a/components/controls/SplitButton.qml b/components/controls/SplitButton.qml
index 4acd98cf..38fca219 100644
--- a/components/controls/SplitButton.qml
+++ b/components/controls/SplitButton.qml
@@ -37,8 +37,8 @@ Row {
 
     StyledRect {
         radius: implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
-        topRightRadius: Tokens.rounding.small / 2
-        bottomRightRadius: Tokens.rounding.small / 2
+        topRightRadius: Tokens.rounding.medium / 2
+        bottomRightRadius: Tokens.rounding.medium / 2
         color: root.disabled ? root.disabledColour : root.colour
 
         implicitWidth: textRow.implicitWidth + root.horizontalPadding * 2
@@ -93,7 +93,7 @@ Row {
     StyledRect {
         id: expandBtn
 
-        property real rad: root.expanded ? implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) : Tokens.rounding.small / 2
+        property real rad: root.expanded ? implicitHeight / 2 * Math.min(1, Tokens.rounding.scale) : Tokens.rounding.medium / 2
 
         radius: implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
         topLeftRadius: rad
diff --git a/components/controls/SplitButtonRow.qml b/components/controls/SplitButtonRow.qml
index bd1ecc62..81c26e93 100644
--- a/components/controls/SplitButtonRow.qml
+++ b/components/controls/SplitButtonRow.qml
@@ -21,7 +21,7 @@ StyledRect {
 
     Layout.fillWidth: true
     implicitHeight: row.implicitHeight + Tokens.padding.large * 2
-    radius: Tokens.rounding.normal
+    radius: Tokens.rounding.large
     color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
     clip: false
diff --git a/components/controls/StyledInputField.qml b/components/controls/StyledInputField.qml
index ff7772ca..e69bb08c 100644
--- a/components/controls/StyledInputField.qml
+++ b/components/controls/StyledInputField.qml
@@ -28,7 +28,7 @@ Item {
 
         anchors.fill: parent
         color: inputHover.containsMouse || inputField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
-        radius: Tokens.rounding.small
+        radius: Tokens.rounding.medium
         border.width: 1
         border.color: inputField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)
         opacity: root.enabled ? 1 : 0.5
diff --git a/components/controls/StyledTextField.qml b/components/controls/StyledTextField.qml
index 4ab2f824..f3dead7e 100644
--- a/components/controls/StyledTextField.qml
+++ b/components/controls/StyledTextField.qml
@@ -25,7 +25,7 @@ TextField {
 
         implicitWidth: 2
         color: Colours.palette.m3primary
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
 
         Connections {
             function onCursorPositionChanged(): void {
diff --git a/components/controls/SwitchRow.qml b/components/controls/SwitchRow.qml
index b909739f..42d4f16e 100644
--- a/components/controls/SwitchRow.qml
+++ b/components/controls/SwitchRow.qml
@@ -14,7 +14,7 @@ StyledRect {
 
     Layout.fillWidth: true
     implicitHeight: row.implicitHeight + Tokens.padding.large * 2
-    radius: Tokens.rounding.normal
+    radius: Tokens.rounding.large
     color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
     Behavior on implicitHeight {
diff --git a/components/controls/TextButton.qml b/components/controls/TextButton.qml
index 94d76ff8..560725c3 100644
--- a/components/controls/TextButton.qml
+++ b/components/controls/TextButton.qml
@@ -47,7 +47,7 @@ StyledRect {
 
     onCheckedChanged: internalChecked = checked
 
-    radius: internalChecked ? Tokens.rounding.small : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
+    radius: internalChecked ? Tokens.rounding.medium : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
     color: type === TextButton.Text ? "transparent" : internalChecked ? activeColour : inactiveColour
 
     implicitWidth: label.implicitWidth + horizontalPadding * 2
diff --git a/components/controls/ToggleButton.qml b/components/controls/ToggleButton.qml
index 232426c1..de94a46e 100644
--- a/components/controls/ToggleButton.qml
+++ b/components/controls/ToggleButton.qml
@@ -27,7 +27,7 @@ StyledRect {
     Layout.preferredWidth: implicitWidth + (toggleStateLayer.pressed ? Tokens.padding.normal * 2 : toggled ? Tokens.padding.small * 2 : 0)
     implicitWidth: toggleBtnInner.implicitWidth + horizontalPadding * 2
     implicitHeight: toggleBtnIcon.implicitHeight + verticalPadding * 2
-    radius: toggled || toggleStateLayer.pressed ? Tokens.rounding.small : Math.min(width, height) / 2 * Math.min(1, Tokens.rounding.scale)
+    radius: toggled || toggleStateLayer.pressed ? Tokens.rounding.medium : Math.min(width, height) / 2 * Math.min(1, Tokens.rounding.scale)
     color: toggled ? Colours.palette[`m3${accent.toLowerCase()}`] : Colours.palette[`m3${accent.toLowerCase()}Container`]
 
     Connections {
diff --git a/components/controls/Tooltip.qml b/components/controls/Tooltip.qml
index 6c62f43d..8eb9b718 100644
--- a/components/controls/Tooltip.qml
+++ b/components/controls/Tooltip.qml
@@ -120,7 +120,7 @@ Popup {
         implicitHeight: tooltipText.implicitHeight + Tokens.padding.smaller * 2
 
         color: Colours.palette.m3surfaceContainerHighest
-        radius: Tokens.rounding.small
+        radius: Tokens.rounding.medium
         antialiasing: true
 
         // Add elevation for depth
diff --git a/components/effects/InnerBorder.qml b/components/effects/InnerBorder.qml
index 1b502e29..12c8d158 100644
--- a/components/effects/InnerBorder.qml
+++ b/components/effects/InnerBorder.qml
@@ -38,7 +38,7 @@ StyledRect {
 
             anchors.fill: parent
             anchors.margins: Tokens.padding.normal
-            radius: Tokens.rounding.normal
+            radius: Tokens.rounding.large
         }
     }
 }
diff --git a/components/filedialog/CurrentItem.qml b/components/filedialog/CurrentItem.qml
index 83cb4a92..b8e410a2 100644
--- a/components/filedialog/CurrentItem.qml
+++ b/components/filedialog/CurrentItem.qml
@@ -18,7 +18,7 @@ Item {
         ShapePath {
             id: path
 
-            readonly property real rounding: Tokens.rounding.small
+            readonly property real rounding: Tokens.rounding.medium
             readonly property bool flatten: root.implicitHeight < rounding * 2
             readonly property real roundingY: flatten ? root.implicitHeight / 2 : rounding
 
diff --git a/components/filedialog/DialogButtons.qml b/components/filedialog/DialogButtons.qml
index b46b4f72..43e19409 100644
--- a/components/filedialog/DialogButtons.qml
+++ b/components/filedialog/DialogButtons.qml
@@ -31,7 +31,7 @@ StyledRect {
             Layout.rightMargin: Tokens.spacing.normal
 
             color: Colours.tPalette.m3surfaceContainerHigh
-            radius: Tokens.rounding.small
+            radius: Tokens.rounding.medium
 
             StyledText {
                 anchors.fill: parent
@@ -43,7 +43,7 @@ StyledRect {
 
         StyledRect {
             color: Colours.tPalette.m3surfaceContainerHigh
-            radius: Tokens.rounding.small
+            radius: Tokens.rounding.medium
 
             implicitWidth: cancelText.implicitWidth + Tokens.padding.normal * 2
             implicitHeight: cancelText.implicitHeight + Tokens.padding.normal * 2
@@ -66,7 +66,7 @@ StyledRect {
 
         StyledRect {
             color: Colours.tPalette.m3surfaceContainerHigh
-            radius: Tokens.rounding.small
+            radius: Tokens.rounding.medium
 
             implicitWidth: cancelText.implicitWidth + Tokens.padding.normal * 2
             implicitHeight: cancelText.implicitHeight + Tokens.padding.normal * 2
diff --git a/components/filedialog/FolderContents.qml b/components/filedialog/FolderContents.qml
index d8869b83..df9f66cf 100644
--- a/components/filedialog/FolderContents.qml
+++ b/components/filedialog/FolderContents.qml
@@ -43,7 +43,7 @@ Item {
         Rectangle {
             anchors.fill: parent
             anchors.margins: Tokens.padding.small
-            radius: Tokens.rounding.small
+            radius: Tokens.rounding.medium
         }
     }
 
@@ -167,7 +167,7 @@ Item {
         implicitWidth: Sizes.itemWidth
         implicitHeight: nonAnimHeight
 
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
         color: Qt.alpha(Colours.tPalette.m3surfaceContainerHighest, GridView.isCurrentItem ? Colours.tPalette.m3surfaceContainerHighest.a : 0)
         z: GridView.isCurrentItem || implicitHeight !== nonAnimHeight ? 1 : 0
         clip: true
diff --git a/components/filedialog/HeaderBar.qml b/components/filedialog/HeaderBar.qml
index c53d8f76..4733eb01 100644
--- a/components/filedialog/HeaderBar.qml
+++ b/components/filedialog/HeaderBar.qml
@@ -28,7 +28,7 @@ StyledRect {
             implicitHeight: upIcon.implicitHeight + Tokens.padding.small * 2
 
             StateLayer {
-                radius: Tokens.rounding.small
+                radius: Tokens.rounding.medium
                 disabled: root.dialog.cwd.length === 1
                 onClicked: root.dialog.cwd.pop()
             }
@@ -46,7 +46,7 @@ StyledRect {
         StyledRect {
             Layout.fillWidth: true
 
-            radius: Tokens.rounding.small
+            radius: Tokens.rounding.medium
             color: Colours.tPalette.m3surfaceContainerHigh
 
             implicitHeight: pathComponents.implicitHeight + pathComponents.anchors.margins * 2
@@ -95,7 +95,7 @@ StyledRect {
                                         root.dialog.cwd = root.dialog.cwd.slice(0, folder.index + 1);
                                     }
 
-                                    radius: Tokens.rounding.small
+                                    radius: Tokens.rounding.medium
                                 }
                             }
 
diff --git a/components/widgets/ExtraIndicator.qml b/components/widgets/ExtraIndicator.qml
index d426eed8..b6974853 100644
--- a/components/widgets/ExtraIndicator.qml
+++ b/components/widgets/ExtraIndicator.qml
@@ -11,7 +11,7 @@ StyledRect {
     anchors.margins: Tokens.padding.normal
 
     color: Colours.palette.m3tertiary
-    radius: Tokens.rounding.small
+    radius: Tokens.rounding.medium
 
     implicitWidth: count.implicitWidth + Tokens.padding.normal * 2
     implicitHeight: count.implicitHeight + Tokens.padding.small * 2
diff --git a/modules/background/DesktopClock.qml b/modules/background/DesktopClock.qml
index c7415be8..1f96a5ed 100644
--- a/modules/background/DesktopClock.qml
+++ b/modules/background/DesktopClock.qml
@@ -63,7 +63,7 @@ Item {
 
             visible: root.bgEnabled
             anchors.fill: parent
-            radius: Tokens.rounding.large * root.clockScale
+            radius: Tokens.rounding.extraLarge * root.clockScale
             opacity: Config.background.desktopClock.background.opacity
             color: Colours.palette.m3surface
 
diff --git a/modules/background/Visualiser.qml b/modules/background/Visualiser.qml
index 45055879..3bf870cb 100644
--- a/modules/background/Visualiser.qml
+++ b/modules/background/Visualiser.qml
@@ -65,7 +65,7 @@ Item {
                     values: Audio.cava.values
                     primaryColor: Qt.alpha(Colours.palette.m3primary, 0.7)
                     secondaryColor: Qt.alpha(Colours.palette.m3inversePrimary, 0.7)
-                    rounding: Tokens.rounding.small * Config.background.visualiser.rounding
+                    rounding: Tokens.rounding.medium * Config.background.visualiser.rounding
                     spacing: Tokens.spacing.small * Config.background.visualiser.spacing
                     animationDuration: Tokens.anim.durations.normal
 
diff --git a/modules/bar/popouts/ActiveWindow.qml b/modules/bar/popouts/ActiveWindow.qml
index 12246645..f6119948 100644
--- a/modules/bar/popouts/ActiveWindow.qml
+++ b/modules/bar/popouts/ActiveWindow.qml
@@ -65,7 +65,7 @@ Item {
                 Layout.alignment: Qt.AlignVCenter
 
                 StateLayer {
-                    radius: Tokens.rounding.normal
+                    radius: Tokens.rounding.large
                     onClicked: root.popouts.detachRequested("winfo")
                 }
 
@@ -84,7 +84,7 @@ Item {
 
         ClippingWrapperRectangle {
             color: "transparent"
-            radius: Tokens.rounding.small
+            radius: Tokens.rounding.medium
 
             ScreencopyView {
                 id: preview
diff --git a/modules/bar/popouts/Battery.qml b/modules/bar/popouts/Battery.qml
index 93d2012b..168d8156 100644
--- a/modules/bar/popouts/Battery.qml
+++ b/modules/bar/popouts/Battery.qml
@@ -49,7 +49,7 @@ Column {
             implicitHeight: child.implicitHeight + Tokens.padding.smaller * 2
 
             color: Colours.palette.m3error
-            radius: Tokens.rounding.normal
+            radius: Tokens.rounding.large
 
             Column {
                 id: child
diff --git a/modules/bar/popouts/WirelessPassword.qml b/modules/bar/popouts/WirelessPassword.qml
index f6a635fe..e61d9478 100644
--- a/modules/bar/popouts/WirelessPassword.qml
+++ b/modules/bar/popouts/WirelessPassword.qml
@@ -129,7 +129,7 @@ ColumnLayout {
         Layout.fillWidth: true
         Layout.preferredWidth: 400
         implicitHeight: content.implicitHeight + Tokens.padding.large * 2
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
         color: Colours.tPalette.m3surfaceContainer
         visible: root.shouldBeVisible || root.isClosing
         opacity: root.shouldBeVisible && !root.isClosing ? 1 : 0
@@ -336,7 +336,7 @@ ColumnLayout {
 
                 StyledRect {
                     anchors.fill: parent
-                    radius: Tokens.rounding.normal
+                    radius: Tokens.rounding.large
                     color: passwordContainer.activeFocus ? Qt.lighter(Colours.tPalette.m3surfaceContainer, 1.05) : Colours.tPalette.m3surfaceContainer
                     border.width: passwordContainer.activeFocus || connectButton.hasError ? 4 : (root.shouldBeVisible ? 1 : 0)
                     border.color: {
@@ -365,7 +365,7 @@ ColumnLayout {
                 StateLayer {
                     hoverEnabled: false
                     cursorShape: Qt.IBeamCursor
-                    radius: Tokens.rounding.normal
+                    radius: Tokens.rounding.large
                     onClicked: passwordContainer.forceActiveFocus()
                 }
 
@@ -408,7 +408,7 @@ ColumnLayout {
                         implicitHeight: charList.implicitHeight
 
                         color: Colours.palette.m3onSurface
-                        radius: Tokens.rounding.small / 2
+                        radius: Tokens.rounding.medium / 2
 
                         opacity: 0
                         scale: 0
diff --git a/modules/controlcenter/ControlCenter.qml b/modules/controlcenter/ControlCenter.qml
index c8b435ca..57bea637 100644
--- a/modules/controlcenter/ControlCenter.qml
+++ b/modules/controlcenter/ControlCenter.qml
@@ -12,7 +12,7 @@ Item {
     id: root
 
     required property ShellScreen screen
-    readonly property int rounding: floating ? 0 : Tokens.rounding.large
+    readonly property int rounding: floating ? 0 : Tokens.rounding.extraLarge
 
     property alias floating: session.floating
     property alias active: session.active
diff --git a/modules/controlcenter/NavRail.qml b/modules/controlcenter/NavRail.qml
index a126c800..af9aef73 100644
--- a/modules/controlcenter/NavRail.qml
+++ b/modules/controlcenter/NavRail.qml
@@ -54,7 +54,7 @@ Item {
                 implicitHeight: root.session.navExpanded ? normalWinIcon.implicitHeight + Tokens.padding.normal * 2 : nonAnimWidth
 
                 color: Colours.palette.m3primaryContainer
-                radius: Tokens.rounding.small
+                radius: Tokens.rounding.medium
 
                 StateLayer {
                     id: normalWinState
diff --git a/modules/controlcenter/appearance/sections/ColorSchemeSection.qml b/modules/controlcenter/appearance/sections/ColorSchemeSection.qml
index 0a65cbdc..a24847d9 100644
--- a/modules/controlcenter/appearance/sections/ColorSchemeSection.qml
+++ b/modules/controlcenter/appearance/sections/ColorSchemeSection.qml
@@ -32,7 +32,7 @@ CollapsibleSection {
                 readonly property bool isCurrent: schemeKey === Schemes.currentScheme
 
                 color: Qt.alpha(Colours.tPalette.m3surfaceContainer, isCurrent ? Colours.tPalette.m3surfaceContainer.a : 0)
-                radius: Tokens.rounding.normal
+                radius: Tokens.rounding.large
                 border.width: isCurrent ? 1 : 0
                 border.color: Colours.palette.m3primary
                 implicitHeight: schemeRow.implicitHeight + Tokens.padding.normal * 2
diff --git a/modules/controlcenter/appearance/sections/ColorVariantSection.qml b/modules/controlcenter/appearance/sections/ColorVariantSection.qml
index c612485d..0392193f 100644
--- a/modules/controlcenter/appearance/sections/ColorVariantSection.qml
+++ b/modules/controlcenter/appearance/sections/ColorVariantSection.qml
@@ -29,7 +29,7 @@ CollapsibleSection {
                 Layout.fillWidth: true
 
                 color: Qt.alpha(Colours.tPalette.m3surfaceContainer, modelData.variant === Schemes.currentVariant ? Colours.tPalette.m3surfaceContainer.a : 0)
-                radius: Tokens.rounding.normal
+                radius: Tokens.rounding.large
                 border.width: modelData.variant === Schemes.currentVariant ? 1 : 0
                 border.color: Colours.palette.m3primary
                 implicitHeight: variantRow.implicitHeight + Tokens.padding.normal * 2
diff --git a/modules/controlcenter/appearance/sections/FontsSection.qml b/modules/controlcenter/appearance/sections/FontsSection.qml
index 10040c58..82510a76 100644
--- a/modules/controlcenter/appearance/sections/FontsSection.qml
+++ b/modules/controlcenter/appearance/sections/FontsSection.qml
@@ -52,7 +52,7 @@ CollapsibleSection {
 
                     width: ListView.view.width
                     color: Qt.alpha(Colours.tPalette.m3surfaceContainer, isCurrent ? Colours.tPalette.m3surfaceContainer.a : 0)
-                    radius: Tokens.rounding.normal
+                    radius: Tokens.rounding.large
                     border.width: isCurrent ? 1 : 0
                     border.color: Colours.palette.m3primary
                     implicitHeight: fontFamilySansRow.implicitHeight + Tokens.padding.normal * 2
@@ -133,7 +133,7 @@ CollapsibleSection {
 
                     width: ListView.view.width
                     color: Qt.alpha(Colours.tPalette.m3surfaceContainer, isCurrent ? Colours.tPalette.m3surfaceContainer.a : 0)
-                    radius: Tokens.rounding.normal
+                    radius: Tokens.rounding.large
                     border.width: isCurrent ? 1 : 0
                     border.color: Colours.palette.m3primary
                     implicitHeight: fontFamilyMonoRow.implicitHeight + Tokens.padding.normal * 2
@@ -216,7 +216,7 @@ CollapsibleSection {
 
                     width: ListView.view.width
                     color: Qt.alpha(Colours.tPalette.m3surfaceContainer, isCurrent ? Colours.tPalette.m3surfaceContainer.a : 0)
-                    radius: Tokens.rounding.normal
+                    radius: Tokens.rounding.large
                     border.width: isCurrent ? 1 : 0
                     border.color: Colours.palette.m3primary
                     implicitHeight: fontFamilyMaterialRow.implicitHeight + Tokens.padding.normal * 2
diff --git a/modules/controlcenter/audio/AudioPane.qml b/modules/controlcenter/audio/AudioPane.qml
index f3edb731..381bb020 100644
--- a/modules/controlcenter/audio/AudioPane.qml
+++ b/modules/controlcenter/audio/AudioPane.qml
@@ -93,7 +93,7 @@ Item {
                                     Layout.fillWidth: true
 
                                     color: Audio.sink?.id === modelData.id ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : "transparent"
-                                    radius: Tokens.rounding.normal
+                                    radius: Tokens.rounding.large
                                     implicitHeight: outputRowLayout.implicitHeight + Tokens.padding.normal * 2
 
                                     StateLayer {
@@ -170,7 +170,7 @@ Item {
                                     Layout.fillWidth: true
 
                                     color: Audio.source?.id === modelData.id ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : "transparent"
-                                    radius: Tokens.rounding.normal
+                                    radius: Tokens.rounding.large
                                     implicitHeight: inputRowLayout.implicitHeight + Tokens.padding.normal * 2
 
                                     StateLayer {
@@ -314,7 +314,7 @@ Item {
                                     implicitWidth: implicitHeight
                                     implicitHeight: muteIcon.implicitHeight + Tokens.padding.normal * 2
 
-                                    radius: Tokens.rounding.normal
+                                    radius: Tokens.rounding.large
                                     color: Audio.muted ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer
 
                                     StateLayer {
@@ -432,7 +432,7 @@ Item {
                                     implicitWidth: implicitHeight
                                     implicitHeight: muteInputIcon.implicitHeight + Tokens.padding.normal * 2
 
-                                    radius: Tokens.rounding.normal
+                                    radius: Tokens.rounding.large
                                     color: Audio.sourceMuted ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer
 
                                     StateLayer {
@@ -566,7 +566,7 @@ Item {
                                             implicitWidth: implicitHeight
                                             implicitHeight: streamMuteIcon.implicitHeight + Tokens.padding.normal * 2
 
-                                            radius: Tokens.rounding.normal
+                                            radius: Tokens.rounding.large
                                             color: Audio.getStreamMuted(modelData) ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer
 
                                             StateLayer {
diff --git a/modules/controlcenter/bluetooth/Details.qml b/modules/controlcenter/bluetooth/Details.qml
index 41575226..9630a15b 100644
--- a/modules/controlcenter/bluetooth/Details.qml
+++ b/modules/controlcenter/bluetooth/Details.qml
@@ -72,7 +72,7 @@ StyledFlickable {
                             Layout.fillWidth: true
                             implicitHeight: deviceStatus.implicitHeight + Tokens.padding.large * 2
 
-                            radius: Tokens.rounding.normal
+                            radius: Tokens.rounding.large
                             color: Colours.tPalette.m3surfaceContainer
 
                             ColumnLayout {
@@ -131,7 +131,7 @@ StyledFlickable {
                             Layout.fillWidth: true
                             implicitHeight: deviceProps.implicitHeight + Tokens.padding.large * 2
 
-                            radius: Tokens.rounding.normal
+                            radius: Tokens.rounding.large
                             color: Colours.tPalette.m3surfaceContainer
 
                             ColumnLayout {
@@ -209,7 +209,7 @@ StyledFlickable {
                                             rightPadding: Tokens.padding.normal
 
                                             background: StyledRect {
-                                                radius: Tokens.rounding.small
+                                                radius: Tokens.rounding.medium
                                                 border.width: 2
                                                 border.color: Colours.palette.m3primary
                                                 opacity: root.session.bt.editingDeviceName ? 1 : 0
@@ -233,7 +233,7 @@ StyledFlickable {
                                         implicitWidth: implicitHeight
                                         implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.smaller * 2
 
-                                        radius: Tokens.rounding.small
+                                        radius: Tokens.rounding.medium
                                         color: Colours.palette.m3secondaryContainer
                                         opacity: root.session.bt.editingDeviceName ? 1 : 0
                                         scale: root.session.bt.editingDeviceName ? 1 : 0.5
@@ -272,7 +272,7 @@ StyledFlickable {
                                         implicitWidth: implicitHeight
                                         implicitHeight: editIcon.implicitHeight + Tokens.padding.smaller * 2
 
-                                        radius: root.session.bt.editingDeviceName ? Tokens.rounding.small : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
+                                        radius: root.session.bt.editingDeviceName ? Tokens.rounding.medium : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
                                         color: Qt.alpha(Colours.palette.m3primary, root.session.bt.editingDeviceName ? 1 : 0)
 
                                         StateLayer {
@@ -337,7 +337,7 @@ StyledFlickable {
                             Layout.fillWidth: true
                             implicitHeight: deviceInfo.implicitHeight + Tokens.padding.large * 2
 
-                            radius: Tokens.rounding.normal
+                            radius: Tokens.rounding.large
                             color: Colours.tPalette.m3surfaceContainer
 
                             ColumnLayout {
@@ -589,7 +589,7 @@ StyledFlickable {
             implicitWidth: 64
             implicitHeight: 64
 
-            radius: Tokens.rounding.normal
+            radius: Tokens.rounding.large
             color: root.session.bt.fabMenuOpen ? Colours.palette.m3primary : Colours.palette.m3primaryContainer
 
             states: State {
diff --git a/modules/controlcenter/bluetooth/DeviceList.qml b/modules/controlcenter/bluetooth/DeviceList.qml
index 419410ee..b20bc573 100644
--- a/modules/controlcenter/bluetooth/DeviceList.qml
+++ b/modules/controlcenter/bluetooth/DeviceList.qml
@@ -140,7 +140,7 @@ DeviceList {
             implicitHeight: deviceInner.implicitHeight + Tokens.padding.normal * 2
 
             color: Qt.alpha(Colours.tPalette.m3surfaceContainer, root.activeItem === modelData ? Colours.tPalette.m3surfaceContainer.a : 0)
-            radius: Tokens.rounding.normal
+            radius: Tokens.rounding.large
 
             StateLayer {
                 id: stateLayer
@@ -163,7 +163,7 @@ DeviceList {
                     implicitWidth: implicitHeight
                     implicitHeight: icon.implicitHeight + Tokens.padding.normal * 2
 
-                    radius: Tokens.rounding.normal
+                    radius: Tokens.rounding.large
                     color: device.connected ? Colours.palette.m3primaryContainer : (device.modelData && device.modelData.bonded) ? Colours.palette.m3secondaryContainer : Colours.tPalette.m3surfaceContainerHigh
 
                     StyledRect {
diff --git a/modules/controlcenter/bluetooth/Settings.qml b/modules/controlcenter/bluetooth/Settings.qml
index 1202cc5b..b828506d 100644
--- a/modules/controlcenter/bluetooth/Settings.qml
+++ b/modules/controlcenter/bluetooth/Settings.qml
@@ -39,7 +39,7 @@ ColumnLayout {
         Layout.fillWidth: true
         implicitHeight: adapterStatus.implicitHeight + Tokens.padding.large * 2
 
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
         color: Colours.tPalette.m3surfaceContainer
 
         ColumnLayout {
@@ -100,7 +100,7 @@ ColumnLayout {
         Layout.fillWidth: true
         implicitHeight: adapterSettings.implicitHeight + Tokens.padding.large * 2
 
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
         color: Colours.tPalette.m3surfaceContainer
 
         ColumnLayout {
@@ -135,7 +135,7 @@ ColumnLayout {
                             adapterPickerButton.expanded = !adapterPickerButton.expanded;
                         }
 
-                        radius: Tokens.rounding.small
+                        radius: Tokens.rounding.medium
                     }
 
                     RowLayout {
@@ -184,7 +184,7 @@ ColumnLayout {
                         implicitHeight: adapterPickerButton.expanded ? adapterList.implicitHeight : adapterPickerButton.implicitHeight
 
                         color: Colours.palette.m3secondaryContainer
-                        radius: Tokens.rounding.small
+                        radius: Tokens.rounding.medium
                         opacity: adapterPickerButton.expanded ? 1 : 0
                         scale: adapterPickerButton.expanded ? 1 : 0.7
 
@@ -346,7 +346,7 @@ ColumnLayout {
                         rightPadding: Tokens.padding.normal
 
                         background: StyledRect {
-                            radius: Tokens.rounding.small
+                            radius: Tokens.rounding.medium
                             border.width: 2
                             border.color: Colours.palette.m3primary
                             opacity: root.session.bt.editingAdapterName ? 1 : 0
@@ -370,7 +370,7 @@ ColumnLayout {
                     implicitWidth: implicitHeight
                     implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.smaller * 2
 
-                    radius: Tokens.rounding.small
+                    radius: Tokens.rounding.medium
                     color: Colours.palette.m3secondaryContainer
                     opacity: root.session.bt.editingAdapterName ? 1 : 0
                     scale: root.session.bt.editingAdapterName ? 1 : 0.5
@@ -409,7 +409,7 @@ ColumnLayout {
                     implicitWidth: implicitHeight
                     implicitHeight: editIcon.implicitHeight + Tokens.padding.smaller * 2
 
-                    radius: root.session.bt.editingAdapterName ? Tokens.rounding.small : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
+                    radius: root.session.bt.editingAdapterName ? Tokens.rounding.medium : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
                     color: Qt.alpha(Colours.palette.m3primary, root.session.bt.editingAdapterName ? 1 : 0)
 
                     StateLayer {
@@ -457,7 +457,7 @@ ColumnLayout {
         Layout.fillWidth: true
         implicitHeight: adapterInfo.implicitHeight + Tokens.padding.large * 2
 
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
         color: Colours.tPalette.m3surfaceContainer
 
         ColumnLayout {
diff --git a/modules/controlcenter/components/ConnectedButtonGroup.qml b/modules/controlcenter/components/ConnectedButtonGroup.qml
index f782838d..1e948611 100644
--- a/modules/controlcenter/components/ConnectedButtonGroup.qml
+++ b/modules/controlcenter/components/ConnectedButtonGroup.qml
@@ -17,7 +17,7 @@ StyledRect {
 
     Layout.fillWidth: true
     implicitHeight: layout.implicitHeight + Tokens.padding.large * 2
-    radius: Tokens.rounding.normal
+    radius: Tokens.rounding.large
     color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
     clip: true
 
@@ -81,7 +81,7 @@ StyledRect {
 
                     // Match utilities Toggles radius styling
                     // Each button has full rounding (not connected) since they have spacing
-                    radius: stateLayer.pressed ? Tokens.rounding.small / 2 : internalChecked ? Tokens.rounding.small : Tokens.rounding.normal
+                    radius: stateLayer.pressed ? Tokens.rounding.medium / 2 : internalChecked ? Tokens.rounding.medium : Tokens.rounding.large
 
                     // Match utilities Toggles inactive color
                     inactiveColour: Colours.layer(Colours.palette.m3surfaceContainerHighest, 2)
diff --git a/modules/controlcenter/components/WallpaperGrid.qml b/modules/controlcenter/components/WallpaperGrid.qml
index 44a615c6..8003eef7 100644
--- a/modules/controlcenter/components/WallpaperGrid.qml
+++ b/modules/controlcenter/components/WallpaperGrid.qml
@@ -34,7 +34,7 @@ GridView {
         required property int index
         readonly property bool isCurrent: modelData && modelData.path === Wallpapers.actualCurrent
         readonly property real itemMargin: Tokens.spacing.normal / 2
-        readonly property real itemRadius: Tokens.rounding.normal
+        readonly property real itemRadius: Tokens.rounding.large
 
         width: root.cellWidth
         height: root.cellHeight
diff --git a/modules/controlcenter/launcher/LauncherPane.qml b/modules/controlcenter/launcher/LauncherPane.qml
index f2372dbe..915260f2 100644
--- a/modules/controlcenter/launcher/LauncherPane.qml
+++ b/modules/controlcenter/launcher/LauncherPane.qml
@@ -312,7 +312,7 @@ Item {
                             implicitHeight: 40
 
                             color: isSelected ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : "transparent"
-                            radius: Tokens.rounding.normal
+                            radius: Tokens.rounding.large
 
                             opacity: 0
 
diff --git a/modules/controlcenter/network/EthernetList.qml b/modules/controlcenter/network/EthernetList.qml
index 3a947c86..0869f3d5 100644
--- a/modules/controlcenter/network/EthernetList.qml
+++ b/modules/controlcenter/network/EthernetList.qml
@@ -65,7 +65,7 @@ DeviceList {
             implicitHeight: rowLayout.implicitHeight + Tokens.padding.normal * 2
 
             color: Qt.alpha(Colours.tPalette.m3surfaceContainer, ethernetItem.isActive ? Colours.tPalette.m3surfaceContainer.a : 0)
-            radius: Tokens.rounding.normal
+            radius: Tokens.rounding.large
 
             StateLayer {
                 id: stateLayer
@@ -87,7 +87,7 @@ DeviceList {
                     implicitWidth: implicitHeight
                     implicitHeight: icon.implicitHeight + Tokens.padding.normal * 2
 
-                    radius: Tokens.rounding.normal
+                    radius: Tokens.rounding.large
                     color: modelData.connected ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh
 
                     StyledRect {
diff --git a/modules/controlcenter/network/EthernetSettings.qml b/modules/controlcenter/network/EthernetSettings.qml
index f13b6fca..0ffd3b2b 100644
--- a/modules/controlcenter/network/EthernetSettings.qml
+++ b/modules/controlcenter/network/EthernetSettings.qml
@@ -38,7 +38,7 @@ ColumnLayout {
         Layout.fillWidth: true
         implicitHeight: ethernetInfo.implicitHeight + Tokens.padding.large * 2
 
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
         color: Colours.tPalette.m3surfaceContainer
 
         ColumnLayout {
diff --git a/modules/controlcenter/network/NetworkSettings.qml b/modules/controlcenter/network/NetworkSettings.qml
index d8700ecd..924763b1 100644
--- a/modules/controlcenter/network/NetworkSettings.qml
+++ b/modules/controlcenter/network/NetworkSettings.qml
@@ -148,7 +148,7 @@ ColumnLayout {
 
         background: StyledRect {
             color: Colours.palette.m3surface
-            radius: Tokens.rounding.large
+            radius: Tokens.rounding.extraLarge
         }
 
         StyledFlickable {
diff --git a/modules/controlcenter/network/VpnDetails.qml b/modules/controlcenter/network/VpnDetails.qml
index 7ac2dc50..f43022c5 100644
--- a/modules/controlcenter/network/VpnDetails.qml
+++ b/modules/controlcenter/network/VpnDetails.qml
@@ -305,7 +305,7 @@ DeviceDetails {
 
         background: StyledRect {
             color: Colours.palette.m3surfaceContainerHigh
-            radius: Tokens.rounding.large
+            radius: Tokens.rounding.extraLarge
 
             Elevation {
                 anchors.fill: parent
@@ -338,7 +338,7 @@ DeviceDetails {
                     Layout.fillWidth: true
                     implicitHeight: 40
                     color: displayNameField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
-                    radius: Tokens.rounding.small
+                    radius: Tokens.rounding.medium
                     border.width: 1
                     border.color: displayNameField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)
 
@@ -375,7 +375,7 @@ DeviceDetails {
                     Layout.fillWidth: true
                     implicitHeight: 40
                     color: interfaceNameField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
-                    radius: Tokens.rounding.small
+                    radius: Tokens.rounding.medium
                     border.width: 1
                     border.color: interfaceNameField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)
 
@@ -413,7 +413,7 @@ DeviceDetails {
                     Layout.fillWidth: true
                     implicitHeight: 40
                     color: connectCmdFieldEdit.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
-                    radius: Tokens.rounding.small
+                    radius: Tokens.rounding.medium
                     border.width: 1
                     border.color: connectCmdFieldEdit.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)
 
@@ -451,7 +451,7 @@ DeviceDetails {
                     Layout.fillWidth: true
                     implicitHeight: 40
                     color: disconnectCmdFieldEdit.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
-                    radius: Tokens.rounding.small
+                    radius: Tokens.rounding.medium
                     border.width: 1
                     border.color: disconnectCmdFieldEdit.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)
 
diff --git a/modules/controlcenter/network/VpnList.qml b/modules/controlcenter/network/VpnList.qml
index d9266b34..a849fb6b 100644
--- a/modules/controlcenter/network/VpnList.qml
+++ b/modules/controlcenter/network/VpnList.qml
@@ -106,7 +106,7 @@ ColumnLayout {
                 implicitHeight: rowLayout.implicitHeight + Tokens.padding.normal * 2
 
                 color: Qt.alpha(Colours.tPalette.m3surfaceContainer, (root.session && root.session.vpn && root.session.vpn.active === modelData) ? Colours.tPalette.m3surfaceContainer.a : 0)
-                radius: Tokens.rounding.normal
+                radius: Tokens.rounding.large
 
                 StateLayer {
                     onClicked: {
@@ -130,7 +130,7 @@ ColumnLayout {
                         implicitWidth: implicitHeight
                         implicitHeight: icon.implicitHeight + Tokens.padding.normal * 2
 
-                        radius: Tokens.rounding.normal
+                        radius: Tokens.rounding.large
                         color: modelData.enabled && VPN.connected ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh
 
                         MaterialIcon {
@@ -416,7 +416,7 @@ ColumnLayout {
 
         background: StyledRect {
             color: Colours.palette.m3surfaceContainerHigh
-            radius: Tokens.rounding.large
+            radius: Tokens.rounding.extraLarge
 
             Elevation {
                 anchors.fill: parent
@@ -594,7 +594,7 @@ ColumnLayout {
                         Layout.fillWidth: true
                         implicitHeight: 40
                         color: displayNameField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
-                        radius: Tokens.rounding.small
+                        radius: Tokens.rounding.medium
                         border.width: 1
                         border.color: displayNameField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)
 
@@ -631,7 +631,7 @@ ColumnLayout {
                         Layout.fillWidth: true
                         implicitHeight: 40
                         color: interfaceNameField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
-                        radius: Tokens.rounding.small
+                        radius: Tokens.rounding.medium
                         border.width: 1
                         border.color: interfaceNameField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)
 
@@ -669,7 +669,7 @@ ColumnLayout {
                         Layout.fillWidth: true
                         implicitHeight: 40
                         color: connectCmdField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
-                        radius: Tokens.rounding.small
+                        radius: Tokens.rounding.medium
                         border.width: 1
                         border.color: connectCmdField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)
 
@@ -707,7 +707,7 @@ ColumnLayout {
                         Layout.fillWidth: true
                         implicitHeight: 40
                         color: disconnectCmdField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
-                        radius: Tokens.rounding.small
+                        radius: Tokens.rounding.medium
                         border.width: 1
                         border.color: disconnectCmdField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)
 
diff --git a/modules/controlcenter/network/VpnSettings.qml b/modules/controlcenter/network/VpnSettings.qml
index 064f32a1..0baf999b 100644
--- a/modules/controlcenter/network/VpnSettings.qml
+++ b/modules/controlcenter/network/VpnSettings.qml
@@ -83,7 +83,7 @@ ColumnLayout {
                     width: ListView.view ? ListView.view.width : undefined
                     implicitHeight: 60
                     color: Colours.tPalette.m3surfaceContainerHigh
-                    radius: Tokens.rounding.normal
+                    radius: Tokens.rounding.large
 
                     RowLayout {
                         anchors.left: parent.left
diff --git a/modules/controlcenter/network/WirelessList.qml b/modules/controlcenter/network/WirelessList.qml
index b6acd079..1ed34a48 100644
--- a/modules/controlcenter/network/WirelessList.qml
+++ b/modules/controlcenter/network/WirelessList.qml
@@ -113,7 +113,7 @@ DeviceList {
             implicitHeight: rowLayout.implicitHeight + Tokens.padding.normal * 2
 
             color: Qt.alpha(Colours.tPalette.m3surfaceContainer, root.activeItem === modelData ? Colours.tPalette.m3surfaceContainer.a : 0)
-            radius: Tokens.rounding.normal
+            radius: Tokens.rounding.large
 
             StateLayer {
                 onClicked: {
@@ -138,7 +138,7 @@ DeviceList {
                     implicitWidth: implicitHeight
                     implicitHeight: icon.implicitHeight + Tokens.padding.normal * 2
 
-                    radius: Tokens.rounding.normal
+                    radius: Tokens.rounding.large
                     color: modelData.active ? Colours.palette.m3primaryContainer : Colours.tPalette.m3surfaceContainerHigh
 
                     MaterialIcon {
diff --git a/modules/controlcenter/network/WirelessPasswordDialog.qml b/modules/controlcenter/network/WirelessPasswordDialog.qml
index ac88f9fc..861a4870 100644
--- a/modules/controlcenter/network/WirelessPasswordDialog.qml
+++ b/modules/controlcenter/network/WirelessPasswordDialog.qml
@@ -101,7 +101,7 @@ Item {
         implicitWidth: 400
         implicitHeight: content.implicitHeight + Tokens.padding.large * 2
 
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
         color: Colours.tPalette.m3surface
         opacity: root.session.network.showPasswordDialog && !root.isClosing ? 1 : 0
         scale: root.session.network.showPasswordDialog && !root.isClosing ? 1 : 0.7
@@ -261,7 +261,7 @@ Item {
 
                 StyledRect {
                     anchors.fill: parent
-                    radius: Tokens.rounding.normal
+                    radius: Tokens.rounding.large
                     color: passwordContainer.activeFocus ? Qt.lighter(Colours.tPalette.m3surfaceContainer, 1.05) : Colours.tPalette.m3surfaceContainer
                     border.width: passwordContainer.activeFocus || connectButton.hasError ? 4 : (root.visible ? 1 : 0)
                     border.color: {
@@ -335,7 +335,7 @@ Item {
                         implicitHeight: charList.implicitHeight
 
                         color: Colours.palette.m3onSurface
-                        radius: Tokens.rounding.small / 2
+                        radius: Tokens.rounding.medium / 2
 
                         opacity: 0
                         scale: 0
diff --git a/modules/controlcenter/taskbar/TaskbarPane.qml b/modules/controlcenter/taskbar/TaskbarPane.qml
index 601fc09f..fc54e956 100644
--- a/modules/controlcenter/taskbar/TaskbarPane.qml
+++ b/modules/controlcenter/taskbar/TaskbarPane.qml
@@ -290,7 +290,7 @@ Item {
                             StyledRect {
                                 Layout.fillWidth: true
                                 implicitHeight: workspacesShownRow.implicitHeight + Tokens.padding.large * 2
-                                radius: Tokens.rounding.normal
+                                radius: Tokens.rounding.large
                                 color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
                                 Behavior on implicitHeight {
@@ -326,7 +326,7 @@ Item {
                             StyledRect {
                                 Layout.fillWidth: true
                                 implicitHeight: workspacesActiveIndicatorRow.implicitHeight + Tokens.padding.large * 2
-                                radius: Tokens.rounding.normal
+                                radius: Tokens.rounding.large
                                 color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
                                 Behavior on implicitHeight {
@@ -360,7 +360,7 @@ Item {
                             StyledRect {
                                 Layout.fillWidth: true
                                 implicitHeight: workspacesOccupiedBgRow.implicitHeight + Tokens.padding.large * 2
-                                radius: Tokens.rounding.normal
+                                radius: Tokens.rounding.large
                                 color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
                                 Behavior on implicitHeight {
@@ -394,7 +394,7 @@ Item {
                             StyledRect {
                                 Layout.fillWidth: true
                                 implicitHeight: workspacesShowWindowsRow.implicitHeight + Tokens.padding.large * 2
-                                radius: Tokens.rounding.normal
+                                radius: Tokens.rounding.large
                                 color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
                                 Behavior on implicitHeight {
@@ -428,7 +428,7 @@ Item {
                             StyledRect {
                                 Layout.fillWidth: true
                                 implicitHeight: workspacesMaxWindowIconsRow.implicitHeight + Tokens.padding.large * 2
-                                radius: Tokens.rounding.normal
+                                radius: Tokens.rounding.large
                                 color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
                                 Behavior on implicitHeight {
@@ -464,7 +464,7 @@ Item {
                             StyledRect {
                                 Layout.fillWidth: true
                                 implicitHeight: workspacesPerMonitorRow.implicitHeight + Tokens.padding.large * 2
-                                radius: Tokens.rounding.normal
+                                radius: Tokens.rounding.large
                                 color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
                                 Behavior on implicitHeight {
diff --git a/modules/dashboard/Content.qml b/modules/dashboard/Content.qml
index 95d2a08a..4640da27 100644
--- a/modules/dashboard/Content.qml
+++ b/modules/dashboard/Content.qml
@@ -83,7 +83,7 @@ Item {
         anchors.bottom: parent.bottom
         anchors.margins: Tokens.padding.large
 
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
         color: "transparent"
 
         Flickable {
diff --git a/modules/dashboard/Dash.qml b/modules/dashboard/Dash.qml
index 6785ede8..f46d3d08 100644
--- a/modules/dashboard/Dash.qml
+++ b/modules/dashboard/Dash.qml
@@ -21,7 +21,7 @@ GridLayout {
         Layout.preferredWidth: user.implicitWidth
         Layout.preferredHeight: user.implicitHeight
 
-        radius: Tokens.rounding.large
+        radius: Tokens.rounding.extraLarge
 
         User {
             id: user
@@ -37,7 +37,7 @@ GridLayout {
         Layout.preferredWidth: Tokens.sizes.dashboard.weatherWidth
         Layout.fillHeight: true
 
-        radius: Tokens.rounding.large * 1.5
+        radius: Tokens.rounding.extraLarge * 1.5
 
         SmallWeather {}
     }
@@ -47,7 +47,7 @@ GridLayout {
         Layout.preferredWidth: dateTime.implicitWidth
         Layout.fillHeight: true
 
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
 
         DateTime {
             id: dateTime
@@ -61,7 +61,7 @@ GridLayout {
         Layout.fillWidth: true
         Layout.preferredHeight: calendar.implicitHeight
 
-        radius: Tokens.rounding.large
+        radius: Tokens.rounding.extraLarge
 
         Calendar {
             id: calendar
@@ -76,7 +76,7 @@ GridLayout {
         Layout.preferredWidth: resources.implicitWidth
         Layout.fillHeight: true
 
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
 
         Resources {
             id: resources
@@ -90,7 +90,7 @@ GridLayout {
         Layout.preferredWidth: media.implicitWidth
         Layout.fillHeight: true
 
-        radius: Tokens.rounding.large * 2
+        radius: Tokens.rounding.extraLarge * 2
 
         Media {
             id: media
diff --git a/modules/dashboard/LyricMenu.qml b/modules/dashboard/LyricMenu.qml
index 1e5461f5..bfd08356 100644
--- a/modules/dashboard/LyricMenu.qml
+++ b/modules/dashboard/LyricMenu.qml
@@ -19,7 +19,7 @@ StyledRect {
 
     implicitHeight: contentHeight
 
-    radius: Tokens.rounding.large
+    radius: Tokens.rounding.extraLarge
     color: Colours.tPalette.m3surfaceContainer
 
     Loader {
@@ -47,7 +47,7 @@ StyledRect {
                 Rectangle {
                     Layout.preferredHeight: 24
                     Layout.preferredWidth: 80
-                    radius: Tokens.rounding.small
+                    radius: Tokens.rounding.medium
                     color: Qt.rgba(Colours.palette.m3primary.r, Colours.palette.m3primary.g, Colours.palette.m3primary.b, 0.15)
 
                     StyledText {
@@ -73,7 +73,7 @@ StyledRect {
                 Rectangle {
                     Layout.preferredHeight: 24
                     Layout.preferredWidth: 60
-                    radius: Tokens.rounding.small
+                    radius: Tokens.rounding.medium
                     visible: LyricsService.preferredBackend === "Auto"
                     color: LyricsService.backend === "Local" ? Qt.rgba(Colours.palette.m3tertiary.r, Colours.palette.m3tertiary.g, Colours.palette.m3tertiary.b, 0.15) : Qt.rgba(Colours.palette.m3secondary.r, Colours.palette.m3secondary.g, Colours.palette.m3secondary.b, 0.15)
 
@@ -115,7 +115,7 @@ StyledRect {
                 Layout.fillWidth: true
                 Layout.preferredHeight: 48
                 visible: LyricsService.preferredBackend === "Local" && LyricsService.loadedLocalFile.length > 0
-                radius: Tokens.rounding.small
+                radius: Tokens.rounding.medium
                 color: Qt.rgba(Colours.palette.m3tertiary.r, Colours.palette.m3tertiary.g, Colours.palette.m3tertiary.b, 0.1)
 
                 ColumnLayout {
@@ -195,7 +195,7 @@ StyledRect {
                             id: background
 
                             anchors.fill: parent
-                            radius: Tokens.rounding.small
+                            radius: Tokens.rounding.medium
 
                             color: delegateRoot.pressed ? Qt.rgba(Colours.palette.m3primary.r, Colours.palette.m3primary.g, Colours.palette.m3primary.b, 0.25) : delegateRoot.hovered ? Qt.rgba(Colours.palette.m3primary.r, Colours.palette.m3primary.g, Colours.palette.m3primary.b, 0.06) : Qt.rgba(Colours.palette.m3primary.r, Colours.palette.m3primary.g, Colours.palette.m3primary.b, 0.03)
 
diff --git a/modules/dashboard/Media.qml b/modules/dashboard/Media.qml
index ccb5f0c4..b8853e11 100644
--- a/modules/dashboard/Media.qml
+++ b/modules/dashboard/Media.qml
@@ -499,7 +499,7 @@ Item {
 
     component PlayerControl: IconButton {
         Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Tokens.padding.large : internalChecked ? Tokens.padding.smaller : 0)
-        radius: stateLayer.pressed ? Tokens.rounding.small / 2 : internalChecked ? Tokens.rounding.small : implicitHeight / 2
+        radius: stateLayer.pressed ? Tokens.rounding.medium / 2 : internalChecked ? Tokens.rounding.medium : implicitHeight / 2
         radiusAnim.duration: Tokens.anim.durations.expressiveFastSpatial
         radiusAnim.easing: Tokens.anim.expressiveFastSpatial
 
diff --git a/modules/dashboard/Performance.qml b/modules/dashboard/Performance.qml
index c93499ca..300cd193 100644
--- a/modules/dashboard/Performance.qml
+++ b/modules/dashboard/Performance.qml
@@ -26,7 +26,7 @@ Item {
         anchors.centerIn: parent
         width: 400
         height: 350
-        radius: Tokens.rounding.large
+        radius: Tokens.rounding.extraLarge
         color: Colours.tPalette.m3surfaceContainer
         visible: !Config.dashboard.performance.showCpu && !(Config.dashboard.performance.showGpu && SystemUsage.gpuType !== "NONE") && !Config.dashboard.performance.showMemory && !Config.dashboard.performance.showStorage && !Config.dashboard.performance.showNetwork && !(UPower.displayDevice.isLaptopBattery && Config.dashboard.performance.showBattery)
 
@@ -166,7 +166,7 @@ Item {
         property real animatedPercentage: 0
 
         color: Colours.tPalette.m3surfaceContainer
-        radius: Tokens.rounding.large
+        radius: Tokens.rounding.extraLarge
         Component.onCompleted: animatedPercentage = percentage
         onPercentageChanged: animatedPercentage = percentage
 
@@ -346,7 +346,7 @@ Item {
         property real animatedTemp: 0
 
         color: Colours.tPalette.m3surfaceContainer
-        radius: Tokens.rounding.large
+        radius: Tokens.rounding.extraLarge
         Component.onCompleted: {
             animatedUsage = usage;
             animatedTemp = tempProgress;
@@ -462,7 +462,7 @@ Item {
         property real animatedPercentage: 0
 
         color: Colours.tPalette.m3surfaceContainer
-        radius: Tokens.rounding.large
+        radius: Tokens.rounding.extraLarge
         clip: true
         Component.onCompleted: animatedPercentage = percentage
         onPercentageChanged: animatedPercentage = percentage
@@ -529,7 +529,7 @@ Item {
         property color accentColor: Colours.palette.m3secondary
 
         color: Colours.tPalette.m3surfaceContainer
-        radius: Tokens.rounding.large
+        radius: Tokens.rounding.extraLarge
         clip: true
         Component.onCompleted: {
             diskCount = SystemUsage.disks.length;
@@ -650,7 +650,7 @@ Item {
         property color accentColor: Colours.palette.m3primary
 
         color: Colours.tPalette.m3surfaceContainer
-        radius: Tokens.rounding.large
+        radius: Tokens.rounding.extraLarge
         clip: true
 
         Ref {
diff --git a/modules/dashboard/Tabs.qml b/modules/dashboard/Tabs.qml
index 5bf99ca3..06311c8f 100644
--- a/modules/dashboard/Tabs.qml
+++ b/modules/dashboard/Tabs.qml
@@ -183,7 +183,7 @@ Item {
                 implicitHeight: parent.height + Tokens.sizes.dashboard.tabIndicatorSpacing * 2
 
                 color: "transparent"
-                radius: Tokens.rounding.small
+                radius: Tokens.rounding.medium
 
                 StyledRect {
                     id: stateLayer
diff --git a/modules/dashboard/WeatherTab.qml b/modules/dashboard/WeatherTab.qml
index 3cf8d3b7..aee3cb8d 100644
--- a/modules/dashboard/WeatherTab.qml
+++ b/modules/dashboard/WeatherTab.qml
@@ -68,7 +68,7 @@ Item {
             Layout.fillWidth: true
             implicitHeight: bigInfoRow.implicitHeight + Tokens.padding.small * 2
 
-            radius: Tokens.rounding.large * 2
+            radius: Tokens.rounding.extraLarge * 2
             color: Colours.tPalette.m3surfaceContainer
 
             RowLayout {
@@ -158,7 +158,7 @@ Item {
                     Layout.fillWidth: true
                     implicitHeight: forecastItemColumn.implicitHeight + Tokens.padding.normal * 2
 
-                    radius: Tokens.rounding.normal
+                    radius: Tokens.rounding.large
                     color: Colours.tPalette.m3surfaceContainer
 
                     ColumnLayout {
@@ -213,7 +213,7 @@ Item {
 
         Layout.fillWidth: true
         Layout.preferredHeight: 60
-        radius: Tokens.rounding.small
+        radius: Tokens.rounding.medium
         color: Colours.tPalette.m3surfaceContainer
 
         Row {
diff --git a/modules/dashboard/dash/User.qml b/modules/dashboard/dash/User.qml
index 79787de5..18708743 100644
--- a/modules/dashboard/dash/User.qml
+++ b/modules/dashboard/dash/User.qml
@@ -20,7 +20,7 @@ Row {
         implicitWidth: info.implicitHeight
         implicitHeight: info.implicitHeight
 
-        radius: Tokens.rounding.large
+        radius: Tokens.rounding.extraLarge
         color: Colours.layer(Colours.palette.m3surfaceContainerHigh, 2)
 
         MaterialIcon {
@@ -63,7 +63,7 @@ Row {
                 implicitWidth: selectIcon.implicitHeight + Tokens.padding.small * 2
                 implicitHeight: selectIcon.implicitHeight + Tokens.padding.small * 2
 
-                radius: Tokens.rounding.normal
+                radius: Tokens.rounding.large
                 color: Colours.palette.m3primary
                 scale: parent.containsMouse ? 1 : 0.5
                 opacity: parent.containsMouse ? 1 : 0
diff --git a/modules/drawers/ContentWindow.qml b/modules/drawers/ContentWindow.qml
index dab1d606..bd78b292 100644
--- a/modules/drawers/ContentWindow.qml
+++ b/modules/drawers/ContentWindow.qml
@@ -302,7 +302,7 @@ StyledWindow {
         y: panel.y + root.borderThickness
         implicitWidth: panel.width
         implicitHeight: panel.height
-        radius: Tokens.rounding.large
+        radius: Tokens.rounding.extraLarge
         deformScale: (deformAmount * Config.appearance.deformScale) / 10000
     }
 }
diff --git a/modules/launcher/AppList.qml b/modules/launcher/AppList.qml
index a2109c04..96475351 100644
--- a/modules/launcher/AppList.qml
+++ b/modules/launcher/AppList.qml
@@ -32,7 +32,7 @@ StyledListView {
 
     highlightFollowsCurrentItem: false
     highlight: StyledRect {
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
         color: Colours.palette.m3onSurface
         opacity: 0.08
 
diff --git a/modules/launcher/Content.qml b/modules/launcher/Content.qml
index 69be0c3a..9252b4c8 100644
--- a/modules/launcher/Content.qml
+++ b/modules/launcher/Content.qml
@@ -15,7 +15,7 @@ Item {
     required property real maxHeight
 
     readonly property int padding: Tokens.padding.large
-    readonly property int rounding: Tokens.rounding.large
+    readonly property int rounding: Tokens.rounding.extraLarge
 
     implicitWidth: listWrapper.width + padding * 2
     implicitHeight: searchWrapper.height + listWrapper.height + padding * 2
diff --git a/modules/launcher/items/ActionItem.qml b/modules/launcher/items/ActionItem.qml
index 0f9fb5dd..6f8fbb79 100644
--- a/modules/launcher/items/ActionItem.qml
+++ b/modules/launcher/items/ActionItem.qml
@@ -15,7 +15,7 @@ Item {
     anchors.right: parent?.right
 
     StateLayer {
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
         onClicked: root.modelData?.onClicked(root.list)
     }
 
@@ -57,7 +57,7 @@ Item {
                 color: Colours.palette.m3outline
 
                 elide: Text.ElideRight
-                width: root.width - icon.width - Tokens.rounding.normal * 2
+                width: root.width - icon.width - Tokens.rounding.extraLargeIncreased
 
                 anchors.top: name.bottom
             }
diff --git a/modules/launcher/items/AppItem.qml b/modules/launcher/items/AppItem.qml
index 80739c8f..60fc9025 100644
--- a/modules/launcher/items/AppItem.qml
+++ b/modules/launcher/items/AppItem.qml
@@ -19,7 +19,7 @@ Item {
     anchors.right: parent?.right
 
     StateLayer {
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
         onClicked: {
             Apps.launch(root.modelData);
             root.visibilities.launcher = false;
@@ -65,7 +65,7 @@ Item {
                 color: Colours.palette.m3outline
 
                 elide: Text.ElideRight
-                width: root.width - icon.width - favouriteIcon.width - Tokens.rounding.normal * 2
+                width: root.width - icon.width - favouriteIcon.width - Tokens.rounding.extraLargeIncreased
 
                 anchors.top: name.bottom
             }
diff --git a/modules/launcher/items/CalcItem.qml b/modules/launcher/items/CalcItem.qml
index e7f11bab..b465e76f 100644
--- a/modules/launcher/items/CalcItem.qml
+++ b/modules/launcher/items/CalcItem.qml
@@ -28,7 +28,7 @@ Item {
     anchors.right: parent?.right
 
     StateLayer {
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
         onClicked: root.onClicked()
     }
 
@@ -66,7 +66,7 @@ Item {
 
         StyledRect {
             color: Colours.palette.m3tertiary
-            radius: Tokens.rounding.normal
+            radius: Tokens.rounding.large
             clip: true
 
             implicitWidth: (stateLayer.containsMouse ? label.implicitWidth + label.anchors.rightMargin : 0) + icon.implicitWidth + Tokens.padding.normal * 2
diff --git a/modules/launcher/items/SchemeItem.qml b/modules/launcher/items/SchemeItem.qml
index ab0784bd..5f6c88d2 100644
--- a/modules/launcher/items/SchemeItem.qml
+++ b/modules/launcher/items/SchemeItem.qml
@@ -16,7 +16,7 @@ Item {
     anchors.right: parent?.right
 
     StateLayer {
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
         onClicked: root.modelData?.onClicked(root.list)
     }
 
diff --git a/modules/launcher/items/VariantItem.qml b/modules/launcher/items/VariantItem.qml
index b13d5d8e..eb4c7b26 100644
--- a/modules/launcher/items/VariantItem.qml
+++ b/modules/launcher/items/VariantItem.qml
@@ -16,7 +16,7 @@ Item {
     anchors.right: parent?.right
 
     StateLayer {
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
         onClicked: root.modelData?.onClicked(root.list)
     }
 
diff --git a/modules/launcher/items/WallpaperItem.qml b/modules/launcher/items/WallpaperItem.qml
index 58be068d..8950e5d8 100644
--- a/modules/launcher/items/WallpaperItem.qml
+++ b/modules/launcher/items/WallpaperItem.qml
@@ -25,7 +25,7 @@ Item {
     implicitHeight: image.height + label.height + Tokens.spacing.small / 2 + Tokens.padding.large + Tokens.padding.normal
 
     StateLayer {
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
         onClicked: {
             Wallpapers.setWallpaper(root.modelData.path);
             root.visibilities.launcher = false;
@@ -49,7 +49,7 @@ Item {
         anchors.horizontalCenter: parent.horizontalCenter
         y: Tokens.padding.large
         color: Colours.tPalette.m3surfaceContainer
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
 
         implicitWidth: Tokens.sizes.launcher.wallpaperWidth
         implicitHeight: implicitWidth / 16 * 9
diff --git a/modules/lock/Content.qml b/modules/lock/Content.qml
index 0ff7daad..594adaf9 100644
--- a/modules/lock/Content.qml
+++ b/modules/lock/Content.qml
@@ -19,8 +19,8 @@ RowLayout {
             Layout.fillWidth: true
             implicitHeight: weather.implicitHeight
 
-            topLeftRadius: Tokens.rounding.large
-            radius: Tokens.rounding.small
+            topLeftRadius: Tokens.rounding.extraLarge
+            radius: Tokens.rounding.medium
             color: Colours.tPalette.m3surfaceContainer
 
             WeatherInfo {
@@ -34,7 +34,7 @@ RowLayout {
             Layout.fillWidth: true
             Layout.fillHeight: true
 
-            radius: Tokens.rounding.small
+            radius: Tokens.rounding.medium
             color: Colours.tPalette.m3surfaceContainer
 
             Fetch {}
@@ -44,8 +44,8 @@ RowLayout {
             Layout.fillWidth: true
             implicitHeight: media.implicitHeight
 
-            bottomLeftRadius: Tokens.rounding.large
-            radius: Tokens.rounding.small
+            bottomLeftRadius: Tokens.rounding.extraLarge
+            radius: Tokens.rounding.medium
             color: Colours.tPalette.m3surfaceContainer
 
             Media {
@@ -68,8 +68,8 @@ RowLayout {
             Layout.fillWidth: true
             implicitHeight: resources.implicitHeight
 
-            topRightRadius: Tokens.rounding.large
-            radius: Tokens.rounding.small
+            topRightRadius: Tokens.rounding.extraLarge
+            radius: Tokens.rounding.medium
             color: Colours.tPalette.m3surfaceContainer
 
             Resources {
@@ -81,8 +81,8 @@ RowLayout {
             Layout.fillWidth: true
             Layout.fillHeight: true
 
-            bottomRightRadius: Tokens.rounding.large
-            radius: Tokens.rounding.small
+            bottomRightRadius: Tokens.rounding.extraLarge
+            radius: Tokens.rounding.medium
             color: Colours.tPalette.m3surfaceContainer
 
             NotifDock {
diff --git a/modules/lock/Fetch.qml b/modules/lock/Fetch.qml
index 0afbe455..92707430 100644
--- a/modules/lock/Fetch.qml
+++ b/modules/lock/Fetch.qml
@@ -28,7 +28,7 @@ ColumnLayout {
             implicitHeight: prompt.implicitHeight + Tokens.padding.normal * 2
 
             color: Colours.palette.m3primary
-            radius: Tokens.rounding.small
+            radius: Tokens.rounding.medium
 
             MonoText {
                 id: prompt
@@ -136,7 +136,7 @@ ColumnLayout {
                     implicitWidth: implicitHeight
                     implicitHeight: Tokens.font.size.larger * 2
                     color: Colours.palette[`term${index}`]
-                    radius: Tokens.rounding.small
+                    radius: Tokens.rounding.medium
                 }
             }
         }
diff --git a/modules/lock/InputField.qml b/modules/lock/InputField.qml
index 1b6c34a7..94ccffff 100644
--- a/modules/lock/InputField.qml
+++ b/modules/lock/InputField.qml
@@ -91,7 +91,7 @@ Item {
             implicitHeight: charList.implicitHeight
 
             color: Colours.palette.m3onSurface
-            radius: Tokens.rounding.small / 2
+            radius: Tokens.rounding.medium / 2
 
             opacity: 0
             scale: 0
diff --git a/modules/lock/LockSurface.qml b/modules/lock/LockSurface.qml
index 322773fd..9bdcedfe 100644
--- a/modules/lock/LockSurface.qml
+++ b/modules/lock/LockSurface.qml
@@ -138,7 +138,7 @@ WlSessionLockSurface {
                 Anim {
                     target: lockBg
                     property: "radius"
-                    to: lockContent.Tokens.rounding.large * 1.5
+                    to: lockContent.Tokens.rounding.extraLarge * 1.5
                 }
                 Anim {
                     target: lockContent
diff --git a/modules/lock/Media.qml b/modules/lock/Media.qml
index 05c9daaf..44ffbbde 100644
--- a/modules/lock/Media.qml
+++ b/modules/lock/Media.qml
@@ -155,7 +155,7 @@ Item {
         implicitHeight: controlIcon.implicitHeight + Tokens.padding.normal * 2
 
         color: active ? Colours.palette[`m3${colour.toLowerCase()}`] : Colours.palette[`m3${colour.toLowerCase()}Container`]
-        radius: active || controlState.pressed ? Tokens.rounding.normal : Math.min(implicitWidth, implicitHeight) / 2 * Math.min(1, Tokens.rounding.scale)
+        radius: active || controlState.pressed ? Tokens.rounding.large : Math.min(implicitWidth, implicitHeight) / 2 * Math.min(1, Tokens.rounding.scale)
 
         Elevation {
             anchors.fill: parent
diff --git a/modules/lock/NotifDock.qml b/modules/lock/NotifDock.qml
index bf827579..73b74c59 100644
--- a/modules/lock/NotifDock.qml
+++ b/modules/lock/NotifDock.qml
@@ -36,7 +36,7 @@ ColumnLayout {
         Layout.fillWidth: true
         Layout.fillHeight: true
 
-        radius: Tokens.rounding.small
+        radius: Tokens.rounding.medium
         color: "transparent"
 
         Loader {
diff --git a/modules/lock/NotifGroup.qml b/modules/lock/NotifGroup.qml
index 0a5b6d73..1c1a8451 100644
--- a/modules/lock/NotifGroup.qml
+++ b/modules/lock/NotifGroup.qml
@@ -49,7 +49,7 @@ StyledRect {
     implicitHeight: content.implicitHeight + Tokens.padding.normal * 2
 
     clip: true
-    radius: Tokens.rounding.normal
+    radius: Tokens.rounding.large
     color: root.urgency === "critical" ? Colours.palette.m3secondaryContainer : Colours.layer(Colours.palette.m3surfaceContainerHigh, 2)
 
     RowLayout {
diff --git a/modules/lock/Resources.qml b/modules/lock/Resources.qml
index 1f38aa00..34f3fdc7 100644
--- a/modules/lock/Resources.qml
+++ b/modules/lock/Resources.qml
@@ -61,7 +61,7 @@ GridLayout {
         implicitHeight: width
 
         color: Colours.layer(Colours.palette.m3surfaceContainerHigh, 2)
-        radius: Tokens.rounding.large
+        radius: Tokens.rounding.extraLarge
 
         CircularProgress {
             id: circ
diff --git a/modules/notifications/Content.qml b/modules/notifications/Content.qml
index aeaa7dea..1795d671 100644
--- a/modules/notifications/Content.qml
+++ b/modules/notifications/Content.qml
@@ -49,7 +49,7 @@ Item {
         anchors.margins: root.padding
 
         color: "transparent"
-        radius: Tokens.rounding.normal
+        radius: Tokens.rounding.large
 
         StyledListView {
             id: list
diff --git a/modules/notifications/Notification.qml b/modules/notifications/Notification.qml
index 70f58af0..bf9b4183 100644
--- a/modules/notifications/Notification.qml
+++ b/modules/notifications/Notification.qml
@@ -22,7 +22,7 @@ StyledRect {
     property bool expanded: Config.notifs.openExpanded
 
     color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3secondaryContainer : Colours.tPalette.m3surfaceContainer
-    radius: Tokens.rounding.normal
+    radius: Tokens.rounding.large
     implicitWidth: Tokens.sizes.notifs.width
     implicitHeight: inner.implicitHeight
 
diff --git a/modules/session/Content.qml b/modules/session/Content.qml
index bf16b148..7a3ec063 100644
--- a/modules/session/Content.qml
+++ b/modules/session/Content.qml
@@ -85,7 +85,7 @@ Column {
         implicitWidth: Tokens.sizes.session.button
         implicitHeight: Tokens.sizes.session.button
 
-        radius: Tokens.rounding.large
+        radius: Tokens.rounding.extraLarge
         color: button.activeFocus ? Colours.palette.m3secondaryContainer : Colours.tPalette.m3surfaceContainer
 
         Keys.onEnterPressed: Quickshell.execDetached(button.command)
diff --git a/modules/sidebar/Content.qml b/modules/sidebar/Content.qml
index f6b8eb05..60396080 100644
--- a/modules/sidebar/Content.qml
+++ b/modules/sidebar/Content.qml
@@ -20,7 +20,7 @@ Item {
             Layout.fillWidth: true
             Layout.fillHeight: true
 
-            radius: Tokens.rounding.normal
+            radius: Tokens.rounding.large
             color: Colours.tPalette.m3surfaceContainerLow
 
             NotifDock {
diff --git a/modules/sidebar/Notif.qml b/modules/sidebar/Notif.qml
index 2a390926..94ee0b80 100644
--- a/modules/sidebar/Notif.qml
+++ b/modules/sidebar/Notif.qml
@@ -20,7 +20,7 @@ StyledRect {
 
     implicitHeight: nonAnimHeight
 
-    radius: Tokens.rounding.small
+    radius: Tokens.rounding.medium
     color: {
         const c = root.modelData?.urgency === "critical" ? Colours.palette.m3secondaryContainer : Colours.layer(Colours.palette.m3surfaceContainerHigh, 2);
         return expanded ? c : Qt.alpha(c, 0);
diff --git a/modules/sidebar/NotifActionList.qml b/modules/sidebar/NotifActionList.qml
index 084fe678..cbc4765c 100644
--- a/modules/sidebar/NotifActionList.qml
+++ b/modules/sidebar/NotifActionList.qml
@@ -118,7 +118,7 @@ Item {
                     implicitHeight: actionInner.implicitHeight + Tokens.padding.small * 2
 
                     Layout.preferredWidth: implicitWidth + (actionStateLayer.pressed ? Tokens.padding.large : 0)
-                    radius: actionStateLayer.pressed ? Tokens.rounding.small / 2 : Tokens.rounding.small
+                    radius: actionStateLayer.pressed ? Tokens.rounding.medium / 2 : Tokens.rounding.medium
                     color: Colours.layer(Colours.palette.m3surfaceContainerHighest, 4)
 
                     Timer {
diff --git a/modules/sidebar/NotifDock.qml b/modules/sidebar/NotifDock.qml
index bf978ec0..95b237b1 100644
--- a/modules/sidebar/NotifDock.qml
+++ b/modules/sidebar/NotifDock.qml
@@ -82,7 +82,7 @@ Item {
         anchors.bottom: parent.bottom
         anchors.topMargin: Tokens.spacing.smaller
 
-        radius: Tokens.rounding.small
+        radius: Tokens.rounding.medium
         color: "transparent"
 
         Loader {
@@ -187,7 +187,7 @@ Item {
             id: clearBtn
 
             icon: "clear_all"
-            radius: Tokens.rounding.normal
+            radius: Tokens.rounding.large
             padding: Tokens.padding.normal
             font.pointSize: Math.round(Tokens.font.size.large * 1.2)
             onClicked: clearTimer.start()
diff --git a/modules/sidebar/NotifGroup.qml b/modules/sidebar/NotifGroup.qml
index 57ee06b4..6901a764 100644
--- a/modules/sidebar/NotifGroup.qml
+++ b/modules/sidebar/NotifGroup.qml
@@ -57,7 +57,7 @@ StyledRect {
     implicitHeight: nonAnimHeight
 
     clip: true
-    radius: Tokens.rounding.normal
+    radius: Tokens.rounding.large
     color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
     Behavior on implicitHeight {
diff --git a/modules/utilities/RecordingDeleteModal.qml b/modules/utilities/RecordingDeleteModal.qml
index 13125f2c..3eb72ccd 100644
--- a/modules/utilities/RecordingDeleteModal.qml
+++ b/modules/utilities/RecordingDeleteModal.qml
@@ -43,7 +43,7 @@ Loader {
                 anchors.fill: parent
                 anchors.rightMargin: -parent.width * (1 - root.deformMatrix.m11) / 2 // Additional bit to account for deform
                 anchors.bottomMargin: -parent.height * 0.1 // Additional bit to account for overshoot
-                topLeftRadius: Tokens.rounding.large
+                topLeftRadius: Tokens.rounding.extraLarge
                 color: Colours.palette.m3scrim
             }
 
@@ -138,7 +138,7 @@ Loader {
 
         StyledRect {
             anchors.centerIn: parent
-            radius: Tokens.rounding.large
+            radius: Tokens.rounding.extraLarge
             color: Colours.palette.m3surfaceContainerHigh
 
             scale: 0
diff --git a/modules/utilities/cards/IdleInhibit.qml b/modules/utilities/cards/IdleInhibit.qml
index c37ef3c5..e9f7206f 100644
--- a/modules/utilities/cards/IdleInhibit.qml
+++ b/modules/utilities/cards/IdleInhibit.qml
@@ -11,7 +11,7 @@ StyledRect {
     Layout.fillWidth: true
     implicitHeight: layout.implicitHeight + (IdleInhibitor.enabled ? activeChip.implicitHeight + activeChip.anchors.topMargin : 0) + Tokens.padding.large * 2
 
-    radius: Tokens.rounding.normal
+    radius: Tokens.rounding.large
     color: Colours.tPalette.m3surfaceContainer
     clip: true
 
diff --git a/modules/utilities/cards/Record.qml b/modules/utilities/cards/Record.qml
index 43a84076..9a95cccc 100644
--- a/modules/utilities/cards/Record.qml
+++ b/modules/utilities/cards/Record.qml
@@ -16,7 +16,7 @@ StyledRect {
     Layout.fillWidth: true
     implicitHeight: layout.implicitHeight + layout.anchors.margins * 2
 
-    radius: Tokens.rounding.normal
+    radius: Tokens.rounding.large
     color: Colours.tPalette.m3surfaceContainer
 
     ColumnLayout {
diff --git a/modules/utilities/cards/Toggles.qml b/modules/utilities/cards/Toggles.qml
index 8c294eb3..1983a74c 100644
--- a/modules/utilities/cards/Toggles.qml
+++ b/modules/utilities/cards/Toggles.qml
@@ -40,7 +40,7 @@ StyledRect {
     Layout.fillWidth: true
     implicitHeight: layout.implicitHeight + Tokens.padding.large * 2
 
-    radius: Tokens.rounding.normal
+    radius: Tokens.rounding.large
     color: Colours.tPalette.m3surfaceContainer
 
     ColumnLayout {
@@ -155,7 +155,7 @@ StyledRect {
     component Toggle: IconButton {
         Layout.fillWidth: true
         Layout.preferredWidth: implicitWidth + (stateLayer.pressed ? Tokens.padding.large : internalChecked ? Tokens.padding.smaller : 0)
-        radius: stateLayer.pressed ? Tokens.rounding.small / 2 : internalChecked ? Tokens.rounding.small : Tokens.rounding.normal
+        radius: stateLayer.pressed ? Tokens.rounding.medium / 2 : internalChecked ? Tokens.rounding.medium : Tokens.rounding.large
         inactiveColour: Colours.layer(Colours.palette.m3surfaceContainerHighest, 2)
         toggle: true
         radiusAnim.duration: Tokens.anim.durations.expressiveFastSpatial
diff --git a/modules/utilities/toasts/ToastItem.qml b/modules/utilities/toasts/ToastItem.qml
index 5247e773..3a89712f 100644
--- a/modules/utilities/toasts/ToastItem.qml
+++ b/modules/utilities/toasts/ToastItem.qml
@@ -15,7 +15,7 @@ StyledRect {
     anchors.right: parent.right
     implicitHeight: layout.implicitHeight + Tokens.padding.smaller * 2
 
-    radius: Tokens.rounding.normal
+    radius: Tokens.rounding.large
     color: {
         if (root.modelData.type === Toast.Success)
             return Colours.palette.m3successContainer;
@@ -56,7 +56,7 @@ StyledRect {
         spacing: Tokens.spacing.normal
 
         StyledRect {
-            radius: Tokens.rounding.normal
+            radius: Tokens.rounding.large
             color: {
                 if (root.modelData.type === Toast.Success)
                     return Colours.palette.m3success;
diff --git a/modules/windowinfo/Buttons.qml b/modules/windowinfo/Buttons.qml
index c4fbbd53..ae6d4aca 100644
--- a/modules/windowinfo/Buttons.qml
+++ b/modules/windowinfo/Buttons.qml
@@ -31,7 +31,7 @@ ColumnLayout {
 
         StyledRect {
             color: Colours.palette.m3primary
-            radius: Tokens.rounding.small
+            radius: Tokens.rounding.medium
 
             implicitWidth: moveToWsIcon.implicitWidth + Tokens.padding.small * 2
             implicitHeight: moveToWsIcon.implicitHeight + Tokens.padding.small
@@ -142,7 +142,7 @@ ColumnLayout {
 
         signal clicked
 
-        radius: Tokens.rounding.small
+        radius: Tokens.rounding.medium
 
         Layout.fillWidth: true
         implicitHeight: label.implicitHeight + Tokens.padding.small * 2
diff --git a/modules/windowinfo/Preview.qml b/modules/windowinfo/Preview.qml
index fed85891..9f9850ea 100644
--- a/modules/windowinfo/Preview.qml
+++ b/modules/windowinfo/Preview.qml
@@ -30,7 +30,7 @@ Item {
         implicitWidth: view.implicitWidth
 
         color: Colours.tPalette.m3surfaceContainer
-        radius: Tokens.rounding.small
+        radius: Tokens.rounding.medium
 
         Loader {
             asynchronous: true
diff --git a/modules/windowinfo/WindowInfo.qml b/modules/windowinfo/WindowInfo.qml
index 7ee35c29..ba9c839f 100644
--- a/modules/windowinfo/WindowInfo.qml
+++ b/modules/windowinfo/WindowInfo.qml
@@ -39,7 +39,7 @@ Item {
                 Layout.fillHeight: true
 
                 color: Colours.tPalette.m3surfaceContainer
-                radius: Tokens.rounding.normal
+                radius: Tokens.rounding.large
 
                 Details {
                     client: root.client
@@ -51,7 +51,7 @@ Item {
                 Layout.preferredHeight: buttons.implicitHeight
 
                 color: Colours.tPalette.m3surfaceContainer
-                radius: Tokens.rounding.normal
+                radius: Tokens.rounding.large
 
                 Buttons {
                     id: buttons