diff --git a/Modules/Bar/Bar.qml b/Modules/Bar/Bar.qml
index 872746c..09bf572 100644
--- a/Modules/Bar/Bar.qml
+++ b/Modules/Bar/Bar.qml
@@ -93,10 +93,10 @@ Variants {
 
             // Top section (left widgets)
             Column {
-              spacing: Style.marginM * root.scaling
+              spacing: Style.marginS * root.scaling
               anchors.horizontalCenter: parent.horizontalCenter
               anchors.top: parent.top
-              anchors.topMargin: Style.marginL * root.scaling
+              anchors.topMargin: Style.marginM * root.scaling
               width: parent.width
 
               Repeater {
@@ -118,7 +118,7 @@ Variants {
 
             // Center section (center widgets)
             Column {
-              spacing: Style.marginM * root.scaling
+              spacing: Style.marginS * root.scaling
               anchors.horizontalCenter: parent.horizontalCenter
               anchors.verticalCenter: parent.verticalCenter
               width: parent.width
@@ -142,10 +142,10 @@ Variants {
 
             // Bottom section (right widgets)
             Column {
-              spacing: Style.marginM * root.scaling
+              spacing: Style.marginS * root.scaling
               anchors.horizontalCenter: parent.horizontalCenter
               anchors.bottom: parent.bottom
-              anchors.bottomMargin: Style.marginL * root.scaling
+              anchors.bottomMargin: Style.marginM * root.scaling
               width: parent.width
 
               Repeater {
diff --git a/Widgets/NPill.qml b/Widgets/NPill.qml
index 50bf6ad..d417203 100644
--- a/Widgets/NPill.qml
+++ b/Widgets/NPill.qml
@@ -40,7 +40,7 @@ Item {
 
     Component {
       id: verticalPillComponent
-      NVerticalPill {
+      NPillVertical {
         icon: root.icon
         text: root.text
         tooltipText: root.tooltipText
@@ -65,7 +65,7 @@ Item {
 
     Component {
       id: horizontalPillComponent
-      NHorizontalPill {
+      NPillHorizontal {
         icon: root.icon
         text: root.text
         tooltipText: root.tooltipText
diff --git a/Widgets/NHorizontalPill.qml b/Widgets/NPillHorizontal.qml
similarity index 100%
rename from Widgets/NHorizontalPill.qml
rename to Widgets/NPillHorizontal.qml
diff --git a/Widgets/NVerticalPill.qml b/Widgets/NPillVertical.qml
similarity index 100%
rename from Widgets/NVerticalPill.qml
rename to Widgets/NPillVertical.qml