diff --git a/Components/CustomSplitButton.qml b/Components/CustomSplitButton.qml
index 76364cc..6d90166 100644
--- a/Components/CustomSplitButton.qml
+++ b/Components/CustomSplitButton.qml
@@ -11,10 +11,9 @@ Row {
 	}
 
 	property alias active: menu.active
-	property color colour: type == CustomSplitButton.Filled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3secondaryContainer
-	property bool disabled
-	property color disabledColour: Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
-	property color disabledTextColour: Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
+	property color color: type == CustomSplitButton.Filled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3secondaryContainer
+	property color disabledColor: Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
+	property color disabledTextColor: Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
 	readonly property alias expandBtn: expandBtn
 	property alias expanded: menu.expanded
 	property string fallbackIcon
@@ -27,7 +26,7 @@ Row {
 	property bool menuOnTop
 	property real minLeftWidth
 	readonly property alias stateLayer: stateLayer
-	property color textColour: type == CustomSplitButton.Filled ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSecondaryContainer
+	property color textColor: type == CustomSplitButton.Filled ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSecondaryContainer
 	readonly property alias textRow: textRow
 	property int type: CustomSplitButton.Filled
 	property real verticalPadding: Appearance.padding.small
@@ -36,7 +35,7 @@ Row {
 
 	CustomRect {
 		bottomRightRadius: Appearance.rounding.small / 2
-		color: root.disabled ? root.disabledColour : root.colour
+		color: !root.enabled ? root.disabledColor : root.color
 		implicitHeight: expandBtn.implicitHeight
 		implicitWidth: Math.max(root.minLeftWidth, textRow.implicitWidth + root.horizontalPadding * 2)
 		radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale)
@@ -46,8 +45,8 @@ Row {
 			id: stateLayer
 
 			bottomRightRadius: parent.bottomRightRadius
-			color: root.textColour
-			disabled: root.disabled
+			color: root.textColor
+			enabled: root.enabled
 			topRightRadius: parent.topRightRadius
 
 			onClicked: root.active?.clicked()
@@ -65,7 +64,7 @@ Row {
 
 				Layout.alignment: Qt.AlignVCenter
 				animate: true
-				color: root.disabled ? root.disabledTextColour : root.textColour
+				color: !root.enabled ? root.disabledTextColor : root.textColor
 				fill: 1
 				text: root.active?.activeIcon ?? root.fallbackIcon
 			}
@@ -77,7 +76,7 @@ Row {
 				Layout.preferredWidth: implicitWidth
 				animate: true
 				clip: true
-				color: root.disabled ? root.disabledTextColour : root.textColour
+				color: !root.enabled ? root.disabledTextColor : root.textColor
 				text: root.active?.activeText ?? root.fallbackText
 
 				Behavior on Layout.preferredWidth {
@@ -95,7 +94,7 @@ Row {
 		property real rad: root.expanded ? implicitHeight / 2 * Math.min(1, Appearance.rounding.scale) : Appearance.rounding.small / 2
 
 		bottomLeftRadius: rad
-		color: root.disabled ? root.disabledColour : root.colour
+		color: !root.enabled ? root.disabledColor : root.color
 		implicitHeight: expandIcon.implicitHeight + root.verticalPadding * 2
 		implicitWidth: implicitHeight
 		radius: implicitHeight / 2 * Math.min(1, Appearance.rounding.scale)
@@ -109,8 +108,8 @@ Row {
 		StateLayer {
 			id: expandStateLayer
 
-			color: root.textColour
-			disabled: root.disabled
+			color: root.textColor
+			enabled: root.enabled
 			rect.bottomLeftRadius: parent.bottomLeftRadius
 			rect.topLeftRadius: parent.topLeftRadius
 
@@ -122,7 +121,7 @@ Row {
 
 			anchors.centerIn: parent
 			anchors.horizontalCenterOffset: root.expanded ? 0 : -Math.floor(root.verticalPadding / 4)
-			color: root.disabled ? root.disabledTextColour : root.textColour
+			color: !root.enabled ? root.disabledTextColor : root.textColor
 			rotation: root.expanded ? 180 : 0
 			text: "expand_more"
 
diff --git a/Components/IconButton.qml b/Components/IconButton.qml
index 22314f7..fe99571 100644
--- a/Components/IconButton.qml
+++ b/Components/IconButton.qml
@@ -13,7 +13,6 @@ CustomRect {
 	property color activeColour: type === IconButton.Filled ? DynamicColors.palette.m3primary : DynamicColors.palette.m3secondary
 	property color activeOnColour: type === IconButton.Filled ? DynamicColors.palette.m3onPrimary : type === IconButton.Tonal ? DynamicColors.palette.m3onSecondary : DynamicColors.palette.m3primary
 	property bool checked
-	property bool disabled
 	property color disabledColour: Qt.alpha(DynamicColors.palette.m3onSurface, 0.1)
 	property color disabledOnColour: Qt.alpha(DynamicColors.palette.m3onSurface, 0.38)
 	property alias font: label.font
@@ -38,7 +37,7 @@ CustomRect {
 
 	signal clicked
 
-	color: type === IconButton.Text ? "transparent" : disabled ? disabledColour : internalChecked ? activeColour : inactiveColour
+	color: type === IconButton.Text ? "transparent" : !enabled ? disabledColour : internalChecked ? activeColour : inactiveColour
 	implicitHeight: label.implicitHeight + padding * 2
 	implicitWidth: implicitHeight
 	radius: internalChecked ? 6 : (implicitHeight / 2 * Math.min(1, 1)) * Appearance.rounding.scale
@@ -55,7 +54,6 @@ CustomRect {
 		id: stateLayer
 
 		color: root.internalChecked ? root.activeOnColour : root.inactiveOnColour
-		disabled: root.disabled
 
 		onClicked: {
 			if (root.toggle)
@@ -68,7 +66,7 @@ CustomRect {
 		id: label
 
 		anchors.centerIn: parent
-		color: root.disabled ? root.disabledOnColour : root.internalChecked ? root.activeOnColour : root.inactiveOnColour
+		color: !root.enabled ? root.disabledOnColour : root.internalChecked ? root.activeOnColour : root.inactiveOnColour
 		fill: !root.toggle || root.internalChecked ? 1 : 0
 
 		Behavior on fill {
diff --git a/Components/Menu.qml b/Components/Menu.qml
index a633a9c..43bdc5e 100644
--- a/Components/Menu.qml
+++ b/Components/Menu.qml
@@ -125,7 +125,7 @@ MouseArea {
 
 						StateLayer {
 							color: item.active ? DynamicColors.palette.m3onTertiaryContainer : DynamicColors.palette.m3onSurface
-							disabled: !root.expanded
+							enabled: root.expanded
 
 							onClicked: {
 								root.itemSelected(item.modelData);
diff --git a/Components/StateLayer.qml b/Components/StateLayer.qml
index aa41297..a3d29b8 100644
--- a/Components/StateLayer.qml
+++ b/Components/StateLayer.qml
@@ -12,7 +12,6 @@ MouseArea {
 	property alias bottomRightRadius: base.bottomRightRadius
 	property real circleRadius
 	property alias color: base.color
-	property bool disabled
 	readonly property real endRadius: {
 		const d1 = distSq(0, 0);
 		const d2 = distSq(width, 0);
@@ -51,8 +50,7 @@ MouseArea {
 	}
 
 	anchors.fill: parent
-	cursorShape: disabled ? undefined : Qt.PointingHandCursor
-	enabled: !disabled
+	cursorShape: !enabled ? undefined : Qt.PointingHandCursor
 	hoverEnabled: true
 
 	Behavior on stateOpacity {
@@ -65,7 +63,6 @@ MouseArea {
 		if (!(pressed || manualPressOverride) && circleRadius > endRadiusAtPress * 0.99 && !fadeAnim.running)
 			fadeAnim.start();
 	}
-	onClicked: event => !disabled && onClicked(event)
 	onManualPressOverrideChanged: {
 		if (!(pressed || manualPressOverride) && circleRadius > endRadiusAtPress * 0.99 && !fadeAnim.running)
 			fadeAnim.start();
diff --git a/Modules/Dashboard/Dash/Calendar.qml b/Modules/Dashboard/Dash/Calendar.qml
index 3175645..be9055c 100644
--- a/Modules/Dashboard/Dash/Calendar.qml
+++ b/Modules/Dashboard/Dash/Calendar.qml
@@ -77,9 +77,9 @@ CustomMouseArea {
 					anchors.leftMargin: -Appearance.padding.normal
 					anchors.margins: -Appearance.padding.small
 					anchors.rightMargin: -Appearance.padding.normal
-					disabled: {
+					enabled: {
 						const now = new Date();
-						return root.currMonth === now.getMonth() && root.currYear === now.getFullYear();
+						return root.currMonth !== now.getMonth() || root.currYear !== now.getFullYear();
 					}
 					radius: Appearance.rounding.full
 
diff --git a/Modules/Dashboard/Dash/Media.qml b/Modules/Dashboard/Dash/Media.qml
index 8512134..57233c4 100644
--- a/Modules/Dashboard/Dash/Media.qml
+++ b/Modules/Dashboard/Dash/Media.qml
@@ -296,7 +296,7 @@ Item {
 			id: controlState
 
 			color: control.canUse ? DynamicColors.palette[`m3on${control.set_color}`] : DynamicColors.palette[`m3on${control.set_color}Container`]
-			disabled: !control.canUse
+			enabled: control.canUse
 
 			onClicked: {
 				control.onClicked();
diff --git a/Modules/Notifications/Sidebar/Utils/Cards/Record.qml b/Modules/Notifications/Sidebar/Utils/Cards/Record.qml
index 7d7c832..1961e1f 100644
--- a/Modules/Notifications/Sidebar/Utils/Cards/Record.qml
+++ b/Modules/Notifications/Sidebar/Utils/Cards/Record.qml
@@ -72,7 +72,7 @@ CustomRect {
 
 			CustomSplitButton {
 				active: menuItems.find(m => root.props.recordingMode === m.icon + m.text) ?? menuItems[0]
-				disabled: Recorder.running
+				enabled: !Recorder.running
 
 				menuItems: [
 					MenuItem {
diff --git a/Modules/Settings/Categories/General.qml b/Modules/Settings/Categories/General.qml
index e62379c..a24cf62 100644
--- a/Modules/Settings/Categories/General.qml
+++ b/Modules/Settings/Categories/General.qml
@@ -243,7 +243,7 @@ SettingsPage {
 		// 	id: timeInput
 		//
 		// 	readonly property bool highlighted: SettingsHighlight.highlightedSetting === name
-		// 	property string name
+		// 	property string name: "Schedule dark mode"
 		// 	property var object
 		// 	property list<string> settings
 		// 	property bool shouldBeActive: true
@@ -371,7 +371,20 @@ SettingsPage {
 		// 				CustomRect {
 		// 					Layout.preferredHeight: 72
 		// 					Layout.preferredWidth: 96
-		// 					color: startHourField.focus ? DynamicColors.palette.m3primaryContainer : DynamicColors.palette.m3surfaceContainer
+		// 					color: startHourField.focus ? DynamicColors.palette.m3primaryContainer : DynamicColors.palette.m3surfaceContainerHighest
+		// 					radius: Appearance.rounding.small
+		//
+		// 					CustomRect {
+		// 						anchors.fill: parent
+		// 						border.color: startHourField.focus ? DynamicColors.palette.m3onPrimaryContainer : DynamicColors.palette.m3surfaceContainerHighest
+		// 						border.width: startHourField.focus ? 2 : 0
+		// 						radius: parent.radius - border.width
+		//
+		// 						Behavior on border.width {
+		// 							Anim {
+		// 							}
+		// 						}
+		// 					}
 		//
 		// 					CustomTextField {
 		// 						id: startHourField
@@ -384,9 +397,13 @@ SettingsPage {
 		// 							return timeValue % 60;
 		// 						}
 		//
-		// 						anchors.fill: parent
+		// 						anchors.centerIn: parent
 		// 						font.family: "Roboto"
-		// 						font.pixelSize: 57
+		// 						font.letterSpacing: -0.25
+		// 						font.pixelSize: 50
+		// 						font.weight: 400
+		// 						implicitHeight: contentHeight
+		// 						implicitWidth: parent.width
 		// 						text: convertHour(Config.general.color.scheduleDarkStart)
 		// 					}
 		// 				}
diff --git a/Modules/Settings/Categories/SystemUpdates.qml b/Modules/Settings/Categories/SystemUpdates.qml
index dfe3850..dd01d70 100644
--- a/Modules/Settings/Categories/SystemUpdates.qml
+++ b/Modules/Settings/Categories/SystemUpdates.qml
@@ -70,7 +70,7 @@ CustomClippingRect {
 
 						StateLayer {
 							color: DynamicColors.palette.m3onPrimary
-							disabled: Updates.updating
+							enabled: !Updates.updating
 
 							onClicked: Updates.performSystemUpdate()
 						}
diff --git a/Modules/Settings/Controls/WallpaperCropper.qml b/Modules/Settings/Controls/WallpaperCropper.qml
index ff90251..20b92d0 100644
--- a/Modules/Settings/Controls/WallpaperCropper.qml
+++ b/Modules/Settings/Controls/WallpaperCropper.qml
@@ -131,19 +131,17 @@ Item {
 					anchors.left: parent.left
 					anchors.right: parent.right
 					implicitHeight: 30
-					spacing: Appearance.spacing.large
-
-					CustomText {
-						text: qsTr("Crop scale")
-					}
 
 					CustomSlider {
 						id: zoomSlider
 
 						Layout.fillWidth: true
+						Layout.leftMargin: Appearance.padding.normal
 						Layout.preferredHeight: Appearance.padding.larger * 3
+						Layout.rightMargin: Appearance.padding.normal
 						from: 1.0
 						implicitHeight: Appearance.padding.larger * 3
+						insetIcon: "crop"
 						to: 5.0
 						value: cropRectLoader.item ? cropRectLoader.item.zoom : 1.0
 
diff --git a/Modules/SysTray/Popouts/TrayMenuPopout.qml b/Modules/SysTray/Popouts/TrayMenuPopout.qml
index 7c48320..ab2459b 100644
--- a/Modules/SysTray/Popouts/TrayMenuPopout.qml
+++ b/Modules/SysTray/Popouts/TrayMenuPopout.qml
@@ -103,7 +103,7 @@ StackView {
 						implicitHeight: 30
 
 						StateLayer {
-							disabled: !item.modelData.enabled
+							enabled: item.modelData.enabled
 							radius: item.radius
 
 							onClicked: {