diff --git a/css/area_footer.less b/css/area_footer.less
index 5eb60ff..c2afe19 100755
--- a/css/area_footer.less
+++ b/css/area_footer.less
@@ -13,7 +13,7 @@
         min-height: @page-header_height;
         background-color: @background_page-header;
         border-top: 1px solid @color-border-light;
-        border-radius: 0 0 @fix_border-radius @fix_border-radius; // @border-radius vs. @fix_border-radius
+        border-radius: 0 0 @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius
         font-size: @font-size-default;
         text-align: right;
         padding: @margin-small @margin-default;
diff --git a/css/area_header.less b/css/area_header.less
index 82c0e7f..190e87f 100755
--- a/css/area_header.less
+++ b/css/area_header.less
@@ -126,7 +126,7 @@
             box-sizing: border-box;
             background-color: #fff;
             border: 1px solid @color-border;
-            border-radius: @border-radius;
+            border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
             color: @color-nav;
             font-size: 1rem;
             text-align: center;
diff --git a/css/area_nav-breadcrumb.less b/css/area_nav-breadcrumb.less
index f4aa473..836fd02 100755
--- a/css/area_nav-breadcrumb.less
+++ b/css/area_nav-breadcrumb.less
@@ -56,7 +56,7 @@
                 width: auto;
                 box-sizing: border-box;
                 border: solid 1px transparent;
-                border-radius: @border-radius;
+                border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
                 vertical-align: middle;
                 text-decoration: none;
                 margin-top: -.2em;
@@ -106,7 +106,7 @@
                 width: auto;
                 min-height: @toggle-size;
                 border: 1px solid @color-border;
-                border-radius: @border-radius;
+                border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
                 color: @color-nav;
                 text-align: center;
                 margin: 0;
diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less
index 6729551..18feb4c 100755
--- a/css/area_nav-metabox.less
+++ b/css/area_nav-metabox.less
@@ -108,13 +108,13 @@
                 transition: @transition color, @transition background-color, @transition border-color;
 
                 @media @screen_min-md {
-                    border-radius: @border-radius @border-radius 0 0; // @border-radius vs. @fix_border-radius
+                    border-radius: @ini_default_border_radius @ini_default_border_radius 0 0; // @ini_default_border_radius vs. @fix_border-radius
                 }
 
                 @media @screen_max-md {
                     top: -1px;
                     background-color: @background_page-header;
-                    border-radius: 0 0 @border-radius @border-radius; // @border-radius vs. @fix_border-radius
+                    border-radius: 0 0 @ini_default_border_radius @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
                     margin-left: 0;
                     padding: .2em .3rem .1em;
                 }
@@ -200,7 +200,7 @@
             }
 
             @media @screen_min-sm {
-                border-radius: 0 0 @fix_border-radius @fix_border-radius; // @border-radius vs. @fix_border-radius
+                border-radius: 0 0 @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius
             }
 
             &.active {
diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less
index 6f110be..1ae889a 100755
--- a/css/area_nav-usertools.less
+++ b/css/area_nav-usertools.less
@@ -32,7 +32,7 @@
                 min-height: @toggle-size;
                 overflow: hidden;
                 border: 1px solid @color-border;
-                border-radius: @border-radius;
+                border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
                 color: @color-nav;
                 text-align: center;
                 margin: 0;
@@ -50,7 +50,7 @@
                 position: relative;
                 display: table-cell;
                 border: solid 1px @color-border;
-                border-radius: @border-radius;
+                border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
                 padding-right: .3rem;
 
                 @media @screen_min-xxlg {
@@ -111,7 +111,7 @@
                         width: auto;
                         opacity: 0;
                         border: solid 1px @color-nav-hover;
-                        border-radius: @border-radius;
+                        border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
                         transform: none;
                         transition: @transition opacity;
                     }
diff --git a/css/area_togglelink.less b/css/area_togglelink.less
index 0b178ba..ecfb97a 100755
--- a/css/area_togglelink.less
+++ b/css/area_togglelink.less
@@ -31,7 +31,7 @@
             height: 100%;
             background-color: @button_background;
             border: solid 1px @button_background;
-            border-radius: @border-radius 0 0 @border-radius; // @border-radius vs. @fix_border-radius
+            border-radius: @ini_default_border_radius 0 0 @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
             color: @button_color;
             text-decoration: none;
             transition: @transition color, @transition background-color, @transition border-color;
@@ -78,7 +78,7 @@
             a {
                 background-color: @button_background;
                 border-color: @button_background;
-                border-radius: 0 @border-radius @border-radius 0; // @border-radius vs. @fix_border-radius
+                border-radius: 0 @ini_default_border_radius @ini_default_border_radius 0; // @ini_default_border_radius vs. @fix_border-radius
 
                 &::before {
                     opacity: .6;
diff --git a/css/base.less b/css/base.less
index a954539..266489b 100755
--- a/css/base.less
+++ b/css/base.less
@@ -11,8 +11,6 @@
 
 @background_page-header: __background_page-header__;
 
-@border-radius:          __default_border_radius__;
-
 @font_family_screen:     __font_family_screen__;
 
 @color-text:             __text__;
diff --git a/css/base_structure.less b/css/base_structure.less
index 3e89105..f4a2062 100755
--- a/css/base_structure.less
+++ b/css/base_structure.less
@@ -83,7 +83,7 @@
 
     .content .row > .col-xs-12 {
         z-index: 3;
-        border-radius: 0 @border-radius @fix_border-radius @fix_border-radius; // @border-radius vs. @fix_border-radius
+        border-radius: 0 @ini_default_border_radius @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius
     }
 
     .top-header {
diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less
index 84035fc..271ed28 100755
--- a/css/plugins/magic-matcher.less
+++ b/css/plugins/magic-matcher.less
@@ -44,7 +44,7 @@
         box-sizing: border-box;
         box-shadow: __box_shadow__;
         background-color: __nav_direct_background__;
-        border-radius: 0 0 __default_border_radius__ __default_border_radius__;
+        border-radius: 0 0 @ini_default_border_radius @ini_default_border_radius;
         font-size: @font-size-default;
         padding: .8em 1em .5em;
         margin-bottom: 0;