diff --git a/src/autocomplete/autocomplete.scss b/src/autocomplete/autocomplete.scss
index 5c5d1f88..e240a859 100644
--- a/src/autocomplete/autocomplete.scss
+++ b/src/autocomplete/autocomplete.scss
@@ -11,7 +11,7 @@
   background: $bg-white;
   border-radius: $border-radius;
   // stylelint-disable-next-line primer/box-shadow
-  box-shadow: 0 0 5px $black-fade-30;
+  box-shadow: inset 0 0 0 1px $border-color, $box-shadow-medium;
 }
 
 // One of the items that appears within an autocomplete group
diff --git a/src/autocomplete/suggester.scss b/src/autocomplete/suggester.scss
index 5ac54219..4c084cce 100644
--- a/src/autocomplete/suggester.scss
+++ b/src/autocomplete/suggester.scss
@@ -19,8 +19,8 @@
   li {
     display: block;
     padding: $spacer-1 $spacer-2;
-    font-weight: $font-weight-bold;
-    border-bottom: $border;
+    font-weight: $font-weight-semibold;
+    border-bottom: $border-width $border-style $border-gray-light;
 
     small {
       font-weight: $font-weight-normal;
diff --git a/src/box/box.scss b/src/box/box.scss
index 80d2f78b..ebd4e06f 100644
--- a/src/box/box.scss
+++ b/src/box/box.scss
@@ -3,7 +3,7 @@
 
 .Box {
   background-color: $bg-white;
-  border: $border-width $border-style $border-gray-dark;
+  border: $border;
   border-radius: $border-radius;
 }
 
@@ -75,7 +75,7 @@
   // stylelint-disable-next-line primer/spacing
   margin: (-$border-width) (-$border-width) 0;
   background-color: $bg-gray;
-  border-color: $border-gray-dark;
+  border-color: $border-color;
   border-style: $border-style;
   border-width: $border-width;
   border-top-left-radius: $border-radius;
@@ -95,10 +95,8 @@
   &:last-of-type {
     // stylelint-disable-next-line primer/spacing
     margin-bottom: -$border-width;
-    // stylelint-disable-next-line primer/borders
-    border-bottom-right-radius: 2px;
-    // stylelint-disable-next-line primer/borders
-    border-bottom-left-radius: 2px;
+    border-bottom-right-radius: $border-radius;
+    border-bottom-left-radius: $border-radius;
   }
 }
 
@@ -108,21 +106,17 @@
   // stylelint-disable-next-line primer/spacing
   margin-top: -1px;
   list-style-type: none; // To account for applying Box component to a list
-  border-top: $border-width $border-style $border-gray;
+  border-top: $border;
 
   &:first-of-type {
     border-top-color: transparent;
-    // stylelint-disable-next-line primer/borders
-    border-top-left-radius: 2px;
-    // stylelint-disable-next-line primer/borders
-    border-top-right-radius: 2px;
+    border-top-left-radius: $border-radius;
+    border-top-right-radius: $border-radius;
   }
 
   &:last-of-type {
-    // stylelint-disable-next-line primer/borders
-    border-bottom-right-radius: 2px;
-    // stylelint-disable-next-line primer/borders
-    border-bottom-left-radius: 2px;
+    border-bottom-right-radius: $border-radius;
+    border-bottom-left-radius: $border-radius;
   }
 
   // Adds a blue vertical line to the left of the row
@@ -216,7 +210,7 @@
   padding: $spacer-3;
   // stylelint-disable-next-line primer/spacing
   margin-top: -1px; // prevents double border when used with .Box-body
-  border-top: $border-width $border-style $border-gray;
+  border-top: $border;
 }
 
 // Option for a box with scrolling content
diff --git a/src/buttons/button.scss b/src/buttons/button.scss
index 03095337..9402235b 100644
--- a/src/buttons/button.scss
+++ b/src/buttons/button.scss
@@ -69,8 +69,7 @@
   color: $text-gray-dark;
   background-color: $bg-gray-light;
   border-color: $border-color-button;
-  // stylelint-disable-next-line primer/box-shadow
-  box-shadow: 0 1px 0 rgba($gray-400, 0.1), inset 0 1px 0 rgba($white, 0.25);
+  box-shadow: $box-shadow, $box-shadow-highlight;
 
   &:focus,
   &.focus {
@@ -108,7 +107,7 @@
   $bg: #159739; // custom green
   $border-color: $green-600;
   $shadow: $green-900;
-  $box-shadow: 0 1px 0 rgba($shadow, 0.1), inset 0 1px 0 rgba($white, 0.03);
+  $box-shadow: $box-shadow, inset 0 1px 0 rgba($white, 0.03);
 
   $bg-hover: #138934; // custom green
   $border-hover: $green-700;
@@ -213,7 +212,7 @@
     color: rgba($color, 0.5);
     background-color: #f3f4f6;
     border-color: $border-color-button;
-    box-shadow: 0 1px 0 rgba($gray-400, 0.1), inset 0 1px 0 rgba($white, 0.25);
+    box-shadow: $box-shadow, $box-shadow-highlight;
   }
 
   .Counter {
diff --git a/src/buttons/misc.scss b/src/buttons/misc.scss
index 39d49547..5a870c9a 100644
--- a/src/buttons/misc.scss
+++ b/src/buttons/misc.scss
@@ -77,8 +77,7 @@
   border-left: 0;
   border-top-right-radius: $border-radius;
   border-bottom-right-radius: $border-radius;
-  // stylelint-disable-next-line primer/box-shadow
-  box-shadow: 0 1px 0 rgba($gray-400, 0.1), inset 0 1px 0 rgba($white, 0.25);
+  box-shadow: $box-shadow, $box-shadow-highlight;
 
   &:hover,
   &:active {
diff --git a/src/dropdown/dropdown.scss b/src/dropdown/dropdown.scss
index d8fea5f4..d8c4ce7e 100644
--- a/src/dropdown/dropdown.scss
+++ b/src/dropdown/dropdown.scss
@@ -31,9 +31,8 @@
   list-style: none;
   background-color: $bg-white;
   background-clip: padding-box;
-  border: $border-width $border-style $border-black-fade;
-  // stylelint-disable-next-line primer/borders
-  border-radius: $spacer-1;
+  border: $border;
+  border-radius: $border-radius;
   box-shadow: $box-shadow-large;
 
   &::before,
diff --git a/src/select-menu/select-menu.scss b/src/select-menu/select-menu.scss
index bf3b103d..e719369d 100644
--- a/src/select-menu/select-menu.scss
+++ b/src/select-menu/select-menu.scss
@@ -73,7 +73,7 @@ $SelectMenu-max-height: 480px !default;
   // stylelint-disable-next-line primer/borders
   border-radius: $border-radius * 2;
   // stylelint-disable-next-line primer/box-shadow
-  box-shadow: 0 0 18px rgba(0, 0, 0, 0.4);
+  box-shadow: 0 0 18px rgba($black, 0.4);
   animation: SelectMenu-modal-animation 0.12s cubic-bezier(0, 0.1, 0.1, 1) backwards;
 
   @keyframes SelectMenu-modal-animation {
@@ -96,9 +96,9 @@ $SelectMenu-max-height: 480px !default;
     max-height: $SelectMenu-max-height;
     margin: $spacer-1 0 $spacer-3 0;
     font-size: $font-size-small;
-    border: $border-width $border-style $border-gray-dark;
+    border: $border;
     border-radius: $border-radius;
-    box-shadow: $box-shadow-medium;
+    box-shadow: $box-shadow-large;
     animation-name: SelectMenu-modal-animation--sm;
   }
 }
diff --git a/src/support/variables/misc.scss b/src/support/variables/misc.scss
index 8a867cfe..1993049f 100644
--- a/src/support/variables/misc.scss
+++ b/src/support/variables/misc.scss
@@ -8,10 +8,12 @@ $border: $border-width $border-color $border-style !default;
 $border-radius: 6px !default;
 
 // Box shadow
-$box-shadow: 0 1px 1px rgba($black, 0.1) !default;
-$box-shadow-medium: 0 1px 5px $black-fade-15 !default;
-$box-shadow-large: 0 1px 15px $black-fade-15 !default;
-$box-shadow-extra-large: 0 10px 50px rgba($black, 0.07) !default;
+$box-shadow: 0 1px 0 rgba($gray-400, 0.1) !default;
+$box-shadow-medium: 0 3px 6px rgba($gray-400, 0.15) !default;
+$box-shadow-large: 0 8px 24px rgba($gray-400, 0.2) !default;
+$box-shadow-extra-large: 0 12px 48px rgba($gray-400, 0.3) !default;
+
+$box-shadow-highlight: inset 0 1px 0 rgba($white, 0.25) !default;
 
 // Focus shadow
 $focus-shadow: 0 0 0 3px rgba($border-blue, 0.3) !default;
diff --git a/src/toasts/toasts.scss b/src/toasts/toasts.scss
index a00422d5..b9845772 100644
--- a/src/toasts/toasts.scss
+++ b/src/toasts/toasts.scss
@@ -7,7 +7,7 @@
   background-color: $bg-white;
   border-radius: $border-radius;
   // stylelint-disable-next-line primer/box-shadow
-  box-shadow: inset 0 0 0 1px $border-gray-dark, $box-shadow-medium;
+  box-shadow: inset 0 0 0 1px $border-color, $box-shadow-large;
 
   @include breakpoint(sm) {
     width: max-content;