diff --git a/docs/assets/plugins/code-block/code-block.css b/docs/assets/plugins/code-block/code-block.css
index 0cfa59a0b..4a03acd36 100644
--- a/docs/assets/plugins/code-block/code-block.css
+++ b/docs/assets/plugins/code-block/code-block.css
@@ -15,7 +15,7 @@
   border-bottom: none;
   border-top-left-radius: 3px;
   border-top-right-radius: 3px;
-  background-color: rgb(var(--sl-color-1000));
+  background-color: rgb(var(--sl-color-neutral-1000));
   min-width: 20rem;
   max-width: 100%;
   padding: 1.5rem 3.25rem 1.5rem 1.5rem;
@@ -44,7 +44,7 @@
   width: 1.75rem;
   font-size: 20px;
   color: rgb(var(--sl-color-neutral-500));
-  background-color: rgb(var(--sl-color-1000));
+  background-color: rgb(var(--sl-color-neutral-1000));
   border-left: solid 1px rgb(var(--sl-color-neutral-200));
   border-top-right-radius: 3px;
   cursor: ew-resize;
@@ -97,7 +97,7 @@
   border: solid 1px rgb(var(--sl-color-neutral-200));
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
-  background: rgb(var(--sl-color-1000));
+  background: rgb(var(--sl-color-neutral-1000));
   font: inherit;
   font-size: 0.875rem;
   color: rgb(var(--sl-color-neutral-600));
diff --git a/docs/assets/styles/docs.css b/docs/assets/styles/docs.css
index c7fcc7aaf..419aae302 100644
--- a/docs/assets/styles/docs.css
+++ b/docs/assets/styles/docs.css
@@ -13,7 +13,7 @@ body {
   font-size: var(--sl-font-size-medium);
   font-weight: var(--sl-font-weight-normal);
   letter-spacing: var(--sl-letter-spacing-normal);
-  background-color: rgb(var(--sl-color-1000));
+  background-color: rgb(var(--sl-color-neutral-1000));
   color: rgb(var(--sl-color-neutral-800));
   line-height: var(--sl-line-height-normal);
 }
@@ -28,7 +28,7 @@ strong {
 
 /* Sidebar */
 .sidebar {
-  background: rgb(var(--sl-color-1000));
+  background: rgb(var(--sl-color-neutral-1000));
   border-right: solid 1px rgb(var(--sl-color-neutral-200));
 }
 
@@ -109,7 +109,7 @@ strong {
 }
 
 .sidebar .clear-button svg path {
-  stroke: rgb(var(--sl-color-1000));
+  stroke: rgb(var(--sl-color-neutral-1000));
 }
 
 .sidebar .clear-button:focus {
@@ -146,7 +146,7 @@ strong {
   width: 2rem;
   height: 2rem;
   border-radius: var(--sl-border-radius-medium);
-  background-color: rgb(var(--sl-color-1000));
+  background-color: rgb(var(--sl-color-neutral-1000));
   padding: 0.5rem;
 }
 
@@ -273,7 +273,7 @@ strong {
 }
 
 .anchor span {
-  color: rgb(var(--sl-color-0));
+  color: rgb(var(--sl-color-neutral-0));
 }
 
 .markdown-section blockquote {
@@ -518,7 +518,7 @@ strong {
 .markdown-section p.warn:before {
   content: '!';
   border-radius: 100%;
-  color: rgb(var(--sl-color-1000));
+  color: rgb(var(--sl-color-neutral-1000));
   font-size: 14px;
   font-weight: bold;
   left: -12px;
@@ -565,7 +565,7 @@ strong {
   margin: 0.75rem 0 0.25rem 0;
 }
 
-.component-header__tag code {
+.markdown-section .component-header__tag code {
   background: none;
   color: rgb(var(--sl-color-neutral-500));
   font-size: var(--sl-font-size-large);
@@ -594,7 +594,7 @@ strong {
 html .repo-button {
   display: inline-flex;
   align-items: center;
-  background-color: rgb(var(--sl-color-1000));
+  background-color: rgb(var(--sl-color-neutral-1000));
   border: solid 1px rgb(var(--sl-color-neutral-200));
   border-radius: var(--sl-border-radius-medium);
   box-shadow: var(--sl-shadow-x-small);
@@ -695,7 +695,7 @@ body[data-page^='tokens/'] .table-wrapper td:first-child code {
 
 /* Elevation dmeo */
 .elevation-demo {
-  background: rgb(var(--sl-color-1000));
+  background: transparent;
   border-radius: 3px;
   width: 4rem;
   height: 4rem;
@@ -731,7 +731,7 @@ body[data-page^='tokens/'] .table-wrapper td:first-child code {
 }
 
 .color-palette__swatch--border {
-  box-shadow: inset 0 0 0 1px rgb(var(--sl-color-0) / 10%);
+  box-shadow: inset 0 0 0 1px rgb(var(--sl-color-neutral-0) / 10%);
 }
 
 @media screen and (max-width: 1200px) {
diff --git a/docs/components/avatar.md b/docs/components/avatar.md
index 7ddad211e..ed59431b4 100644
--- a/docs/components/avatar.md
+++ b/docs/components/avatar.md
@@ -78,7 +78,7 @@ You can group avatars with a few lines of CSS.
   }
 
   .avatar-group sl-avatar::part(base) {
-    border: solid 2px rgb(var(--sl-color-1000));
+    border: solid 2px rgb(var(--sl-color-neutral-1000));
   }
 </style>
 ```
diff --git a/docs/resources/changelog.md b/docs/resources/changelog.md
index 90990aaea..0c8bab848 100644
--- a/docs/resources/changelog.md
+++ b/docs/resources/changelog.md
@@ -29,7 +29,7 @@ This is more verbose than before, but it has the advantage of letting you set th
 This change applies to all design tokens that implement a color. Refer to the [color tokens](/tokens/color) page for more details.
 
 - 🚨 BREAKING: all design tokens that implement colors have been converted to `R G B` and must be used with the `rgb()` function
-- 🚨 BREAKING: removed `--sl-color-black|white` color tokens (use `--sl-color-1000|full` instead)
+- 🚨 BREAKING: removed `--sl-color-black|white` color tokens (use `--sl-color-neutral-1000|full` instead)
 - 🚨 BREAKING: removed `--sl-color-primary|success|warning|info|danger-text` design tokens (use theme or primitive colors instead)
 - 🚨 BREAKING: removed `info` variant from `sl-alert`, `sl-badge`, `sl-button`, and `sl-tag` (use `neutral` instead)
 - 🚨 BREAKING: removed `--sl-color-info-*` design token (use `--sl-color-neutral-*` instead)
diff --git a/docs/tokens/color.md b/docs/tokens/color.md
index e6ee3be3c..0441d7909 100644
--- a/docs/tokens/color.md
+++ b/docs/tokens/color.md
@@ -129,8 +129,8 @@ Theme tokens give you a semantic way to reference colors in your app. The primar
     Black & White<br>
     <code>--sl-color-neutral-<em>{n}</em></code>
   </div>
-  <div class="color-palette__example"><div class="color-palette__swatch" style="background-color: rgb(var(--sl-color-0));"></div>0</div>
-  <div class="color-palette__example"><div class="color-palette__swatch color-palette__swatch--border" style="background-color: rgb(var(--sl-color-1000));"></div>1000</div>
+  <div class="color-palette__example"><div class="color-palette__swatch" style="background-color: rgb(var(--sl-color-neutral-0));"></div>0</div>
+  <div class="color-palette__example"><div class="color-palette__swatch color-palette__swatch--border" style="background-color: rgb(var(--sl-color-neutral-1000));"></div>1000</div>
 </div>
 
 ## Primitives
diff --git a/src/components/alert/alert.styles.ts b/src/components/alert/alert.styles.ts
index eeab685d2..0971a82ff 100644
--- a/src/components/alert/alert.styles.ts
+++ b/src/components/alert/alert.styles.ts
@@ -15,7 +15,7 @@ export default css`
     position: relative;
     display: flex;
     align-items: stretch;
-    background-color: rgb(var(--sl-color-1000));
+    background-color: rgb(var(--sl-color-neutral-1000));
     border: solid 1px rgb(var(--sl-color-neutral-200));
     border-top-width: 3px;
     border-radius: var(--sl-border-radius-medium);
diff --git a/src/components/avatar/avatar.styles.ts b/src/components/avatar/avatar.styles.ts
index 11bf66af2..2b11d58e0 100644
--- a/src/components/avatar/avatar.styles.ts
+++ b/src/components/avatar/avatar.styles.ts
@@ -21,7 +21,7 @@ export default css`
     font-family: var(--sl-font-sans);
     font-size: calc(var(--size) * 0.5);
     font-weight: var(--sl-font-weight-normal);
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
     overflow: hidden;
     user-select: none;
     vertical-align: middle;
diff --git a/src/components/badge/badge.styles.ts b/src/components/badge/badge.styles.ts
index 42e00706b..95c726ffe 100644
--- a/src/components/badge/badge.styles.ts
+++ b/src/components/badge/badge.styles.ts
@@ -26,27 +26,27 @@ export default css`
   /* Type modifiers */
   .badge--primary {
     background-color: rgb(var(--sl-color-primary-500));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   .badge--success {
     background-color: rgb(var(--sl-color-success-500));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   .badge--neutral {
     background-color: rgb(var(--sl-color-neutral-500));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   .badge--warning {
     background-color: rgb(var(--sl-color-warning-500));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   .badge--danger {
     background-color: rgb(var(--sl-color-danger-500));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   /* Pill modifier */
diff --git a/src/components/button/button.styles.ts b/src/components/button/button.styles.ts
index 8b587db05..4a17dc941 100644
--- a/src/components/button/button.styles.ts
+++ b/src/components/button/button.styles.ts
@@ -69,7 +69,7 @@ export default css`
 
   /* Default */
   .button.button--default {
-    background-color: rgb(var(--sl-color-1000));
+    background-color: rgb(var(--sl-color-neutral-1000));
     border-color: rgb(var(--sl-color-neutral-300));
     color: rgb(var(--sl-color-neutral-600));
   }
@@ -97,129 +97,129 @@ export default css`
   .button.button--primary {
     background-color: rgb(var(--sl-color-primary-500));
     border-color: rgb(var(--sl-color-primary-500));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   .button.button--primary:hover:not(.button--disabled) {
     background-color: rgb(var(--sl-color-primary-400));
     border-color: rgb(var(--sl-color-primary-400));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   .button.button--primary:focus:not(.button--disabled) {
     background-color: rgb(var(--sl-color-primary-400));
     border-color: rgb(var(--sl-color-primary-400));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
     box-shadow: 0 0 0 var(--sl-focus-ring-width) rgb(var(--sl-focus-ring-color-primary) / 25%);
   }
 
   .button.button--primary:active:not(.button--disabled) {
     background-color: rgb(var(--sl-color-primary-500));
     border-color: rgb(var(--sl-color-primary-500));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   /* Success */
   .button.button--success {
     background-color: rgb(var(--sl-color-success-500));
     border-color: rgb(var(--sl-color-success-500));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   .button.button--success:hover:not(.button--disabled) {
     background-color: rgb(var(--sl-color-success-400));
     border-color: rgb(var(--sl-color-success-400));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   .button.button--success:focus:not(.button--disabled) {
     background-color: rgb(var(--sl-color-success-400));
     border-color: rgb(var(--sl-color-success-400));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
     box-shadow: 0 0 0 var(--sl-focus-ring-width) rgb(var(--sl-focus-ring-color-success) / 25%);
   }
 
   .button.button--success:active:not(.button--disabled) {
     background-color: rgb(var(--sl-color-success-500));
     border-color: rgb(var(--sl-color-success-500));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   /* Neutral */
   .button.button--neutral {
     background-color: rgb(var(--sl-color-neutral-500));
     border-color: rgb(var(--sl-color-neutral-500));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   .button.button--neutral:hover:not(.button--disabled) {
     background-color: rgb(var(--sl-color-neutral-400));
     border-color: rgb(var(--sl-color-neutral-400));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   .button.button--neutral:focus:not(.button--disabled) {
     background-color: rgb(var(--sl-color-neutral-400));
     border-color: rgb(var(--sl-color-neutral-400));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
     box-shadow: 0 0 0 var(--sl-focus-ring-width) rgb(var(--sl-focus-ring-color-neutral) / 25%);
   }
 
   .button.button--neutral:active:not(.button--disabled) {
     background-color: rgb(var(--sl-color-neutral-500));
     border-color: rgb(var(--sl-color-neutral-500));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   /* Warning */
   .button.button--warning {
     background-color: rgb(var(--sl-color-warning-500));
     border-color: rgb(var(--sl-color-warning-500));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
   .button.button--warning:hover:not(.button--disabled) {
     background-color: rgb(var(--sl-color-warning-400));
     border-color: rgb(var(--sl-color-warning-400));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   .button.button--warning:focus:not(.button--disabled) {
     background-color: rgb(var(--sl-color-warning-400));
     border-color: rgb(var(--sl-color-warning-400));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
     box-shadow: 0 0 0 var(--sl-focus-ring-width) rgb(var(--sl-focus-ring-color-warning) / 25%);
   }
 
   .button.button--warning:active:not(.button--disabled) {
     background-color: rgb(var(--sl-color-warning-500));
     border-color: rgb(var(--sl-color-warning-500));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   /* Danger */
   .button.button--danger {
     background-color: rgb(var(--sl-color-danger-500));
     border-color: rgb(var(--sl-color-danger-500));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   .button.button--danger:hover:not(.button--disabled) {
     background-color: rgb(var(--sl-color-danger-400));
     border-color: rgb(var(--sl-color-danger-400));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   .button.button--danger:focus:not(.button--disabled) {
     background-color: rgb(var(--sl-color-danger-400));
     border-color: rgb(var(--sl-color-danger-400));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
     box-shadow: 0 0 0 var(--sl-focus-ring-width) rgb(var(--sl-focus-ring-color-danger) / 25%);
   }
 
   .button.button--danger:active:not(.button--disabled) {
     background-color: rgb(var(--sl-color-danger-500));
     border-color: rgb(var(--sl-color-danger-500));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   /*
@@ -482,7 +482,7 @@ export default css`
     top: 0;
     left: 0;
     bottom: 0;
-    border-left: solid 1px rgb(var(--sl-color-1000) / 20%);
+    border-left: solid 1px rgb(var(--sl-color-neutral-1000) / 20%);
   }
 
   /* Bump focused buttons up so their focus ring isn't clipped */
diff --git a/src/components/card/card.styles.ts b/src/components/card/card.styles.ts
index 4bc568092..489d02994 100644
--- a/src/components/card/card.styles.ts
+++ b/src/components/card/card.styles.ts
@@ -16,7 +16,7 @@ export default css`
   .card {
     display: flex;
     flex-direction: column;
-    background-color: rgb(var(--sl-color-1000));
+    background-color: rgb(var(--sl-color-neutral-1000));
     box-shadow: var(--sl-shadow-x-small);
     border: solid var(--border-width) var(--border-color);
     border-radius: var(--border-radius);
diff --git a/src/components/checkbox/checkbox.styles.ts b/src/components/checkbox/checkbox.styles.ts
index 72104a28a..5230ef04e 100644
--- a/src/components/checkbox/checkbox.styles.ts
+++ b/src/components/checkbox/checkbox.styles.ts
@@ -30,7 +30,7 @@ export default css`
     border: solid var(--sl-input-border-width) rgb(var(--sl-input-border-color));
     border-radius: 2px;
     background-color: rgb(var(--sl-input-background-color));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
     transition: var(--sl-transition-fast) border-color, var(--sl-transition-fast) background-color,
       var(--sl-transition-fast) color, var(--sl-transition-fast) box-shadow;
   }
diff --git a/src/components/dialog/dialog.styles.ts b/src/components/dialog/dialog.styles.ts
index dafa03488..5937d2c80 100644
--- a/src/components/dialog/dialog.styles.ts
+++ b/src/components/dialog/dialog.styles.ts
@@ -101,6 +101,6 @@ export default css`
     right: 0;
     bottom: 0;
     left: 0;
-    background-color: rgb(var(--sl-overlay-background-color) / 40%);
+    background-color: rgb(var(--sl-overlay-background-color) / var(--sl-overlay-opacity));
   }
 `;
diff --git a/src/components/drawer/drawer.styles.ts b/src/components/drawer/drawer.styles.ts
index 61d5df5c0..691ebe004 100644
--- a/src/components/drawer/drawer.styles.ts
+++ b/src/components/drawer/drawer.styles.ts
@@ -132,7 +132,7 @@ export default css`
     right: 0;
     bottom: 0;
     left: 0;
-    background-color: rgb(var(--sl-overlay-background-color) / 40%);
+    background-color: rgb(var(--sl-overlay-background-color) / var(--sl-overlay-opacity));
     pointer-events: all;
   }
 
diff --git a/src/components/image-comparer/image-comparer.styles.ts b/src/components/image-comparer/image-comparer.styles.ts
index cf0ae1ffa..2d60bfb2b 100644
--- a/src/components/image-comparer/image-comparer.styles.ts
+++ b/src/components/image-comparer/image-comparer.styles.ts
@@ -48,7 +48,7 @@ export default css`
     top: 0;
     width: var(--divider-width);
     height: 100%;
-    background-color: rgb(var(--sl-color-1000));
+    background-color: rgb(var(--sl-color-neutral-1000));
     transform: translateX(calc(var(--divider-width) / -2));
     cursor: ew-resize;
   }
@@ -61,7 +61,7 @@ export default css`
     top: calc(50% - (var(--handle-size) / 2));
     width: var(--handle-size);
     height: var(--handle-size);
-    background-color: rgb(var(--sl-color-1000));
+    background-color: rgb(var(--sl-color-neutral-1000));
     border-radius: var(--sl-border-radius-circle);
     font-size: calc(var(--handle-size) * 0.5);
     color: rgb(var(--sl-color-neutral-500));
diff --git a/src/components/menu-item/menu-item.styles.ts b/src/components/menu-item/menu-item.styles.ts
index f0df7d73d..6004ca1fa 100644
--- a/src/components/menu-item/menu-item.styles.ts
+++ b/src/components/menu-item/menu-item.styles.ts
@@ -63,7 +63,7 @@ export default css`
   :host(:focus:not([aria-disabled='true'])) .menu-item {
     outline: none;
     background-color: rgb(var(--sl-color-primary-500));
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
   }
 
   .menu-item .menu-item__check {
diff --git a/src/components/progress-bar/progress-bar.styles.ts b/src/components/progress-bar/progress-bar.styles.ts
index f098b7124..d3624b204 100644
--- a/src/components/progress-bar/progress-bar.styles.ts
+++ b/src/components/progress-bar/progress-bar.styles.ts
@@ -8,7 +8,7 @@ export default css`
     --height: 16px;
     --track-color: rgb(var(--sl-color-neutral-500) / 20%);
     --indicator-color: rgb(var(--sl-color-primary-500));
-    --label-color: rgb(var(--sl-color-1000));
+    --label-color: rgb(var(--sl-color-neutral-1000));
 
     display: block;
   }
diff --git a/src/components/radio/radio.styles.ts b/src/components/radio/radio.styles.ts
index db71497f7..c2e301e5f 100644
--- a/src/components/radio/radio.styles.ts
+++ b/src/components/radio/radio.styles.ts
@@ -69,7 +69,7 @@ export default css`
 
   /* Checked */
   .radio--checked .radio__control {
-    color: rgb(var(--sl-color-1000));
+    color: rgb(var(--sl-color-neutral-1000));
     border-color: rgb(var(--sl-color-primary-500));
     background-color: rgb(var(--sl-color-primary-500));
   }
diff --git a/src/components/switch/switch.styles.ts b/src/components/switch/switch.styles.ts
index 0978437b9..01427b27e 100644
--- a/src/components/switch/switch.styles.ts
+++ b/src/components/switch/switch.styles.ts
@@ -40,7 +40,7 @@ export default css`
   .switch__control .switch__thumb {
     width: var(--thumb-size);
     height: var(--thumb-size);
-    background-color: rgb(var(--sl-color-1000));
+    background-color: rgb(var(--sl-color-neutral-1000));
     border-radius: 50%;
     border: solid var(--sl-input-border-width) rgb(var(--sl-input-border-color));
     transform: translateX(calc((var(--width) - var(--height)) / -2));
@@ -62,7 +62,7 @@ export default css`
     border-color: rgb(var(--sl-color-neutral-200));
   }
   .switch:not(.switch--checked):not(.switch--disabled) .switch__control:hover .switch__thumb {
-    background-color: rgb(var(--sl-color-1000));
+    background-color: rgb(var(--sl-color-neutral-1000));
     border-color: rgb(var(--sl-input-border-color));
   }
 
@@ -73,7 +73,7 @@ export default css`
   }
 
   .switch.switch--focused:not(.switch--checked):not(.switch--disabled) .switch__control .switch__thumb {
-    background-color: rgb(var(--sl-color-1000));
+    background-color: rgb(var(--sl-color-neutral-1000));
     border-color: rgb(var(--sl-color-primary-500));
     box-shadow: 0 0 0 var(--sl-focus-ring-width) rgb(var(--sl-focus-ring-color-primary) / var(--sl-focus-ring-alpha));
   }
@@ -84,7 +84,7 @@ export default css`
     border-color: rgb(var(--sl-color-primary-500));
   }
   .switch--checked .switch__control .switch__thumb {
-    background-color: rgb(var(--sl-color-1000));
+    background-color: rgb(var(--sl-color-neutral-1000));
     border-color: rgb(var(--sl-color-primary-500));
     transform: translateX(calc((var(--width) - var(--height)) / 2));
   }
@@ -95,7 +95,7 @@ export default css`
     border-color: rgb(var(--sl-color-primary-400));
   }
   .switch.switch--checked:not(.switch--disabled) .switch__control:hover .switch__thumb {
-    background-color: rgb(var(--sl-color-1000));
+    background-color: rgb(var(--sl-color-neutral-1000));
     border-color: rgb(var(--sl-color-primary-500));
   }
 
@@ -106,7 +106,7 @@ export default css`
   }
 
   .switch.switch--checked:not(.switch--disabled).switch--focused .switch__control .switch__thumb {
-    background-color: rgb(var(--sl-color-1000));
+    background-color: rgb(var(--sl-color-neutral-1000));
     border-color: rgb(var(--sl-color-primary-500));
     box-shadow: 0 0 0 var(--sl-focus-ring-width) rgb(var(--sl-focus-ring-color-primary) / var(--sl-focus-ring-alpha));
   }
diff --git a/src/themes/base.styles.ts b/src/themes/base.styles.ts
index abfb44aa9..b9c8f2558 100644
--- a/src/themes/base.styles.ts
+++ b/src/themes/base.styles.ts
@@ -298,9 +298,6 @@ export default css`
      * Theme Tokens
      */
 
-    --sl-color-0: 0 0 0;
-    --sl-color-1000: 255 255 255;
-
     /* Primary */
     --sl-color-primary-50: var(--sl-color-sky-50);
     --sl-color-primary-100: var(--sl-color-sky-100);
@@ -365,6 +362,8 @@ export default css`
     --sl-color-neutral-800: var(--sl-color-gray-800);
     --sl-color-neutral-900: var(--sl-color-gray-900);
     --sl-color-neutral-950: var(--sl-color-gray-950);
+    --sl-color-neutral-0: 0 0 0;
+    --sl-color-neutral-1000: 255 255 255;
 
     /*
      * Border radius tokens
@@ -382,11 +381,11 @@ export default css`
      * Elevation tokens
      */
 
-    --sl-shadow-x-small: 0 1px 0 #0d131e0d;
-    --sl-shadow-small: 0 1px 2px #0d131e1a;
-    --sl-shadow-medium: 0 2px 4px #0d131e1a;
-    --sl-shadow-large: 0 2px 8px #0d131e1a;
-    --sl-shadow-x-large: 0 4px 16px #0d131e1a;
+    --sl-shadow-x-small: 0 1px 0 rgb(0 0 0 / 5%);
+    --sl-shadow-small: 0 1px 2px rgb(0 0 0 / 9%);
+    --sl-shadow-medium: 0 2px 4px rgb(0 0 0 / 9%);
+    --sl-shadow-large: 0 2px 8px rgb(0 0 0 / 9%);
+    --sl-shadow-x-large: 0 4px 16px rgb(0 0 0 / 9%);
 
     /*
      * Spacing tokens
@@ -473,9 +472,9 @@ export default css`
     --sl-input-height-medium: 2.5rem; /* 40px */
     --sl-input-height-large: 3.125rem; /* 50px */
 
-    --sl-input-background-color: var(--sl-color-1000);
-    --sl-input-background-color-hover: var(--sl-color-1000);
-    --sl-input-background-color-focus: var(--sl-color-1000);
+    --sl-input-background-color: var(--sl-color-neutral-1000);
+    --sl-input-background-color-hover: var(--sl-color-neutral-1000);
+    --sl-input-background-color-focus: var(--sl-color-neutral-1000);
     --sl-input-background-color-disabled: var(--sl-color-neutral-100);
     --sl-input-border-color: var(--sl-color-neutral-300);
     --sl-input-border-color-hover: var(--sl-color-neutral-400);
@@ -528,13 +527,14 @@ export default css`
      * Overlay tokens
      */
 
-    --sl-overlay-background-color: var(--sl-color-blue-gray-900);
+    --sl-overlay-background-color: var(--sl-color-blue-gray-500);
+    --sl-overlay-opacity: 33%;
 
     /*
      * Panels
      */
 
-    --sl-panel-background-color: var(--sl-color-1000);
+    --sl-panel-background-color: var(--sl-color-neutral-1000);
     --sl-panel-border-color: var(--sl-color-neutral-200);
     /*
      * Tooltip tokens
@@ -542,7 +542,7 @@ export default css`
 
     --sl-tooltip-border-radius: var(--sl-border-radius-medium);
     --sl-tooltip-background-color: var(--sl-color-neutral-900);
-    --sl-tooltip-color: var(--sl-color-1000);
+    --sl-tooltip-color: var(--sl-color-neutral-1000);
     --sl-tooltip-font-family: var(--sl-font-sans);
     --sl-tooltip-font-weight: var(--sl-font-weight-normal);
     --sl-tooltip-font-size: var(--sl-font-size-small);
diff --git a/src/themes/dark.styles.ts b/src/themes/dark.styles.ts
index db8433471..a46b7f441 100644
--- a/src/themes/dark.styles.ts
+++ b/src/themes/dark.styles.ts
@@ -3,9 +3,6 @@ import { css } from 'lit';
 export default css`
   :host,
   .sl-theme-dark {
-    --sl-color-0: 255 255 255;
-    --sl-color-1000: var(--sl-color-gray-50);
-
     /* Blue Gray */
     --sl-color-blue-gray-950: 248 250 252;
     --sl-color-blue-gray-900: 241 245 249;
@@ -291,5 +288,9 @@ export default css`
     --sl-color-rose-200: 159 18 57;
     --sl-color-rose-100: 136 19 55;
     --sl-color-rose-50: 74 13 32;
+
+    /* Neutral one-offs */
+    --sl-color-neutral-0: 255 255 255;
+    --sl-color-neutral-1000: var(--sl-color-gray-50);
   }
 `;