diff --git a/scripts/config-darkmode.json b/scripts/config-darkmode.json
index 4388e0f..b736fb1 100644
--- a/scripts/config-darkmode.json
+++ b/scripts/config-darkmode.json
@@ -59,7 +59,7 @@
         }
       ]
     },
-    "JSmoduledarkC-color": {
+    "JSmodule--color": {
       "prefix": "ds",
       "transformGroup": "js",
       "comment": "File type: JS; data type: JS; filter: colors || public, theme: dark mode",
diff --git a/src/color-darkmode/alert.json b/src/color-darkmode/alert.json
deleted file mode 100644
index c74c877..0000000
--- a/src/color-darkmode/alert.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "color": {
-    "alert": {
-      "notification": {
-        "default": {
-          "value": "{color.brand.breeze.300.value}",
-          "public": true,
-          "default": true,
-          "usage": "Notification color on dark backgrounds",
-          "wcag": "AAA",
-          "deprecated": false
-        }
-      },
-      "warning": {
-        "default": {
-          "value": "{color.state.warning.500.value}",
-          "public": true,
-          "default": true,
-          "usage": "Warning color on dark backgrounds",
-          "wcag": "AAA",
-          "deprecated": false
-        }
-      },
-      "error": {
-        "default": {
-          "value": "{color.state.error.100.value}",
-          "public": true,
-          "default": true,
-          "usage": "Error color on dark backgrounds",
-          "wcag": "AAA",
-          "deprecated": false
-        }
-      },
-      "success": {
-        "default": {
-          "value": "{color.state.success.100.value}",
-          "public": true,
-          "default": true,
-          "usage": "Success color on dark backgrounds",
-          "wcag": "AAA",
-          "deprecated": false
-        }
-      },
-      "advisory": {
-        "default": {
-          "value": "{color.brand.goldcoast.100.value}",
-          "public": true,
-          "default": true,
-          "usage": "Travel advisory or system maintenance color on dark backgrounds",
-          "wcag": "AAA",
-          "deprecated": false
-        }
-      }
-    }
-  }
-}
diff --git a/src/color-darkmode/background.json b/src/color-darkmode/background.json
deleted file mode 100644
index 234a1a2..0000000
--- a/src/color-darkmode/background.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "color": {
-    "background": {
-      "lightest": {
-        "value": "{color.base.white.value}",
-        "public": true,
-        "neutral": true,
-        "usage": "Used for creating light backgrounds",
-        "wcag": "n/a",
-        "deprecated": false
-      },
-      "lighter": {
-        "value": "{color.base.gray.100.value}",
-        "public": true,
-        "neutral": true,
-        "usage": "Used for creating light backgrounds @ 90% white",
-        "wcag": "n/a",
-        "deprecated": false
-      },
-      "darker": {
-        "value": "{color.brand.midnight.400.value}",
-        "public": true,
-        "neutral": true,
-        "usage": "Used for creating dark backgrounds",
-        "wcag": "n/a",
-        "deprecated": false
-      },
-      "darkest": {
-        "value": "{color.brand.midnight.500.value}",
-        "public": true,
-        "neutral": true,
-        "usage": "Used for creating dark backgrounds @ 20% darker",
-        "wcag": "n/a",
-        "deprecated": false
-      }
-    }
-  }
-}
diff --git a/src/color-darkmode/base.json b/src/color-darkmode/base.json
index 8844346..7add1a3 100644
--- a/src/color-darkmode/base.json
+++ b/src/color-darkmode/base.json
@@ -2,138 +2,18 @@
   "color": {
     "base": {
       "white": {
-        "value": "ffffff",
+        "value": "000000",
         "comment": "{comments.color.base.value.comment}",
         "public": true,
-        "deprecated": false
-      },
-      "white-opacity-40": {
-        "value": "ffffff66",
-        "comment": "white @ 40%",
-        "public": true,
-        "opacity": true,
-        "deprecated": false
+        "deprecated": false,
+        "darkmode": true
       },
       "black": {
-        "value": "000000",
+        "value": "ffffff",
         "comment": "{comments.color.base.value.comment}",
         "public": true,
-        "deprecated": false
-      },
-      "black-opacity-15": {
-        "value": "00000026",
-        "comment": "black @ 15%",
-        "public": true,
-        "opacity": true,
-        "deprecated": false
-      },
-      "gray": {
-        "100": {
-          "value": "f8f8f8",
-          "version": "3.1.0",
-          "public": false,
-          "neutral": true,
-          "usage": "Neutral accent",
-          "wcag": "n/a",
-          "deprecated": true,
-          "reference": "color-brand-gray-100",
-          "comment": "{comments.reference.comment} color-brand-gray-100"
-        },
-        "200": {
-          "value": "dbdbdb",
-          "public": false,
-          "neutral": true,
-          "usage": "Neutral accent",
-          "wcag": "n/a",
-          "deprecated": true,
-          "version": "3.1.0",
-          "reference": "color-brand-gray-200",
-          "comment": "{comments.reference.comment} color-brand-gray-200"
-        },
-        "300": {
-          "value": "b2b2b2",
-          "public": false,
-          "neutral": true,
-          "usage": "Neutral accent",
-          "wcag": "n/a",
-          "deprecated": true,
-          "version": "3.1.0",
-          "reference": "color-brand-gray-300",
-          "comment": "{comments.reference.comment} color-brand-gray-300"
-        },
-        "400": {
-          "value": "767676",
-          "public": false,
-          "neutral": true,
-          "usage": "Neutral accent",
-          "wcag": "n/a",
-          "deprecated": true,
-          "version": "3.1.0",
-          "reference": "color-brand-gray-400",
-          "comment": "{comments.reference.comment} color-brand-gray-400"
-        },
-        "500": {
-          "value": "222222",
-          "public": false,
-          "neutral": true,
-          "usage": "Neutral accent",
-          "wcag": "n/a",
-          "deprecated": true,
-          "version": "3.1.0",
-          "reference": "color-brand-gray-500",
-          "comment": "{comments.reference.comment} color-brand-gray-500"
-        }
-      },
-      "neutral": {
-        "400": {
-          "value": "9fabbb",
-          "public": false,
-          "deprecated": true,
-          "version": "3.1.0",
-          "reference": "color-brand-neutral-400",
-          "comment": "{comments.reference.comment} color-brand-neutral-400"
-        },
-        "500": {
-          "value": "626b79",
-          "public": false,
-          "deprecated": true,
-          "version": "3.1.0",
-          "reference": "color-brand-neutral-500",
-          "comment": "{comments.reference.comment} color-brand-neutral-500"
-        }
-      }
-    },
-    "state": {
-      "error": {
-        "100": {
-          "value": "ff999b",
-          "public": true,
-          "deprecated": false
-        },
-        "500": {
-          "value": "df0b37",
-          "public": true,
-          "deprecated": false
-        }
-      },
-      "success": {
-        "100": {
-          "value": "69cf96",
-          "public": true,
-          "deprecated": false
-        },
-        "500": {
-          "value": "00805d",
-          "public": true,
-          "deprecated": false
-        }
-      },
-      "warning": {
-        "500": {
-          "value": "de750c",
-          "public": true,
-          "deprecated": false
-        }
+        "deprecated": false,
+        "darkmode": true
       }
     }
   }
diff --git a/src/color-darkmode/border.json b/src/color-darkmode/border.json
index 7ce8aed..f4c6a5b 100644
--- a/src/color-darkmode/border.json
+++ b/src/color-darkmode/border.json
@@ -5,56 +5,18 @@
         "default": {
           "value": "{color.brand.neutral.400.value}",
           "public": true,
+          "darkmode": true,
           "default": true,
           "usage": "Primary border color on dark background",
           "wcag": "n/a",
           "deprecated": false
         }
       },
-      "active": {
-        "default": {
-          "value": "{color.brand.breeze.300.value}",
-          "public": true,
-          "default": true,
-          "usage": "Active border color on dark backgrounds",
-          "wcag": "n/a",
-          "deprecated": false
-        }
-      },
-      "error": {
-        "default": {
-          "value": "{color.state.error.100.value}",
-          "public": true,
-          "default": true,
-          "usage": "Error states border color on dark background",
-          "wcag": "n/a",
-          "deprecated": false
-        }
-      },
-      "disabled": {
-        "default": {
-          "value": "{color.base.gray.200.value}",
-          "public": true,
-          "default": true,
-          "usage": "Disabled border color on dark background",
-          "wcag": "n/a",
-          "deprecated": false
-        }
-      },
-      "Focus": {
-        "default": {
-          "value": "{color.base.white.value}",
-          "public": true,
-          "default": true,
-          "usage": "Focus border color for dark backgrounds",
-          "wcag": "n/a",
-          "deprecated": false
-        }
-      },
       "divider": {
         "default": {
           "value": "{color.base.white.value}",
           "public": true,
+          "darkmode": true,
           "default": true,
           "usage": "Strict use as divider between elements on dark backgrounds",
           "wcag": "n/a",
diff --git a/src/color-darkmode/brand.json b/src/color-darkmode/brand.json
deleted file mode 100644
index 4b4174d..0000000
--- a/src/color-darkmode/brand.json
+++ /dev/null
@@ -1,530 +0,0 @@
-{
-  "color": {
-    "brand": {
-      "midnight": {
-        "100": {
-          "value": "c1daf0",
-          "comment": "{comments.color.brand.value.comment}",
-          "public": true,
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "200": {
-          "value": "569ed7",
-          "comment": "{comments.color.brand.value.comment}",
-          "public": true,
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "300": {
-          "value": "156fad",
-          "comment": "{comments.color.brand.value.comment}",
-          "public": true,
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "400": {
-          "value": "01426a",
-          "comment": "{comments.color.brand.value.comment}",
-          "public": true,
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "500": {
-          "value": "00274a",
-          "comment": "{comments.color.brand.value.comment}",
-          "public": true,
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        }
-      },
-      "atlas": {
-        "100": {
-          "value": "cde6ff",
-          "comment": "{comments.color.brand.value.comment}",
-          "public": true,
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "200": {
-          "value": "6bb7fb",
-          "comment": "{comments.color.brand.value.comment}",
-          "public": true,
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "300": {
-          "value": "2492eb",
-          "comment": "{comments.color.brand.value.comment}",
-          "public": true,
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "400": {
-          "value": "0074c8",
-          "comment": "{comments.color.brand.value.comment}",
-          "public": true,
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "400-opacity-20": {
-          "value": "0074c833",
-          "comment": "color brand atlas 400 @ 20%",
-          "opacity": true
-        },
-        "500": {
-          "value": "054687",
-          "comment": "{comments.color.brand.value.comment}",
-          "public": true,
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        }
-      },
-      "breeze": {
-        "100": {
-          "value": "c0f7ff",
-          "comment": "{comments.color.brand.value.comment}",
-          "public": true,
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "200": {
-          "value": "5de3f7",
-          "comment": "{comments.color.brand.value.comment}",
-          "public": true,
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "300": {
-          "value": "00cff0",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "300-opacity-30": {
-          "value": "00cff04d",
-          "comment": "breeze 300 @ 30%",
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "400": {
-          "value": "099dc5",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "500": {
-          "value": "0b5575",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        }
-      },
-      "tropical": {
-        "100": {
-          "value": "e2ffcd",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "200": {
-          "value": "d0fba6",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "300": {
-          "value": "c0e585",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "400": {
-          "value": "91be62",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "500": {
-          "value": "5e8741",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Transactional colors to move guests through task-based interactions.",
-          "wcag": "n/a",
-          "deprecated": false
-        }
-      },
-      "alpine": {
-        "100": {
-          "value": "bcaae6",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "200": {
-          "value": "9e73ea",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "300": {
-          "value": "8439ef",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "400": {
-          "value": "631db8",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "500": {
-          "value": "39115c",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        }
-      },
-      "flamingo": {
-        "100": {
-          "value": "ffebee",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "200": {
-          "value": "ffc0ca",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "300": {
-          "value": "ff94a7",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "400": {
-          "value": "F65b7b",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "500": {
-          "value": "b82b47",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        }
-      },
-      "canyon": {
-        "100": {
-          "value": "ffcab6",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "200": {
-          "value": "f99574",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "300": {
-          "value": "f26135",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "400": {
-          "value": "de3e09",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "500": {
-          "value": "b83302",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        }
-      },
-      "goldcoast": {
-        "100": {
-          "value": "fff0cd",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "200": {
-          "value": "ffdb67",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "300": {
-          "value": "ffd200",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "400": {
-          "value": "e5ad07",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "500": {
-          "value": "b88624",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "Conversational colors add warmth and energy to our experience",
-          "wcag": "n/a",
-          "deprecated": false
-        }
-      },
-      "neutral": {
-        "100": {
-          "value": "f9fbfc",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "TBD...",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "200": {
-          "value": "e2eaef",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "TBD...",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "300": {
-          "value": "cbd8e2",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "TBD...",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "400": {
-          "value": "9fabbb",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "TBD...",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "500": {
-          "value": "626b79",
-          "public": true,
-          "comment": "{comments.color.brand.value.comment}",
-          "neutral": true,
-          "usage": "TBD...",
-          "wcag": "n/a",
-          "deprecated": false
-        }
-      },
-      "gray": {
-        "100": {
-          "value": "f8f8f8",
-          "public": true,
-          "neutral": true,
-          "usage": "Neutral accent",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "200": {
-          "value": "dbdbdb",
-          "public": true,
-          "neutral": true,
-          "usage": "Neutral accent",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "300": {
-          "value": "b2b2b2",
-          "public": true,
-          "neutral": true,
-          "usage": "Neutral accent",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "400": {
-          "value": "767676",
-          "public": true,
-          "neutral": true,
-          "usage": "Neutral accent",
-          "wcag": "n/a",
-          "deprecated": false
-        },
-        "500": {
-          "value": "222222",
-          "public": true,
-          "neutral": true,
-          "usage": "Neutral accent",
-          "wcag": "n/a",
-          "deprecated": false
-        }
-      },
-      "goldgray": {
-        "100": {
-          "value": "C5C1BF",
-          "public": true,
-          "usage": "Tier branding color",
-          "deprecated": false
-        },
-        "200": {
-          "value": "726E6C",
-          "public": true,
-          "usage": "Tier branding color",
-          "deprecated": false
-        }
-      },
-      "gold": {
-        "100": {
-          "value": "CCBC94",
-          "public": true,
-          "usage": "Tier branding color",
-          "deprecated": false
-        },
-        "200": {
-          "value": "7F682E",
-          "public": true,
-          "usage": "Tier branding color",
-          "deprecated": false
-        }
-      },
-      "emerald": {
-        "value": "139142",
-        "public": true,
-        "usage": "Tier branding color",
-        "deprecated": false
-      },
-      "sapphire": {
-        "value": "015DAA",
-        "public": true,
-        "usage": "Tier branding color",
-        "deprecated": false
-      },
-      "ruby": {
-        "value": "A41D4A",
-        "public": true,
-        "usage": "Tier branding color",
-        "deprecated": false
-      }
-    }
-  }
-}
diff --git a/src/color-darkmode/icon.json b/src/color-darkmode/icon.json
index 2a75f7a..6620c53 100644
--- a/src/color-darkmode/icon.json
+++ b/src/color-darkmode/icon.json
@@ -5,6 +5,7 @@
         "default": {
           "value": "{color.base.neutral.400.value}",
           "public": true,
+          "darkmode": true,
           "default": true,
           "usage": "Primary color for icons on dark backgrounds",
           "wcag": "AAA",
@@ -15,31 +16,12 @@
         "default": {
           "value": "{color.base.white.value}",
           "public": true,
+          "darkmode": true,
           "default": true,
           "usage": "Emphasis or lightest icon color on dark backgrounds",
           "wcag": "AAA",
           "deprecated": false
         }
-      },
-      "accent": {
-        "default": {
-          "value": "{color.brand.breeze.300.value}",
-          "public": true,
-          "default": true,
-          "usage": "Accent color for icon color on dark backgrounds",
-          "wcag": "AA",
-          "deprecated": false
-        }
-      },
-      "disabled": {
-        "default": {
-          "value": "{color.base.white-opacity-40.value}",
-          "public": true,
-          "default": true,
-          "usage": "Disabled icon color on dark backgrounds",
-          "wcag": "n/a",
-          "deprecated": false
-        }
       }
     }
   }
diff --git a/src/color-darkmode/text.json b/src/color-darkmode/text.json
index 89116c0..2d6e52b 100644
--- a/src/color-darkmode/text.json
+++ b/src/color-darkmode/text.json
@@ -5,6 +5,7 @@
         "default": {
           "value": "{color.base.white.value}",
           "public": true,
+          "darkmode": true,
           "default": true,
           "usage": "Primary color for body and header text on dark backgrounds",
           "wcag": "AAA",
@@ -15,6 +16,7 @@
         "default": {
           "value": "{color.base.neutral.400.value}",
           "public": true,
+          "darkmode": true,
           "default": true,
           "usage": "Secondary color for body text on dark backgrounds",
           "wcag": "AAA",
@@ -25,6 +27,7 @@
         "default": {
           "value": "{color.brand.breeze.300.value}",
           "public": true,
+          "darkmode": true,
           "default": true,
           "usage": "Link text color on light backgrounds",
           "wcag": "AA",
@@ -35,26 +38,18 @@
         "default": {
           "value": "{color.state.error.100.value}",
           "public": true,
+          "darkmode": true,
           "default": true,
           "usage": "Error text color on dark backgrounds",
           "wcag": "AA",
           "deprecated": false
         }
       },
-      "disabled": {
-        "default": {
-          "value": "{color.base.gray.200.value}",
-          "public": true,
-          "default": true,
-          "usage": "Disabled text color on dark backgrounds",
-          "wcag": "n/a",
-          "deprecated": false
-        }
-      },
       "emphasis": {
         "default": {
           "value": "{color.brand.midnight.100.value}",
           "public": true,
+          "darkmode": true,
           "default": true,
           "usage": "Emphasized text color on dark backgrounds",
           "wcag": "n/a",
diff --git a/src/color-darkmode/tier.json b/src/color-darkmode/tier.json
index a66d921..1605ba5 100644
--- a/src/color-darkmode/tier.json
+++ b/src/color-darkmode/tier.json
@@ -6,6 +6,7 @@
           "default": {
             "value": "{color.brand.goldgray.100.value}",
             "public": true,
+            "darkmode": true,
             "default": true,
             "usage": "MVP tier color for Alaska Airlines",
             "wcag": "n/a",
@@ -16,38 +17,13 @@
           "default": {
             "value": "{color.brand.gold.100.value}",
             "public": true,
+            "darkmode": true,
             "default": true,
             "usage": "MVP Gold tier color for Alaska Airlines",
             "wcag": "n/a",
             "deprecated": false
           }
         }
-      },
-      "oneworld": {
-        "emerald": {
-            "value": "{color.brand.emerald.value}",
-            "public": true,
-            "onLight": true,
-            "usage": "Emerald tier color for Oneworld",
-            "wcag": "n/a",
-            "deprecated": false
-        },
-        "sapphire": {
-            "value": "{color.brand.sapphire.value}",
-            "public": true,
-            "default": true,
-            "usage": "Sapphire tier color for Oneworld",
-            "wcag": "n/a",
-            "deprecated": false
-        },
-        "ruby": {
-            "value": "{color.brand.ruby.value}",
-            "public": true,
-            "default": true,
-            "usage": "Ruby tier color for Oneworld",
-            "wcag": "n/a",
-            "deprecated": false
-        }
       }
     }
   }
diff --git a/src/color-darkmode/ui.json b/src/color-darkmode/ui.json
deleted file mode 100644
index 7317e8b..0000000
--- a/src/color-darkmode/ui.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "color": {
-    "ui": {
-      "default": {
-        "default": {
-          "value": "{color.brand.breeze.300.value}",
-          "public": true,
-          "default": true,
-          "usage": "default interaction color affordance",
-          "wcag": "AAA",
-          "deprecated": false
-        }
-      },
-      "hover": {
-        "default": {
-          "value": "{color.brand.breeze.200.value}",
-          "public": true,
-          "default": true,
-          "usage": "Hover interaction color on dark backgrounds",
-          "wcag": "AAA",
-          "deprecated": false
-        }
-      },
-      "active": {
-        "default": {
-          "value": "{color.brand.breeze.200.value}",
-          "public": true,
-          "default": true,
-          "usage": "default active state color affordance",
-          "wcag": "AAA",
-          "deprecated": false
-        }
-      },
-      "disabled": {
-        "default": {
-          "value": "{color.brand.breeze.300-opacity-30.value}",
-          "public": true,
-          "default": true,
-          "usage": "default disabled state color affordance",
-          "wcag": "n/a",
-          "deprecated": false
-        }
-      },
-      "bkg": {
-        "hover": {
-          "default": {
-            "value": "5de3f71a",
-            "public": true,
-            "default": true,
-            "usage": "Default hover affordance for background colors default",
-            "deprecated": false
-          }
-        }
-      }
-    }
-  }
-}