diff --git a/_data/changelogs/tokens-color-state.yml b/_data/changelogs/tokens-color-state.yml
index 126bee45b..62a43341e 100644
--- a/_data/changelogs/tokens-color-state.yml
+++ b/_data/changelogs/tokens-color-state.yml
@@ -2,8 +2,21 @@ title: State color tokens
 type: token
 changelogURL:
 items:
+  - date: 2021-12-21
+    summary: Updated the documentation for `success-dark` and `success-darker` to match the current USWDS values.
+    summaryAdditional:
+    isBreaking:
+    affectsAccessibility:
+    affectsAssets:
+    affectsGuidance: true
+    affectsJavascript:
+    affectsMarkup:
+    affectsStyles:
+    githubPr: 1939
+    githubRepo: uswds-site
+    versionUswds:
   - date: 2021-06-16
-    summary: Updated values for `success-dark` and `success-darker`.
+    summary: Updated the values of `success-dark` from `green-cool-50` to `green-cool-50v` and `success-darker` from `green-cool-60` to `green-cool-60v`.
     summaryAdditional:
     isBreaking:
     affectsAccessibility:
diff --git a/_data/settings.yml b/_data/settings.yml
index 90271c734..e59e792a0 100644
--- a/_data/settings.yml
+++ b/_data/settings.yml
@@ -308,7 +308,7 @@
       subsection: theme color token
       usage: Use grades 60-90.
       var: $theme-color-accent-warm-darker
-      default: "'orange-60v'"
+      default: "'orange-60'"
       kind: color
     - name: accent-warm-lightest
       subsection: theme color token
@@ -467,13 +467,13 @@
       subsection: state color token
       usage: Use grades 60-70.
       var: $theme-color-success-dark
-      default: "'green-cool-50'"
+      default: "'green-cool-50v'"
       kind: color
     - name: success-darker
       subsection: state color token
       usage: Use grades 70-80.
       var: $theme-color-success-darker
-      default: "'green-cool-60'"
+      default: "'green-cool-60v'"
       kind: color
 
     - name: Info color family
diff --git a/_data/settings/color.yml b/_data/settings/color.yml
index b8324e597..7725a24ae 100644
--- a/_data/settings/color.yml
+++ b/_data/settings/color.yml
@@ -211,7 +211,7 @@ contents:
     subsection: theme color token
     description: Use grades 60-90.
     var: $theme-color-accent-warm-darker
-    default: '"orange-60v"'
+    default: '"orange-60"'
     type: color
   - name: accent-warm-lightest
     subsection: theme color token
@@ -370,13 +370,13 @@ contents:
     subsection: state color token
     description: Use grades 60-70.
     var: $theme-color-success-dark
-    default: '"green-cool-50"'
+    default: '"green-cool-50v"'
     type: color
   - name: success-darker
     subsection: state color token
     description: Use grades 70-80.
     var: $theme-color-success-darker
-    default: '"green-cool-60"'
+    default: '"green-cool-60v"'
     type: color
 
   - name: Info color family
diff --git a/_data/tokens/color.yml b/_data/tokens/color.yml
index d675c32f3..4d79e0fde 100644
--- a/_data/tokens/color.yml
+++ b/_data/tokens/color.yml
@@ -86,19 +86,19 @@ state:
   - token: success
     default: "green-cool-40v"
   - token: success-dark
-    default: "green-cool-50"
+    default: "green-cool-50v"
   - token: success-darker
-    default: "green-cool-60"
+    default: "green-cool-60v"
   - token: disabled-light
     default: "gray-10"
-  - token: emergency
-    default: "red-warm-60v"
-  - token: emergency-dark
-    default: "red-warm-80"
   - token: disabled
     default: "gray-20"
   - token: disabled-dark
     default: "gray-30"
+  - token: emergency
+    default: "red-warm-60v"
+  - token: emergency-dark
+    default: "red-warm-80"
 
 theme:
   - token: base-lightest
diff --git a/css/settings/_uswds-theme-color.scss b/css/settings/_uswds-theme-color.scss
index 9309afbcb..2703d9189 100644
--- a/css/settings/_uswds-theme-color.scss
+++ b/css/settings/_uswds-theme-color.scss
@@ -103,8 +103,8 @@ $theme-color-success-family: "green-cool";
 $theme-color-success-lighter: "green-cool-5";
 $theme-color-success-light: "green-cool-20v";
 $theme-color-success: "green-cool-40v";
-$theme-color-success-dark: "green-cool-50";
-$theme-color-success-darker: "green-cool-60";
+$theme-color-success-dark: "green-cool-50v";
+$theme-color-success-darker: "green-cool-60v";
 
 // Info colors
 $theme-color-info-family: "cyan";