diff --git a/components/SectionHeader.qml b/components/SectionHeader.qml
index f78cf486..23eb913c 100644
--- a/components/SectionHeader.qml
+++ b/components/SectionHeader.qml
@@ -15,7 +15,7 @@ ColumnLayout {
     StyledText {
         Layout.topMargin: Tokens.spacing.largeIncreased
         text: root.title
-        font: Tokens.font.title.builders.medium.weight(500).build()
+        font: Tokens.font.title.builders.medium.weight(Font.Medium).build()
     }
 
     StyledText {
diff --git a/components/controls/CollapsibleSection.qml b/components/controls/CollapsibleSection.qml
index b8ef092a..bebc50e7 100644
--- a/components/controls/CollapsibleSection.qml
+++ b/components/controls/CollapsibleSection.qml
@@ -38,7 +38,7 @@ ColumnLayout {
 
             StyledText {
                 text: root.title
-                font: Tokens.font.title.builders.medium.weight(500).build()
+                font: Tokens.font.title.builders.medium.weight(Font.Medium).build()
             }
 
             Item {
diff --git a/components/filedialog/FolderContents.qml b/components/filedialog/FolderContents.qml
index 5e43c113..0f0a64f0 100644
--- a/components/filedialog/FolderContents.qml
+++ b/components/filedialog/FolderContents.qml
@@ -59,13 +59,13 @@ Item {
                 Layout.alignment: Qt.AlignHCenter
                 text: "scan_delete"
                 color: Colours.palette.m3outline
-                fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 2).weight(500).build()
+                fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 2).weight(Font.Medium).build()
             }
 
             StyledText {
                 text: qsTr("This folder is empty")
                 color: Colours.palette.m3outline
-                font: Tokens.font.body.builders.large.weight(500).build()
+                font: Tokens.font.body.builders.large.weight(Font.Medium).build()
             }
         }
 
diff --git a/modules/bar/popouts/Audio.qml b/modules/bar/popouts/Audio.qml
index 76bdb04c..5404c145 100644
--- a/modules/bar/popouts/Audio.qml
+++ b/modules/bar/popouts/Audio.qml
@@ -34,7 +34,7 @@ Item {
 
         StyledText {
             text: qsTr("Output device")
-            font: Tokens.font.body.builders.medium.weight(500).build()
+            font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
         }
 
         Repeater {
@@ -55,7 +55,7 @@ Item {
         StyledText {
             Layout.topMargin: Tokens.spacing.medium
             text: qsTr("Input device")
-            font: Tokens.font.body.builders.medium.weight(500).build()
+            font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
         }
 
         Repeater {
@@ -75,7 +75,7 @@ Item {
             Layout.topMargin: Tokens.spacing.medium
             Layout.bottomMargin: -Tokens.spacing.extraSmall
             text: qsTr("Volume (%1)").arg(Audio.muted ? qsTr("Muted") : `${Math.round(Audio.volume * 100)}%`)
-            font: Tokens.font.body.builders.medium.weight(500).build()
+            font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
         }
 
         CustomMouseArea {
diff --git a/modules/bar/popouts/Battery.qml b/modules/bar/popouts/Battery.qml
index cac78f82..1af24fa0 100644
--- a/modules/bar/popouts/Battery.qml
+++ b/modules/bar/popouts/Battery.qml
@@ -72,7 +72,7 @@ Column {
                         anchors.verticalCenter: parent.verticalCenter
                         text: qsTr("Performance Degraded")
                         color: Colours.palette.m3onError
-                        font: Tokens.font.mono.builders.medium.weight(500).build()
+                        font: Tokens.font.mono.builders.medium.weight(Font.Medium).build()
                     }
 
                     MaterialIcon {
diff --git a/modules/bar/popouts/Bluetooth.qml b/modules/bar/popouts/Bluetooth.qml
index 30113bd1..41020033 100644
--- a/modules/bar/popouts/Bluetooth.qml
+++ b/modules/bar/popouts/Bluetooth.qml
@@ -22,7 +22,7 @@ ColumnLayout {
         Layout.topMargin: Tokens.padding.medium
         Layout.rightMargin: Tokens.padding.extraSmall
         text: qsTr("Bluetooth")
-        font: Tokens.font.body.builders.medium.weight(500).build()
+        font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
     }
 
     Toggle {
diff --git a/modules/bar/popouts/Network.qml b/modules/bar/popouts/Network.qml
index 1cfaf2cb..b2f3aa9b 100644
--- a/modules/bar/popouts/Network.qml
+++ b/modules/bar/popouts/Network.qml
@@ -29,7 +29,7 @@ ColumnLayout {
         Layout.topMargin: visible ? Tokens.padding.medium : 0
         Layout.rightMargin: Tokens.padding.extraSmall
         text: qsTr("Wireless")
-        font: Tokens.font.body.builders.medium.weight(500).build()
+        font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
     }
 
     Toggle {
@@ -106,7 +106,7 @@ ColumnLayout {
                 Layout.fillWidth: true
                 text: networkItem.modelData.ssid
                 elide: Text.ElideRight
-                font: Tokens.font.body.builders.medium.weight(networkItem.modelData.active ? 500 : 400).build()
+                font: Tokens.font.body.builders.medium.weight(networkItem.modelData.active ? Font.Medium : Font.Normal).build()
                 color: networkItem.modelData.active ? Colours.palette.m3primary : Colours.palette.m3onSurface
             }
 
@@ -221,7 +221,7 @@ ColumnLayout {
         Layout.topMargin: visible ? Tokens.padding.medium : 0
         Layout.rightMargin: Tokens.padding.extraSmall
         text: qsTr("Ethernet")
-        font: Tokens.font.body.builders.medium.weight(500).build()
+        font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
     }
 
     StyledText {
@@ -283,7 +283,7 @@ ColumnLayout {
                 Layout.fillWidth: true
                 text: ethernetItem.modelData.interface || qsTr("Unknown")
                 elide: Text.ElideRight
-                font: Tokens.font.body.builders.medium.weight(ethernetItem.modelData.connected ? 500 : 400).build()
+                font: Tokens.font.body.builders.medium.weight(ethernetItem.modelData.connected ? Font.Medium : Font.Normal).build()
                 color: ethernetItem.modelData.connected ? Colours.palette.m3primary : Colours.palette.m3onSurface
             }
 
diff --git a/modules/bar/popouts/WirelessPassword.qml b/modules/bar/popouts/WirelessPassword.qml
index 65a54419..86d2f19b 100644
--- a/modules/bar/popouts/WirelessPassword.qml
+++ b/modules/bar/popouts/WirelessPassword.qml
@@ -183,7 +183,7 @@ ColumnLayout {
             StyledText {
                 Layout.alignment: Qt.AlignHCenter
                 text: qsTr("Enter password")
-                font: Tokens.font.body.builders.large.weight(500).build()
+                font: Tokens.font.body.builders.large.weight(Font.Medium).build()
             }
 
             StyledText {
@@ -248,7 +248,7 @@ ColumnLayout {
                     return "";
                 }
                 color: connectButton.hasError ? Colours.palette.m3error : Colours.palette.m3onSurfaceVariant
-                font: Tokens.font.body.builders.small.weight(400).build()
+                font: Tokens.font.body.builders.small.weight(Font.Normal).build()
                 wrapMode: Text.WordWrap
                 Layout.maximumWidth: parent.width - Tokens.padding.extraLargeIncreased
             }
diff --git a/modules/bar/popouts/kblayout/KbLayout.qml b/modules/bar/popouts/kblayout/KbLayout.qml
index edf87cb4..abbbae09 100644
--- a/modules/bar/popouts/kblayout/KbLayout.qml
+++ b/modules/bar/popouts/kblayout/KbLayout.qml
@@ -27,7 +27,7 @@ ColumnLayout {
         Layout.topMargin: Tokens.padding.medium
         Layout.rightMargin: Tokens.padding.extraSmall
         text: qsTr("Keyboard Layouts")
-        font: Tokens.font.body.builders.medium.weight(500).build()
+        font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
     }
 
     ListView {
@@ -155,7 +155,7 @@ ColumnLayout {
             Layout.fillWidth: true
             text: kb.activeLabel
             elide: Text.ElideRight
-            font: Tokens.font.body.builders.medium.weight(500).build()
+            font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
             color: Colours.palette.m3primary
         }
 
diff --git a/modules/controlcenter/WindowTitle.qml b/modules/controlcenter/WindowTitle.qml
index 01255d8b..143168a2 100644
--- a/modules/controlcenter/WindowTitle.qml
+++ b/modules/controlcenter/WindowTitle.qml
@@ -20,7 +20,7 @@ StyledRect {
         anchors.bottom: parent.bottom
 
         text: qsTr("Caelestia Settings - %1").arg(root.session.active)
-        font: Tokens.font.title.builders.medium.capitalisation(Font.Capitalize).weight(500).build()
+        font: Tokens.font.title.builders.medium.capitalisation(Font.Capitalize).weight(Font.Medium).build()
     }
 
     Item {
diff --git a/modules/controlcenter/appearance/AppearancePane.qml b/modules/controlcenter/appearance/AppearancePane.qml
index d84545c6..33676862 100644
--- a/modules/controlcenter/appearance/AppearancePane.qml
+++ b/modules/controlcenter/appearance/AppearancePane.qml
@@ -111,7 +111,7 @@ Item {
                     Layout.alignment: Qt.AlignHCenter
                     Layout.bottomMargin: Tokens.spacing.medium
                     text: qsTr("Wallpaper")
-                    font: Tokens.font.body.builders.large.size(28).weight(600).build()
+                    font: Tokens.font.body.builders.large.size(28).weight(Font.DemiBold).build()
                 }
 
                 Loader {
@@ -176,7 +176,7 @@ Item {
 
                         StyledText {
                             text: qsTr("Appearance")
-                            font: Tokens.font.body.builders.large.weight(500).build()
+                            font: Tokens.font.body.builders.large.weight(Font.Medium).build()
                         }
 
                         Item {
diff --git a/modules/controlcenter/appearance/sections/BackgroundSection.qml b/modules/controlcenter/appearance/sections/BackgroundSection.qml
index b7a4d9cc..75018df2 100644
--- a/modules/controlcenter/appearance/sections/BackgroundSection.qml
+++ b/modules/controlcenter/appearance/sections/BackgroundSection.qml
@@ -39,7 +39,7 @@ CollapsibleSection {
     StyledText {
         Layout.topMargin: Tokens.spacing.medium
         text: qsTr("Desktop Clock")
-        font: Tokens.font.body.builders.large.weight(500).build()
+        font: Tokens.font.body.builders.large.weight(Font.Medium).build()
     }
 
     SwitchRow {
@@ -68,7 +68,7 @@ CollapsibleSection {
 
         StyledText {
             text: qsTr("Positioning")
-            font: Tokens.font.body.builders.large.weight(500).build()
+            font: Tokens.font.body.builders.large.weight(Font.Medium).build()
         }
 
         SplitButtonRow {
@@ -158,7 +158,7 @@ CollapsibleSection {
 
         StyledText {
             text: qsTr("Shadow")
-            font: Tokens.font.body.builders.large.weight(500).build()
+            font: Tokens.font.body.builders.large.weight(Font.Medium).build()
         }
 
         SwitchRow {
@@ -226,7 +226,7 @@ CollapsibleSection {
 
         StyledText {
             text: qsTr("Background")
-            font: Tokens.font.body.builders.large.weight(500).build()
+            font: Tokens.font.body.builders.large.weight(Font.Medium).build()
         }
 
         SwitchRow {
@@ -276,7 +276,7 @@ CollapsibleSection {
     StyledText {
         Layout.topMargin: Tokens.spacing.medium
         text: qsTr("Visualiser")
-        font: Tokens.font.body.builders.large.weight(500).build()
+        font: Tokens.font.body.builders.large.weight(Font.Medium).build()
     }
 
     SwitchRow {
diff --git a/modules/controlcenter/appearance/sections/ColorVariantSection.qml b/modules/controlcenter/appearance/sections/ColorVariantSection.qml
index 7e763d34..3d0198aa 100644
--- a/modules/controlcenter/appearance/sections/ColorVariantSection.qml
+++ b/modules/controlcenter/appearance/sections/ColorVariantSection.qml
@@ -75,7 +75,7 @@ CollapsibleSection {
                     StyledText {
                         Layout.fillWidth: true
                         text: modelData.name
-                        font: modelData.variant === Schemes.currentVariant ? Tokens.font.body.builders.small.weight(500).build() : Tokens.font.body.builders.small.weight(400).build()
+                        font: modelData.variant === Schemes.currentVariant ? Tokens.font.body.builders.small.weight(Font.Medium).build() : Tokens.font.body.builders.small.weight(Font.Normal).build()
                     }
 
                     MaterialIcon {
diff --git a/modules/controlcenter/audio/AudioPane.qml b/modules/controlcenter/audio/AudioPane.qml
index a6eacb41..1f0da38d 100644
--- a/modules/controlcenter/audio/AudioPane.qml
+++ b/modules/controlcenter/audio/AudioPane.qml
@@ -46,7 +46,7 @@ Item {
 
                         StyledText {
                             text: qsTr("Audio")
-                            font: Tokens.font.body.builders.large.weight(500).build()
+                            font: Tokens.font.body.builders.large.weight(Font.Medium).build()
                         }
 
                         Item {
@@ -71,7 +71,7 @@ Item {
 
                                 StyledText {
                                     text: qsTr("Devices (%1)").arg(Audio.sinks.length)
-                                    font: Tokens.font.body.builders.medium.weight(500).build()
+                                    font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
                                 }
                             }
 
@@ -122,7 +122,7 @@ Item {
                                             maximumLineCount: 1
 
                                             text: modelData.description || qsTr("Unknown")
-                                            font: Audio.sink?.id === modelData.id ? Tokens.font.body.builders.small.weight(500).build() : Tokens.font.body.builders.small.weight(400).build()
+                                            font: Audio.sink?.id === modelData.id ? Tokens.font.body.builders.small.weight(Font.Medium).build() : Tokens.font.body.builders.small.weight(Font.Normal).build()
                                         }
                                     }
                                 }
@@ -147,7 +147,7 @@ Item {
 
                                 StyledText {
                                     text: qsTr("Devices (%1)").arg(Audio.sources.length)
-                                    font: Tokens.font.body.builders.medium.weight(500).build()
+                                    font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
                                 }
                             }
 
@@ -198,7 +198,7 @@ Item {
                                             maximumLineCount: 1
 
                                             text: modelData.description || qsTr("Unknown")
-                                            font: Audio.source?.id === modelData.id ? Tokens.font.body.builders.small.weight(500).build() : Tokens.font.body.builders.small.weight(400).build()
+                                            font: Audio.source?.id === modelData.id ? Tokens.font.body.builders.small.weight(Font.Medium).build() : Tokens.font.body.builders.small.weight(Font.Normal).build()
                                         }
                                     }
                                 }
@@ -251,7 +251,7 @@ Item {
 
                                 StyledText {
                                     text: qsTr("Volume")
-                                    font: Tokens.font.body.builders.medium.weight(500).build()
+                                    font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
                                 }
 
                                 Item {
@@ -368,7 +368,7 @@ Item {
 
                                 StyledText {
                                     text: qsTr("Volume")
-                                    font: Tokens.font.body.builders.medium.weight(500).build()
+                                    font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
                                 }
 
                                 Item {
@@ -505,7 +505,7 @@ Item {
                                             elide: Text.ElideRight
                                             maximumLineCount: 1
                                             text: Audio.getStreamName(modelData)
-                                            font: Tokens.font.body.builders.medium.weight(500).build()
+                                            font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
                                         }
 
                                         StyledInputField {
diff --git a/modules/controlcenter/bluetooth/Details.qml b/modules/controlcenter/bluetooth/Details.qml
index 74b57e52..acce9776 100644
--- a/modules/controlcenter/bluetooth/Details.qml
+++ b/modules/controlcenter/bluetooth/Details.qml
@@ -59,7 +59,7 @@ StyledFlickable {
                         StyledText {
                             Layout.topMargin: Tokens.spacing.largeIncreased
                             text: qsTr("Connection status")
-                            font: Tokens.font.body.builders.large.weight(500).build()
+                            font: Tokens.font.body.builders.large.weight(Font.Medium).build()
                         }
 
                         StyledText {
@@ -117,7 +117,7 @@ StyledFlickable {
                         StyledText {
                             Layout.topMargin: Tokens.spacing.largeIncreased
                             text: qsTr("Device properties")
-                            font: Tokens.font.body.builders.large.weight(500).build()
+                            font: Tokens.font.body.builders.large.weight(Font.Medium).build()
                         }
 
                         StyledText {
@@ -322,7 +322,7 @@ StyledFlickable {
                         StyledText {
                             Layout.topMargin: Tokens.spacing.largeIncreased
                             text: qsTr("Device information")
-                            font: Tokens.font.body.builders.large.weight(500).build()
+                            font: Tokens.font.body.builders.large.weight(Font.Medium).build()
                         }
 
                         StyledText {
diff --git a/modules/controlcenter/bluetooth/DeviceList.qml b/modules/controlcenter/bluetooth/DeviceList.qml
index caadf5d5..342b5cd6 100644
--- a/modules/controlcenter/bluetooth/DeviceList.qml
+++ b/modules/controlcenter/bluetooth/DeviceList.qml
@@ -36,7 +36,7 @@ DeviceList {
 
             StyledText {
                 text: qsTr("Bluetooth")
-                font: Tokens.font.body.builders.large.weight(500).build()
+                font: Tokens.font.body.builders.large.weight(Font.Medium).build()
             }
 
             Item {
diff --git a/modules/controlcenter/bluetooth/Settings.qml b/modules/controlcenter/bluetooth/Settings.qml
index 53c738b7..a5f04285 100644
--- a/modules/controlcenter/bluetooth/Settings.qml
+++ b/modules/controlcenter/bluetooth/Settings.qml
@@ -26,7 +26,7 @@ ColumnLayout {
     StyledText {
         Layout.topMargin: Tokens.spacing.largeIncreased
         text: qsTr("Adapter status")
-        font: Tokens.font.body.builders.large.weight(500).build()
+        font: Tokens.font.body.builders.large.weight(Font.Medium).build()
     }
 
     StyledText {
@@ -86,7 +86,7 @@ ColumnLayout {
     StyledText {
         Layout.topMargin: Tokens.spacing.largeIncreased
         text: qsTr("Adapter properties")
-        font: Tokens.font.body.builders.large.weight(500).build()
+        font: Tokens.font.body.builders.large.weight(Font.Medium).build()
     }
 
     StyledText {
@@ -442,7 +442,7 @@ ColumnLayout {
     StyledText {
         Layout.topMargin: Tokens.spacing.largeIncreased
         text: qsTr("Adapter information")
-        font: Tokens.font.body.builders.large.weight(500).build()
+        font: Tokens.font.body.builders.large.weight(Font.Medium).build()
     }
 
     StyledText {
diff --git a/modules/controlcenter/components/DeviceList.qml b/modules/controlcenter/components/DeviceList.qml
index 29215372..a56a3bd0 100644
--- a/modules/controlcenter/components/DeviceList.qml
+++ b/modules/controlcenter/components/DeviceList.qml
@@ -47,7 +47,7 @@ ColumnLayout {
         StyledText {
             visible: root.title !== ""
             text: root.title
-            font: Tokens.font.title.builders.medium.weight(500).build()
+            font: Tokens.font.title.builders.medium.weight(Font.Medium).build()
         }
 
         Loader {
diff --git a/modules/controlcenter/components/WallpaperGrid.qml b/modules/controlcenter/components/WallpaperGrid.qml
index 799fbb7e..a2378734 100644
--- a/modules/controlcenter/components/WallpaperGrid.qml
+++ b/modules/controlcenter/components/WallpaperGrid.qml
@@ -210,7 +210,7 @@ GridView {
             anchors.bottomMargin: Tokens.padding.medium
 
             text: modelData.name
-            font: Tokens.font.body.builders.small.weight(500).build()
+            font: Tokens.font.body.builders.small.weight(Font.Medium).build()
             color: isCurrent ? Colours.palette.m3primary : Colours.palette.m3onSurface
             elide: Text.ElideMiddle
             maximumLineCount: 1
diff --git a/modules/controlcenter/dashboard/DashboardPane.qml b/modules/controlcenter/dashboard/DashboardPane.qml
index cf2a8b3f..d69d0745 100644
--- a/modules/controlcenter/dashboard/DashboardPane.qml
+++ b/modules/controlcenter/dashboard/DashboardPane.qml
@@ -119,7 +119,7 @@ Item {
 
                     StyledText {
                         text: qsTr("Dashboard")
-                        font: Tokens.font.title.builders.medium.weight(500).build()
+                        font: Tokens.font.title.builders.medium.weight(Font.Medium).build()
                     }
                 }
 
diff --git a/modules/controlcenter/launcher/LauncherPane.qml b/modules/controlcenter/launcher/LauncherPane.qml
index 587d0402..51e5c760 100644
--- a/modules/controlcenter/launcher/LauncherPane.qml
+++ b/modules/controlcenter/launcher/LauncherPane.qml
@@ -156,7 +156,7 @@ Item {
 
                     StyledText {
                         text: qsTr("Launcher")
-                        font: Tokens.font.title.builders.medium.weight(500).build()
+                        font: Tokens.font.title.builders.medium.weight(Font.Medium).build()
                     }
 
                     Item {
@@ -187,7 +187,7 @@ Item {
                 StyledText {
                     Layout.topMargin: Tokens.spacing.largeIncreased
                     text: qsTr("Applications (%1)").arg(root.searchText ? root.filteredApps.length : allAppsDb.apps.length)
-                    font: Tokens.font.title.builders.small.weight(500).build()
+                    font: Tokens.font.title.builders.small.weight(Font.Medium).build()
                 }
 
                 StyledText {
diff --git a/modules/controlcenter/network/EthernetList.qml b/modules/controlcenter/network/EthernetList.qml
index 2b27f1c4..60f2119a 100644
--- a/modules/controlcenter/network/EthernetList.qml
+++ b/modules/controlcenter/network/EthernetList.qml
@@ -27,7 +27,7 @@ DeviceList {
 
             StyledText {
                 text: qsTr("Settings")
-                font: Tokens.font.title.builders.medium.weight(500).build()
+                font: Tokens.font.title.builders.medium.weight(Font.Medium).build()
             }
 
             Item {
@@ -129,7 +129,7 @@ DeviceList {
                             Layout.fillWidth: true
                             text: modelData.connected ? qsTr("Connected") : qsTr("Disconnected")
                             color: modelData.connected ? Colours.palette.m3primary : Colours.palette.m3outline
-                            font: Tokens.font.body.builders.small.weight(modelData.connected ? 500 : 400).build()
+                            font: Tokens.font.body.builders.small.weight(modelData.connected ? Font.Medium : Font.Normal).build()
                             elide: Text.ElideRight
                         }
                     }
diff --git a/modules/controlcenter/network/EthernetSettings.qml b/modules/controlcenter/network/EthernetSettings.qml
index 03dea154..00ef4452 100644
--- a/modules/controlcenter/network/EthernetSettings.qml
+++ b/modules/controlcenter/network/EthernetSettings.qml
@@ -25,7 +25,7 @@ ColumnLayout {
     StyledText {
         Layout.topMargin: Tokens.spacing.largeIncreased
         text: qsTr("Ethernet devices")
-        font: Tokens.font.body.builders.large.weight(500).build()
+        font: Tokens.font.body.builders.large.weight(Font.Medium).build()
     }
 
     StyledText {
diff --git a/modules/controlcenter/network/NetworkingPane.qml b/modules/controlcenter/network/NetworkingPane.qml
index 80b0d5fc..bf2daa1a 100644
--- a/modules/controlcenter/network/NetworkingPane.qml
+++ b/modules/controlcenter/network/NetworkingPane.qml
@@ -51,7 +51,7 @@ Item {
 
                         StyledText {
                             text: qsTr("Network")
-                            font: Tokens.font.body.builders.large.weight(500).build()
+                            font: Tokens.font.body.builders.large.weight(Font.Medium).build()
                         }
 
                         Item {
diff --git a/modules/controlcenter/network/VpnDetails.qml b/modules/controlcenter/network/VpnDetails.qml
index b174e0ba..983cc1a1 100644
--- a/modules/controlcenter/network/VpnDetails.qml
+++ b/modules/controlcenter/network/VpnDetails.qml
@@ -320,7 +320,7 @@ DeviceDetails {
 
             StyledText {
                 text: qsTr("Edit VPN Provider")
-                font: Tokens.font.body.builders.large.weight(500).build()
+                font: Tokens.font.body.builders.large.weight(Font.Medium).build()
             }
 
             ColumnLayout {
diff --git a/modules/controlcenter/network/VpnList.qml b/modules/controlcenter/network/VpnList.qml
index 0649f2c4..b1b7b01b 100644
--- a/modules/controlcenter/network/VpnList.qml
+++ b/modules/controlcenter/network/VpnList.qml
@@ -196,7 +196,7 @@ ColumnLayout {
                                         return Colours.palette.m3tertiary;
                                     return Colours.palette.m3onSurface;
                                 }
-                                font: Tokens.font.body.builders.small.weight(modelData.enabled && VPN.connected ? 500 : 400).build()
+                                font: Tokens.font.body.builders.small.weight(modelData.enabled && VPN.connected ? Font.Medium : Font.Normal).build()
                                 elide: Text.ElideRight
                             }
                         }
@@ -456,7 +456,7 @@ ColumnLayout {
 
                 StyledText {
                     text: qsTr("Add VPN Provider")
-                    font: Tokens.font.body.builders.large.weight(500).build()
+                    font: Tokens.font.body.builders.large.weight(Font.Medium).build()
                 }
 
                 StyledText {
@@ -574,7 +574,7 @@ ColumnLayout {
 
                 StyledText {
                     text: vpnDialog.editIndex >= 0 ? qsTr("Edit VPN Provider") : qsTr("Add %1 VPN").arg(vpnDialog.displayName)
-                    font: Tokens.font.body.builders.large.weight(500).build()
+                    font: Tokens.font.body.builders.large.weight(Font.Medium).build()
                 }
 
                 ColumnLayout {
diff --git a/modules/controlcenter/network/VpnSettings.qml b/modules/controlcenter/network/VpnSettings.qml
index 2557a973..328292e5 100644
--- a/modules/controlcenter/network/VpnSettings.qml
+++ b/modules/controlcenter/network/VpnSettings.qml
@@ -104,7 +104,7 @@ ColumnLayout {
 
                             StyledText {
                                 text: modelData.displayName
-                                font: Tokens.font.body.builders.medium.weight(modelData.isActive ? 500 : 400).build()
+                                font: Tokens.font.body.builders.medium.weight(modelData.isActive ? Font.Medium : Font.Normal).build()
                             }
 
                             StyledText {
diff --git a/modules/controlcenter/network/WirelessList.qml b/modules/controlcenter/network/WirelessList.qml
index ebb8778b..6dc29d69 100644
--- a/modules/controlcenter/network/WirelessList.qml
+++ b/modules/controlcenter/network/WirelessList.qml
@@ -52,7 +52,7 @@ DeviceList {
 
             StyledText {
                 text: qsTr("Settings")
-                font: Tokens.font.title.builders.medium.weight(500).build()
+                font: Tokens.font.title.builders.medium.weight(Font.Medium).build()
             }
 
             Item {
@@ -181,7 +181,7 @@ DeviceList {
                                 return qsTr("Open");
                             }
                             color: modelData.active ? Colours.palette.m3primary : Colours.palette.m3outline
-                            font: Tokens.font.body.builders.small.weight(modelData.active ? 500 : 400).build()
+                            font: Tokens.font.body.builders.small.weight(modelData.active ? Font.Medium : Font.Normal).build()
                             elide: Text.ElideRight
                         }
                     }
diff --git a/modules/controlcenter/network/WirelessPasswordDialog.qml b/modules/controlcenter/network/WirelessPasswordDialog.qml
index 608714a8..bc64592c 100644
--- a/modules/controlcenter/network/WirelessPasswordDialog.qml
+++ b/modules/controlcenter/network/WirelessPasswordDialog.qml
@@ -155,7 +155,7 @@ Item {
             StyledText {
                 Layout.alignment: Qt.AlignHCenter
                 text: qsTr("Enter password")
-                font: Tokens.font.body.builders.large.weight(500).build()
+                font: Tokens.font.body.builders.large.weight(Font.Medium).build()
             }
 
             StyledText {
@@ -181,7 +181,7 @@ Item {
                     return "";
                 }
                 color: connectButton.hasError ? Colours.palette.m3error : Colours.palette.m3onSurfaceVariant
-                font: Tokens.font.body.builders.small.weight(400).build()
+                font: Tokens.font.body.builders.small.weight(Font.Normal).build()
                 wrapMode: Text.WordWrap
                 Layout.maximumWidth: parent.width - Tokens.padding.extraLargeIncreased
             }
diff --git a/modules/controlcenter/taskbar/TaskbarPane.qml b/modules/controlcenter/taskbar/TaskbarPane.qml
index 5d816659..f4ed385d 100644
--- a/modules/controlcenter/taskbar/TaskbarPane.qml
+++ b/modules/controlcenter/taskbar/TaskbarPane.qml
@@ -179,7 +179,7 @@ Item {
 
                     StyledText {
                         text: qsTr("Taskbar")
-                        font: Tokens.font.title.builders.medium.weight(500).build()
+                        font: Tokens.font.title.builders.medium.weight(Font.Medium).build()
                     }
                 }
 
diff --git a/modules/dashboard/WeatherTab.qml b/modules/dashboard/WeatherTab.qml
index 6628d051..e88abfa2 100644
--- a/modules/dashboard/WeatherTab.qml
+++ b/modules/dashboard/WeatherTab.qml
@@ -29,7 +29,7 @@ Item {
 
                 StyledText {
                     text: Weather.city || qsTr("Loading...")
-                    font: Tokens.font.body.builders.large.size(28).weight(600).build()
+                    font: Tokens.font.body.builders.large.size(28).weight(Font.DemiBold).build()
                     color: Colours.palette.m3onSurface
                 }
 
@@ -90,7 +90,7 @@ Item {
 
                     StyledText {
                         text: Weather.temp
-                        font: Tokens.font.body.builders.large.size(28 * 2).weight(500).build()
+                        font: Tokens.font.body.builders.large.size(28 * 2).weight(Font.Medium).build()
                         color: Colours.palette.m3primary
                     }
 
@@ -133,7 +133,7 @@ Item {
             Layout.leftMargin: Tokens.padding.medium
             visible: forecastRepeater.count > 0
             text: qsTr("7-Day Forecast")
-            font: Tokens.font.body.builders.medium.weight(600).build()
+            font: Tokens.font.body.builders.medium.weight(Font.DemiBold).build()
             color: Colours.palette.m3onSurface
         }
 
@@ -167,7 +167,7 @@ Item {
                         StyledText {
                             Layout.alignment: Qt.AlignHCenter
                             text: forecastItem.index === 0 ? qsTr("Today") : new Date(forecastItem.modelData.date).toLocaleDateString(Qt.locale(), "ddd")
-                            font: Tokens.font.body.builders.medium.weight(600).build()
+                            font: Tokens.font.body.builders.medium.weight(Font.DemiBold).build()
                             color: Colours.palette.m3primary
                         }
 
@@ -190,7 +190,7 @@ Item {
                         StyledText {
                             Layout.alignment: Qt.AlignHCenter
                             text: GlobalConfig.services.useFahrenheit ? forecastItem.modelData.maxTempF + "°" + " / " + forecastItem.modelData.minTempF + "°" : forecastItem.modelData.maxTempC + "°" + " / " + forecastItem.modelData.minTempC + "°"
-                            font: Tokens.font.body.builders.small.weight(600).build()
+                            font: Tokens.font.body.builders.small.weight(Font.DemiBold).build()
                             color: Colours.palette.m3tertiary
                         }
                     }
@@ -235,7 +235,7 @@ Item {
                 }
                 StyledText {
                     text: detailRoot.value
-                    font: Tokens.font.body.builders.small.weight(600).build()
+                    font: Tokens.font.body.builders.small.weight(Font.DemiBold).build()
                     horizontalAlignment: Text.AlignLeft
                 }
             }
@@ -266,7 +266,7 @@ Item {
             }
             StyledText {
                 text: weatherStat.value
-                font: Tokens.font.body.builders.small.weight(600).build()
+                font: Tokens.font.body.builders.small.weight(Font.DemiBold).build()
                 color: Colours.palette.m3onSurface
             }
         }
diff --git a/modules/dashboard/dash/Calendar.qml b/modules/dashboard/dash/Calendar.qml
index 323b203f..ad57beed 100644
--- a/modules/dashboard/dash/Calendar.qml
+++ b/modules/dashboard/dash/Calendar.qml
@@ -61,7 +61,7 @@ CustomMouseArea {
                     anchors.centerIn: parent
                     text: "chevron_left"
                     color: Colours.palette.m3tertiary
-                    fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.medium.pointSize).weight(700).build()
+                    fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.medium.pointSize).weight(Font.Bold).build()
                 }
             }
 
@@ -94,7 +94,7 @@ CustomMouseArea {
                     anchors.centerIn: parent
                     text: grid.title
                     color: Colours.palette.m3primary
-                    font: Tokens.font.body.builders.medium.weight(500).capitalisation(Font.Capitalize).build()
+                    font: Tokens.font.body.builders.medium.weight(Font.Medium).capitalisation(Font.Capitalize).build()
                 }
             }
 
@@ -118,7 +118,7 @@ CustomMouseArea {
                     anchors.centerIn: parent
                     text: "chevron_right"
                     color: Colours.palette.m3tertiary
-                    fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.medium.pointSize).weight(700).build()
+                    fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.medium.pointSize).weight(Font.Bold).build()
                 }
             }
         }
@@ -134,7 +134,7 @@ CustomMouseArea {
 
                 horizontalAlignment: Text.AlignHCenter
                 text: model.shortName
-                font: Tokens.font.body.builders.medium.weight(500).build()
+                font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
                 color: (model.day === 0 || model.day === 6) ? Colours.palette.m3secondary : Colours.palette.m3onSurfaceVariant
             }
         }
@@ -177,7 +177,7 @@ CustomMouseArea {
                             return Colours.palette.m3onSurfaceVariant;
                         }
                         opacity: dayItem.model.today || dayItem.model.month === grid.month ? 1 : 0.4
-                        font: Tokens.font.body.builders.medium.weight(500).build()
+                        font: Tokens.font.body.builders.medium.weight(Font.Medium).build()
                     }
                 }
             }
diff --git a/modules/dashboard/dash/DateTime.qml b/modules/dashboard/dash/DateTime.qml
index b4a44b82..5b7f4bb7 100644
--- a/modules/dashboard/dash/DateTime.qml
+++ b/modules/dashboard/dash/DateTime.qml
@@ -24,7 +24,7 @@ Item {
             Layout.alignment: Qt.AlignHCenter
             text: Time.hourStr
             color: Colours.palette.m3secondary
-            font: Tokens.font.clock.size(28).weight(600).build()
+            font: Tokens.font.clock.size(28).weight(Font.DemiBold).build()
         }
 
         StyledText {
@@ -39,7 +39,7 @@ Item {
             Layout.alignment: Qt.AlignHCenter
             text: Time.minuteStr
             color: Colours.palette.m3secondary
-            font: Tokens.font.clock.size(28).weight(600).build()
+            font: Tokens.font.clock.size(28).weight(Font.DemiBold).build()
         }
 
         Loader {
@@ -52,7 +52,7 @@ Item {
             sourceComponent: StyledText {
                 text: Time.amPmStr
                 color: Colours.palette.m3primary
-                font: Tokens.font.clock.size(18).weight(600).build()
+                font: Tokens.font.clock.size(18).weight(Font.DemiBold).build()
             }
         }
     }
diff --git a/modules/dashboard/dash/SmallWeather.qml b/modules/dashboard/dash/SmallWeather.qml
index a14f119b..b20086cb 100644
--- a/modules/dashboard/dash/SmallWeather.qml
+++ b/modules/dashboard/dash/SmallWeather.qml
@@ -39,7 +39,7 @@ Item {
             animate: true
             text: Weather.temp
             color: Colours.palette.m3primary
-            font: Tokens.font.body.builders.large.size(28).weight(500).build()
+            font: Tokens.font.body.builders.large.size(28).weight(Font.Medium).build()
         }
 
         StyledText {
diff --git a/modules/launcher/ContentList.qml b/modules/launcher/ContentList.qml
index 4e5bad8b..60770579 100644
--- a/modules/launcher/ContentList.qml
+++ b/modules/launcher/ContentList.qml
@@ -130,7 +130,7 @@ Item {
             StyledText {
                 text: root.state === "wallpapers" ? qsTr("No wallpapers found") : qsTr("No results")
                 color: Colours.palette.m3onSurfaceVariant
-                font: Tokens.font.body.builders.large.weight(500).build()
+                font: Tokens.font.body.builders.large.weight(Font.Medium).build()
             }
 
             StyledText {
diff --git a/modules/launcher/items/WallpaperItem.qml b/modules/launcher/items/WallpaperItem.qml
index 9f747a2d..fa844c7a 100644
--- a/modules/launcher/items/WallpaperItem.qml
+++ b/modules/launcher/items/WallpaperItem.qml
@@ -58,7 +58,7 @@ Item {
             anchors.centerIn: parent
             text: "image"
             color: Colours.tPalette.m3outline
-            fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 2).weight(600).build()
+            fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 2).weight(Font.DemiBold).build()
         }
 
         CachingImage {
diff --git a/modules/lock/Center.qml b/modules/lock/Center.qml
index b3f62f5f..56090d02 100644
--- a/modules/lock/Center.qml
+++ b/modules/lock/Center.qml
@@ -194,7 +194,7 @@ ColumnLayout {
                     anchors.centerIn: parent
                     text: "arrow_forward"
                     color: root.lock.pam.buffer ? Colours.palette.m3onPrimary : Colours.palette.m3onSurface
-                    fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.large.pointSize).weight(500).build()
+                    fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.large.pointSize).weight(Font.Medium).build()
                 }
             }
         }
diff --git a/modules/lock/Media.qml b/modules/lock/Media.qml
index 422c2ffe..a8f9ddd4 100644
--- a/modules/lock/Media.qml
+++ b/modules/lock/Media.qml
@@ -76,7 +76,7 @@ Item {
             Layout.bottomMargin: Tokens.spacing.large
             text: qsTr("Now playing")
             color: Colours.palette.m3onSurfaceVariant
-            font: Tokens.font.mono.builders.small.weight(500).build()
+            font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
         }
 
         StyledText {
@@ -85,7 +85,7 @@ Item {
             text: Players.active?.trackArtist ?? qsTr("No media")
             color: Colours.palette.m3primary
             horizontalAlignment: Text.AlignHCenter
-            font: Tokens.font.mono.builders.large.weight(600).build()
+            font: Tokens.font.mono.builders.large.weight(Font.DemiBold).build()
             elide: Text.ElideRight
         }
 
diff --git a/modules/lock/NotifDock.qml b/modules/lock/NotifDock.qml
index a8a9ff7a..3f3578bf 100644
--- a/modules/lock/NotifDock.qml
+++ b/modules/lock/NotifDock.qml
@@ -25,7 +25,7 @@ ColumnLayout {
         Layout.fillWidth: true
         text: Notifs.list.length > 0 ? qsTr("%1 notification%2").arg(Notifs.list.length).arg(Notifs.list.length === 1 ? "" : "s") : qsTr("Notifications")
         color: Colours.palette.m3outline
-        font: Tokens.font.mono.builders.small.weight(500).build()
+        font: Tokens.font.mono.builders.small.weight(Font.Medium).build()
         elide: Text.ElideRight
     }
 
@@ -64,7 +64,7 @@ ColumnLayout {
                     Layout.alignment: Qt.AlignHCenter
                     text: Config.lock.hideNotifs ? qsTr("Unlock for Notifications") : qsTr("No Notifications")
                     color: Colours.palette.m3outlineVariant
-                    font: Tokens.font.mono.builders.large.weight(500).build()
+                    font: Tokens.font.mono.builders.large.weight(Font.Medium).build()
                 }
             }
 
diff --git a/modules/lock/Resources.qml b/modules/lock/Resources.qml
index 0b92347a..314a521e 100644
--- a/modules/lock/Resources.qml
+++ b/modules/lock/Resources.qml
@@ -80,7 +80,7 @@ GridLayout {
             anchors.centerIn: parent
             text: res.icon
             color: res.colour
-            fontStyle: Tokens.font.icon.builder.size((circ.arcRadius * 0.7) || 1).weight(600).build()
+            fontStyle: Tokens.font.icon.builder.size((circ.arcRadius * 0.7) || 1).weight(Font.DemiBold).build()
         }
 
         Behavior on value {
diff --git a/modules/lock/WeatherInfo.qml b/modules/lock/WeatherInfo.qml
index c2dcd57c..cc7fb6f1 100644
--- a/modules/lock/WeatherInfo.qml
+++ b/modules/lock/WeatherInfo.qml
@@ -29,7 +29,7 @@ ColumnLayout {
         sourceComponent: StyledText {
             text: qsTr("Weather")
             color: Colours.palette.m3primary
-            font: Tokens.font.body.builders.large.size(28).weight(500).build()
+            font: Tokens.font.body.builders.large.size(28).weight(Font.Medium).build()
         }
     }
 
@@ -53,7 +53,7 @@ ColumnLayout {
                 animate: true
                 text: Weather.description
                 color: Colours.palette.m3secondary
-                font: Tokens.font.body.builders.large.weight(500).build()
+                font: Tokens.font.body.builders.large.weight(Font.Medium).build()
                 elide: Text.ElideRight
             }
 
@@ -84,7 +84,7 @@ ColumnLayout {
                     text: Weather.temp
                     color: Colours.palette.m3primary
                     horizontalAlignment: Text.AlignRight
-                    font: Tokens.font.body.builders.large.size(28).weight(500).build()
+                    font: Tokens.font.body.builders.large.size(28).weight(Font.Medium).build()
                     elide: Text.ElideLeft
                 }
 
@@ -150,7 +150,7 @@ ColumnLayout {
                     MaterialIcon {
                         Layout.alignment: Qt.AlignHCenter
                         text: forecastHour.modelData?.icon ?? "cloud_alert"
-                        fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 1.5).weight(500).build()
+                        fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize * 1.5).weight(Font.Medium).build()
                     }
 
                     StyledText {
diff --git a/modules/session/Content.qml b/modules/session/Content.qml
index fb6be9c2..a9184b5b 100644
--- a/modules/session/Content.qml
+++ b/modules/session/Content.qml
@@ -125,7 +125,7 @@ Column {
 
             text: button.icon
             color: button.activeFocus ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface
-            fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize).weight(500).build()
+            fontStyle: Tokens.font.icon.builder.size(Tokens.font.icon.extraLarge.pointSize).weight(Font.Medium).build()
         }
     }
 }
diff --git a/modules/sidebar/NotifDock.qml b/modules/sidebar/NotifDock.qml
index 5b3d4c8c..96081919 100644
--- a/modules/sidebar/NotifDock.qml
+++ b/modules/sidebar/NotifDock.qml
@@ -43,7 +43,7 @@ Item {
 
             text: root.notifCount
             color: Colours.palette.m3outline
-            font: Tokens.font.mono.builders.medium.weight(500).build()
+            font: Tokens.font.mono.builders.medium.weight(Font.Medium).build()
 
             Behavior on anchors.leftMargin {
                 Anim {}
@@ -64,7 +64,7 @@ Item {
 
             text: root.notifCount > 0 ? qsTr("notification%1").arg(root.notifCount === 1 ? "" : "s") : qsTr("Notifications")
             color: Colours.palette.m3outline
-            font: Tokens.font.mono.builders.medium.weight(500).build()
+            font: Tokens.font.mono.builders.medium.weight(Font.Medium).build()
             elide: Text.ElideRight
         }
     }
@@ -107,7 +107,7 @@ Item {
                     Layout.alignment: Qt.AlignHCenter
                     text: qsTr("No Notifications")
                     color: Colours.palette.m3outlineVariant
-                    font: Tokens.font.mono.builders.large.weight(500).build()
+                    font: Tokens.font.mono.builders.large.weight(Font.Medium).build()
                 }
             }
 
diff --git a/modules/windowinfo/Details.qml b/modules/windowinfo/Details.qml
index 579ff3e5..50babbda 100644
--- a/modules/windowinfo/Details.qml
+++ b/modules/windowinfo/Details.qml
@@ -19,7 +19,7 @@ ColumnLayout {
         text: root.client?.title ?? qsTr("No active client")
         wrapMode: Text.WrapAtWordBoundaryOrAnywhere
 
-        font: Tokens.font.body.builders.large.weight(500).build()
+        font: Tokens.font.body.builders.large.weight(Font.Medium).build()
     }
 
     Label {
diff --git a/modules/windowinfo/Preview.qml b/modules/windowinfo/Preview.qml
index 6ded74cb..c9e1455d 100644
--- a/modules/windowinfo/Preview.qml
+++ b/modules/windowinfo/Preview.qml
@@ -51,7 +51,7 @@ Item {
                     Layout.alignment: Qt.AlignHCenter
                     text: qsTr("No active client")
                     color: Colours.palette.m3outline
-                    font: Tokens.font.body.builders.large.size(28).weight(500).build()
+                    font: Tokens.font.body.builders.large.size(28).weight(Font.Medium).build()
                 }
 
                 StyledText {