diff --git a/components/StyledTabBar.qml b/components/StyledTabBar.qml
index 5459d8b..c81c935 100644
--- a/components/StyledTabBar.qml
+++ b/components/StyledTabBar.qml
@@ -1,23 +1,18 @@
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Controls.Basic
 
 TabBar {
     id: control
 
     property alias orientation: view.orientation
 
-    contentItem: Item {
-        ListView {
-            id: view
-            anchors.centerIn: parent
-            implicitWidth: parent.width - 20
-            implicitHeight: parent.height - 20
-            model: control.contentModel
-            currentIndex: control.currentIndex
-            spacing: control.spacing
-            orientation: ListView.Horizontal
-            boundsBehavior: Flickable.StopAtBounds
-        }
+    contentItem: ListView {
+        id: view
+        model: control.contentModel
+        currentIndex: control.currentIndex
+        spacing: control.spacing
+        orientation: ListView.Horizontal
+        boundsBehavior: Flickable.StopAtBounds
     }
 
     background: Item {}
diff --git a/components/StyledTabButton.qml b/components/StyledTabButton.qml
index fc78729..1c85273 100644
--- a/components/StyledTabButton.qml
+++ b/components/StyledTabButton.qml
@@ -1,6 +1,6 @@
 import qs.config
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Controls.Basic
 
 TabButton {
     id: control
@@ -14,28 +14,31 @@ TabButton {
         verticalAlignment: Text.AlignVCenter
         horizontalAlignment: Text.AlignHCenter
         padding: 6
-        color: control.hovered ? Styling.theme.primarycontent : Styling.theme.basecontent
+        color: control.hovered ? Styling.theme.primarycontent : control.checked ? Styling.theme.accent : Styling.theme.basecontent
         Behavior on color {
             ColorAnimation {
                 duration: Styling.animations.speed.normal
             }
         }
+        rotation: control.rotation
+        Behavior on rotation {
+            RotationAnimation {
+                duration: Styling.animations.speed.slow
+                easing.type: Easing.OutQuad
+            }
+        }
     }
 
     background: Rectangle {
         id: rectangle
-        color: control.hovered ? Styling.theme.primary : Styling.theme.base100
+        color: control.hovered ? Styling.theme.primary : Styling.theme.base200
         Behavior on color {
             ColorAnimation {
                 duration: Styling.animations.speed.normal
             }
         }
-        opacity: control.checked || control.hovered ? 1.0 : 0.0
-        Behavior on opacity {
-            NumberAnimation {
-                duration: Styling.animations.speed.normal
-            }
-        }
+        border.width: 2
+        border.color: control.checked ? Styling.theme.accent : "transparent"
     }
 
     HoverHandler {
diff --git a/modules/configuration/Configuration.qml b/modules/configuration/Configuration.qml
index 8a6606a..1e1871e 100644
--- a/modules/configuration/Configuration.qml
+++ b/modules/configuration/Configuration.qml
@@ -2,8 +2,6 @@ import qs.components
 import qs.services
 import QtQuick
 import QtQuick.Controls
-import Quickshell.Hyprland
-import Quickshell.Wayland
 
 StyledPanelWindow {
     id: window
@@ -14,17 +12,6 @@ StyledPanelWindow {
     implicitWidth: 800
     implicitHeight: 400
 
-    WlrLayershell.layer: WlrLayer.Top
-    WlrLayershell.keyboardFocus: window.visible ? WlrKeyboardFocus.OnDemand : WlrKeyboardFocus.None
-
-    HyprlandFocusGrab {
-        active: Visibility.configuration
-        windows: [window]
-        onCleared: {
-            Visibility.configuration = false;
-        }
-    }
-
     StyledTabBar {
         id: tabs
         anchors.top: parent.top