diff --git a/tokens/base/color.yml b/tokens/base/color.yml
index 68d8d31..5e624ce 100644
--- a/tokens/base/color.yml
+++ b/tokens/base/color.yml
@@ -16,9 +16,9 @@ component-themes:
     slot-one:
       value: "{color.blue.yale.value}"
     slot-two:
-      value: "{color.blue.medium.value}"
+      value: "{color.blue.athens.value}"
     slot-three:
-      value: "{color.blue.light.value}"
+      value: "{color.blue.whipple.value}"
     slot-four:
       value: "{color.gray.100.value}"
     slot-five:
@@ -33,11 +33,11 @@ component-themes:
     slot-one:
       value: "{color.blue.yale.value}"
     slot-two:
-      value: "{color.green.primary.value}"
+      value: "{color.green.sweet-basil.value}"
     slot-three:
-      value: "{color.green.primary.value}"
+      value: "{color.green.sweet-basil.value}"
     slot-four:
-      value: "{color.green.light.value}"
+      value: "{color.green.kennebunkport.value}"
     slot-five:
       value: "{color.gray.600.value}"
   "three":
@@ -50,11 +50,11 @@ component-themes:
     slot-one:
       value: "{color.blue.yale.value}"
     slot-two:
-      value: "{color.blue.medium.value}"
+      value: "{color.blue.twilight.value}"
     slot-three:
-      value: "{color.orange.primary.value}"
+      value: "{color.orange.bryant.value}"
     slot-four:
-      value: "{color.yellow.primary.value}"
+      value: "{color.yellow.marblehead.value}"
     slot-five:
       value: "{color.gray.600.value}"
 global-themes:
@@ -65,27 +65,27 @@ global-themes:
       slot-one:
         value: "{color.blue.yale.value}"
       slot-two:
-        value: "{color.blue.medium.value}"
+        value: "{color.blue.athens.value}"
       slot-three:
-        value: "{color.blue.light.value}"
+        value: "{color.blue.whipple.value}"
       slot-four:
-        value: "{color.gray.100.value}"
+        value: "{color.blue.yarmouth.value}"
       slot-five:
-        value: "{color.gray.800.value}"
+        value: "{color.gray.hale.value}"
   "two":
     label:
       value: "New Haven Green"
     colors:
       slot-one:
-        value: "{color.blue.medium.value}"
+        value: "{color.gray.700.value}"
       slot-two:
-        value: "{color.green.primary.value}"
+        value: "{color.green.sweet-basil.value}"
       slot-three:
-        value: "{color.green.primary.value}"
+        value: "{color.green.kennebunkport.value}"
       slot-four:
-        value: "{color.green.light.value}"
+        value: "{color.green.overcast.value}"
       slot-five:
-        value: "{color.gray.600.value}"
+        value: "{color.green.essex-green.value}"
   "three":
     label:
       value: "Shoreline Summer"
@@ -93,41 +93,13 @@ global-themes:
       slot-one:
         value: "{color.blue.yale.value}"
       slot-two:
-        value: "{color.blue.medium.value}"
-      slot-three:
-        value: "{color.orange.primary.value}"
-      slot-four:
-        value: "{color.yellow.primary.value}"
-      slot-five:
-        value: "{color.gray.600.value}"
-  "four":
-    label:
-      value: "Elm City Nights"
-    colors:
-      slot-one:
-        value: "{color.blue.yale.value}"
-      slot-two:
-        value: "{color.blue.medium.value}"
-      slot-three:
-        value: "{color.purple.primary.value}"
-      slot-four:
-        value: "{color.gray.100.value}"
-      slot-five:
-        value: "{color.purple.primary.value}"
-  "five":
-    label:
-      value: "Quiet Corner"
-    colors:
-      slot-one:
-        value: "{color.blue.yale.value}"
-      slot-two:
-        value: "{color.blue.medium.value}"
+        value: "{color.blue.twilight.value}"
       slot-three:
-        value: "{color.basic.brown-gray.value}"
+        value: "{color.orange.bryant.value}"
       slot-four:
-        value: "{color.gray.200.value}"
+        value: "{color.yellow.marblehead.value}"
       slot-five:
-        value: "{color.gray.600.value}"
+        value: "{color.blue.yorktown.value}"
 basic-themes:
   "gray-800":
     background:
diff --git a/tokens/figma-export/tokens.json b/tokens/figma-export/tokens.json
index 09dcfc6..6bac3e7 100644
--- a/tokens/figma-export/tokens.json
+++ b/tokens/figma-export/tokens.json
@@ -103,6 +103,26 @@
         "light": {
           "value": "#63aaff",
           "type": "color"
+        },
+        "athens": {
+          "value": "#3E75AD",
+          "type": "color"
+        },
+        "whipple": {
+          "value": "#779FB1",
+          "type": "color"
+        },
+        "yarmouth": {
+          "value": "#B6C9CA",
+          "type": "color"
+        },
+        "twilight": {
+          "value": "#375597",
+          "type": "color"
+        },
+        "yorktown": {
+          "value": "#475B5E",
+          "type": "color"
         }
       },
       "green": {
@@ -113,12 +133,32 @@
         "light": {
           "value": "#F7FDD2",
           "type": "color"
+        },
+        "sweet-basil": {
+          "value": "#57674F",
+          "type": "color"          
+        },
+        "kennebunkport": {
+          "value": "#929E83",
+          "type": "color"          
+        },
+        "overcast": {
+          "value": "#DEDBC7",
+          "type": "color"
+        },
+        "essex-green": {
+          "value": "#28372F",
+          "type": "color"
         }
       },
       "orange": {
         "primary": {
           "value": "#FF6D1B",
           "type": "color"
+        },
+        "bryant" : {
+          "value": "#D6A760",
+          "type": "color"
         }
       },
       "purple": {
@@ -131,7 +171,11 @@
         "primary": {
           "value": "#FFE980",
           "type": "color"
-        }
+        },
+        "marblehead": {
+          "value": "#E2C579",
+          "type": "color"
+        } 
       },
       "basic": {
         "white": {
@@ -179,6 +223,10 @@
         "800": {
           "value": "#222222",
           "type": "color"
+        },
+        "hale": {
+          "value": "#444C57",
+          "type": "color"
         }
       }
     },
diff --git a/tokens/organisms/site-footer.yml b/tokens/organisms/site-footer.yml
index 4c88230..0f491ce 100644
--- a/tokens/organisms/site-footer.yml
+++ b/tokens/organisms/site-footer.yml
@@ -62,45 +62,3 @@ site-footer-themes:
       value: "{color.yellow.primary.value}"
     slot-five:
       value: "{color.gray.600.value}"
-  four:
-    background-color:
-      value: "{color.gray.700.value}"
-    yale-branding:
-      value: "{color.blue.yale.value}"
-    border-color:
-      value: "{color.blue.light.value}"
-    divider-color:
-      value: "{color.gray.300.value}"
-    text-color:
-      value: "{color.basic.white.value}"
-    slot-one:
-      value: "{color.blue.yale.value}"
-    slot-two:
-      value: "{color.blue.medium.value}"
-    slot-three:
-      value: "{color.purple.primary.value}"
-    slot-four:
-      value: "{color.gray.100.value}"
-    slot-five:
-      value: "{color.purple.primary.value}"
-  five:
-    background-color:
-      value: "{color.blue.yale.value}"
-    yale-branding:
-      value: "{color.blue.yale.value}"
-    border-color:
-      value: "{color.blue.light.value}"
-    divider-color:
-      value: "{color.gray.300.value}"
-    text-color:
-      value: "{color.basic.white.value}"
-    slot-one:
-      value: "{color.blue.yale.value}"
-    slot-two:
-      value: "{color.blue.medium.value}"
-    slot-three:
-      value: "{color.basic.brown-gray.value}"
-    slot-four:
-      value: "{color.gray.200.value}"
-    slot-five:
-      value: "{color.gray.600.value}"
diff --git a/tokens/organisms/site-header.yml b/tokens/organisms/site-header.yml
index 79181b1..203f9ef 100644
--- a/tokens/organisms/site-header.yml
+++ b/tokens/organisms/site-header.yml
@@ -16,23 +16,31 @@ site-header-themes:
       value: "{color.blue.yale.value}"
     slot-three:
       value: "{color.blue.yale.value}"
+    slot-four:
+      value: "{color.blue.yale.value}"
+    slot-five:
+      value: "{color.blue.yale.value}"
   two:
     background:
-      value: "{color.gray.100.value}"
+      value: "{color.gray.800.value}"
     yale-branding:
-      value: "{color.blue.yale.value}"
+      value: "{color.blue.light.value}"
     site-branding:
-      value: "{color.blue.yale.value}"
+      value: "{color.basic.white.value}"
     border-color:
-      value: "{color.blue.yale.value}"
+      value: "{color.blue.light.value}"
     divider-color:
-      value: "{color.gray.300.value}"
+      value: "{color.gray.500.value}"
     slot-one:
-      value: "{color.gray.100.value}"
-    slot-two:
       value: "{color.blue.yale.value}"
+    slot-two:
+      value: "{color.blue.light.value}"
     slot-three:
       value: "{color.blue.light.value}"
+    slot-four:
+      value: "{color.blue.light.value}"
+    slot-five:
+      value: "{color.blue.light.value}"
   three:
     background:
       value: "{color.blue.yale.value}"
@@ -50,6 +58,10 @@ site-header-themes:
       value: "{color.blue.light.value}"
     slot-three:
       value: "{color.blue.light.value}"
+    slot-four:
+      value: "{color.blue.light.value}"
+    slot-five:
+      value: "{color.blue.light.value}"
 site-header-layout:
   left:
     justify: