diff --git a/lib_source/qml/Qt5/RibbonButton.qml b/lib_source/qml/Qt5/RibbonButton.qml
index adc1dc7..17cffa6 100644
--- a/lib_source/qml/Qt5/RibbonButton.qml
+++ b/lib_source/qml/Qt5/RibbonButton.qml
@@ -32,7 +32,7 @@ Button {
         visible: showBg
         border.color: isDarkMode ? "#7F7F7F" : "#D2D1CE"
         border.width: 1
-        radius: 3
+        radius: 5
         color: bgColor
     }
     contentItem: Item{
@@ -41,7 +41,7 @@ Button {
         implicitHeight: adaptHeight?root.parent.height>=layout.height?root.parent.height:layout.height:layout.height + 10
         Rectangle{
             anchors.fill: parent
-            radius: 3
+            radius: background.radius
             color: {
                 if (root.pressed)
                     return pressedColor
diff --git a/lib_source/qml/Qt5/RibbonComboBox.qml b/lib_source/qml/Qt5/RibbonComboBox.qml
index 4fd446a..9291c76 100644
--- a/lib_source/qml/Qt5/RibbonComboBox.qml
+++ b/lib_source/qml/Qt5/RibbonComboBox.qml
@@ -173,8 +173,8 @@ ComboBox {
         background: RibbonBlur{
             radius: 5
             maskOpacity: 1
-            maskBorder.color: RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5"
-            maskBorder.width: 1
+            maskBorderColor: RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5"
+            maskBorderWidth: 1
         }
 
         enter: Transition {
diff --git a/lib_source/qml/Qt5/RibbonPopup.qml b/lib_source/qml/Qt5/RibbonPopup.qml
index 9ad8644..773eef8 100644
--- a/lib_source/qml/Qt5/RibbonPopup.qml
+++ b/lib_source/qml/Qt5/RibbonPopup.qml
@@ -58,7 +58,7 @@ Popup {
         RectangularGlow {
             id: effect
             anchors.fill: blur
-            anchors.margins: blur.maskBorder.width
+            anchors.margins: blur.maskBorderWidth
             glowRadius: 20
             spread: 0
             color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.7) : Qt.rgba(0,0,0,0.45)
@@ -68,12 +68,12 @@ Popup {
             implicitHeight: parent.height
             implicitWidth: parent.width
             id: blur
-            radius: 20
+            radius: 7
             maskOpacity: blurEnabled ? 0.9 : 1
-            maskBorder.color: RibbonTheme.modernStyle ?
+            maskBorderColor: RibbonTheme.modernStyle ?
                                    RibbonTheme.isDarkMode ? "#7A7A7A" : "#2C59B7" :
             RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5"
-            maskBorder.width: 1
+            maskBorderWidth: 1
         }
     }
     contentItem: Item{
diff --git a/lib_source/qml/Qt5/RibbonPopupDialog.qml b/lib_source/qml/Qt5/RibbonPopupDialog.qml
index ac56ac4..81b221c 100644
--- a/lib_source/qml/Qt5/RibbonPopupDialog.qml
+++ b/lib_source/qml/Qt5/RibbonPopupDialog.qml
@@ -13,7 +13,6 @@ RibbonPopup {
     property bool isDarkMode: RibbonTheme.isDarkMode
     property int contentMargins: 20
     showCloseBtn: false
-    radius: 5
     signal neutralClicked
     signal negativeClicked
     signal positiveClicked
@@ -25,7 +24,7 @@ RibbonPopup {
         id:layout_content
         anchors.fill: parent
         color: 'transparent'
-        radius:5
+        radius:3
         RibbonText{
             id:text_title
             font.pixelSize: 24
diff --git a/lib_source/qml/Qt5/RibbonTour.qml b/lib_source/qml/Qt5/RibbonTour.qml
index 837bb08..3e0a9cf 100644
--- a/lib_source/qml/Qt5/RibbonTour.qml
+++ b/lib_source/qml/Qt5/RibbonTour.qml
@@ -43,7 +43,7 @@ Popup {
         RectangularGlow {
             id: effect
             anchors.fill: blur
-            anchors.margins: blur.maskBorder.width
+            anchors.margins: blur.maskBorderWidth
             glowRadius: 10
             spread: 0
             color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.7) : Qt.rgba(0,0,0,0.45)
@@ -53,12 +53,12 @@ Popup {
             implicitHeight: parent.height
             implicitWidth: parent.width
             id: blur
-            radius: 10
+            radius: 7
             maskOpacity: blurEnabled ? 0.9 : 1
-            maskBorder.color: RibbonTheme.modernStyle ?
+            maskBorderColor: RibbonTheme.modernStyle ?
                                    RibbonTheme.isDarkMode ? "#7A7A7A" : "#2C59B7" :
             RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5"
-            maskBorder.width: 1
+            maskBorderWidth: 1
         }
     }
     contentItem: Item{
diff --git a/lib_source/qml/Qt6/RibbonButton.qml b/lib_source/qml/Qt6/RibbonButton.qml
index ce7abb1..ee03398 100644
--- a/lib_source/qml/Qt6/RibbonButton.qml
+++ b/lib_source/qml/Qt6/RibbonButton.qml
@@ -32,7 +32,7 @@ Button {
         visible: showBg
         border.color: isDarkMode ? "#7F7F7F" : "#D2D1CE"
         border.width: 1
-        radius: 3
+        radius: 5
         color: bgColor
     }
     contentItem: Item{
@@ -41,7 +41,7 @@ Button {
         implicitHeight: adaptHeight?root.parent.height>=layout.height?root.parent.height:layout.height:layout.height + 10
         Rectangle{
             anchors.fill: parent
-            radius: 3
+            radius: background.radius
             color: {
                 if (root.pressed)
                     return pressedColor
diff --git a/lib_source/qml/Qt6/RibbonComboBox.qml b/lib_source/qml/Qt6/RibbonComboBox.qml
index fb1f8e5..b0da84d 100644
--- a/lib_source/qml/Qt6/RibbonComboBox.qml
+++ b/lib_source/qml/Qt6/RibbonComboBox.qml
@@ -171,8 +171,8 @@ ComboBox {
         background: RibbonBlur{
             radius: 5
             maskOpacity: 1
-            maskBorder.color: RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5"
-            maskBorder.width: 1
+            maskBorderColor: RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5"
+            maskBorderWidth: 1
         }
 
         enter: Transition {
diff --git a/lib_source/qml/Qt6/RibbonPopup.qml b/lib_source/qml/Qt6/RibbonPopup.qml
index 374cf51..6eab850 100644
--- a/lib_source/qml/Qt6/RibbonPopup.qml
+++ b/lib_source/qml/Qt6/RibbonPopup.qml
@@ -58,7 +58,7 @@ Popup {
         RectangularGlow {
             id: effect
             anchors.fill: blur
-            anchors.margins: blur.maskBorder.width
+            anchors.margins: blur.maskBorderWidth
             glowRadius: 20
             spread: 0
             color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.7) : Qt.rgba(0,0,0,0.45)
@@ -68,12 +68,12 @@ Popup {
             implicitHeight: parent.height
             implicitWidth: parent.width
             id: blur
-            radius: 20
+            radius: 7
             maskOpacity: blurEnabled ? 0.9 : 1
-            maskBorder.color: RibbonTheme.modernStyle ?
+            maskBorderColor: RibbonTheme.modernStyle ?
                                    RibbonTheme.isDarkMode ? "#7A7A7A" : "#2C59B7" :
             RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5"
-            maskBorder.width: 1
+            maskBorderWidth: 1
         }
     }
     contentItem: Item{
diff --git a/lib_source/qml/Qt6/RibbonPopupDialog.qml b/lib_source/qml/Qt6/RibbonPopupDialog.qml
index 00d4d96..ef1a992 100644
--- a/lib_source/qml/Qt6/RibbonPopupDialog.qml
+++ b/lib_source/qml/Qt6/RibbonPopupDialog.qml
@@ -14,7 +14,6 @@ RibbonPopup {
     property bool isDarkMode: RibbonTheme.isDarkMode
     property int contentMargins: 20
     showCloseBtn: false
-    radius: 5
     signal neutralClicked
     signal negativeClicked
     signal positiveClicked
@@ -26,7 +25,7 @@ RibbonPopup {
         id:layout_content
         anchors.fill: parent
         color: 'transparent'
-        radius:5
+        radius:3
         RibbonText{
             id:text_title
             font.pixelSize: 24
diff --git a/lib_source/qml/Qt6/RibbonTour.qml b/lib_source/qml/Qt6/RibbonTour.qml
index 5f74fc0..37bf484 100644
--- a/lib_source/qml/Qt6/RibbonTour.qml
+++ b/lib_source/qml/Qt6/RibbonTour.qml
@@ -44,7 +44,7 @@ Popup {
         RectangularGlow {
             id: effect
             anchors.fill: blur
-            anchors.margins: blur.maskBorder.width
+            anchors.margins: blur.maskBorderWidth
             glowRadius: 10
             spread: 0
             color: RibbonTheme.isDarkMode ? Qt.rgba(0,0,0,0.7) : Qt.rgba(0,0,0,0.45)
@@ -54,12 +54,12 @@ Popup {
             implicitHeight: parent.height
             implicitWidth: parent.width
             id: blur
-            radius: 10
+            radius: 7
             maskOpacity: blurEnabled ? 0.9 : 1
-            maskBorder.color: RibbonTheme.modernStyle ?
+            maskBorderColor: RibbonTheme.modernStyle ?
                                    RibbonTheme.isDarkMode ? "#7A7A7A" : "#2C59B7" :
             RibbonTheme.isDarkMode ? "#5C5D5D" : "#B5B4B5"
-            maskBorder.width: 1
+            maskBorderWidth: 1
         }
     }
     contentItem: Item{