diff --git a/components/app/Sidenav.vue b/components/app/Sidenav.vue
index fd0672b33..4d5650d67 100644
--- a/components/app/Sidenav.vue
+++ b/components/app/Sidenav.vue
@@ -62,8 +62,7 @@ export default {
   @apply items-center;
   @apply justify-center;
   @apply transition;
-  @apply hover:bg-primaryDark;
-  @apply hover:text-secondaryDark;
+  @apply hover:(bg-primaryDark text-secondaryDark);
 
   .material-icons,
   .svg-icons {
diff --git a/components/button/Primary.vue b/components/button/Primary.vue
index 27bd81a81..80268e89c 100644
--- a/components/button/Primary.vue
+++ b/components/button/Primary.vue
@@ -14,7 +14,7 @@
     "
     :class="[
       color
-        ? `text-${color}-800 bg-${color}-200 hover:text-${color}-900 hover:bg-${color}-300 focus:text-${color}-900 focus:bg-${color}-300`
+        ? `text-${color}-800 bg-${color}-200 hover:(text-${color}-900 bg-${color}-300) focus:(text-${color}-900 bg-${color}-300)`
         : `text-accentContrast bg-accent hover:bg-accentDark focus:bg-accentDark`,
       label ? 'px-4' : 'px-2',
       rounded ? 'rounded-full' : 'rounded',
diff --git a/components/button/Secondary.vue b/components/button/Secondary.vue
index 9b25b4344..00e78acd7 100644
--- a/components/button/Secondary.vue
+++ b/components/button/Secondary.vue
@@ -10,12 +10,12 @@
       inline-flex
       items-center
       justify-center
-      focus:outline-none
       hover:bg-primaryDark
+      focus:outline-none
     "
     :class="[
       color
-        ? `text-${color}-500 hover:text-${color}-600 focus:text-${color}-600`
+        ? `text-${color}-500 hover:(text-${color}-600 text-${color}-600)`
         : 'text-secondary hover:text-secondaryDark focus:text-secondaryDark',
       label ? 'px-4' : 'px-2',
       rounded ? 'rounded-full' : 'rounded',
diff --git a/components/realtime/Mqtt.vue b/components/realtime/Mqtt.vue
index 82d71824f..002c5c0a6 100644
--- a/components/realtime/Mqtt.vue
+++ b/components/realtime/Mqtt.vue
@@ -22,7 +22,8 @@
                     px-4
                     transition
                     truncate
-                    focus:border-accent focus:outline-none
+                    focus:(border-accent
+                    outline-none)
                   "
                   :placeholder="$t('url')"
                 />
diff --git a/components/realtime/Socketio.vue b/components/realtime/Socketio.vue
index 64c20b094..c0e607327 100644
--- a/components/realtime/Socketio.vue
+++ b/components/realtime/Socketio.vue
@@ -25,7 +25,8 @@
                     px-4
                     transition
                     truncate
-                    focus:border-accent focus:outline-none
+                    focus:(border-accent
+                    outline-none)
                   "
                   :placeholder="$t('url')"
                   @keyup.enter="urlValid ? toggleConnection() : null"
@@ -45,7 +46,8 @@
                     px-4
                     transition
                     truncate
-                    focus:border-accent focus:outline-none
+                    focus:(border-accent
+                    outline-none)
                   "
                   spellcheck="false"
                 />
diff --git a/components/realtime/Sse.vue b/components/realtime/Sse.vue
index 1707b8b5e..5d04fc88e 100644
--- a/components/realtime/Sse.vue
+++ b/components/realtime/Sse.vue
@@ -21,7 +21,8 @@
               px-4
               transition
               truncate
-              focus:border-accent focus:outline-none
+              focus:(border-accent
+              outline-none)
             "
             :placeholder="$t('url')"
             @keyup.enter="serverValid ? toggleSSEConnection() : null"
@@ -47,7 +48,8 @@
               px-4
               transition
               truncate
-              focus:border-accent focus:outline-none
+              focus:(border-accent
+              outline-none)
             "
             spellcheck="false"
           />
diff --git a/components/realtime/Websocket.vue b/components/realtime/Websocket.vue
index 2990ab895..9ebbc4913 100644
--- a/components/realtime/Websocket.vue
+++ b/components/realtime/Websocket.vue
@@ -20,7 +20,8 @@
                     px-4
                     transition
                     truncate
-                    focus:border-accent focus:outline-none
+                    focus:(border-accent
+                    outline-none)
                   "
                   type="url"
                   spellcheck="false"
diff --git a/components/smart/Item.vue b/components/smart/Item.vue
index 2cf1b359a..927237cc3 100644
--- a/components/smart/Item.vue
+++ b/components/smart/Item.vue
@@ -11,8 +11,11 @@
       transition
       inline-flex
       items-center
-      hover:bg-primaryDark hover:text-secondaryDark
-      focus:bg-primaryDark focus:outline-none focus:text-secondaryDark
+      hover:(bg-primaryDark
+      text-secondaryDark)
+      focus:(bg-primaryDark
+      outline-none
+      text-secondaryDark)
     "
     :class="[
       { 'opacity-75 cursor-not-allowed': disabled },
diff --git a/components/smart/Tabs.vue b/components/smart/Tabs.vue
index a5088e546..800f62066 100644
--- a/components/smart/Tabs.vue
+++ b/components/smart/Tabs.vue
@@ -86,8 +86,7 @@ export default {
     @apply cursor-pointer;
     @apply transition;
     @apply hover:text-secondaryDark;
-    @apply focus:text-secondaryDark;
-    @apply focus:outline-none;
+    @apply focus:(text-secondaryDark outline-none);
 
     .tab-info {
       @apply inline-flex;
@@ -118,6 +117,10 @@ export default {
       @apply mr-4;
     }
 
+    &:focus::after {
+      @apply bg-divider;
+    }
+
     &.active {
       @apply text-accent;
       @apply border-accent;
diff --git a/components/tab/Secondary.vue b/components/tab/Secondary.vue
index 410f47cd2..9c30f6c04 100644
--- a/components/tab/Secondary.vue
+++ b/components/tab/Secondary.vue
@@ -11,9 +11,9 @@
       transition
       inline-flex
       items-center
-      focus:outline-none
       hover:translate-x-2
-      focus:translate-x-2
+      focus:(outline-none
+      translate-x-2)
     "
     :class="[
       label ? 'px-3' : 'px-2',
diff --git a/layouts/default.vue b/layouts/default.vue
index bf5856c1f..1c4345910 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex h-screen w-screen">
     <Splitpanes :dbl-click-splitter="false" horizontal>
-      <Pane class="flex flex-1 !overflow-auto">
+      <Pane class="flex flex-1 hide-scrollbar !overflow-auto">
         <Splitpanes
           :dbl-click-splitter="false"
           :horizontal="!(windowInnerWidth >= 768)"
@@ -13,14 +13,16 @@
           >
             <AppSidenav />
           </Pane>
-          <Pane class="flex flex-1 !overflow-auto">
+          <Pane class="flex flex-1 hide-scrollbar !overflow-auto">
             <Splitpanes :dbl-click-splitter="false" horizontal>
               <Pane v-if="!ZEN_MODE" style="height: auto">
                 <!-- <AppAnnouncement /> -->
                 <AppHeader />
               </Pane>
-              <Pane class="flex flex-1 !overflow-auto">
-                <nuxt class="flex flex-1" />
+              <Pane class="flex flex-1 hide-scrollbar !overflow-auto">
+                <main class="flex flex-1">
+                  <nuxt class="flex flex-1" />
+                </main>
               </Pane>
             </Splitpanes>
           </Pane>
diff --git a/pages/graphql.vue b/pages/graphql.vue
index 679dfee2f..4caa278a3 100644
--- a/pages/graphql.vue
+++ b/pages/graphql.vue
@@ -22,7 +22,8 @@
                     px-4
                     transition
                     truncate
-                    focus:border-accent focus:outline-none
+                    focus:(border-accent
+                    outline-none)
                   "
                   :placeholder="$t('url')"
                   @keyup.enter="onPollSchemaClick()"
diff --git a/pages/settings.vue b/pages/settings.vue
index 0434e72f5..db75a7248 100644
--- a/pages/settings.vue
+++ b/pages/settings.vue
@@ -323,7 +323,8 @@
                     py-2
                     px-4
                     block
-                    focus:border-accent focus:outline-none
+                    focus:(border-accent
+                    outline-none)
                   "
                   type="url"
                   :disabled="!PROXY_ENABLED"
diff --git a/windi.config.js b/windi.config.js
index 6c07677c3..dacfcae80 100644
--- a/windi.config.js
+++ b/windi.config.js
@@ -36,11 +36,11 @@ export default defineConfig({
         gradientVia: "var(--gradient-via-color)",
         gradientTo: "var(--gradient-to-color)",
       },
-    },
-    fontFamily: {
-      sans: "var(--font-sans)",
-      mono: "var(--font-mono)",
-      icon: "var(--font-icon)",
+      fontFamily: {
+        sans: "var(--font-sans)",
+        mono: "var(--font-mono)",
+        icon: "var(--font-icon)",
+      },
     },
   },
 })