diff --git a/Widgets/NPill.qml b/Modules/Bar/Extras/BarPill.qml
similarity index 97%
rename from Widgets/NPill.qml
rename to Modules/Bar/Extras/BarPill.qml
index 28d2578..6714d17 100644
--- a/Widgets/NPill.qml
+++ b/Modules/Bar/Extras/BarPill.qml
@@ -2,6 +2,7 @@ import QtQuick
 import QtQuick.Controls
 import qs.Commons
 import qs.Services
+import qs.Widgets
 
 Item {
   id: root
@@ -41,7 +42,7 @@ Item {
 
     Component {
       id: verticalPillComponent
-      NPillVertical {
+      BarPillVertical {
         icon: root.icon
         text: root.text
         suffix: root.suffix
@@ -66,7 +67,7 @@ Item {
 
     Component {
       id: horizontalPillComponent
-      NPillHorizontal {
+      BarPillHorizontal {
         icon: root.icon
         text: root.text
         suffix: root.suffix
diff --git a/Widgets/NPillHorizontal.qml b/Modules/Bar/Extras/BarPillHorizontal.qml
similarity index 99%
rename from Widgets/NPillHorizontal.qml
rename to Modules/Bar/Extras/BarPillHorizontal.qml
index 45cc95b..0e4b548 100644
--- a/Widgets/NPillHorizontal.qml
+++ b/Modules/Bar/Extras/BarPillHorizontal.qml
@@ -2,6 +2,7 @@ import QtQuick
 import QtQuick.Controls
 import qs.Commons
 import qs.Services
+import qs.Widgets
 
 Item {
   id: root
diff --git a/Widgets/NPillVertical.qml b/Modules/Bar/Extras/BarPillVertical.qml
similarity index 99%
rename from Widgets/NPillVertical.qml
rename to Modules/Bar/Extras/BarPillVertical.qml
index 1c5991a..9b97527 100644
--- a/Widgets/NPillVertical.qml
+++ b/Modules/Bar/Extras/BarPillVertical.qml
@@ -2,6 +2,8 @@ import QtQuick
 import QtQuick.Controls
 import qs.Commons
 import qs.Services
+import qs.Widgets
+
 
 Item {
   id: root
diff --git a/Modules/Bar/Widgets/Battery.qml b/Modules/Bar/Widgets/Battery.qml
index f91599a..2b5ec67 100644
--- a/Modules/Bar/Widgets/Battery.qml
+++ b/Modules/Bar/Widgets/Battery.qml
@@ -5,6 +5,7 @@ import QtQuick.Layouts
 import qs.Commons
 import qs.Services
 import qs.Widgets
+import qs.Modules.Bar.Extras
 
 Item {
   id: root
@@ -81,11 +82,11 @@ Item {
     }
   }
 
-  NPill {
+  BarPill {
     id: pill
 
     compact: (Settings.data.bar.density === "compact")
-    rightOpen: BarWidgetRegistry.getNPillDirection(root)
+    rightOpen: BarWidgetRegistry.getPillDirection(root)
     icon: testMode ? BatteryService.getIcon(testPercent, testCharging, true) : BatteryService.getIcon(percent, charging, isReady)
     text: (isReady || testMode) ? Math.round(percent) : "-"
     suffix: "%"
diff --git a/Modules/Bar/Widgets/Brightness.qml b/Modules/Bar/Widgets/Brightness.qml
index e01c157..c588b1d 100644
--- a/Modules/Bar/Widgets/Brightness.qml
+++ b/Modules/Bar/Widgets/Brightness.qml
@@ -4,6 +4,7 @@ import qs.Commons
 import qs.Modules.SettingsPanel
 import qs.Services
 import qs.Widgets
+import qs.Modules.Bar.Extras
 
 Item {
   id: root
@@ -73,11 +74,11 @@ Item {
     onTriggered: pill.hide()
   }
 
-  NPill {
+  BarPill {
     id: pill
 
     compact: (Settings.data.bar.density === "compact")
-    rightOpen: BarWidgetRegistry.getNPillDirection(root)
+    rightOpen: BarWidgetRegistry.getPillDirection(root)
     icon: getIcon()
     autoHide: false // Important to be false so we can hover as long as we want
     text: {
diff --git a/Modules/Bar/Widgets/Clock.qml b/Modules/Bar/Widgets/Clock.qml
index 0cf3ff9..3b2e4f7 100644
--- a/Modules/Bar/Widgets/Clock.qml
+++ b/Modules/Bar/Widgets/Clock.qml
@@ -40,7 +40,7 @@ Rectangle {
   readonly property bool verticalMode: barPosition === "left" || barPosition === "right"
 
   implicitWidth: verticalMode ? Math.round(Style.capsuleHeight * scaling) : Math.round(layout.implicitWidth + Style.marginM * 2 * scaling)
-  implicitHeight: verticalMode ? Math.round(Style.capsuleHeight * 2.5 * scaling) : Math.round(Style.capsuleHeight * scaling) // Match NPill
+  implicitHeight: verticalMode ? Math.round(Style.capsuleHeight * 2.5 * scaling) : Math.round(Style.capsuleHeight * scaling) // Match BarPill
 
   radius: Math.round(Style.radiusS * scaling)
   color: Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent
diff --git a/Modules/Bar/Widgets/CustomButton.qml b/Modules/Bar/Widgets/CustomButton.qml
index d32c8a8..496c670 100644
--- a/Modules/Bar/Widgets/CustomButton.qml
+++ b/Modules/Bar/Widgets/CustomButton.qml
@@ -6,6 +6,7 @@ import qs.Commons
 import qs.Services
 import qs.Widgets
 import qs.Modules.SettingsPanel
+import qs.Modules.Bar.Extras
 
 Item {
   id: root
@@ -43,10 +44,10 @@ Item {
   implicitWidth: pill.width
   implicitHeight: pill.height
 
-  NPill {
+  BarPill {
     id: pill
 
-    rightOpen: BarWidgetRegistry.getNPillDirection(root)
+    rightOpen: BarWidgetRegistry.getPillDirection(root)
     icon: customIcon
     text: _dynamicText
     compact: (Settings.data.bar.density === "compact")
diff --git a/Modules/Bar/Widgets/KeyboardLayout.qml b/Modules/Bar/Widgets/KeyboardLayout.qml
index e1f4095..13b4dac 100644
--- a/Modules/Bar/Widgets/KeyboardLayout.qml
+++ b/Modules/Bar/Widgets/KeyboardLayout.qml
@@ -6,6 +6,7 @@ import Quickshell.Io
 import qs.Commons
 import qs.Services
 import qs.Widgets
+import qs.Modules.Bar.Extras
 
 Item {
   id: root
@@ -38,12 +39,12 @@ Item {
   implicitWidth: pill.width
   implicitHeight: pill.height
 
-  NPill {
+  BarPill {
     id: pill
 
     anchors.verticalCenter: parent.verticalCenter
     compact: (Settings.data.bar.density === "compact")
-    rightOpen: BarWidgetRegistry.getNPillDirection(root)
+    rightOpen: BarWidgetRegistry.getPillDirection(root)
     icon: "keyboard"
     autoHide: false // Important to be false so we can hover as long as we want
     text: currentLayout.toUpperCase()
diff --git a/Modules/Bar/Widgets/Microphone.qml b/Modules/Bar/Widgets/Microphone.qml
index 98f0011..7504414 100644
--- a/Modules/Bar/Widgets/Microphone.qml
+++ b/Modules/Bar/Widgets/Microphone.qml
@@ -6,6 +6,7 @@ import qs.Commons
 import qs.Modules.SettingsPanel
 import qs.Services
 import qs.Widgets
+import qs.Modules.Bar.Extras
 
 Item {
   id: root
@@ -86,9 +87,9 @@ Item {
     }
   }
 
-  NPill {
+  BarPill {
     id: pill
-    rightOpen: BarWidgetRegistry.getNPillDirection(root)
+    rightOpen: BarWidgetRegistry.getPillDirection(root)
     icon: getIcon()
     compact: (Settings.data.bar.density === "compact")
     autoHide: false // Important to be false so we can hover as long as we want
diff --git a/Modules/Bar/Widgets/Volume.qml b/Modules/Bar/Widgets/Volume.qml
index bebc532..bcacd7f 100644
--- a/Modules/Bar/Widgets/Volume.qml
+++ b/Modules/Bar/Widgets/Volume.qml
@@ -6,6 +6,7 @@ import qs.Commons
 import qs.Modules.SettingsPanel
 import qs.Services
 import qs.Widgets
+import qs.Modules.Bar.Extras
 
 Item {
   id: root
@@ -71,11 +72,11 @@ Item {
     }
   }
 
-  NPill {
+  BarPill {
     id: pill
 
     compact: (Settings.data.bar.density === "compact")
-    rightOpen: BarWidgetRegistry.getNPillDirection(root)
+    rightOpen: BarWidgetRegistry.getPillDirection(root)
     icon: getIcon()
     autoHide: false // Important to be false so we can hover as long as we want
     text: Math.floor(AudioService.volume * 100)
diff --git a/Services/BarWidgetRegistry.qml b/Services/BarWidgetRegistry.qml
index 392b570..f12a94c 100644
--- a/Services/BarWidgetRegistry.qml
+++ b/Services/BarWidgetRegistry.qml
@@ -207,7 +207,7 @@ Singleton {
     return (widgetMetadata[id] !== undefined) && (widgetMetadata[id].allowUserSettings === true)
   }
 
-  function getNPillDirection(widget) {
+  function getPillDirection(widget) {
     try {
       if (widget.section === "left") {
         return true