diff --git a/components/containers/StyledFlickable.qml b/components/containers/StyledFlickable.qml
index bc6ae0f6..b792e583 100644
--- a/components/containers/StyledFlickable.qml
+++ b/components/containers/StyledFlickable.qml
@@ -1,5 +1,5 @@
-import ".."
 import QtQuick
+import qs.components
 
 Flickable {
     id: root
diff --git a/components/containers/StyledListView.qml b/components/containers/StyledListView.qml
index 626d2063..8b5a4401 100644
--- a/components/containers/StyledListView.qml
+++ b/components/containers/StyledListView.qml
@@ -1,5 +1,5 @@
-import ".."
 import QtQuick
+import qs.components
 
 ListView {
     id: root
diff --git a/components/controls/CircularIndicator.qml b/components/controls/CircularIndicator.qml
index 763b112c..aabda13a 100644
--- a/components/controls/CircularIndicator.qml
+++ b/components/controls/CircularIndicator.qml
@@ -1,8 +1,8 @@
-import ".."
 import QtQuick
 import QtQuick.Templates
 import Caelestia.Config
 import Caelestia.Internal
+import qs.components
 import qs.services
 
 BusyIndicator {
diff --git a/components/controls/CircularProgress.qml b/components/controls/CircularProgress.qml
index f66e02e0..2372c86c 100644
--- a/components/controls/CircularProgress.qml
+++ b/components/controls/CircularProgress.qml
@@ -1,7 +1,7 @@
-import ".."
 import QtQuick
 import QtQuick.Shapes
 import Caelestia.Config
+import qs.components
 import qs.services
 
 Shape {
diff --git a/components/controls/CollapsibleSection.qml b/components/controls/CollapsibleSection.qml
index 1c1eccec..80ea8fe8 100644
--- a/components/controls/CollapsibleSection.qml
+++ b/components/controls/CollapsibleSection.qml
@@ -1,4 +1,3 @@
-import ".."
 import QtQuick
 import QtQuick.Layouts
 import Caelestia.Config
diff --git a/components/controls/CustomSpinBox.qml b/components/controls/CustomSpinBox.qml
index 96175192..d7885c30 100644
--- a/components/controls/CustomSpinBox.qml
+++ b/components/controls/CustomSpinBox.qml
@@ -1,9 +1,9 @@
 pragma ComponentBehavior: Bound
 
-import ".."
 import QtQuick
 import QtQuick.Layouts
 import Caelestia.Config
+import qs.components
 import qs.services
 
 RowLayout {
diff --git a/components/controls/FilledSlider.qml b/components/controls/FilledSlider.qml
index 794f707a..1d8c85a9 100644
--- a/components/controls/FilledSlider.qml
+++ b/components/controls/FilledSlider.qml
@@ -1,8 +1,8 @@
-import ".."
 import "../effects"
 import QtQuick
 import QtQuick.Templates
 import Caelestia.Config
+import qs.components
 import qs.services
 
 Slider {
diff --git a/components/controls/IconButton.qml b/components/controls/IconButton.qml
index 01be6d8b..58af806a 100644
--- a/components/controls/IconButton.qml
+++ b/components/controls/IconButton.qml
@@ -1,6 +1,6 @@
-import ".."
 import QtQuick
 import Caelestia.Config
+import qs.components
 import qs.services
 
 StyledRect {
diff --git a/components/controls/IconTextButton.qml b/components/controls/IconTextButton.qml
index c93ec9dd..2a1dacec 100644
--- a/components/controls/IconTextButton.qml
+++ b/components/controls/IconTextButton.qml
@@ -1,7 +1,7 @@
-import ".."
 import QtQuick
 import QtQuick.Layouts
 import Caelestia.Config
+import qs.components
 import qs.services
 
 StyledRect {
diff --git a/components/controls/Menu.qml b/components/controls/Menu.qml
index d0a35318..8bd6830e 100644
--- a/components/controls/Menu.qml
+++ b/components/controls/Menu.qml
@@ -1,10 +1,10 @@
 pragma ComponentBehavior: Bound
 
-import ".."
 import "../effects"
 import QtQuick
 import QtQuick.Layouts
 import Caelestia.Config
+import qs.components
 import qs.services
 
 Elevation {
diff --git a/components/controls/SpinBoxRow.qml b/components/controls/SpinBoxRow.qml
index d15414f0..dc52c19c 100644
--- a/components/controls/SpinBoxRow.qml
+++ b/components/controls/SpinBoxRow.qml
@@ -1,4 +1,3 @@
-import ".."
 import QtQuick
 import QtQuick.Layouts
 import Caelestia.Config
diff --git a/components/controls/SplitButton.qml b/components/controls/SplitButton.qml
index e3e2cfa8..f4297db9 100644
--- a/components/controls/SplitButton.qml
+++ b/components/controls/SplitButton.qml
@@ -1,7 +1,7 @@
-import ".."
 import QtQuick
 import QtQuick.Layouts
 import Caelestia.Config
+import qs.components
 import qs.services
 
 Row {
diff --git a/components/controls/SplitButtonRow.qml b/components/controls/SplitButtonRow.qml
index c097bfd5..bd1ecc62 100644
--- a/components/controls/SplitButtonRow.qml
+++ b/components/controls/SplitButtonRow.qml
@@ -1,6 +1,5 @@
 pragma ComponentBehavior: Bound
 
-import ".."
 import QtQuick
 import QtQuick.Layouts
 import Caelestia.Config
diff --git a/components/controls/StyledInputField.qml b/components/controls/StyledInputField.qml
index 38b1208b..ff7772ca 100644
--- a/components/controls/StyledInputField.qml
+++ b/components/controls/StyledInputField.qml
@@ -1,6 +1,5 @@
 pragma ComponentBehavior: Bound
 
-import ".."
 import QtQuick
 import Caelestia.Config
 import qs.components
diff --git a/components/controls/StyledScrollBar.qml b/components/controls/StyledScrollBar.qml
index aaeaff29..8cfe3f8d 100644
--- a/components/controls/StyledScrollBar.qml
+++ b/components/controls/StyledScrollBar.qml
@@ -1,7 +1,7 @@
-import ".."
 import QtQuick
 import QtQuick.Templates
 import Caelestia.Config
+import qs.components
 import qs.services
 
 ScrollBar {
diff --git a/components/controls/StyledSwitch.qml b/components/controls/StyledSwitch.qml
index df1bfc71..2e31adbf 100644
--- a/components/controls/StyledSwitch.qml
+++ b/components/controls/StyledSwitch.qml
@@ -1,8 +1,8 @@
-import ".."
 import QtQuick
 import QtQuick.Shapes
 import QtQuick.Templates
 import Caelestia.Config
+import qs.components
 import qs.services
 
 Switch {
diff --git a/components/controls/StyledTextField.qml b/components/controls/StyledTextField.qml
index 0d193e11..4ab2f824 100644
--- a/components/controls/StyledTextField.qml
+++ b/components/controls/StyledTextField.qml
@@ -1,9 +1,9 @@
 pragma ComponentBehavior: Bound
 
-import ".."
 import QtQuick
 import QtQuick.Controls
 import Caelestia.Config
+import qs.components
 import qs.services
 
 TextField {
diff --git a/components/controls/SwitchRow.qml b/components/controls/SwitchRow.qml
index 8b2d617d..b909739f 100644
--- a/components/controls/SwitchRow.qml
+++ b/components/controls/SwitchRow.qml
@@ -1,4 +1,3 @@
-import ".."
 import QtQuick
 import QtQuick.Layouts
 import Caelestia.Config
@@ -10,7 +9,8 @@ StyledRect {
 
     required property string label
     required property bool checked
-    property var onToggled: function (checked) {}
+
+    signal toggled(checked: bool)
 
     Layout.fillWidth: true
     implicitHeight: row.implicitHeight + Tokens.padding.large * 2
@@ -38,9 +38,7 @@ StyledRect {
         StyledSwitch {
             checked: root.checked
             enabled: root.enabled
-            onToggled: {
-                root.onToggled(checked); // qmllint disable use-proper-function
-            }
+            onToggled: root.toggled(checked)
         }
     }
 }
diff --git a/components/controls/TextButton.qml b/components/controls/TextButton.qml
index f1871405..94d76ff8 100644
--- a/components/controls/TextButton.qml
+++ b/components/controls/TextButton.qml
@@ -1,6 +1,6 @@
-import ".."
 import QtQuick
 import Caelestia.Config
+import qs.components
 import qs.services
 
 StyledRect {
diff --git a/components/controls/ToggleButton.qml b/components/controls/ToggleButton.qml
index e470091c..232426c1 100644
--- a/components/controls/ToggleButton.qml
+++ b/components/controls/ToggleButton.qml
@@ -1,6 +1,5 @@
 pragma ComponentBehavior: Bound
 
-import ".."
 import QtQuick
 import QtQuick.Layouts
 import Caelestia.Config
@@ -23,9 +22,8 @@ StyledRect {
 
     signal clicked
 
-    Component.onCompleted: {
-        hovered = toggleStateLayer.containsMouse;
-    }
+    Component.onCompleted: hovered = toggleStateLayer.containsMouse
+
     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
diff --git a/components/controls/Tooltip.qml b/components/controls/Tooltip.qml
index 00252be3..6c62f43d 100644
--- a/components/controls/Tooltip.qml
+++ b/components/controls/Tooltip.qml
@@ -1,7 +1,7 @@
-import ".."
 import QtQuick
 import QtQuick.Controls
 import Caelestia.Config
+import qs.components
 import qs.components.effects
 import qs.services
 
diff --git a/components/effects/Colouriser.qml b/components/effects/Colouriser.qml
index 2948155d..b8abebb1 100644
--- a/components/effects/Colouriser.qml
+++ b/components/effects/Colouriser.qml
@@ -1,6 +1,6 @@
-import ".."
 import QtQuick
 import QtQuick.Effects
+import qs.components
 
 MultiEffect {
     property color sourceColor: "black"
diff --git a/components/effects/Elevation.qml b/components/effects/Elevation.qml
index cfe5cb79..9e0962da 100644
--- a/components/effects/Elevation.qml
+++ b/components/effects/Elevation.qml
@@ -1,6 +1,6 @@
-import ".."
 import QtQuick
 import QtQuick.Effects
+import qs.components
 import qs.services
 
 RectangularShadow {
diff --git a/components/effects/InnerBorder.qml b/components/effects/InnerBorder.qml
index 2723a04e..d5442e8f 100644
--- a/components/effects/InnerBorder.qml
+++ b/components/effects/InnerBorder.qml
@@ -1,9 +1,9 @@
 pragma ComponentBehavior: Bound
 
-import ".."
 import QtQuick
 import QtQuick.Effects
 import Caelestia.Config
+import qs.components
 import qs.services
 
 StyledRect {
diff --git a/components/filedialog/CurrentItem.qml b/components/filedialog/CurrentItem.qml
index 036828e5..83cb4a92 100644
--- a/components/filedialog/CurrentItem.qml
+++ b/components/filedialog/CurrentItem.qml
@@ -1,7 +1,7 @@
-import ".."
 import QtQuick
 import QtQuick.Shapes
 import Caelestia.Config
+import qs.components
 import qs.services
 
 Item {
diff --git a/components/filedialog/HeaderBar.qml b/components/filedialog/HeaderBar.qml
index 5d482d48..c53d8f76 100644
--- a/components/filedialog/HeaderBar.qml
+++ b/components/filedialog/HeaderBar.qml
@@ -1,9 +1,9 @@
 pragma ComponentBehavior: Bound
 
-import ".."
 import QtQuick
 import QtQuick.Layouts
 import Caelestia.Config
+import qs.components
 import qs.services
 
 StyledRect {
diff --git a/components/widgets/ExtraIndicator.qml b/components/widgets/ExtraIndicator.qml
index 9c7a1ced..d426eed8 100644
--- a/components/widgets/ExtraIndicator.qml
+++ b/components/widgets/ExtraIndicator.qml
@@ -1,7 +1,7 @@
-import ".."
 import "../effects"
 import QtQuick
 import Caelestia.Config
+import qs.components
 import qs.services
 
 StyledRect {