diff --git a/.bundlewatch.config.json b/.bundlewatch.config.json
index 18895b5003..307a12b915 100644
--- a/.bundlewatch.config.json
+++ b/.bundlewatch.config.json
@@ -2,11 +2,11 @@
   "files": [
     {
       "path": "./dist/css/boosted-grid.css",
-      "maxSize": "11.0 kB"
+      "maxSize": "7.0 kB"
     },
     {
       "path": "./dist/css/boosted-grid.min.css",
-      "maxSize": "10.0 kB"
+      "maxSize": "6.25 kB"
     },
     {
       "path": "./dist/css/boosted-reboot.css",
diff --git a/scss/boosted-grid.scss b/scss/boosted-grid.scss
index 024f7e08a5..52bd577e3a 100644
--- a/scss/boosted-grid.scss
+++ b/scss/boosted-grid.scss
@@ -1,6 +1,8 @@
 @import "mixins/banner";
 @include bsBanner(Grid);
 
+$include-column-box-sizing: true !default;
+
 @import "functions";
 @import "variables";
 @import "variables-dark";
@@ -17,18 +19,6 @@
 @import "grid";
 
 @import "utilities";
-@import "utilities/api";
-
-html {
-  box-sizing: border-box;
-}
-
-*,
-*::before,
-*::after {
-  box-sizing: inherit;
-}
-
 // Only use the utilities we need
 // stylelint-disable-next-line scss/dollar-variable-default
 $utilities: map-get-multiple(
@@ -39,7 +29,7 @@ $utilities: map-get-multiple(
     "flex",
     "flex-direction",
     "flex-grow",
-    "flex-shrink"
+    "flex-shrink",
     "flex-wrap",
     "justify-content",
     "align-items",
@@ -49,7 +39,7 @@ $utilities: map-get-multiple(
     "margin-x",
     "margin-y",
     "margin-top",
-    "margin-right",
+    "margin-end",
     "margin-bottom",
     "margin-start",
     "negative-margin",
@@ -68,3 +58,5 @@ $utilities: map-get-multiple(
     "padding-start",
   )
 );
+
+@import "utilities/api";
diff --git a/scss/boosted-utilities.scss b/scss/boosted-utilities.scss
index f33dfa8cd4..99c4a3595c 100644
--- a/scss/boosted-utilities.scss
+++ b/scss/boosted-utilities.scss
@@ -2,7 +2,6 @@
 @include bsBanner(Utilities);
 
 // Configuration
-
 @import "functions";
 @import "variables";
 @import "variables-dark";
diff --git a/scss/mixins/_utilities.scss b/scss/mixins/_utilities.scss
index 6a8e022dc3..54c75817f8 100644
--- a/scss/mixins/_utilities.scss
+++ b/scss/mixins/_utilities.scss
@@ -8,6 +8,7 @@
   }
   @return undefined;
 }
+// End mod
 
 // Utility generator
 // Used to generate utilities & print utilities