diff --git a/Modules/Lock/Resources.qml b/Modules/Lock/Resources.qml
index 01c1f23..dfb1bba 100644
--- a/Modules/Lock/Resources.qml
+++ b/Modules/Lock/Resources.qml
@@ -1,6 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
-import qs.Modules
+import ZShell.Services
 import qs.Components
 import qs.Helpers
 import qs.Config
@@ -16,30 +16,34 @@ GridLayout {
 	rowSpacing: Appearance.spacing.large
 	rows: 1
 
-	Ref {
-		service: SystemUsage
+	ServiceRef {
+		service: Memory
+	}
+
+	ServiceRef {
+		service: Cpu
 	}
 
 	Resource {
 		Layout.bottomMargin: Appearance.padding.large
 		Layout.topMargin: Appearance.padding.large
-		color: DynamicColors.palette.m3primary
+		fgColor: DynamicColors.palette.m3primary
 		icon: "memory"
-		value: SystemUsage.cpuPerc
+		value: Cpu.percentage
 	}
 
 	Resource {
 		Layout.bottomMargin: Appearance.padding.large
 		Layout.topMargin: Appearance.padding.large
-		color: DynamicColors.palette.m3secondary
+		fgColor: DynamicColors.palette.m3secondary
 		icon: "memory_alt"
-		value: SystemUsage.memPerc
+		value: Memory.percentage
 	}
 
 	component Resource: CustomRect {
 		id: res
 
-		required property color color
+		required property color fgColor
 		required property string icon
 		required property real value
 
@@ -59,7 +63,7 @@ GridLayout {
 
 			anchors.fill: parent
 			bgColor: DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 3)
-			fgColor: res.color
+			fgColor: res.fgColor
 			padding: Appearance.padding.large * 3
 			strokeWidth: width < 200 ? Appearance.padding.smaller : Appearance.padding.normal
 			value: res.value
@@ -69,7 +73,7 @@ GridLayout {
 			id: icon
 
 			anchors.centerIn: parent
-			color: res.color
+			color: res.fgColor
 			font.pointSize: (circ.arcRadius * 0.7) || 1
 			font.weight: 600
 			text: res.icon
diff --git a/Modules/Notifications/Notification.qml b/Modules/Notifications/Notification.qml
index 7abb578..fd4e9e0 100644
--- a/Modules/Notifications/Notification.qml
+++ b/Modules/Notifications/Notification.qml
@@ -13,7 +13,6 @@ import qs.Components
 CustomRect {
 	id: root
 
-	readonly property int bodyTextFormat: /[<*_`#\[\]]/.test(modelData.body) ? Text.MarkdownText : Text.PlainText
 	property bool expanded: Config.notifs.openExpanded
 	readonly property bool hasAppIcon: modelData.appIcon.length > 0
 	readonly property bool hasImage: modelData.image.length > 0
@@ -246,6 +245,7 @@ CustomRect {
 				anchors.leftMargin: Appearance.spacing.small
 				anchors.top: parent.top
 				animate: true
+				font.pointSize: Appearance.font.size.small
 				height: implicitHeight
 				maximumLineCount: 1
 				text: summaryMetrics.elidedText
@@ -326,6 +326,7 @@ CustomRect {
 				anchors.top: parent.top
 				animate: true
 				color: DynamicColors.palette.m3onSurfaceVariant
+				font.pointSize: Appearance.font.size.small
 				horizontalAlignment: Text.AlignLeft
 				text: root.modelData.timeStr
 			}
@@ -374,9 +375,10 @@ CustomRect {
 				anchors.top: summary.bottom
 				animate: true
 				color: DynamicColors.palette.m3onSurfaceVariant
+				font.pointSize: Appearance.font.size.small
 				opacity: root.expanded ? 0 : 1
 				text: bodyPreviewMetrics.elidedText
-				textFormat: root.bodyTextFormat
+				textFormat: Text.MarkdownText
 
 				Behavior on opacity {
 					Anim {
@@ -406,7 +408,7 @@ CustomRect {
 				height: text ? implicitHeight : 0
 				opacity: root.expanded ? 1 : 0
 				text: root.modelData.body
-				textFormat: root.bodyTextFormat
+				textFormat: Text.MarkdownText
 				wrapMode: Text.WrapAtWordBoundaryOrAnywhere
 
 				Behavior on opacity {
@@ -441,6 +443,7 @@ CustomRect {
 				}
 
 				IconButton {
+					enabled: root.expanded
 					fillWidth: root.modelData.actions.length === 0
 					icon: "close"
 					inactiveColor: root.modelData.urgency === NotificationUrgency.Critical ? DynamicColors.palette.m3secondary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 2)
@@ -458,7 +461,13 @@ CustomRect {
 					TextButton {
 						required property var modelData
 
+						enabled: root.expanded
 						fillWidth: true
+						font: {
+							const f = Qt.font(font);
+							f.pointSize = Appearance.font.size.small;
+							return f;
+						}
 						implicitWidth: label.implicitWidth
 						inactiveColor: root.modelData.urgency === NotificationUrgency.Critical ? DynamicColors.palette.m3secondary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 2)
 						inactiveOnColor: root.modelData.urgency === NotificationUrgency.Critical ? DynamicColors.palette.m3onSecondary : DynamicColors.palette.m3onSurfaceVariant
@@ -478,6 +487,7 @@ CustomRect {
 				}
 
 				IconButton {
+					enabled: root.expanded
 					fillWidth: root.modelData.actions.length === 0
 					icon: copyTimer.running ? "inventory" : "content_copy"
 					inactiveColor: root.modelData.urgency === NotificationUrgency.Critical ? DynamicColors.palette.m3secondary : DynamicColors.layer(DynamicColors.palette.m3surfaceContainerHighest, 2)