diff --git a/modules/bar/components/bluetooth/BluetoothMenu.qml b/modules/bar/components/bluetooth/BluetoothMenu.qml
index 72481f8..14e9759 100644
--- a/modules/bar/components/bluetooth/BluetoothMenu.qml
+++ b/modules/bar/components/bluetooth/BluetoothMenu.qml
@@ -4,7 +4,6 @@ import qs.components
 import qs.config
 import qs.widgets
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
 import Quickshell.Bluetooth
@@ -22,29 +21,19 @@ StyledPopupWindow {
             margin: 16
             Layout.fillWidth: true
             RowLayout {
-                RowLayout {
-                    StyledText {
-                        text: "Enabled"
-                    }
-
-                    Switch {
-                        checkable: !!Bluetooth.defaultAdapter
-                        checked: Bluetooth.defaultAdapter?.enabled ?? false
-                        onClicked: Bluetooth.defaultAdapter.enabled = checked
-                    }
+                StyledSwitch {
+                    text: "Enabled"
+                    checkable: !!Bluetooth.defaultAdapter
+                    checked: Bluetooth.defaultAdapter?.enabled ?? false
+                    onClicked: Bluetooth.defaultAdapter.enabled = checked
                 }
 
-                RowLayout {
+                StyledSwitch {
                     Layout.alignment: Qt.AlignRight
-                    StyledText {
-                        text: "Scan"
-                    }
-
-                    Switch {
-                        checkable: !!Bluetooth.defaultAdapter
-                        checked: Bluetooth.defaultAdapter?.discovering ?? false
-                        onClicked: Bluetooth.defaultAdapter.discovering = checked
-                    }
+                    text: "Scan"
+                    checkable: !!Bluetooth.defaultAdapter
+                    checked: Bluetooth.defaultAdapter?.discovering ?? false
+                    onClicked: Bluetooth.defaultAdapter.discovering = checked
                 }
             }
         }
diff --git a/modules/bar/components/notifications/NotificationMenu.qml b/modules/bar/components/notifications/NotificationMenu.qml
index 35f9c19..3781e6b 100644
--- a/modules/bar/components/notifications/NotificationMenu.qml
+++ b/modules/bar/components/notifications/NotificationMenu.qml
@@ -5,7 +5,6 @@ import qs.config
 import qs.services
 import qs.widgets
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
 
 StyledPopupWindow {
@@ -20,17 +19,14 @@ StyledPopupWindow {
 
         RowLayout {
             Layout.fillWidth: true
-            StyledText {
-                text: "Enabled"
-            }
 
-            Switch {
+            StyledSwitch {
+                text: "Enabled"
                 checked: Notifications.enabled
                 onClicked: Notifications.enabled = checked
             }
 
             StyledButton {
-                id: clearButton
                 Layout.alignment: Qt.AlignRight
                 text: "Clear"
                 onClicked: Notifications.clear()