diff --git a/lua/github-theme/palette/primitives/dark.lua b/lua/github-theme/palette/primitives/dark.lua
index 896581e..13b378c 100644
--- a/lua/github-theme/palette/primitives/dark.lua
+++ b/lua/github-theme/palette/primitives/dark.lua
@@ -11,149 +11,194 @@ local function m(tbl)
   return setmetatable(tbl, mt)
 end
 local M = m({
-  treeViewItem = m({
-    leadingVisual = m({
-      iconColor = m({
-        rest = '#8d96a0',
-      }),
+  borderColor = m({
+    neutral = m({
+      emphasis = '#6e7681',
+      muted = '#6e768166',
     }),
-  }),
-  topicTag = m({
-    borderColor = '#00000000',
-  }),
-  timelineBadge = m({
-    bgColor = '#21262d',
-  }),
-  bgColor = m({
-    white = '#ffffff',
+    default = '#30363d',
+    open = m({
+      emphasis = '#238636',
+      muted = '#2ea04366',
+    }),
+    translucent = '#ffffff26',
     upsell = m({
-      muted = '#ab7df826',
       emphasis = '#8957e5',
+      muted = '#ab7df866',
     }),
     success = m({
-      muted = '#2ea04326',
       emphasis = '#238636',
+      muted = '#2ea04366',
     }),
     sponsors = m({
-      muted = '#db61a21a',
       emphasis = '#bf4b8a',
+      muted = '#db61a266',
     }),
     severe = m({
-      muted = '#db6d281a',
       emphasis = '#bd561d',
+      muted = '#db6d2866',
     }),
-    muted = '#161b22',
-    open = m({
-      muted = '#2ea0431a',
-      emphasis = '#238636',
-    }),
+    muted = '#30363db3',
     done = m({
-      muted = '#ab7df826',
       emphasis = '#8957e5',
+      muted = '#ab7df866',
     }),
     disabled = '#21262db3',
     danger = m({
-      muted = '#f851491a',
       emphasis = '#da3633',
+      muted = '#f8514966',
+    }),
+    closed = m({
+      emphasis = '#da3633',
+      muted = '#f8514966',
     }),
-    inset = '#010409',
-    black = '#010409',
-    transparent = '#00000000',
     accent = m({
-      muted = '#388bfd1a',
       emphasis = '#1f6feb',
+      muted = '#388bfd66',
     }),
-    inverse = '#ffffff',
-    emphasis = '#6e7681',
     attention = m({
-      muted = '#bb800926',
       emphasis = '#9e6a03',
+      muted = '#bb800966',
     }),
-    neutral = m({
-      muted = '#6e768166',
-      emphasis = '#6e7681',
-    }),
-    closed = m({
-      muted = '#f8514926',
-      emphasis = '#da3633',
+    emphasis = '#484f58',
+    transparent = '#00000000',
+  }),
+  treeViewItem = m({
+    leadingVisual = m({
+      iconColor = m({
+        rest = '#8d96a0',
+      }),
     }),
-    default = '#0d1117',
+  }),
+  topicTag = m({
+    borderColor = '#00000000',
+  }),
+  timelineBadge = m({
+    bgColor = '#21262d',
+  }),
+  card = m({
+    bgColor = '#161b22',
   }),
   skeletonLoader = m({
     bgColor = '#161b22',
   }),
+  buttonCounter = m({
+    primary = m({
+      bgColor = m({
+        rest = '#04260f33',
+      }),
+    }),
+    danger = m({
+      bgColor = m({
+        disabled = '#da36330d',
+        rest = '#49020233',
+        hover = '#ffffff33',
+      }),
+      fgColor = m({
+        disabled = '#f8514980',
+        rest = '#f85149',
+        hover = '#ffffff',
+      }),
+    }),
+    outline = m({
+      bgColor = m({
+        disabled = '#1f6feb0d',
+        rest = '#051d4d33',
+        hover = '#051d4d33',
+      }),
+      fgColor = m({
+        disabled = '#4493f880',
+        rest = '#388bfd',
+        hover = '#58a6ff',
+      }),
+    }),
+    default = m({
+      bgColor = m({
+        rest = '#30363d',
+      }),
+    }),
+    invisible = m({
+      bgColor = m({
+        rest = '#30363d',
+      }),
+    }),
+  }),
   sideNav = m({
     bgColor = m({
       selected = '#21262d',
     }),
   }),
+  shadow = m({
+    floating = m({
+      small = '0px 0px 0px 1px #30363d, 0px 6px 12px -3px #01040966, 0px 6px 18px 0px #01040966',
+      medium = '0px 0px 0px 1px #30363d, 0px 8px 16px -4px #01040966, 0px 4px 32px -4px #01040966, 0px 24px 48px -12px #01040966, 0px 48px 96px -24px #01040966',
+      xlarge = '0px 0px 0px 1px #30363d, 0px 32px 64px 0px #010409',
+      legacy = '0px 6px 12px -3px #01040966, 0px 6px 18px 0px #01040966',
+      large = '0px 0px 0px 1px #30363d, 0px 24px 48px 0px #010409',
+    }),
+    inset = 'inset 0px 1px 0px 0px #0104093d',
+    resting = m({
+      small = '0px 1px 0px 0px #01040966',
+      xsmall = '0px 1px 0px 0px #010409cc',
+      medium = '0px 3px 6px 0px #010409cc',
+    }),
+  }),
   button = m({
-    primary = m({
+    danger = m({
+      borderColor = m({
+        active = '#f0f6fc1a',
+        rest = '#30363d',
+        hover = '#f0f6fc1a',
+      }),
       fgColor = m({
-        rest = '#ffffff',
-        disabled = '#ffffff66',
+        disabled = '#f8514980',
+        active = '#ffffff',
+        rest = '#f85149',
+        hover = '#ffffff',
+      }),
+      iconColor = m({
+        hover = '#ffffff',
+        rest = '#f85149',
       }),
       shadow = m({
         selected = '0px 0px 0px 0px #000000',
       }),
       bgColor = m({
-        rest = '#238636',
-        disabled = '#105823',
-        active = '#2e9a40',
-        hover = '#29903b',
+        disabled = '#21262db3',
+        active = '#d03533',
+        rest = '#21262d',
+        hover = '#b62324',
       }),
+    }),
+    primary = m({
       borderColor = m({
-        rest = '#f0f6fc1a',
         disabled = '#105823',
         active = '#f0f6fc1a',
+        rest = '#f0f6fc1a',
         hover = '#f0f6fc1a',
       }),
-      iconColor = m({
+      fgColor = m({
+        disabled = '#ffffff66',
         rest = '#ffffff',
       }),
-    }),
-    inactive = m({
-      fgColor = '#8b949e',
-      bgColor = '#21262d',
-    }),
-    star = m({
-      iconColor = '#e3b341',
-    }),
-    invisible = m({
-      bgColor = m({
-        rest = '#00000000',
-        disabled = '#21262db3',
-        active = '#b1bac433',
-        hover = '#b1bac41f',
-      }),
-      borderColor = m({
-        rest = '#00000000',
-        disabled = '#21262db3',
-        hover = '#00000000',
-      }),
       iconColor = m({
-        rest = '#8d96a0',
-        disabled = '#6e7681',
-        hover = '#e6edf3',
+        rest = '#ffffff',
       }),
-      fgColor = m({
-        rest = '#4493f8',
-        disabled = '#6e7681',
-        hover = '#58a6ff',
+      shadow = m({
+        selected = '0px 0px 0px 0px #000000',
       }),
-    }),
-    default = m({
       bgColor = m({
-        rest = '#21262d',
-        hover = '#292e36',
-        disabled = '#21262db3',
-        active = '#31363e',
-        selected = '#31363e',
+        disabled = '#105823',
+        active = '#2e9a40',
+        rest = '#238636',
+        hover = '#29903b',
       }),
+    }),
+    default = m({
       borderColor = m({
-        rest = '#30363d',
         disabled = '#21262db3',
         active = '#30363d',
+        rest = '#30363d',
         hover = '#30363d',
       }),
       fgColor = m({
@@ -162,81 +207,80 @@ local M = m({
       shadow = m({
         resting = '0px 0px 0px 0px #000000',
       }),
-    }),
-    danger = m({
-      fgColor = m({
-        rest = '#f85149',
-        disabled = '#f8514980',
-        active = '#ffffff',
-        hover = '#ffffff',
-      }),
-      shadow = m({
-        selected = '0px 0px 0px 0px #000000',
-      }),
       bgColor = m({
+        active = '#31363e',
+        selected = '#31363e',
         rest = '#21262d',
         disabled = '#21262db3',
-        active = '#d03533',
-        hover = '#b62324',
-      }),
-      borderColor = m({
-        rest = '#30363d',
-        active = '#f0f6fc1a',
-        hover = '#f0f6fc1a',
-      }),
-      iconColor = m({
-        rest = '#f85149',
-        hover = '#ffffff',
+        hover = '#292e36',
       }),
     }),
+    star = m({
+      iconColor = '#e3b341',
+    }),
     outline = m({
-      bgColor = m({
-        rest = '#f0f6fc',
-        disabled = '#0d1117',
-        active = '#0d419d',
-        hover = '#30363d',
-      }),
       borderColor = m({
-        hover = '#f0f6fc1a',
         selected = '#f0f6fc1a',
+        hover = '#f0f6fc1a',
       }),
       fgColor = m({
-        rest = '#388bfd',
         disabled = '#4493f880',
         active = '#ffffff',
+        rest = '#388bfd',
         hover = '#58a6ff',
       }),
       shadow = m({
         selected = '0px 0px 0px 0px #000000',
       }),
+      bgColor = m({
+        disabled = '#0d1117',
+        active = '#0d419d',
+        rest = '#f0f6fc',
+        hover = '#30363d',
+      }),
     }),
-  }),
-  shadow = m({
-    resting = m({
-      small = '0px 1px 0px 0px #01040966',
-      xsmall = '0px 1px 0px 0px #010409cc',
-      medium = '0px 3px 6px 0px #010409cc',
-    }),
-    floating = m({
-      xlarge = '0px 0px 0px 1px #30363d, 0px 32px 64px 0px #010409',
-      legacy = '0px 6px 12px -3px #01040966, 0px 6px 18px 0px #01040966',
-      large = '0px 0px 0px 1px #30363d, 0px 24px 48px 0px #010409',
-      small = '0px 0px 0px 1px #30363d, 0px 6px 12px -3px #01040966, 0px 6px 18px 0px #01040966',
-      medium = '0px 0px 0px 1px #30363d, 0px 8px 16px -4px #01040966, 0px 4px 32px -4px #01040966, 0px 24px 48px -12px #01040966, 0px 48px 96px -24px #01040966',
+    invisible = m({
+      borderColor = m({
+        disabled = '#21262db3',
+        rest = '#00000000',
+        hover = '#00000000',
+      }),
+      fgColor = m({
+        disabled = '#6e7681',
+        rest = '#4493f8',
+        hover = '#58a6ff',
+      }),
+      iconColor = m({
+        disabled = '#6e7681',
+        rest = '#8d96a0',
+        hover = '#e6edf3',
+      }),
+      bgColor = m({
+        disabled = '#21262db3',
+        active = '#b1bac433',
+        rest = '#00000000',
+        hover = '#b1bac41f',
+      }),
+    }),
+    inactive = m({
+      bgColor = '#21262d',
+      fgColor = '#8b949e',
     }),
-    inset = 'inset 0px 1px 0px 0px #0104093d',
   }),
   diffBlob = m({
+    expander = m({
+      iconColor = '#8d96a0',
+    }),
     deletion = m({
-      fgColor = m({
-        num = '#e6edf3',
-        text = '#e6edf3',
-      }),
       bgColor = m({
-        line = '#f8514926',
         word = '#f8514966',
+        line = '#f8514926',
         num = '#f851494d',
       }),
+      fgColor = m({
+        num = '#e6edf3',
+        text = '#e6edf3',
+      }),
     }),
     hunk = m({
       bgColor = m({
@@ -244,315 +288,247 @@ local M = m({
       }),
     }),
     addition = m({
-      fgColor = m({
-        num = '#e6edf3',
-        text = '#e6edf3',
-      }),
       bgColor = m({
-        line = '#2ea04326',
         word = '#2ea04366',
+        line = '#2ea04326',
         num = '#3fb9504d',
       }),
-    }),
-    expander = m({
-      iconColor = '#8d96a0',
-    }),
-  }),
-  data = m({
-    purple = m({
-      color = m({
-        muted = '#211047',
-        default = '#975bf1',
-      }),
-    }),
-    pink = m({
-      color = m({
-        muted = '#2d1524',
-        default = '#d34591',
-      }),
-    }),
-    yellow = m({
-      color = m({
-        muted = '#2e1a00',
-        default = '#895906',
-      }),
-    }),
-    blue = m({
-      color = m({
-        muted = '#001a47',
-        default = '#0576ff',
-      }),
-    }),
-    auburn = m({
-      color = m({
-        muted = '#271817',
-        default = '#a86f6b',
-      }),
-    }),
-    gray = m({
-      color = m({
-        muted = '#1c1c1c',
-        default = '#576270',
-      }),
-    }),
-    green = m({
-      color = m({
-        muted = '#122117',
-        default = '#2f6f37',
+      fgColor = m({
+        num = '#e6edf3',
+        text = '#e6edf3',
       }),
     }),
+  }),
+  selection = m({
+    bgColor = '#1f6febb3',
+  }),
+  display = m({
     orange = m({
-      color = m({
+      borderColor = m({
+        emphasis = '#c46212',
+        muted = '#43200a',
+      }),
+      fgColor = '#ed8326',
+      bgColor = m({
+        emphasis = '#c46212',
         muted = '#311708',
-        default = '#984b10',
       }),
     }),
-    red = m({
-      color = m({
-        muted = '#3c0614',
-        default = '#eb3342',
+    auburn = m({
+      borderColor = m({
+        emphasis = '#a86f6b',
+        muted = '#3a2422',
       }),
-    }),
-    teal = m({
-      color = m({
-        muted = '#041f25',
-        default = '#106c70',
+      fgColor = '#bf9592',
+      bgColor = m({
+        emphasis = '#a86f6b',
+        muted = '#271817',
       }),
     }),
-  }),
-  display = m({
     olive = m({
-      bgColor = m({
-        muted = '#171e0b',
-        emphasis = '#7a8321',
-      }),
       borderColor = m({
-        muted = '#252d10',
         emphasis = '#7a8321',
+        muted = '#252d10',
       }),
       fgColor = '#a2a626',
-    }),
-    lime = m({
       bgColor = m({
-        muted = '#141f0f',
-        emphasis = '#5f892f',
+        emphasis = '#7a8321',
+        muted = '#171e0b',
       }),
+    }),
+    lime = m({
       borderColor = m({
-        muted = '#1f3116',
         emphasis = '#5f892f',
+        muted = '#1f3116',
       }),
       fgColor = '#7dae37',
-    }),
-    lemon = m({
       bgColor = m({
-        muted = '#291d00',
-        emphasis = '#977b0c',
+        emphasis = '#5f892f',
+        muted = '#141f0f',
       }),
+    }),
+    lemon = m({
       borderColor = m({
-        muted = '#372901',
         emphasis = '#977b0c',
+        muted = '#372901',
       }),
       fgColor = '#ba9b12',
-    }),
-    yellow = m({
       bgColor = m({
-        muted = '#2e1a00',
-        emphasis = '#aa7109',
+        emphasis = '#977b0c',
+        muted = '#291d00',
       }),
+    }),
+    yellow = m({
       borderColor = m({
-        muted = '#3d2401',
         emphasis = '#aa7109',
+        muted = '#3d2401',
       }),
       fgColor = '#d3910d',
-    }),
-    indigo = m({
       bgColor = m({
-        muted = '#1b183f',
-        emphasis = '#7070e1',
+        emphasis = '#aa7109',
+        muted = '#2e1a00',
       }),
+    }),
+    indigo = m({
       borderColor = m({
-        muted = '#25215f',
         emphasis = '#7070e1',
+        muted = '#25215f',
       }),
       fgColor = '#9899ec',
-    }),
-    teal = m({
       bgColor = m({
-        muted = '#041f25',
-        emphasis = '#158a8a',
+        emphasis = '#7070e1',
+        muted = '#1b183f',
       }),
+    }),
+    teal = m({
       borderColor = m({
-        muted = '#073036',
         emphasis = '#158a8a',
+        muted = '#073036',
       }),
       fgColor = '#1cb0ab',
-    }),
-    cyan = m({
       bgColor = m({
-        muted = '#001f29',
-        emphasis = '#0587b3',
+        emphasis = '#158a8a',
+        muted = '#041f25',
       }),
+    }),
+    green = m({
       borderColor = m({
-        muted = '#002e3d',
-        emphasis = '#0587b3',
+        emphasis = '#388f3f',
+        muted = '#182f1f',
       }),
-      fgColor = '#07ace4',
-    }),
-    purple = m({
+      fgColor = '#41b445',
       bgColor = m({
-        muted = '#211047',
-        emphasis = '#975bf1',
+        emphasis = '#388f3f',
+        muted = '#122117',
       }),
+    }),
+    red = m({
       borderColor = m({
-        muted = '#31146b',
-        emphasis = '#975bf1',
+        emphasis = '#eb3342',
+        muted = '#58091a',
       }),
-      fgColor = '#b687f7',
-    }),
-    plum = m({
+      fgColor = '#f27d83',
       bgColor = m({
-        muted = '#2a0e3f',
-        emphasis = '#b643ef',
+        emphasis = '#eb3342',
+        muted = '#3c0614',
       }),
+    }),
+    gray = m({
       borderColor = m({
-        muted = '#40125e',
-        emphasis = '#b643ef',
+        emphasis = '#6e7f96',
+        muted = '#2a2b2d',
       }),
-      fgColor = '#d07ef7',
-    }),
-    auburn = m({
+      fgColor = '#92a1b5',
       bgColor = m({
-        muted = '#271817',
-        emphasis = '#a86f6b',
+        emphasis = '#6e7f96',
+        muted = '#1c1c1c',
       }),
+    }),
+    purple = m({
       borderColor = m({
-        muted = '#3a2422',
-        emphasis = '#a86f6b',
+        emphasis = '#975bf1',
+        muted = '#31146b',
       }),
-      fgColor = '#bf9592',
-    }),
-    pink = m({
+      fgColor = '#b687f7',
       bgColor = m({
-        muted = '#2d1524',
-        emphasis = '#d34591',
-      }),
-      borderColor = m({
-        muted = '#451c35',
-        emphasis = '#d34591',
+        emphasis = '#975bf1',
+        muted = '#211047',
       }),
-      fgColor = '#e57bb2',
     }),
-    blue = m({
-      bgColor = m({
-        muted = '#001a47',
-        emphasis = '#0576ff',
-      }),
+    cyan = m({
       borderColor = m({
-        muted = '#002766',
-        emphasis = '#0576ff',
+        emphasis = '#0587b3',
+        muted = '#002e3d',
       }),
-      fgColor = '#4da0ff',
-    }),
-    brown = m({
+      fgColor = '#07ace4',
       bgColor = m({
-        muted = '#241c14',
-        emphasis = '#94774c',
-      }),
-      borderColor = m({
-        muted = '#342a1d',
-        emphasis = '#94774c',
+        emphasis = '#0587b3',
+        muted = '#001f29',
       }),
-      fgColor = '#b69a6d',
     }),
-    pine = m({
-      bgColor = m({
-        muted = '#082119',
-        emphasis = '#18915e',
-      }),
+    plum = m({
       borderColor = m({
-        muted = '#0b3224',
-        emphasis = '#18915e',
+        emphasis = '#b643ef',
+        muted = '#40125e',
       }),
-      fgColor = '#1bb673',
-    }),
-    green = m({
+      fgColor = '#d07ef7',
       bgColor = m({
-        muted = '#122117',
-        emphasis = '#388f3f',
+        emphasis = '#b643ef',
+        muted = '#2a0e3f',
       }),
+    }),
+    coral = m({
       borderColor = m({
-        muted = '#182f1f',
-        emphasis = '#388f3f',
+        emphasis = '#eb3342',
+        muted = '#58091a',
       }),
-      fgColor = '#41b445',
-    }),
-    red = m({
+      fgColor = '#f27d83',
       bgColor = m({
-        muted = '#3c0614',
         emphasis = '#eb3342',
+        muted = '#3c0614',
       }),
+    }),
+    pink = m({
       borderColor = m({
-        muted = '#58091a',
-        emphasis = '#eb3342',
+        emphasis = '#d34591',
+        muted = '#451c35',
       }),
-      fgColor = '#f27d83',
-    }),
-    orange = m({
+      fgColor = '#e57bb2',
       bgColor = m({
-        muted = '#311708',
-        emphasis = '#c46212',
+        emphasis = '#d34591',
+        muted = '#2d1524',
       }),
+    }),
+    brown = m({
       borderColor = m({
-        muted = '#43200a',
-        emphasis = '#c46212',
+        emphasis = '#94774c',
+        muted = '#342a1d',
       }),
-      fgColor = '#ed8326',
-    }),
-    gray = m({
+      fgColor = '#b69a6d',
       bgColor = m({
-        muted = '#1c1c1c',
-        emphasis = '#6e7f96',
+        emphasis = '#94774c',
+        muted = '#241c14',
       }),
+    }),
+    pine = m({
       borderColor = m({
-        muted = '#2a2b2d',
-        emphasis = '#6e7f96',
+        emphasis = '#18915e',
+        muted = '#0b3224',
       }),
-      fgColor = '#92a1b5',
-    }),
-    coral = m({
+      fgColor = '#1bb673',
       bgColor = m({
-        muted = '#3c0614',
-        emphasis = '#eb3342',
+        emphasis = '#18915e',
+        muted = '#082119',
       }),
+    }),
+    blue = m({
       borderColor = m({
-        muted = '#58091a',
-        emphasis = '#eb3342',
+        emphasis = '#0576ff',
+        muted = '#002766',
+      }),
+      fgColor = '#4da0ff',
+      bgColor = m({
+        emphasis = '#0576ff',
+        muted = '#001a47',
       }),
-      fgColor = '#f27d83',
-    }),
-  }),
-  selection = m({
-    bgColor = '#1f6febb3',
-  }),
-  selectMenu = m({
-    bgColor = m({
-      active = '#0c2d6b',
     }),
-    borderColor = '#484f58',
   }),
   reactionButton = m({
     selected = m({
-      fgColor = m({
-        rest = '#4493f8',
-        hover = '#79c0ff',
-      }),
       bgColor = m({
-        rest = '#388bfd33',
         hover = '#3a8cfd5c',
+        rest = '#388bfd33',
+      }),
+      fgColor = m({
+        hover = '#79c0ff',
+        rest = '#4493f8',
       }),
     }),
   }),
   fgColor = m({
+    neutral = '#6e7681',
+    default = '#e6edf3',
+    open = '#3fb950',
     white = '#ffffff',
     upsell = '#ab7df8',
     success = '#3fb950',
@@ -568,9 +544,6 @@ local M = m({
     black = '#010409',
     attention = '#d29922',
     accent = '#4493f8',
-    default = '#e6edf3',
-    neutral = '#6e7681',
-    open = '#3fb950',
   }),
   page = m({
     header = m({
@@ -578,21 +551,26 @@ local M = m({
     }),
   }),
   header = m({
-    bgColor = '#161b22f2',
     borderColor = m({
       divider = '#8b949e',
     }),
     fgColor = m({
-      logo = '#f0f6fc',
       default = '#ffffffb3',
+      logo = '#f0f6fc',
     }),
+    bgColor = '#161b22f2',
   }),
   overlay = m({
-    bgColor = '#161b22',
     borderColor = '#30363db3',
     backdrop = m({
       bgColor = '#161b2266',
     }),
+    bgColor = '#161b22',
+  }),
+  highlight = m({
+    neutral = m({
+      bgColor = '#d2992266',
+    }),
   }),
   outline = m({
     focus = '#1f6feb solid 2px',
@@ -603,8 +581,8 @@ local M = m({
   avatarStack = m({
     fade = m({
       bgColor = m({
-        muted = '#21262d',
         default = '#30363d',
+        muted = '#21262d',
       }),
     }),
   }),
@@ -613,351 +591,479 @@ local M = m({
       active = '#161b22',
     }),
   }),
-  counter = m({
-    borderColor = '#00000000',
+  avatar = m({
+    borderColor = '#ffffff26',
+    shadow = '0px 0px 0px 2px #0d1117',
+    bgColor = '#ffffff1a',
   }),
   label = m({
-    olive = m({
+    orange = m({
+      bgColor = m({
+        active = '#632f0d',
+        rest = '#311708',
+        hover = '#43200a',
+      }),
       fgColor = m({
-        rest = '#a2a626',
-        active = '#cbc025',
-        hover = '#b2af24',
+        active = '#f6b06a',
+        rest = '#ed8326',
+        hover = '#f1933b',
       }),
+    }),
+    auburn = m({
+      bgColor = m({
+        active = '#543331',
+        rest = '#271817',
+        hover = '#3a2422',
+      }),
+      fgColor = m({
+        active = '#d4b7b5',
+        rest = '#bf9592',
+        hover = '#c6a19f',
+      }),
+    }),
+    olive = m({
       bgColor = m({
-        rest = '#171e0b',
         active = '#374115',
+        rest = '#171e0b',
         hover = '#252d10',
       }),
-    }),
-    lime = m({
       fgColor = m({
-        rest = '#7dae37',
-        active = '#9fcc3e',
-        hover = '#89ba36',
+        active = '#cbc025',
+        rest = '#a2a626',
+        hover = '#b2af24',
       }),
+    }),
+    lime = m({
       bgColor = m({
-        rest = '#141f0f',
         active = '#2c441d',
+        rest = '#141f0f',
         hover = '#1f3116',
       }),
-    }),
-    lemon = m({
       fgColor = m({
-        rest = '#ba9b12',
-        active = '#d7bc1d',
-        hover = '#c4a717',
+        active = '#9fcc3e',
+        rest = '#7dae37',
+        hover = '#89ba36',
       }),
+    }),
+    lemon = m({
       bgColor = m({
-        rest = '#291d00',
         active = '#4f3c02',
+        rest = '#291d00',
         hover = '#372901',
       }),
-    }),
-    yellow = m({
       fgColor = m({
-        rest = '#d3910d',
-        active = '#edb431',
-        hover = '#df9e11',
+        active = '#d7bc1d',
+        rest = '#ba9b12',
+        hover = '#c4a717',
       }),
+    }),
+    yellow = m({
       bgColor = m({
-        rest = '#2e1a00',
         active = '#5a3702',
+        rest = '#2e1a00',
         hover = '#3d2401',
       }),
-    }),
-    indigo = m({
       fgColor = m({
-        rest = '#9899ec',
-        active = '#b7baf6',
-        hover = '#a2a5f1',
+        active = '#edb431',
+        rest = '#d3910d',
+        hover = '#df9e11',
       }),
+    }),
+    indigo = m({
       bgColor = m({
-        rest = '#1b183f',
         active = '#312c90',
+        rest = '#1b183f',
         hover = '#25215f',
       }),
-    }),
-    teal = m({
       fgColor = m({
-        rest = '#1cb0ab',
-        active = '#24d6c4',
-        hover = '#1fbdb2',
+        active = '#b7baf6',
+        rest = '#9899ec',
+        hover = '#a2a5f1',
       }),
+    }),
+    teal = m({
       bgColor = m({
-        rest = '#041f25',
         active = '#0a464d',
+        rest = '#041f25',
         hover = '#073036',
       }),
-    }),
-    cyan = m({
       fgColor = m({
-        rest = '#07ace4',
-        active = '#45cbf7',
-        hover = '#09b7f1',
-      }),
-      bgColor = m({
-        rest = '#001f29',
-        active = '#014156',
-        hover = '#002e3d',
+        active = '#24d6c4',
+        rest = '#1cb0ab',
+        hover = '#1fbdb2',
       }),
     }),
-    purple = m({
-      fgColor = m({
-        rest = '#b687f7',
-        active = '#d2affd',
-        hover = '#c398fb',
-      }),
+    green = m({
       bgColor = m({
-        rest = '#211047',
-        active = '#481a9e',
-        hover = '#31146b',
+        active = '#214529',
+        rest = '#122117',
+        hover = '#182f1f',
       }),
-    }),
-    plum = m({
       fgColor = m({
-        rest = '#d07ef7',
-        active = '#e4a5fd',
-        hover = '#d889fa',
+        active = '#75d36f',
+        rest = '#41b445',
+        hover = '#46c144',
       }),
+    }),
+    red = m({
       bgColor = m({
-        rest = '#2a0e3f',
-        active = '#5c1688',
-        hover = '#40125e',
+        active = '#790c20',
+        rest = '#3c0614',
+        hover = '#58091a',
       }),
-    }),
-    auburn = m({
       fgColor = m({
-        rest = '#bf9592',
-        active = '#d4b7b5',
-        hover = '#c6a19f',
+        active = '#f7adab',
+        rest = '#f27d83',
+        hover = '#f48b8d',
       }),
+    }),
+    gray = m({
       bgColor = m({
-        rest = '#271817',
-        active = '#543331',
-        hover = '#3a2422',
+        active = '#393d41',
+        rest = '#1c1c1c',
+        hover = '#2a2b2d',
       }),
-    }),
-    pink = m({
       fgColor = m({
-        rest = '#e57bb2',
-        active = '#f4a9cd',
-        hover = '#ec8dbd',
+        active = '#b3c0d1',
+        rest = '#92a1b5',
+        hover = '#9babbf',
       }),
+    }),
+    purple = m({
       bgColor = m({
-        rest = '#2d1524',
-        active = '#65244a',
-        hover = '#451c35',
+        active = '#481a9e',
+        rest = '#211047',
+        hover = '#31146b',
       }),
-    }),
-    blue = m({
       fgColor = m({
-        rest = '#4da0ff',
-        active = '#85c2ff',
-        hover = '#61adff',
+        active = '#d2affd',
+        rest = '#b687f7',
+        hover = '#c398fb',
       }),
+    }),
+    cyan = m({
       bgColor = m({
-        rest = '#001a47',
-        active = '#00378a',
-        hover = '#002766',
+        active = '#014156',
+        rest = '#001f29',
+        hover = '#002e3d',
       }),
-    }),
-    brown = m({
       fgColor = m({
-        rest = '#b69a6d',
-        active = '#cdbb98',
-        hover = '#bfa77d',
+        active = '#45cbf7',
+        rest = '#07ace4',
+        hover = '#09b7f1',
       }),
+    }),
+    plum = m({
       bgColor = m({
-        rest = '#241c14',
-        active = '#483a28',
-        hover = '#342a1d',
+        active = '#5c1688',
+        rest = '#2a0e3f',
+        hover = '#40125e',
       }),
-    }),
-    pine = m({
       fgColor = m({
-        rest = '#1bb673',
-        active = '#1bda81',
-        hover = '#1ac176',
+        active = '#e4a5fd',
+        rest = '#d07ef7',
+        hover = '#d889fa',
       }),
+    }),
+    coral = m({
       bgColor = m({
-        rest = '#082119',
-        active = '#0e4430',
-        hover = '#0b3224',
+        active = '#72220d',
+        rest = '#351008',
+        hover = '#51180b',
       }),
-    }),
-    green = m({
       fgColor = m({
-        rest = '#41b445',
-        active = '#75d36f',
-        hover = '#46c144',
+        active = '#fdaa86',
+        rest = '#f7794b',
+        hover = '#fa8c61',
       }),
+    }),
+    pink = m({
       bgColor = m({
-        rest = '#122117',
-        active = '#214529',
-        hover = '#182f1f',
+        active = '#65244a',
+        rest = '#2d1524',
+        hover = '#451c35',
       }),
-    }),
-    red = m({
       fgColor = m({
-        rest = '#f27d83',
-        active = '#f7adab',
-        hover = '#f48b8d',
+        active = '#f4a9cd',
+        rest = '#e57bb2',
+        hover = '#ec8dbd',
       }),
+    }),
+    brown = m({
       bgColor = m({
-        rest = '#3c0614',
-        active = '#790c20',
-        hover = '#58091a',
+        active = '#483a28',
+        rest = '#241c14',
+        hover = '#342a1d',
       }),
-    }),
-    orange = m({
       fgColor = m({
-        rest = '#ed8326',
-        active = '#f6b06a',
-        hover = '#f1933b',
+        active = '#cdbb98',
+        rest = '#b69a6d',
+        hover = '#bfa77d',
       }),
+    }),
+    pine = m({
       bgColor = m({
-        rest = '#311708',
-        active = '#632f0d',
-        hover = '#43200a',
+        active = '#0e4430',
+        rest = '#082119',
+        hover = '#0b3224',
       }),
-    }),
-    gray = m({
       fgColor = m({
-        rest = '#92a1b5',
-        active = '#b3c0d1',
-        hover = '#9babbf',
+        active = '#1bda81',
+        rest = '#1bb673',
+        hover = '#1ac176',
       }),
+    }),
+    blue = m({
       bgColor = m({
-        rest = '#1c1c1c',
-        active = '#393d41',
-        hover = '#2a2b2d',
+        active = '#00378a',
+        rest = '#001a47',
+        hover = '#002766',
       }),
-    }),
-    coral = m({
       fgColor = m({
-        rest = '#f7794b',
-        active = '#fdaa86',
-        hover = '#fa8c61',
-      }),
-      bgColor = m({
-        rest = '#351008',
-        active = '#72220d',
-        hover = '#51180b',
+        active = '#85c2ff',
+        rest = '#4da0ff',
+        hover = '#61adff',
       }),
     }),
   }),
+  counter = m({
+    borderColor = '#00000000',
+  }),
   controlTrack = m({
-    bgColor = m({
-      rest = '#21262d',
-      disabled = '#6e7681',
-      active = '#31363e',
-      hover = '#292e36',
-    }),
     borderColor = m({
-      rest = '#00000000',
       disabled = '#6e7681',
+      rest = '#00000000',
     }),
     fgColor = m({
-      rest = '#8d96a0',
       disabled = '#ffffff',
+      rest = '#8d96a0',
     }),
-  }),
-  controlKnob = m({
     bgColor = m({
-      rest = '#010409',
-      disabled = '#21262db3',
-      checked = '#ffffff',
+      disabled = '#6e7681',
+      active = '#31363e',
+      rest = '#21262d',
+      hover = '#292e36',
     }),
+  }),
+  controlKnob = m({
     borderColor = m({
-      rest = '#666e79',
       disabled = '#21262db3',
       checked = '#1f6feb',
+      rest = '#666e79',
     }),
-  }),
-  highlight = m({
-    neutral = m({
-      bgColor = '#d2992266',
+    bgColor = m({
+      disabled = '#21262db3',
+      checked = '#ffffff',
+      rest = '#010409',
     }),
   }),
   control = m({
-    transparent = m({
-      bgColor = m({
-        rest = '#00000000',
-        hover = '#b1bac41f',
-        disabled = '#21262db3',
-        active = '#b1bac433',
-        selected = '#b1bac414',
-      }),
-      borderColor = m({
-        rest = '#00000000',
-        active = '#00000000',
-        hover = '#00000000',
-      }),
-    }),
-    iconColor = m({
-      rest = '#8d96a0',
-    }),
     borderColor = m({
-      rest = '#30363d',
-      danger = '#da3633',
-      emphasis = '#666e79',
       warning = '#9e6a03',
+      selected = '#f0f6fc',
+      rest = '#30363d',
       disabled = '#21262db3',
       success = '#238636',
-      selected = '#f0f6fc',
-    }),
-    bgColor = m({
-      rest = '#21262d',
-      hover = '#292e36',
-      disabled = '#21262db3',
-      active = '#31363e',
-      selected = '#161b22',
+      danger = '#da3633',
+      emphasis = '#666e79',
     }),
     checked = m({
-      bgColor = m({
-        rest = '#1f6feb',
-        disabled = '#6e7681',
-        active = '#3685f3',
-        hover = '#2a7aef',
-      }),
       borderColor = m({
-        rest = '#1f6feb',
         disabled = '#6e7681',
         active = '#3685f3',
+        rest = '#1f6feb',
         hover = '#2a7aef',
       }),
       fgColor = m({
-        rest = '#ffffff',
         disabled = '#010409',
+        rest = '#ffffff',
+      }),
+      bgColor = m({
+        disabled = '#6e7681',
+        active = '#3685f3',
+        rest = '#1f6feb',
+        hover = '#2a7aef',
       }),
     }),
+    iconColor = m({
+      rest = '#8d96a0',
+    }),
+    fgColor = m({
+      disabled = '#6e7681',
+      placeholder = '#858e98',
+      rest = '#c9d1d9',
+    }),
     danger = m({
+      bgColor = m({
+        active = '#f8514966',
+        hover = '#f851491a',
+      }),
       fgColor = m({
-        rest = '#f85149',
         hover = '#ff7b72',
+        rest = '#f85149',
+      }),
+    }),
+    transparent = m({
+      borderColor = m({
+        active = '#00000000',
+        rest = '#00000000',
+        hover = '#00000000',
       }),
       bgColor = m({
-        hover = '#f851491a',
-        active = '#f8514966',
+        active = '#b1bac433',
+        selected = '#b1bac414',
+        rest = '#00000000',
+        disabled = '#21262db3',
+        hover = '#b1bac41f',
       }),
     }),
-    fgColor = m({
-      rest = '#c9d1d9',
-      placeholder = '#858e98',
-      disabled = '#6e7681',
+    bgColor = m({
+      active = '#31363e',
+      selected = '#161b22',
+      rest = '#21262d',
+      disabled = '#21262db3',
+      hover = '#292e36',
+    }),
+  }),
+  color = m({
+    ansi = m({
+      red = m({
+        bright = '#ffa198',
+        default = '#ff7b72',
+      }),
+      gray = '#6e7681',
+      cyan = m({
+        bright = '#56d4dd',
+        default = '#39c5cf',
+      }),
+      black = m({
+        bright = '#6e7681',
+        default = '#484f58',
+      }),
+      white = m({
+        bright = '#ffffff',
+        default = '#b1bac4',
+      }),
+      yellow = m({
+        bright = '#e3b341',
+        default = '#d29922',
+      }),
+      magenta = m({
+        bright = '#d2a8ff',
+        default = '#be8fff',
+      }),
+      blue = m({
+        bright = '#79c0ff',
+        default = '#58a6ff',
+      }),
+      green = m({
+        bright = '#56d364',
+        default = '#3fb950',
+      }),
+    }),
+    prettylights = m({
+      syntax = m({
+        brackethighlighter = m({
+          angle = '#8b949e',
+          unmatched = '#f85149',
+        }),
+        keyword = '#ff7b72',
+        invalid = m({
+          illegal = m({
+            bg = '#8e1519',
+            text = '#f0f6fc',
+          }),
+        }),
+        markup = m({
+          bold = '#c9d1d9',
+          changed = m({
+            bg = '#5a1e02',
+            text = '#ffdfb6',
+          }),
+          ignored = m({
+            bg = '#1158c7',
+            text = '#c9d1d9',
+          }),
+          list = '#f2cc60',
+          deleted = m({
+            bg = '#67060c',
+            text = '#ffdcd7',
+          }),
+          italic = '#c9d1d9',
+          heading = '#1f6feb',
+          inserted = m({
+            bg = '#033a16',
+            text = '#aff5b4',
+          }),
+        }),
+        string = m({
+          default = '#a5d6ff',
+          regexp = '#7ee787',
+        }),
+        constant = m({
+          default = '#79c0ff',
+          other = m({
+            reference = m({
+              link = '#a5d6ff',
+            }),
+          }),
+        }),
+        sublimelinter = m({
+          gutter = m({
+            mark = '#484f58',
+          }),
+        }),
+        meta = m({
+          diff = m({
+            range = '#d2a8ff',
+          }),
+        }),
+        comment = '#8b949e',
+        entity = m({
+          default = '#d2a8ff',
+          tag = '#7ee787',
+        }),
+        carriage = m({
+          ['return'] = m({
+            bg = '#b62324',
+            text = '#f0f6fc',
+          }),
+        }),
+        storage = m({
+          modifier = m({
+            import = '#c9d1d9',
+          }),
+        }),
+        variable = '#ffa657',
+      }),
     }),
   }),
   codeMirror = m({
+    gutters = m({
+      bgColor = '#0d1117',
+    }),
+    gutterMarker = m({
+      fgColor = m({
+        default = '#0d1117',
+        muted = '#8d96a0',
+      }),
+    }),
+    cursor = m({
+      fgColor = '#e6edf3',
+    }),
+    lines = m({
+      bgColor = '#0d1117',
+    }),
     syntax = m({
       fgColor = m({
-        entity = '#d2a8ff',
-        storage = '#ff7b72',
-        string = '#a5d6ff',
         support = '#79c0ff',
         keyword = '#ff7b72',
         constant = '#79c0ff',
         comment = '#8b949e',
         variable = '#ffa657',
+        entity = '#d2a8ff',
+        storage = '#ff7b72',
+        string = '#a5d6ff',
       }),
     }),
     bgColor = '#0d1117',
@@ -967,56 +1073,38 @@ local M = m({
     matchingBracket = m({
       fgColor = '#e6edf3',
     }),
-    gutterMarker = m({
-      fgColor = m({
-        muted = '#8d96a0',
-        default = '#0d1117',
-      }),
-    }),
-    lines = m({
-      bgColor = '#0d1117',
-    }),
     fgColor = '#e6edf3',
-    gutters = m({
-      bgColor = '#0d1117',
+    lineNumber = m({
+      fgColor = '#8d96a0',
     }),
     activeline = m({
       bgColor = '#6e768166',
     }),
-    cursor = m({
-      fgColor = '#e6edf3',
-    }),
-    lineNumber = m({
-      fgColor = '#8d96a0',
-    }),
   }),
   scale = m({
-    black = '#010409',
-    transparent = '#00000000',
-    white = '#ffffff',
-    blue = m({
-      [1] = '#cae8ff',
-      [2] = '#a5d6ff',
-      [3] = '#79c0ff',
-      [4] = '#58a6ff',
-      [5] = '#388bfd',
-      [6] = '#1f6feb',
-      [7] = '#1158c7',
-      [8] = '#0d419d',
-      [9] = '#0c2d6b',
-      [10] = '#051d4d',
+    orange = m({
+      [1] = '#ffdfb6',
+      [2] = '#ffc680',
+      [3] = '#ffa657',
+      [4] = '#f0883e',
+      [5] = '#db6d28',
+      [6] = '#bd561d',
+      [7] = '#9b4215',
+      [8] = '#762d0a',
+      [9] = '#5a1e02',
+      [10] = '#3d1300',
     }),
-    green = m({
-      [1] = '#aff5b4',
-      [2] = '#7ee787',
-      [3] = '#56d364',
-      [4] = '#3fb950',
-      [5] = '#2ea043',
-      [6] = '#238636',
-      [7] = '#196c2e',
-      [8] = '#0f5323',
-      [9] = '#033a16',
-      [10] = '#04260f',
+    red = m({
+      [1] = '#ffdcd7',
+      [2] = '#ffc1ba',
+      [3] = '#ffa198',
+      [4] = '#ff7b72',
+      [5] = '#f85149',
+      [6] = '#da3633',
+      [7] = '#b62324',
+      [8] = '#8e1519',
+      [9] = '#67060c',
+      [10] = '#490202',
     }),
     purple = m({
       [1] = '#eddeff',
@@ -1030,6 +1118,32 @@ local M = m({
       [9] = '#3c1e70',
       [10] = '#271052',
     }),
+    transparent = '#00000000',
+    black = '#010409',
+    coral = m({
+      [1] = '#ffddd2',
+      [2] = '#ffc2b2',
+      [3] = '#ffa28b',
+      [4] = '#f78166',
+      [5] = '#ea6045',
+      [6] = '#cf462d',
+      [7] = '#ac3220',
+      [8] = '#872012',
+      [9] = '#640d04',
+      [10] = '#460701',
+    }),
+    pink = m({
+      [1] = '#ffdaec',
+      [2] = '#ffbedd',
+      [3] = '#ff9bce',
+      [4] = '#f778ba',
+      [5] = '#db61a2',
+      [6] = '#bf4b8a',
+      [7] = '#9e3670',
+      [8] = '#7d2457',
+      [9] = '#5e103e',
+      [10] = '#42062a',
+    }),
     yellow = m({
       [1] = '#f8e3a1',
       [2] = '#f2cc60',
@@ -1042,6 +1156,7 @@ local M = m({
       [9] = '#4b2900',
       [10] = '#341a00',
     }),
+    white = '#ffffff',
     neutral = m({
       [1] = '#f0f6fc',
       [2] = '#c9d1d9',
@@ -1054,72 +1169,171 @@ local M = m({
       [9] = '#161b22',
       [10] = '#0d1117',
     }),
-    pink = m({
-      [1] = '#ffdaec',
-      [2] = '#ffbedd',
-      [3] = '#ff9bce',
-      [4] = '#f778ba',
-      [5] = '#db61a2',
-      [6] = '#bf4b8a',
-      [7] = '#9e3670',
-      [8] = '#7d2457',
-      [9] = '#5e103e',
-      [10] = '#42062a',
-    }),
-    orange = m({
-      [1] = '#ffdfb6',
-      [2] = '#ffc680',
-      [3] = '#ffa657',
-      [4] = '#f0883e',
-      [5] = '#db6d28',
-      [6] = '#bd561d',
-      [7] = '#9b4215',
-      [8] = '#762d0a',
-      [9] = '#5a1e02',
-      [10] = '#3d1300',
-    }),
-    red = m({
-      [1] = '#ffdcd7',
-      [2] = '#ffc1ba',
-      [3] = '#ffa198',
-      [4] = '#ff7b72',
-      [5] = '#f85149',
-      [6] = '#da3633',
-      [7] = '#b62324',
-      [8] = '#8e1519',
-      [9] = '#67060c',
-      [10] = '#490202',
-    }),
-    coral = m({
-      [1] = '#ffddd2',
-      [2] = '#ffc2b2',
-      [3] = '#ffa28b',
-      [4] = '#f78166',
-      [5] = '#ea6045',
-      [6] = '#cf462d',
-      [7] = '#ac3220',
-      [8] = '#872012',
-      [9] = '#640d04',
-      [10] = '#460701',
-    }),
-  }),
-  avatar = m({
-    bgColor = '#ffffff1a',
-    borderColor = '#ffffff26',
-    shadow = '0px 0px 0px 2px #0d1117',
-  }),
-  underlineNav = m({
-    iconColor = m({
-      rest = '#8d96a0',
+    blue = m({
+      [1] = '#cae8ff',
+      [2] = '#a5d6ff',
+      [3] = '#79c0ff',
+      [4] = '#58a6ff',
+      [5] = '#388bfd',
+      [6] = '#1f6feb',
+      [7] = '#1158c7',
+      [8] = '#0d419d',
+      [9] = '#0c2d6b',
+      [10] = '#051d4d',
     }),
-    borderColor = m({
-      hover = '#6e768166',
-      active = '#f78166',
+    green = m({
+      [1] = '#aff5b4',
+      [2] = '#7ee787',
+      [3] = '#56d364',
+      [4] = '#3fb950',
+      [5] = '#2ea043',
+      [6] = '#238636',
+      [7] = '#196c2e',
+      [8] = '#0f5323',
+      [9] = '#033a16',
+      [10] = '#04260f',
     }),
   }),
   base = m({
+    color = m({
+      orange = m({
+        [0] = '#ffdfb6',
+        [1] = '#ffc680',
+        [2] = '#ffa657',
+        [3] = '#f0883e',
+        [4] = '#db6d28',
+        [5] = '#bd561d',
+        [6] = '#9b4215',
+        [7] = '#762d0a',
+        [8] = '#5a1e02',
+        [9] = '#3d1300',
+      }),
+      red = m({
+        [0] = '#ffdcd7',
+        [1] = '#ffc1ba',
+        [2] = '#ffa198',
+        [3] = '#ff7b72',
+        [4] = '#f85149',
+        [5] = '#da3633',
+        [6] = '#b62324',
+        [7] = '#8e1519',
+        [8] = '#67060c',
+        [9] = '#490202',
+      }),
+      purple = m({
+        [0] = '#eddeff',
+        [1] = '#e2c5ff',
+        [2] = '#d2a8ff',
+        [3] = '#be8fff',
+        [4] = '#ab7df8',
+        [5] = '#8957e5',
+        [6] = '#6e40c9',
+        [7] = '#553098',
+        [8] = '#3c1e70',
+        [9] = '#271052',
+      }),
+      transparent = '#00000000',
+      black = '#010409',
+      coral = m({
+        [0] = '#ffddd2',
+        [1] = '#ffc2b2',
+        [2] = '#ffa28b',
+        [3] = '#f78166',
+        [4] = '#ea6045',
+        [5] = '#cf462d',
+        [6] = '#ac3220',
+        [7] = '#872012',
+        [8] = '#640d04',
+        [9] = '#460701',
+      }),
+      pink = m({
+        [0] = '#ffdaec',
+        [1] = '#ffbedd',
+        [2] = '#ff9bce',
+        [3] = '#f778ba',
+        [4] = '#db61a2',
+        [5] = '#bf4b8a',
+        [6] = '#9e3670',
+        [7] = '#7d2457',
+        [8] = '#5e103e',
+        [9] = '#42062a',
+      }),
+      yellow = m({
+        [0] = '#f8e3a1',
+        [1] = '#f2cc60',
+        [2] = '#e3b341',
+        [3] = '#d29922',
+        [4] = '#bb8009',
+        [5] = '#9e6a03',
+        [6] = '#845306',
+        [7] = '#693e00',
+        [8] = '#4b2900',
+        [9] = '#341a00',
+      }),
+      white = '#ffffff',
+      neutral = m({
+        [0] = '#f0f6fc',
+        [1] = '#c9d1d9',
+        [2] = '#b1bac4',
+        [3] = '#8b949e',
+        [4] = '#6e7681',
+        [5] = '#484f58',
+        [6] = '#30363d',
+        [7] = '#21262d',
+        [8] = '#161b22',
+        [9] = '#0d1117',
+      }),
+      blue = m({
+        [0] = '#cae8ff',
+        [1] = '#a5d6ff',
+        [2] = '#79c0ff',
+        [3] = '#58a6ff',
+        [4] = '#388bfd',
+        [5] = '#1f6feb',
+        [6] = '#1158c7',
+        [7] = '#0d419d',
+        [8] = '#0c2d6b',
+        [9] = '#051d4d',
+      }),
+      green = m({
+        [0] = '#aff5b4',
+        [1] = '#7ee787',
+        [2] = '#56d364',
+        [3] = '#3fb950',
+        [4] = '#2ea043',
+        [5] = '#238636',
+        [6] = '#196c2e',
+        [7] = '#0f5323',
+        [8] = '#033a16',
+        [9] = '#04260f',
+      }),
+    }),
     display = m({
       color = m({
+        orange = m({
+          [0] = '#311708',
+          [1] = '#43200a',
+          [2] = '#632f0d',
+          [3] = '#7b3c0e',
+          [4] = '#984b10',
+          [5] = '#c46212',
+          [6] = '#ed8326',
+          [7] = '#f1933b',
+          [8] = '#f6b06a',
+          [9] = '#fac68f',
+        }),
+        auburn = m({
+          [0] = '#271817',
+          [1] = '#3a2422',
+          [2] = '#543331',
+          [3] = '#6d4340',
+          [4] = '#87534f',
+          [5] = '#a86f6b',
+          [6] = '#bf9592',
+          [7] = '#c6a19f',
+          [8] = '#d4b7b5',
+          [9] = '#dfcac8',
+        }),
         olive = m({
           [0] = '#171e0b',
           [1] = '#252d10',
@@ -1144,7 +1358,6 @@ local M = m({
           [8] = '#9fcc3e',
           [9] = '#bcda67',
         }),
-        white = '#ffffff',
         lemon = m({
           [0] = '#291d00',
           [1] = '#372901',
@@ -1181,31 +1394,54 @@ local M = m({
           [8] = '#b7baf6',
           [9] = '#c8cbf9',
         }),
-        gray = m({
-          [0] = '#1c1c1c',
-          [1] = '#2a2b2d',
-          [2] = '#393d41',
-          [3] = '#474e57',
-          [4] = '#576270',
-          [5] = '#6e7f96',
-          [6] = '#92a1b5',
-          [7] = '#9babbf',
+        teal = m({
+          [0] = '#041f25',
+          [1] = '#073036',
+          [2] = '#0a464d',
+          [3] = '#0c555a',
+          [4] = '#106c70',
+          [5] = '#158a8a',
+          [6] = '#1cb0ab',
+          [7] = '#1fbdb2',
+          [8] = '#24d6c4',
+          [9] = '#5fe3d1',
+        }),
+        green = m({
+          [0] = '#122117',
+          [1] = '#182f1f',
+          [2] = '#214529',
+          [3] = '#285830',
+          [4] = '#2f6f37',
+          [5] = '#388f3f',
+          [6] = '#41b445',
+          [7] = '#46c144',
+          [8] = '#75d36f',
+          [9] = '#99e090',
+        }),
+        red = m({
+          [0] = '#3c0614',
+          [1] = '#58091a',
+          [2] = '#790c20',
+          [3] = '#990f24',
+          [4] = '#c31328',
+          [5] = '#eb3342',
+          [6] = '#f27d83',
+          [7] = '#f48b8d',
+          [8] = '#f7adab',
+          [9] = '#f9c1be',
+        }),
+        gray = m({
+          [0] = '#1c1c1c',
+          [1] = '#2a2b2d',
+          [2] = '#393d41',
+          [3] = '#474e57',
+          [4] = '#576270',
+          [5] = '#6e7f96',
+          [6] = '#92a1b5',
+          [7] = '#9babbf',
           [8] = '#b3c0d1',
           [9] = '#c4cfde',
         }),
-        cyan = m({
-          [0] = '#001f29',
-          [1] = '#002e3d',
-          [2] = '#014156',
-          [3] = '#02536f',
-          [4] = '#036a8c',
-          [5] = '#0587b3',
-          [6] = '#07ace4',
-          [7] = '#09b7f1',
-          [8] = '#45cbf7',
-          [9] = '#80dbf9',
-        }),
-        black = '#0d1117',
         purple = m({
           [0] = '#211047',
           [1] = '#31146b',
@@ -1218,6 +1454,18 @@ local M = m({
           [8] = '#d2affd',
           [9] = '#e1c7ff',
         }),
+        cyan = m({
+          [0] = '#001f29',
+          [1] = '#002e3d',
+          [2] = '#014156',
+          [3] = '#02536f',
+          [4] = '#036a8c',
+          [5] = '#0587b3',
+          [6] = '#07ace4',
+          [7] = '#09b7f1',
+          [8] = '#45cbf7',
+          [9] = '#80dbf9',
+        }),
         plum = m({
           [0] = '#2a0e3f',
           [1] = '#40125e',
@@ -1230,17 +1478,17 @@ local M = m({
           [8] = '#e4a5fd',
           [9] = '#edbdff',
         }),
-        auburn = m({
-          [0] = '#271817',
-          [1] = '#3a2422',
-          [2] = '#543331',
-          [3] = '#6d4340',
-          [4] = '#87534f',
-          [5] = '#a86f6b',
-          [6] = '#bf9592',
-          [7] = '#c6a19f',
-          [8] = '#d4b7b5',
-          [9] = '#dfcac8',
+        coral = m({
+          [0] = '#351008',
+          [1] = '#51180b',
+          [2] = '#72220d',
+          [3] = '#902a0e',
+          [4] = '#b3350f',
+          [5] = '#e1430e',
+          [6] = '#f7794b',
+          [7] = '#fa8c61',
+          [8] = '#fdaa86',
+          [9] = '#ffc0a3',
         }),
         pink = m({
           [0] = '#2d1524',
@@ -1254,18 +1502,6 @@ local M = m({
           [8] = '#f4a9cd',
           [9] = '#f9bed9',
         }),
-        blue = m({
-          [0] = '#001a47',
-          [1] = '#002766',
-          [2] = '#00378a',
-          [3] = '#0046a8',
-          [4] = '#005bd1',
-          [5] = '#0576ff',
-          [6] = '#4da0ff',
-          [7] = '#61adff',
-          [8] = '#85c2ff',
-          [9] = '#a3d3ff',
-        }),
         brown = m({
           [0] = '#241c14',
           [1] = '#342a1d',
@@ -1278,6 +1514,7 @@ local M = m({
           [8] = '#cdbb98',
           [9] = '#dbceb3',
         }),
+        black = '#0d1117',
         pine = m({
           [0] = '#082119',
           [1] = '#0b3224',
@@ -1290,392 +1527,155 @@ local M = m({
           [8] = '#1bda81',
           [9] = '#3eea97',
         }),
-        coral = m({
-          [0] = '#351008',
-          [1] = '#51180b',
-          [2] = '#72220d',
-          [3] = '#902a0e',
-          [4] = '#b3350f',
-          [5] = '#e1430e',
-          [6] = '#f7794b',
-          [7] = '#fa8c61',
-          [8] = '#fdaa86',
-          [9] = '#ffc0a3',
-        }),
-        red = m({
-          [0] = '#3c0614',
-          [1] = '#58091a',
-          [2] = '#790c20',
-          [3] = '#990f24',
-          [4] = '#c31328',
-          [5] = '#eb3342',
-          [6] = '#f27d83',
-          [7] = '#f48b8d',
-          [8] = '#f7adab',
-          [9] = '#f9c1be',
-        }),
-        orange = m({
-          [0] = '#311708',
-          [1] = '#43200a',
-          [2] = '#632f0d',
-          [3] = '#7b3c0e',
-          [4] = '#984b10',
-          [5] = '#c46212',
-          [6] = '#ed8326',
-          [7] = '#f1933b',
-          [8] = '#f6b06a',
-          [9] = '#fac68f',
-        }),
-        green = m({
-          [0] = '#122117',
-          [1] = '#182f1f',
-          [2] = '#214529',
-          [3] = '#285830',
-          [4] = '#2f6f37',
-          [5] = '#388f3f',
-          [6] = '#41b445',
-          [7] = '#46c144',
-          [8] = '#75d36f',
-          [9] = '#99e090',
-        }),
-        teal = m({
-          [0] = '#041f25',
-          [1] = '#073036',
-          [2] = '#0a464d',
-          [3] = '#0c555a',
-          [4] = '#106c70',
-          [5] = '#158a8a',
-          [6] = '#1cb0ab',
-          [7] = '#1fbdb2',
-          [8] = '#24d6c4',
-          [9] = '#5fe3d1',
+        blue = m({
+          [0] = '#001a47',
+          [1] = '#002766',
+          [2] = '#00378a',
+          [3] = '#0046a8',
+          [4] = '#005bd1',
+          [5] = '#0576ff',
+          [6] = '#4da0ff',
+          [7] = '#61adff',
+          [8] = '#85c2ff',
+          [9] = '#a3d3ff',
         }),
-      }),
-    }),
-    color = m({
-      black = '#010409',
-      transparent = '#00000000',
-      white = '#ffffff',
-      pink = m({
-        [0] = '#ffdaec',
-        [1] = '#ffbedd',
-        [2] = '#ff9bce',
-        [3] = '#f778ba',
-        [4] = '#db61a2',
-        [5] = '#bf4b8a',
-        [6] = '#9e3670',
-        [7] = '#7d2457',
-        [8] = '#5e103e',
-        [9] = '#42062a',
-      }),
-      yellow = m({
-        [0] = '#f8e3a1',
-        [1] = '#f2cc60',
-        [2] = '#e3b341',
-        [3] = '#d29922',
-        [4] = '#bb8009',
-        [5] = '#9e6a03',
-        [6] = '#845306',
-        [7] = '#693e00',
-        [8] = '#4b2900',
-        [9] = '#341a00',
-      }),
-      blue = m({
-        [0] = '#cae8ff',
-        [1] = '#a5d6ff',
-        [2] = '#79c0ff',
-        [3] = '#58a6ff',
-        [4] = '#388bfd',
-        [5] = '#1f6feb',
-        [6] = '#1158c7',
-        [7] = '#0d419d',
-        [8] = '#0c2d6b',
-        [9] = '#051d4d',
-      }),
-      coral = m({
-        [0] = '#ffddd2',
-        [1] = '#ffc2b2',
-        [2] = '#ffa28b',
-        [3] = '#f78166',
-        [4] = '#ea6045',
-        [5] = '#cf462d',
-        [6] = '#ac3220',
-        [7] = '#872012',
-        [8] = '#640d04',
-        [9] = '#460701',
-      }),
-      green = m({
-        [0] = '#aff5b4',
-        [1] = '#7ee787',
-        [2] = '#56d364',
-        [3] = '#3fb950',
-        [4] = '#2ea043',
-        [5] = '#238636',
-        [6] = '#196c2e',
-        [7] = '#0f5323',
-        [8] = '#033a16',
-        [9] = '#04260f',
-      }),
-      orange = m({
-        [0] = '#ffdfb6',
-        [1] = '#ffc680',
-        [2] = '#ffa657',
-        [3] = '#f0883e',
-        [4] = '#db6d28',
-        [5] = '#bd561d',
-        [6] = '#9b4215',
-        [7] = '#762d0a',
-        [8] = '#5a1e02',
-        [9] = '#3d1300',
-      }),
-      neutral = m({
-        [0] = '#f0f6fc',
-        [1] = '#c9d1d9',
-        [2] = '#b1bac4',
-        [3] = '#8b949e',
-        [4] = '#6e7681',
-        [5] = '#484f58',
-        [6] = '#30363d',
-        [7] = '#21262d',
-        [8] = '#161b22',
-        [9] = '#0d1117',
-      }),
-      red = m({
-        [0] = '#ffdcd7',
-        [1] = '#ffc1ba',
-        [2] = '#ffa198',
-        [3] = '#ff7b72',
-        [4] = '#f85149',
-        [5] = '#da3633',
-        [6] = '#b62324',
-        [7] = '#8e1519',
-        [8] = '#67060c',
-        [9] = '#490202',
-      }),
-      purple = m({
-        [0] = '#eddeff',
-        [1] = '#e2c5ff',
-        [2] = '#d2a8ff',
-        [3] = '#be8fff',
-        [4] = '#ab7df8',
-        [5] = '#8957e5',
-        [6] = '#6e40c9',
-        [7] = '#553098',
-        [8] = '#3c1e70',
-        [9] = '#271052',
+        white = '#ffffff',
       }),
     }),
   }),
-  borderColor = m({
-    translucent = '#ffffff26',
+  bgColor = m({
+    neutral = m({
+      emphasis = '#6e7681',
+      muted = '#6e768166',
+    }),
+    default = '#0d1117',
+    open = m({
+      emphasis = '#238636',
+      muted = '#2ea0431a',
+    }),
+    white = '#ffffff',
     upsell = m({
-      muted = '#ab7df866',
       emphasis = '#8957e5',
+      muted = '#ab7df826',
     }),
     success = m({
-      muted = '#2ea04366',
       emphasis = '#238636',
+      muted = '#2ea04326',
     }),
     sponsors = m({
-      muted = '#db61a266',
       emphasis = '#bf4b8a',
+      muted = '#db61a21a',
     }),
     severe = m({
-      muted = '#db6d2866',
       emphasis = '#bd561d',
+      muted = '#db6d281a',
     }),
-    muted = '#30363db3',
-    open = m({
-      muted = '#2ea04366',
-      emphasis = '#238636',
-    }),
+    muted = '#161b22',
+    inset = '#010409',
     done = m({
-      muted = '#ab7df866',
       emphasis = '#8957e5',
+      muted = '#ab7df826',
     }),
     disabled = '#21262db3',
     danger = m({
-      muted = '#f8514966',
-      emphasis = '#da3633',
-    }),
-    closed = m({
-      muted = '#f8514966',
       emphasis = '#da3633',
+      muted = '#f851491a',
     }),
+    transparent = '#00000000',
+    black = '#010409',
     attention = m({
-      muted = '#bb800966',
       emphasis = '#9e6a03',
+      muted = '#bb800926',
     }),
+    inverse = '#ffffff',
+    emphasis = '#6e7681',
     accent = m({
-      muted = '#388bfd66',
       emphasis = '#1f6feb',
+      muted = '#388bfd1a',
     }),
-    default = '#30363d',
-    emphasis = '#484f58',
-    neutral = m({
-      muted = '#6e768166',
-      emphasis = '#6e7681',
+    closed = m({
+      emphasis = '#da3633',
+      muted = '#f8514926',
     }),
-    transparent = '#00000000',
   }),
-  color = m({
-    prettylights = m({
-      syntax = m({
-        entity = m({
-          tag = '#7ee787',
-          default = '#d2a8ff',
-        }),
-        constant = m({
-          other = m({
-            reference = m({
-              link = '#a5d6ff',
-            }),
-          }),
-          default = '#79c0ff',
-        }),
-        sublimelinter = m({
-          gutter = m({
-            mark = '#484f58',
-          }),
-        }),
-        comment = '#8b949e',
-        variable = '#ffa657',
-        carriage = m({
-          ['return'] = m({
-            bg = '#b62324',
-            text = '#f0f6fc',
-          }),
-        }),
-        storage = m({
-          modifier = m({
-            import = '#c9d1d9',
-          }),
-        }),
-        string = m({
-          regexp = '#7ee787',
-          default = '#a5d6ff',
-        }),
-        brackethighlighter = m({
-          unmatched = '#f85149',
-          angle = '#8b949e',
-        }),
-        meta = m({
-          diff = m({
-            range = '#d2a8ff',
-          }),
-        }),
-        keyword = '#ff7b72',
-        invalid = m({
-          illegal = m({
-            bg = '#8e1519',
-            text = '#f0f6fc',
-          }),
-        }),
-        markup = m({
-          italic = '#c9d1d9',
-          changed = m({
-            bg = '#5a1e02',
-            text = '#ffdfb6',
-          }),
-          inserted = m({
-            bg = '#033a16',
-            text = '#aff5b4',
-          }),
-          bold = '#c9d1d9',
-          deleted = m({
-            bg = '#67060c',
-            text = '#ffdcd7',
-          }),
-          ignored = m({
-            bg = '#1158c7',
-            text = '#c9d1d9',
-          }),
-          list = '#f2cc60',
-          heading = '#1f6feb',
-        }),
-      }),
+  underlineNav = m({
+    borderColor = m({
+      active = '#f78166',
+      hover = '#6e768166',
     }),
-    ansi = m({
-      magenta = m({
-        default = '#be8fff',
-        bright = '#d2a8ff',
-      }),
-      white = m({
-        default = '#b1bac4',
-        bright = '#ffffff',
-      }),
-      blue = m({
-        default = '#58a6ff',
-        bright = '#79c0ff',
-      }),
-      yellow = m({
-        default = '#d29922',
-        bright = '#e3b341',
-      }),
-      gray = '#6e7681',
-      black = m({
-        default = '#484f58',
-        bright = '#6e7681',
-      }),
-      red = m({
-        default = '#ff7b72',
-        bright = '#ffa198',
-      }),
-      cyan = m({
-        default = '#39c5cf',
-        bright = '#56d4dd',
-      }),
-      green = m({
-        default = '#3fb950',
-        bright = '#56d364',
-      }),
+    iconColor = m({
+      rest = '#8d96a0',
     }),
   }),
-  card = m({
-    bgColor = '#161b22',
-  }),
   headerSearch = m({
-    bgColor = '#0d1117',
     borderColor = '#30363d',
+    bgColor = '#0d1117',
   }),
-  buttonCounter = m({
-    primary = m({
-      bgColor = m({
-        rest = '#04260f33',
+  selectMenu = m({
+    borderColor = '#484f58',
+    bgColor = m({
+      active = '#0c2d6b',
+    }),
+  }),
+  data = m({
+    orange = m({
+      color = m({
+        default = '#984b10',
+        muted = '#311708',
       }),
     }),
-    outline = m({
-      fgColor = m({
-        rest = '#388bfd',
-        disabled = '#4493f880',
-        hover = '#58a6ff',
+    red = m({
+      color = m({
+        default = '#eb3342',
+        muted = '#3c0614',
       }),
-      bgColor = m({
-        rest = '#051d4d33',
-        disabled = '#1f6feb0d',
-        hover = '#051d4d33',
+    }),
+    gray = m({
+      color = m({
+        default = '#576270',
+        muted = '#1c1c1c',
       }),
     }),
-    invisible = m({
-      bgColor = m({
-        rest = '#30363d',
+    purple = m({
+      color = m({
+        default = '#975bf1',
+        muted = '#211047',
       }),
     }),
-    default = m({
-      bgColor = m({
-        rest = '#30363d',
+    pink = m({
+      color = m({
+        default = '#d34591',
+        muted = '#2d1524',
       }),
     }),
-    danger = m({
-      fgColor = m({
-        rest = '#f85149',
-        disabled = '#f8514980',
-        hover = '#ffffff',
+    yellow = m({
+      color = m({
+        default = '#895906',
+        muted = '#2e1a00',
       }),
-      bgColor = m({
-        rest = '#49020233',
-        disabled = '#da36330d',
-        hover = '#ffffff33',
+    }),
+    auburn = m({
+      color = m({
+        default = '#a86f6b',
+        muted = '#271817',
+      }),
+    }),
+    blue = m({
+      color = m({
+        default = '#0576ff',
+        muted = '#001a47',
+      }),
+    }),
+    teal = m({
+      color = m({
+        default = '#106c70',
+        muted = '#041f25',
+      }),
+    }),
+    green = m({
+      color = m({
+        default = '#2f6f37',
+        muted = '#122117',
       }),
     }),
   }),
diff --git a/lua/github-theme/palette/primitives/dark_colorblind.lua b/lua/github-theme/palette/primitives/dark_colorblind.lua
index 842f0bf..d5a5df3 100644
--- a/lua/github-theme/palette/primitives/dark_colorblind.lua
+++ b/lua/github-theme/palette/primitives/dark_colorblind.lua
@@ -11,204 +11,52 @@ local function m(tbl)
   return setmetatable(tbl, mt)
 end
 local M = m({
-  shadow = m({
-    floating = m({
-      legacy = '0px 6px 12px -3px #01040966, 0px 6px 18px 0px #01040966',
-      large = '0px 0px 0px 1px #30363d, 0px 24px 48px 0px #010409',
-      small = '0px 0px 0px 1px #30363d, 0px 6px 12px -3px #01040966, 0px 6px 18px 0px #01040966',
-      medium = '0px 0px 0px 1px #30363d, 0px 8px 16px -4px #01040966, 0px 4px 32px -4px #01040966, 0px 24px 48px -12px #01040966, 0px 48px 96px -24px #01040966',
-      xlarge = '0px 0px 0px 1px #30363d, 0px 32px 64px 0px #010409',
-    }),
-    inset = 'inset 0px 1px 0px 0px #0104093d',
-    resting = m({
-      xsmall = '0px 1px 0px 0px #010409cc',
-      medium = '0px 3px 6px 0px #010409cc',
-      small = '0px 1px 0px 0px #01040966',
-    }),
+  selection = m({
+    bgColor = '#1f6febb3',
   }),
-  button = m({
-    invisible = m({
-      iconColor = m({
-        disabled = '#6e7681',
-        rest = '#8d96a0',
-        hover = '#e6edf3',
-      }),
-      fgColor = m({
-        disabled = '#6e7681',
-        rest = '#4493f8',
-        hover = '#58a6ff',
-      }),
-      bgColor = m({
-        active = '#b1bac433',
-        disabled = '#21262db3',
-        rest = '#00000000',
-        hover = '#b1bac41f',
-      }),
-      borderColor = m({
-        disabled = '#21262db3',
-        rest = '#00000000',
-        hover = '#00000000',
-      }),
-    }),
-    inactive = m({
-      fgColor = '#8b949e',
-      bgColor = '#21262d',
-    }),
-    danger = m({
-      iconColor = m({
-        rest = '#db6d28',
-        hover = '#ffffff',
-      }),
-      shadow = m({
-        selected = '0px 0px 0px 0px #000000',
-      }),
-      bgColor = m({
-        active = '#b5531d',
-        disabled = '#21262db3',
-        rest = '#21262d',
-        hover = '#9b4215',
-      }),
-      borderColor = m({
-        active = '#f0f6fc1a',
-        rest = '#30363d',
-        hover = '#f0f6fc1a',
-      }),
-      fgColor = m({
-        active = '#ffffff',
-        disabled = '#db6d2880',
-        rest = '#db6d28',
-        hover = '#ffffff',
-      }),
-    }),
-    default = m({
-      fgColor = m({
-        rest = '#c9d1d9',
-      }),
-      shadow = m({
-        resting = '0px 0px 0px 0px #000000',
-      }),
-      bgColor = m({
-        disabled = '#21262db3',
-        active = '#31363e',
-        selected = '#31363e',
-        rest = '#21262d',
-        hover = '#292e36',
-      }),
-      borderColor = m({
-        active = '#30363d',
-        disabled = '#21262db3',
-        rest = '#30363d',
-        hover = '#30363d',
-      }),
+  selectMenu = m({
+    borderColor = '#484f58',
+    bgColor = m({
+      active = '#0c2d6b',
     }),
-    primary = m({
-      iconColor = m({
-        rest = '#ffffff',
-      }),
-      shadow = m({
-        selected = '0px 0px 0px 0px #000000',
-      }),
-      bgColor = m({
-        active = '#3685f3',
-        disabled = '#1158c7',
-        rest = '#1f6feb',
-        hover = '#2a7aef',
-      }),
-      borderColor = m({
-        active = '#f0f6fc1a',
-        disabled = '#1158c7',
-        rest = '#f0f6fc1a',
-        hover = '#f0f6fc1a',
-      }),
-      fgColor = m({
-        rest = '#ffffff',
-        disabled = '#ffffff66',
-      }),
+  }),
+  controlTrack = m({
+    borderColor = m({
+      disabled = '#6e7681',
+      rest = '#00000000',
     }),
-    outline = m({
-      fgColor = m({
-        active = '#ffffff',
-        disabled = '#4493f880',
-        rest = '#388bfd',
-        hover = '#58a6ff',
-      }),
-      shadow = m({
-        selected = '0px 0px 0px 0px #000000',
-      }),
-      bgColor = m({
-        active = '#0d419d',
-        disabled = '#0d1117',
-        rest = '#f0f6fc',
-        hover = '#30363d',
-      }),
-      borderColor = m({
-        hover = '#f0f6fc1a',
-        selected = '#f0f6fc1a',
-      }),
+    fgColor = m({
+      disabled = '#ffffff',
+      rest = '#8d96a0',
     }),
-    star = m({
-      iconColor = '#e3b341',
+    bgColor = m({
+      disabled = '#6e7681',
+      active = '#31363e',
+      rest = '#21262d',
+      hover = '#292e36',
     }),
   }),
-  diffBlob = m({
-    deletion = m({
-      fgColor = m({
-        num = '#e6edf3',
-        text = '#e6edf3',
-      }),
-      bgColor = m({
-        line = '#db6d2826',
-        word = '#db6d2866',
-        num = '#db6d284d',
-      }),
-    }),
-    hunk = m({
-      bgColor = m({
-        num = '#388bfd66',
-      }),
-    }),
-    addition = m({
-      fgColor = m({
-        num = '#e6edf3',
-        text = '#e6edf3',
-      }),
+  avatarStack = m({
+    fade = m({
       bgColor = m({
-        line = '#388bfd26',
-        word = '#388bfd66',
-        num = '#58a6ff4d',
+        muted = '#21262d',
+        default = '#30363d',
       }),
     }),
-    expander = m({
-      iconColor = '#8d96a0',
-    }),
-  }),
-  selection = m({
-    bgColor = '#1f6febb3',
-  }),
-  selectMenu = m({
-    bgColor = m({
-      active = '#0c2d6b',
-    }),
-    borderColor = '#484f58',
   }),
   reactionButton = m({
     selected = m({
-      fgColor = m({
-        rest = '#4493f8',
-        hover = '#79c0ff',
-      }),
       bgColor = m({
-        rest = '#388bfd33',
         hover = '#3a8cfd5c',
+        rest = '#388bfd33',
+      }),
+      fgColor = m({
+        hover = '#79c0ff',
+        rest = '#4493f8',
       }),
     }),
   }),
   fgColor = m({
-    open = '#f0883e',
-    neutral = '#6e7681',
-    default = '#e6edf3',
-    white = '#ffffff',
-    upsell = '#ab7df8',
     success = '#58a6ff',
     sponsors = '#db61a2',
     severe = '#db6d28',
@@ -221,7 +69,24 @@ local M = m({
     closed = '#8b949e',
     black = '#010409',
     attention = '#d29922',
+    open = '#f0883e',
+    default = '#e6edf3',
+    neutral = '#6e7681',
     accent = '#4493f8',
+    white = '#ffffff',
+    upsell = '#ab7df8',
+  }),
+  controlKnob = m({
+    borderColor = m({
+      checked = '#1f6feb',
+      rest = '#666e79',
+      disabled = '#21262db3',
+    }),
+    bgColor = m({
+      checked = '#ffffff',
+      rest = '#010409',
+      disabled = '#21262db3',
+    }),
   }),
   page = m({
     header = m({
@@ -229,48 +94,70 @@ local M = m({
     }),
   }),
   header = m({
+    borderColor = m({
+      divider = '#8b949e',
+    }),
     fgColor = m({
-      default = '#ffffffb3',
       logo = '#f0f6fc',
+      default = '#ffffffb3',
     }),
     bgColor = '#161b22f2',
-    borderColor = m({
-      divider = '#8b949e',
-    }),
   }),
   overlay = m({
+    borderColor = '#30363db3',
     backdrop = m({
       bgColor = '#161b2266',
     }),
     bgColor = '#161b22',
-    borderColor = '#30363db3',
-  }),
-  avatar = m({
-    shadow = '0px 0px 0px 2px #0d1117',
-    bgColor = '#ffffff1a',
-    borderColor = '#ffffff26',
   }),
-  counter = m({
-    borderColor = '#00000000',
-  }),
-  focus = m({
-    outlineColor = '#1f6feb',
-  }),
-  controlTrack = m({
-    fgColor = m({
-      rest = '#8d96a0',
-      disabled = '#ffffff',
+  codeMirror = m({
+    selection = m({
+      bgColor = '#388bfd66',
     }),
-    bgColor = m({
-      active = '#31363e',
-      disabled = '#6e7681',
-      rest = '#21262d',
-      hover = '#292e36',
+    lineNumber = m({
+      fgColor = '#8d96a0',
     }),
-    borderColor = m({
-      rest = '#00000000',
-      disabled = '#6e7681',
+    fgColor = '#e6edf3',
+    gutterMarker = m({
+      fgColor = m({
+        muted = '#8d96a0',
+        default = '#0d1117',
+      }),
+    }),
+    cursor = m({
+      fgColor = '#e6edf3',
+    }),
+    lines = m({
+      bgColor = '#0d1117',
+    }),
+    syntax = m({
+      fgColor = m({
+        comment = '#8b949e',
+        variable = '#ffa657',
+        constant = '#79c0ff',
+        storage = '#f0883e',
+        entity = '#d2a8ff',
+        support = '#79c0ff',
+        keyword = '#f0883e',
+        string = '#a5d6ff',
+      }),
+    }),
+    activeline = m({
+      bgColor = '#6e768166',
+    }),
+    matchingBracket = m({
+      fgColor = '#e6edf3',
+    }),
+    gutters = m({
+      bgColor = '#0d1117',
     }),
+    bgColor = '#0d1117',
+  }),
+  outline = m({
+    focus = '#1f6feb solid 2px',
+  }),
+  focus = m({
+    outlineColor = '#1f6feb',
   }),
   menu = m({
     bgColor = m({
@@ -278,676 +165,683 @@ local M = m({
     }),
   }),
   label = m({
-    brown = m({
-      fgColor = m({
-        active = '#cdbb98',
-        rest = '#b69a6d',
-        hover = '#bfa77d',
-      }),
+    pink = m({
       bgColor = m({
-        active = '#483a28',
-        rest = '#241c14',
-        hover = '#342a1d',
+        active = '#65244a',
+        rest = '#2d1524',
+        hover = '#451c35',
       }),
-    }),
-    yellow = m({
       fgColor = m({
-        active = '#edb431',
-        rest = '#d3910d',
-        hover = '#df9e11',
+        active = '#f4a9cd',
+        rest = '#e57bb2',
+        hover = '#ec8dbd',
       }),
+    }),
+    pine = m({
       bgColor = m({
-        active = '#5a3702',
-        rest = '#2e1a00',
-        hover = '#3d2401',
+        active = '#0e4430',
+        rest = '#082119',
+        hover = '#0b3224',
       }),
-    }),
-    orange = m({
       fgColor = m({
-        active = '#f6b06a',
-        rest = '#ed8326',
-        hover = '#f1933b',
+        active = '#1bda81',
+        rest = '#1bb673',
+        hover = '#1ac176',
       }),
+    }),
+    orange = m({
       bgColor = m({
         active = '#632f0d',
         rest = '#311708',
         hover = '#43200a',
       }),
-    }),
-    teal = m({
       fgColor = m({
-        active = '#24d6c4',
-        rest = '#1cb0ab',
-        hover = '#1fbdb2',
-      }),
-      bgColor = m({
-        active = '#0a464d',
-        rest = '#041f25',
-        hover = '#073036',
+        active = '#f6b06a',
+        rest = '#ed8326',
+        hover = '#f1933b',
       }),
     }),
-    olive = m({
-      fgColor = m({
-        active = '#cbc025',
-        rest = '#a2a626',
-        hover = '#b2af24',
-      }),
+    coral = m({
       bgColor = m({
-        active = '#374115',
-        rest = '#171e0b',
-        hover = '#252d10',
+        active = '#72220d',
+        rest = '#351008',
+        hover = '#51180b',
       }),
-    }),
-    red = m({
       fgColor = m({
-        active = '#f7adab',
-        rest = '#f27d83',
-        hover = '#f48b8d',
-      }),
-      bgColor = m({
-        active = '#790c20',
-        rest = '#3c0614',
-        hover = '#58091a',
+        active = '#fdaa86',
+        rest = '#f7794b',
+        hover = '#fa8c61',
       }),
     }),
     lime = m({
-      fgColor = m({
-        active = '#9fcc3e',
-        rest = '#7dae37',
-        hover = '#89ba36',
-      }),
       bgColor = m({
         active = '#2c441d',
         rest = '#141f0f',
         hover = '#1f3116',
       }),
-    }),
-    purple = m({
       fgColor = m({
-        active = '#d2affd',
-        rest = '#b687f7',
-        hover = '#c398fb',
-      }),
-      bgColor = m({
-        active = '#481a9e',
-        rest = '#211047',
-        hover = '#31146b',
+        active = '#9fcc3e',
+        rest = '#7dae37',
+        hover = '#89ba36',
       }),
     }),
     lemon = m({
-      fgColor = m({
-        active = '#d7bc1d',
-        rest = '#ba9b12',
-        hover = '#c4a717',
-      }),
       bgColor = m({
         active = '#4f3c02',
         rest = '#291d00',
         hover = '#372901',
       }),
-    }),
-    plum = m({
       fgColor = m({
-        active = '#e4a5fd',
-        rest = '#d07ef7',
-        hover = '#d889fa',
+        active = '#d7bc1d',
+        rest = '#ba9b12',
+        hover = '#c4a717',
       }),
+    }),
+    yellow = m({
       bgColor = m({
-        active = '#5c1688',
-        rest = '#2a0e3f',
-        hover = '#40125e',
+        active = '#5a3702',
+        rest = '#2e1a00',
+        hover = '#3d2401',
+      }),
+      fgColor = m({
+        active = '#edb431',
+        rest = '#d3910d',
+        hover = '#df9e11',
       }),
     }),
     indigo = m({
+      bgColor = m({
+        active = '#312c90',
+        rest = '#1b183f',
+        hover = '#25215f',
+      }),
       fgColor = m({
         active = '#b7baf6',
         rest = '#9899ec',
         hover = '#a2a5f1',
       }),
+    }),
+    auburn = m({
       bgColor = m({
-        active = '#312c90',
-        rest = '#1b183f',
-        hover = '#25215f',
+        active = '#543331',
+        rest = '#271817',
+        hover = '#3a2422',
       }),
-    }),
-    pink = m({
       fgColor = m({
-        active = '#f4a9cd',
-        rest = '#e57bb2',
-        hover = '#ec8dbd',
+        active = '#d4b7b5',
+        rest = '#bf9592',
+        hover = '#c6a19f',
       }),
+    }),
+    teal = m({
       bgColor = m({
-        active = '#65244a',
-        rest = '#2d1524',
-        hover = '#451c35',
+        active = '#0a464d',
+        rest = '#041f25',
+        hover = '#073036',
+      }),
+      fgColor = m({
+        active = '#24d6c4',
+        rest = '#1cb0ab',
+        hover = '#1fbdb2',
       }),
     }),
     green = m({
+      bgColor = m({
+        active = '#214529',
+        rest = '#122117',
+        hover = '#182f1f',
+      }),
       fgColor = m({
         active = '#75d36f',
         rest = '#41b445',
         hover = '#46c144',
       }),
+    }),
+    blue = m({
       bgColor = m({
-        active = '#214529',
-        rest = '#122117',
-        hover = '#182f1f',
+        active = '#00378a',
+        rest = '#001a47',
+        hover = '#002766',
       }),
-    }),
-    pine = m({
       fgColor = m({
-        active = '#1bda81',
-        rest = '#1bb673',
-        hover = '#1ac176',
+        active = '#85c2ff',
+        rest = '#4da0ff',
+        hover = '#61adff',
       }),
+    }),
+    red = m({
       bgColor = m({
-        active = '#0e4430',
-        rest = '#082119',
-        hover = '#0b3224',
+        active = '#790c20',
+        rest = '#3c0614',
+        hover = '#58091a',
       }),
-    }),
-    gray = m({
       fgColor = m({
-        active = '#b3c0d1',
-        rest = '#92a1b5',
-        hover = '#9babbf',
+        active = '#f7adab',
+        rest = '#f27d83',
+        hover = '#f48b8d',
       }),
+    }),
+    gray = m({
       bgColor = m({
         active = '#393d41',
         rest = '#1c1c1c',
         hover = '#2a2b2d',
       }),
-    }),
-    cyan = m({
       fgColor = m({
-        active = '#45cbf7',
-        rest = '#07ace4',
-        hover = '#09b7f1',
-      }),
-      bgColor = m({
-        active = '#014156',
-        rest = '#001f29',
-        hover = '#002e3d',
+        active = '#b3c0d1',
+        rest = '#92a1b5',
+        hover = '#9babbf',
       }),
     }),
-    auburn = m({
+    brown = m({
+      bgColor = m({
+        active = '#483a28',
+        rest = '#241c14',
+        hover = '#342a1d',
+      }),
       fgColor = m({
-        active = '#d4b7b5',
-        rest = '#bf9592',
-        hover = '#c6a19f',
+        active = '#cdbb98',
+        rest = '#b69a6d',
+        hover = '#bfa77d',
       }),
+    }),
+    purple = m({
       bgColor = m({
-        active = '#543331',
-        rest = '#271817',
-        hover = '#3a2422',
+        active = '#481a9e',
+        rest = '#211047',
+        hover = '#31146b',
       }),
-    }),
-    coral = m({
       fgColor = m({
-        active = '#fdaa86',
-        rest = '#f7794b',
-        hover = '#fa8c61',
+        active = '#d2affd',
+        rest = '#b687f7',
+        hover = '#c398fb',
       }),
+    }),
+    cyan = m({
       bgColor = m({
-        active = '#72220d',
-        rest = '#351008',
-        hover = '#51180b',
+        active = '#014156',
+        rest = '#001f29',
+        hover = '#002e3d',
       }),
-    }),
-    blue = m({
       fgColor = m({
-        active = '#85c2ff',
-        rest = '#4da0ff',
-        hover = '#61adff',
+        active = '#45cbf7',
+        rest = '#07ace4',
+        hover = '#09b7f1',
       }),
+    }),
+    olive = m({
       bgColor = m({
-        active = '#00378a',
-        rest = '#001a47',
-        hover = '#002766',
+        active = '#374115',
+        rest = '#171e0b',
+        hover = '#252d10',
       }),
-    }),
-  }),
-  controlKnob = m({
-    bgColor = m({
-      checked = '#ffffff',
-      rest = '#010409',
-      disabled = '#21262db3',
-    }),
-    borderColor = m({
-      checked = '#1f6feb',
-      rest = '#666e79',
-      disabled = '#21262db3',
-    }),
-  }),
-  data = m({
-    pink = m({
-      color = m({
-        default = '#d34591',
-        muted = '#2d1524',
+      fgColor = m({
+        active = '#cbc025',
+        rest = '#a2a626',
+        hover = '#b2af24',
       }),
     }),
-    yellow = m({
-      color = m({
-        default = '#895906',
-        muted = '#2e1a00',
+    plum = m({
+      bgColor = m({
+        active = '#5c1688',
+        rest = '#2a0e3f',
+        hover = '#40125e',
       }),
-    }),
-    green = m({
-      color = m({
-        default = '#2f6f37',
-        muted = '#122117',
+      fgColor = m({
+        active = '#e4a5fd',
+        rest = '#d07ef7',
+        hover = '#d889fa',
       }),
     }),
-    orange = m({
-      color = m({
-        default = '#984b10',
-        muted = '#311708',
+  }),
+  headerSearch = m({
+    borderColor = '#30363d',
+    bgColor = '#0d1117',
+  }),
+  card = m({
+    bgColor = '#161b22',
+  }),
+  buttonCounter = m({
+    danger = m({
+      bgColor = m({
+        disabled = '#bd561d0d',
+        rest = '#49020233',
+        hover = '#ffffff33',
       }),
-    }),
-    teal = m({
-      color = m({
-        default = '#106c70',
-        muted = '#041f25',
+      fgColor = m({
+        disabled = '#db6d2880',
+        rest = '#db6d28',
+        hover = '#ffffff',
       }),
     }),
-    gray = m({
-      color = m({
-        default = '#576270',
-        muted = '#1c1c1c',
+    invisible = m({
+      bgColor = m({
+        rest = '#30363d',
       }),
     }),
-    red = m({
-      color = m({
-        default = '#eb3342',
-        muted = '#3c0614',
+    outline = m({
+      bgColor = m({
+        disabled = '#1f6feb0d',
+        rest = '#051d4d33',
+        hover = '#051d4d33',
       }),
-    }),
-    purple = m({
-      color = m({
-        default = '#975bf1',
-        muted = '#211047',
+      fgColor = m({
+        disabled = '#4493f880',
+        rest = '#388bfd',
+        hover = '#58a6ff',
       }),
     }),
-    auburn = m({
-      color = m({
-        default = '#a86f6b',
-        muted = '#271817',
+    default = m({
+      bgColor = m({
+        rest = '#30363d',
       }),
     }),
-    blue = m({
-      color = m({
-        default = '#0576ff',
-        muted = '#001a47',
+    primary = m({
+      bgColor = m({
+        rest = '#04260f33',
       }),
     }),
   }),
-  control = m({
+  underlineNav = m({
+    borderColor = m({
+      active = '#f78166',
+      hover = '#6e768166',
+    }),
     iconColor = m({
       rest = '#8d96a0',
     }),
-    transparent = m({
+  }),
+  button = m({
+    inactive = m({
+      bgColor = '#21262d',
+      fgColor = '#8b949e',
+    }),
+    star = m({
+      iconColor = '#e3b341',
+    }),
+    invisible = m({
+      borderColor = m({
+        disabled = '#21262db3',
+        rest = '#00000000',
+        hover = '#00000000',
+      }),
+      fgColor = m({
+        disabled = '#6e7681',
+        rest = '#4493f8',
+        hover = '#58a6ff',
+      }),
+      iconColor = m({
+        disabled = '#6e7681',
+        rest = '#8d96a0',
+        hover = '#e6edf3',
+      }),
       bgColor = m({
         disabled = '#21262db3',
         active = '#b1bac433',
-        selected = '#b1bac414',
         rest = '#00000000',
         hover = '#b1bac41f',
       }),
-      borderColor = m({
-        active = '#00000000',
-        rest = '#00000000',
-        hover = '#00000000',
-      }),
-    }),
-    bgColor = m({
-      disabled = '#21262db3',
-      active = '#31363e',
-      selected = '#161b22',
-      rest = '#21262d',
-      hover = '#292e36',
     }),
     danger = m({
+      borderColor = m({
+        active = '#f0f6fc1a',
+        rest = '#30363d',
+        hover = '#f0f6fc1a',
+      }),
       fgColor = m({
+        disabled = '#db6d2880',
+        active = '#ffffff',
         rest = '#db6d28',
-        hover = '#f0883e',
+        hover = '#ffffff',
+      }),
+      iconColor = m({
+        hover = '#ffffff',
+        rest = '#db6d28',
+      }),
+      shadow = m({
+        selected = '0px 0px 0px 0px #000000',
       }),
       bgColor = m({
-        hover = '#db6d281a',
-        active = '#db6d2866',
+        disabled = '#21262db3',
+        active = '#b5531d',
+        rest = '#21262d',
+        hover = '#9b4215',
       }),
     }),
-    checked = m({
+    outline = m({
+      borderColor = m({
+        selected = '#f0f6fc1a',
+        hover = '#f0f6fc1a',
+      }),
       fgColor = m({
-        rest = '#ffffff',
-        disabled = '#010409',
+        disabled = '#4493f880',
+        active = '#ffffff',
+        rest = '#388bfd',
+        hover = '#58a6ff',
       }),
-      bgColor = m({
-        active = '#3685f3',
-        disabled = '#6e7681',
-        rest = '#1f6feb',
-        hover = '#2a7aef',
+      shadow = m({
+        selected = '0px 0px 0px 0px #000000',
       }),
-      borderColor = m({
-        active = '#3685f3',
-        disabled = '#6e7681',
-        rest = '#1f6feb',
-        hover = '#2a7aef',
+      bgColor = m({
+        disabled = '#0d1117',
+        active = '#0d419d',
+        rest = '#f0f6fc',
+        hover = '#30363d',
       }),
     }),
-    borderColor = m({
-      danger = '#bd561d',
-      disabled = '#21262db3',
-      success = '#1f6feb',
-      warning = '#9e6a03',
-      selected = '#f0f6fc',
-      rest = '#30363d',
-      emphasis = '#666e79',
+    default = m({
+      borderColor = m({
+        disabled = '#21262db3',
+        active = '#30363d',
+        rest = '#30363d',
+        hover = '#30363d',
+      }),
+      fgColor = m({
+        rest = '#c9d1d9',
+      }),
+      shadow = m({
+        resting = '0px 0px 0px 0px #000000',
+      }),
+      bgColor = m({
+        active = '#31363e',
+        selected = '#31363e',
+        rest = '#21262d',
+        hover = '#292e36',
+        disabled = '#21262db3',
+      }),
     }),
-    fgColor = m({
-      placeholder = '#858e98',
-      rest = '#c9d1d9',
-      disabled = '#6e7681',
+    primary = m({
+      borderColor = m({
+        disabled = '#1158c7',
+        active = '#f0f6fc1a',
+        rest = '#f0f6fc1a',
+        hover = '#f0f6fc1a',
+      }),
+      fgColor = m({
+        disabled = '#ffffff66',
+        rest = '#ffffff',
+      }),
+      iconColor = m({
+        rest = '#ffffff',
+      }),
+      shadow = m({
+        selected = '0px 0px 0px 0px #000000',
+      }),
+      bgColor = m({
+        disabled = '#1158c7',
+        active = '#3685f3',
+        rest = '#1f6feb',
+        hover = '#2a7aef',
+      }),
     }),
   }),
-  codeMirror = m({
-    fgColor = '#e6edf3',
-    lineNumber = m({
-      fgColor = '#8d96a0',
-    }),
-    gutters = m({
-      bgColor = '#0d1117',
+  diffBlob = m({
+    addition = m({
+      bgColor = m({
+        num = '#58a6ff4d',
+        line = '#388bfd26',
+        word = '#388bfd66',
+      }),
+      fgColor = m({
+        text = '#e6edf3',
+        num = '#e6edf3',
+      }),
     }),
-    lines = m({
-      bgColor = '#0d1117',
+    expander = m({
+      iconColor = '#8d96a0',
     }),
-    gutterMarker = m({
+    deletion = m({
+      bgColor = m({
+        num = '#db6d284d',
+        line = '#db6d2826',
+        word = '#db6d2866',
+      }),
       fgColor = m({
-        default = '#0d1117',
-        muted = '#8d96a0',
+        text = '#e6edf3',
+        num = '#e6edf3',
       }),
     }),
-    cursor = m({
-      fgColor = '#e6edf3',
+    hunk = m({
+      bgColor = m({
+        num = '#388bfd66',
+      }),
     }),
-    syntax = m({
-      fgColor = m({
-        entity = '#d2a8ff',
-        storage = '#f0883e',
-        string = '#a5d6ff',
-        support = '#79c0ff',
-        keyword = '#f0883e',
-        constant = '#79c0ff',
-        comment = '#8b949e',
-        variable = '#ffa657',
+  }),
+  treeViewItem = m({
+    leadingVisual = m({
+      iconColor = m({
+        rest = '#8d96a0',
       }),
     }),
-    bgColor = '#0d1117',
-    selection = m({
-      bgColor = '#388bfd66',
+  }),
+  topicTag = m({
+    borderColor = '#00000000',
+  }),
+  timelineBadge = m({
+    bgColor = '#21262d',
+  }),
+  bgColor = m({
+    success = m({
+      muted = '#388bfd26',
+      emphasis = '#1f6feb',
     }),
-    matchingBracket = m({
-      fgColor = '#e6edf3',
+    sponsors = m({
+      muted = '#db61a21a',
+      emphasis = '#bf4b8a',
     }),
-    activeline = m({
-      bgColor = '#6e768166',
+    severe = m({
+      muted = '#db6d281a',
+      emphasis = '#bd561d',
+    }),
+    muted = '#161b22',
+    done = m({
+      muted = '#ab7df826',
+      emphasis = '#8957e5',
+    }),
+    disabled = '#21262db3',
+    danger = m({
+      muted = '#db6d281a',
+      emphasis = '#bd561d',
+    }),
+    closed = m({
+      muted = '#6e768166',
+      emphasis = '#6e7681',
+    }),
+    black = '#010409',
+    transparent = '#00000000',
+    open = m({
+      muted = '#db6d2866',
+      emphasis = '#bd561d',
+    }),
+    emphasis = '#6e7681',
+    inverse = '#ffffff',
+    default = '#0d1117',
+    neutral = m({
+      muted = '#6e768166',
+      emphasis = '#6e7681',
+    }),
+    inset = '#010409',
+    accent = m({
+      muted = '#388bfd1a',
+      emphasis = '#1f6feb',
+    }),
+    attention = m({
+      muted = '#bb800926',
+      emphasis = '#9e6a03',
+    }),
+    white = '#ffffff',
+    upsell = m({
+      muted = '#ab7df826',
+      emphasis = '#8957e5',
     }),
   }),
-  headerSearch = m({
-    bgColor = '#0d1117',
-    borderColor = '#30363d',
+  skeletonLoader = m({
+    bgColor = '#161b22',
   }),
-  color = m({
-    prettylights = m({
-      syntax = m({
-        carriage = m({
-          ['return'] = m({
-            bg = '#9b4215',
-            text = '#f0f6fc',
-          }),
-        }),
-        storage = m({
-          modifier = m({
-            import = '#c9d1d9',
-          }),
-        }),
-        string = m({
-          regexp = '#a5d6ff',
-          default = '#a5d6ff',
-        }),
-        brackethighlighter = m({
-          unmatched = '#db6d28',
-          angle = '#8b949e',
-        }),
-        meta = m({
-          diff = m({
-            range = '#d2a8ff',
-          }),
-        }),
-        invalid = m({
-          illegal = m({
-            bg = '#762d0a',
-            text = '#f0f6fc',
-          }),
-        }),
-        markup = m({
-          italic = '#c9d1d9',
-          changed = m({
-            bg = '#5a1e02',
-            text = '#ffdfb6',
-          }),
-          inserted = m({
-            bg = '#0c2d6b',
-            text = '#cae8ff',
-          }),
-          bold = '#c9d1d9',
-          deleted = m({
-            bg = '#5a1e02',
-            text = '#ffdfb6',
-          }),
-          ignored = m({
-            bg = '#1158c7',
-            text = '#c9d1d9',
-          }),
-          list = '#f2cc60',
-          heading = '#1f6feb',
-        }),
-        entity = m({
-          tag = '#a5d6ff',
-          default = '#d2a8ff',
-        }),
-        constant = m({
-          other = m({
-            reference = m({
-              link = '#a5d6ff',
-            }),
-          }),
-          default = '#79c0ff',
-        }),
-        sublimelinter = m({
-          gutter = m({
-            mark = '#484f58',
-          }),
-        }),
-        variable = '#ffa657',
-        comment = '#8b949e',
-        keyword = '#f0883e',
-      }),
+  sideNav = m({
+    bgColor = m({
+      selected = '#21262d',
+    }),
+  }),
+  scale = m({
+    blue = m({
+      [1] = '#cae8ff',
+      [2] = '#a5d6ff',
+      [3] = '#79c0ff',
+      [4] = '#58a6ff',
+      [5] = '#388bfd',
+      [6] = '#1f6feb',
+      [7] = '#1158c7',
+      [8] = '#0d419d',
+      [9] = '#0c2d6b',
+      [10] = '#051d4d',
+    }),
+    pink = m({
+      [1] = '#ffdaec',
+      [2] = '#ffbedd',
+      [3] = '#ff9bce',
+      [4] = '#f778ba',
+      [5] = '#db61a2',
+      [6] = '#bf4b8a',
+      [7] = '#9e3670',
+      [8] = '#7d2457',
+      [9] = '#5e103e',
+      [10] = '#42062a',
+    }),
+    yellow = m({
+      [1] = '#f8e3a1',
+      [2] = '#f2cc60',
+      [3] = '#e3b341',
+      [4] = '#d29922',
+      [5] = '#bb8009',
+      [6] = '#9e6a03',
+      [7] = '#845306',
+      [8] = '#693e00',
+      [9] = '#4b2900',
+      [10] = '#341a00',
+    }),
+    neutral = m({
+      [1] = '#f0f6fc',
+      [2] = '#c9d1d9',
+      [3] = '#b1bac4',
+      [4] = '#8b949e',
+      [5] = '#6e7681',
+      [6] = '#484f58',
+      [7] = '#30363d',
+      [8] = '#21262d',
+      [9] = '#161b22',
+      [10] = '#0d1117',
+    }),
+    orange = m({
+      [1] = '#ffdfb6',
+      [2] = '#ffc680',
+      [3] = '#ffa657',
+      [4] = '#f0883e',
+      [5] = '#db6d28',
+      [6] = '#bd561d',
+      [7] = '#9b4215',
+      [8] = '#762d0a',
+      [9] = '#5a1e02',
+      [10] = '#3d1300',
+    }),
+    red = m({
+      [1] = '#ffdcd7',
+      [2] = '#ffc1ba',
+      [3] = '#ffa198',
+      [4] = '#ff7b72',
+      [5] = '#f85149',
+      [6] = '#da3633',
+      [7] = '#b62324',
+      [8] = '#8e1519',
+      [9] = '#67060c',
+      [10] = '#490202',
+    }),
+    black = '#010409',
+    transparent = '#00000000',
+    purple = m({
+      [1] = '#eddeff',
+      [2] = '#e2c5ff',
+      [3] = '#d2a8ff',
+      [4] = '#be8fff',
+      [5] = '#ab7df8',
+      [6] = '#8957e5',
+      [7] = '#6e40c9',
+      [8] = '#553098',
+      [9] = '#3c1e70',
+      [10] = '#271052',
+    }),
+    green = m({
+      [1] = '#aff5b4',
+      [2] = '#7ee787',
+      [3] = '#56d364',
+      [4] = '#3fb950',
+      [5] = '#2ea043',
+      [6] = '#238636',
+      [7] = '#196c2e',
+      [8] = '#0f5323',
+      [9] = '#033a16',
+      [10] = '#04260f',
+    }),
+    white = '#ffffff',
+    coral = m({
+      [1] = '#ffddd2',
+      [2] = '#ffc2b2',
+      [3] = '#ffa28b',
+      [4] = '#f78166',
+      [5] = '#ea6045',
+      [6] = '#cf462d',
+      [7] = '#ac3220',
+      [8] = '#872012',
+      [9] = '#640d04',
+      [10] = '#460701',
+    }),
+  }),
+  shadow = m({
+    floating = m({
+      small = '0px 0px 0px 1px #30363d, 0px 6px 12px -3px #01040966, 0px 6px 18px 0px #01040966',
+      medium = '0px 0px 0px 1px #30363d, 0px 8px 16px -4px #01040966, 0px 4px 32px -4px #01040966, 0px 24px 48px -12px #01040966, 0px 48px 96px -24px #01040966',
+      xlarge = '0px 0px 0px 1px #30363d, 0px 32px 64px 0px #010409',
+      legacy = '0px 6px 12px -3px #01040966, 0px 6px 18px 0px #01040966',
+      large = '0px 0px 0px 1px #30363d, 0px 24px 48px 0px #010409',
     }),
-    ansi = m({
-      white = m({
-        default = '#b1bac4',
-        bright = '#ffffff',
-      }),
-      yellow = m({
-        default = '#d29922',
-        bright = '#e3b341',
-      }),
-      green = m({
-        default = '#58a6ff',
-        bright = '#79c0ff',
-      }),
-      magenta = m({
-        default = '#be8fff',
-        bright = '#d2a8ff',
-      }),
-      red = m({
-        default = '#f0883e',
-        bright = '#ffa657',
-      }),
-      cyan = m({
-        default = '#39c5cf',
-        bright = '#56d4dd',
-      }),
-      black = m({
-        default = '#484f58',
-        bright = '#6e7681',
-      }),
-      gray = '#6e7681',
-      blue = m({
-        default = '#58a6ff',
-        bright = '#79c0ff',
-      }),
+    inset = 'inset 0px 1px 0px 0px #0104093d',
+    resting = m({
+      small = '0px 1px 0px 0px #01040966',
+      xsmall = '0px 1px 0px 0px #010409cc',
+      medium = '0px 3px 6px 0px #010409cc',
     }),
   }),
+  avatar = m({
+    borderColor = '#ffffff26',
+    shadow = '0px 0px 0px 2px #0d1117',
+    bgColor = '#ffffff1a',
+  }),
   base = m({
-    color = m({
-      white = '#ffffff',
-      pink = m({
-        [0] = '#ffdaec',
-        [1] = '#ffbedd',
-        [2] = '#ff9bce',
-        [3] = '#f778ba',
-        [4] = '#db61a2',
-        [5] = '#bf4b8a',
-        [6] = '#9e3670',
-        [7] = '#7d2457',
-        [8] = '#5e103e',
-        [9] = '#42062a',
-      }),
-      yellow = m({
-        [0] = '#f8e3a1',
-        [1] = '#f2cc60',
-        [2] = '#e3b341',
-        [3] = '#d29922',
-        [4] = '#bb8009',
-        [5] = '#9e6a03',
-        [6] = '#845306',
-        [7] = '#693e00',
-        [8] = '#4b2900',
-        [9] = '#341a00',
-      }),
-      green = m({
-        [0] = '#aff5b4',
-        [1] = '#7ee787',
-        [2] = '#56d364',
-        [3] = '#3fb950',
-        [4] = '#2ea043',
-        [5] = '#238636',
-        [6] = '#196c2e',
-        [7] = '#0f5323',
-        [8] = '#033a16',
-        [9] = '#04260f',
-      }),
-      orange = m({
-        [0] = '#ffdfb6',
-        [1] = '#ffc680',
-        [2] = '#ffa657',
-        [3] = '#f0883e',
-        [4] = '#db6d28',
-        [5] = '#bd561d',
-        [6] = '#9b4215',
-        [7] = '#762d0a',
-        [8] = '#5a1e02',
-        [9] = '#3d1300',
-      }),
-      transparent = '#00000000',
-      neutral = m({
-        [0] = '#f0f6fc',
-        [1] = '#c9d1d9',
-        [2] = '#b1bac4',
-        [3] = '#8b949e',
-        [4] = '#6e7681',
-        [5] = '#484f58',
-        [6] = '#30363d',
-        [7] = '#21262d',
-        [8] = '#161b22',
-        [9] = '#0d1117',
-      }),
-      black = '#010409',
-      blue = m({
-        [0] = '#cae8ff',
-        [1] = '#a5d6ff',
-        [2] = '#79c0ff',
-        [3] = '#58a6ff',
-        [4] = '#388bfd',
-        [5] = '#1f6feb',
-        [6] = '#1158c7',
-        [7] = '#0d419d',
-        [8] = '#0c2d6b',
-        [9] = '#051d4d',
-      }),
-      purple = m({
-        [0] = '#eddeff',
-        [1] = '#e2c5ff',
-        [2] = '#d2a8ff',
-        [3] = '#be8fff',
-        [4] = '#ab7df8',
-        [5] = '#8957e5',
-        [6] = '#6e40c9',
-        [7] = '#553098',
-        [8] = '#3c1e70',
-        [9] = '#271052',
-      }),
-      coral = m({
-        [0] = '#ffddd2',
-        [1] = '#ffc2b2',
-        [2] = '#ffa28b',
-        [3] = '#f78166',
-        [4] = '#ea6045',
-        [5] = '#cf462d',
-        [6] = '#ac3220',
-        [7] = '#872012',
-        [8] = '#640d04',
-        [9] = '#460701',
-      }),
-      red = m({
-        [0] = '#ffdcd7',
-        [1] = '#ffc1ba',
-        [2] = '#ffa198',
-        [3] = '#ff7b72',
-        [4] = '#f85149',
-        [5] = '#da3633',
-        [6] = '#b62324',
-        [7] = '#8e1519',
-        [8] = '#67060c',
-        [9] = '#490202',
-      }),
-    }),
     display = m({
       color = m({
-        brown = m({
-          [0] = '#241c14',
-          [1] = '#342a1d',
-          [2] = '#483a28',
-          [3] = '#5d4a32',
-          [4] = '#755e3e',
-          [5] = '#94774c',
-          [6] = '#b69a6d',
-          [7] = '#bfa77d',
-          [8] = '#cdbb98',
-          [9] = '#dbceb3',
+        pink = m({
+          [0] = '#2d1524',
+          [1] = '#451c35',
+          [2] = '#65244a',
+          [3] = '#842a5d',
+          [4] = '#ac2f74',
+          [5] = '#d34591',
+          [6] = '#e57bb2',
+          [7] = '#ec8dbd',
+          [8] = '#f4a9cd',
+          [9] = '#f9bed9',
         }),
-        yellow = m({
-          [0] = '#2e1a00',
-          [1] = '#3d2401',
-          [2] = '#5a3702',
-          [3] = '#6d4403',
-          [4] = '#895906',
-          [5] = '#aa7109',
-          [6] = '#d3910d',
-          [7] = '#df9e11',
-          [8] = '#edb431',
-          [9] = '#f0ca6a',
+        pine = m({
+          [0] = '#082119',
+          [1] = '#0b3224',
+          [2] = '#0e4430',
+          [3] = '#115a3e',
+          [4] = '#14714c',
+          [5] = '#18915e',
+          [6] = '#1bb673',
+          [7] = '#1ac176',
+          [8] = '#1bda81',
+          [9] = '#3eea97',
         }),
         orange = m({
           [0] = '#311708',
@@ -961,18 +855,7 @@ local M = m({
           [8] = '#f6b06a',
           [9] = '#fac68f',
         }),
-        teal = m({
-          [0] = '#041f25',
-          [1] = '#073036',
-          [2] = '#0a464d',
-          [3] = '#0c555a',
-          [4] = '#106c70',
-          [5] = '#158a8a',
-          [6] = '#1cb0ab',
-          [7] = '#1fbdb2',
-          [8] = '#24d6c4',
-          [9] = '#5fe3d1',
-        }),
+        black = '#0d1117',
         olive = m({
           [0] = '#171e0b',
           [1] = '#252d10',
@@ -985,18 +868,6 @@ local M = m({
           [8] = '#cbc025',
           [9] = '#e2d04b',
         }),
-        red = m({
-          [0] = '#3c0614',
-          [1] = '#58091a',
-          [2] = '#790c20',
-          [3] = '#990f24',
-          [4] = '#c31328',
-          [5] = '#eb3342',
-          [6] = '#f27d83',
-          [7] = '#f48b8d',
-          [8] = '#f7adab',
-          [9] = '#f9c1be',
-        }),
         lime = m({
           [0] = '#141f0f',
           [1] = '#1f3116',
@@ -1009,18 +880,6 @@ local M = m({
           [8] = '#9fcc3e',
           [9] = '#bcda67',
         }),
-        purple = m({
-          [0] = '#211047',
-          [1] = '#31146b',
-          [2] = '#481a9e',
-          [3] = '#5b1cca',
-          [4] = '#7730e8',
-          [5] = '#975bf1',
-          [6] = '#b687f7',
-          [7] = '#c398fb',
-          [8] = '#d2affd',
-          [9] = '#e1c7ff',
-        }),
         lemon = m({
           [0] = '#291d00',
           [1] = '#372901',
@@ -1033,19 +892,30 @@ local M = m({
           [8] = '#d7bc1d',
           [9] = '#e3d04f',
         }),
-        plum = m({
-          [0] = '#2a0e3f',
-          [1] = '#40125e',
-          [2] = '#5c1688',
-          [3] = '#7517ab',
-          [4] = '#9518d8',
-          [5] = '#b643ef',
-          [6] = '#d07ef7',
-          [7] = '#d889fa',
-          [8] = '#e4a5fd',
-          [9] = '#edbdff',
+        auburn = m({
+          [0] = '#271817',
+          [1] = '#3a2422',
+          [2] = '#543331',
+          [3] = '#6d4340',
+          [4] = '#87534f',
+          [5] = '#a86f6b',
+          [6] = '#bf9592',
+          [7] = '#c6a19f',
+          [8] = '#d4b7b5',
+          [9] = '#dfcac8',
+        }),
+        yellow = m({
+          [0] = '#2e1a00',
+          [1] = '#3d2401',
+          [2] = '#5a3702',
+          [3] = '#6d4403',
+          [4] = '#895906',
+          [5] = '#aa7109',
+          [6] = '#d3910d',
+          [7] = '#df9e11',
+          [8] = '#edb431',
+          [9] = '#f0ca6a',
         }),
-        white = '#ffffff',
         indigo = m({
           [0] = '#1b183f',
           [1] = '#25215f',
@@ -1058,17 +928,29 @@ local M = m({
           [8] = '#b7baf6',
           [9] = '#c8cbf9',
         }),
-        pink = m({
-          [0] = '#2d1524',
-          [1] = '#451c35',
-          [2] = '#65244a',
-          [3] = '#842a5d',
-          [4] = '#ac2f74',
-          [5] = '#d34591',
-          [6] = '#e57bb2',
-          [7] = '#ec8dbd',
-          [8] = '#f4a9cd',
-          [9] = '#f9bed9',
+        blue = m({
+          [0] = '#001a47',
+          [1] = '#002766',
+          [2] = '#00378a',
+          [3] = '#0046a8',
+          [4] = '#005bd1',
+          [5] = '#0576ff',
+          [6] = '#4da0ff',
+          [7] = '#61adff',
+          [8] = '#85c2ff',
+          [9] = '#a3d3ff',
+        }),
+        teal = m({
+          [0] = '#041f25',
+          [1] = '#073036',
+          [2] = '#0a464d',
+          [3] = '#0c555a',
+          [4] = '#106c70',
+          [5] = '#158a8a',
+          [6] = '#1cb0ab',
+          [7] = '#1fbdb2',
+          [8] = '#24d6c4',
+          [9] = '#5fe3d1',
         }),
         green = m({
           [0] = '#122117',
@@ -1082,17 +964,29 @@ local M = m({
           [8] = '#75d36f',
           [9] = '#99e090',
         }),
-        pine = m({
-          [0] = '#082119',
-          [1] = '#0b3224',
-          [2] = '#0e4430',
-          [3] = '#115a3e',
-          [4] = '#14714c',
-          [5] = '#18915e',
-          [6] = '#1bb673',
-          [7] = '#1ac176',
-          [8] = '#1bda81',
-          [9] = '#3eea97',
+        brown = m({
+          [0] = '#241c14',
+          [1] = '#342a1d',
+          [2] = '#483a28',
+          [3] = '#5d4a32',
+          [4] = '#755e3e',
+          [5] = '#94774c',
+          [6] = '#b69a6d',
+          [7] = '#bfa77d',
+          [8] = '#cdbb98',
+          [9] = '#dbceb3',
+        }),
+        red = m({
+          [0] = '#3c0614',
+          [1] = '#58091a',
+          [2] = '#790c20',
+          [3] = '#990f24',
+          [4] = '#c31328',
+          [5] = '#eb3342',
+          [6] = '#f27d83',
+          [7] = '#f48b8d',
+          [8] = '#f7adab',
+          [9] = '#f9c1be',
         }),
         gray = m({
           [0] = '#1c1c1c',
@@ -1106,31 +1000,6 @@ local M = m({
           [8] = '#b3c0d1',
           [9] = '#c4cfde',
         }),
-        cyan = m({
-          [0] = '#001f29',
-          [1] = '#002e3d',
-          [2] = '#014156',
-          [3] = '#02536f',
-          [4] = '#036a8c',
-          [5] = '#0587b3',
-          [6] = '#07ace4',
-          [7] = '#09b7f1',
-          [8] = '#45cbf7',
-          [9] = '#80dbf9',
-        }),
-        auburn = m({
-          [0] = '#271817',
-          [1] = '#3a2422',
-          [2] = '#543331',
-          [3] = '#6d4340',
-          [4] = '#87534f',
-          [5] = '#a86f6b',
-          [6] = '#bf9592',
-          [7] = '#c6a19f',
-          [8] = '#d4b7b5',
-          [9] = '#dfcac8',
-        }),
-        black = '#0d1117',
         coral = m({
           [0] = '#351008',
           [1] = '#51180b',
@@ -1143,540 +1012,671 @@ local M = m({
           [8] = '#fdaa86',
           [9] = '#ffc0a3',
         }),
-        blue = m({
-          [0] = '#001a47',
-          [1] = '#002766',
-          [2] = '#00378a',
-          [3] = '#0046a8',
-          [4] = '#005bd1',
-          [5] = '#0576ff',
-          [6] = '#4da0ff',
-          [7] = '#61adff',
-          [8] = '#85c2ff',
-          [9] = '#a3d3ff',
+        purple = m({
+          [0] = '#211047',
+          [1] = '#31146b',
+          [2] = '#481a9e',
+          [3] = '#5b1cca',
+          [4] = '#7730e8',
+          [5] = '#975bf1',
+          [6] = '#b687f7',
+          [7] = '#c398fb',
+          [8] = '#d2affd',
+          [9] = '#e1c7ff',
         }),
-      }),
-    }),
-  }),
-  underlineNav = m({
-    iconColor = m({
-      rest = '#8d96a0',
-    }),
-    borderColor = m({
-      hover = '#6e768166',
-      active = '#f78166',
-    }),
-  }),
-  scale = m({
-    white = '#ffffff',
-    pink = m({
-      [1] = '#ffdaec',
-      [2] = '#ffbedd',
-      [3] = '#ff9bce',
-      [4] = '#f778ba',
-      [5] = '#db61a2',
-      [6] = '#bf4b8a',
-      [7] = '#9e3670',
-      [8] = '#7d2457',
-      [9] = '#5e103e',
-      [10] = '#42062a',
-    }),
-    yellow = m({
-      [1] = '#f8e3a1',
-      [2] = '#f2cc60',
-      [3] = '#e3b341',
-      [4] = '#d29922',
-      [5] = '#bb8009',
-      [6] = '#9e6a03',
-      [7] = '#845306',
-      [8] = '#693e00',
-      [9] = '#4b2900',
-      [10] = '#341a00',
-    }),
-    green = m({
-      [1] = '#aff5b4',
-      [2] = '#7ee787',
-      [3] = '#56d364',
-      [4] = '#3fb950',
-      [5] = '#2ea043',
-      [6] = '#238636',
-      [7] = '#196c2e',
-      [8] = '#0f5323',
-      [9] = '#033a16',
-      [10] = '#04260f',
-    }),
-    orange = m({
-      [1] = '#ffdfb6',
-      [2] = '#ffc680',
-      [3] = '#ffa657',
-      [4] = '#f0883e',
-      [5] = '#db6d28',
-      [6] = '#bd561d',
-      [7] = '#9b4215',
-      [8] = '#762d0a',
-      [9] = '#5a1e02',
-      [10] = '#3d1300',
-    }),
-    transparent = '#00000000',
-    neutral = m({
-      [1] = '#f0f6fc',
-      [2] = '#c9d1d9',
-      [3] = '#b1bac4',
-      [4] = '#8b949e',
-      [5] = '#6e7681',
-      [6] = '#484f58',
-      [7] = '#30363d',
-      [8] = '#21262d',
-      [9] = '#161b22',
-      [10] = '#0d1117',
-    }),
-    red = m({
-      [1] = '#ffdcd7',
-      [2] = '#ffc1ba',
-      [3] = '#ffa198',
-      [4] = '#ff7b72',
-      [5] = '#f85149',
-      [6] = '#da3633',
-      [7] = '#b62324',
-      [8] = '#8e1519',
-      [9] = '#67060c',
-      [10] = '#490202',
-    }),
-    purple = m({
-      [1] = '#eddeff',
-      [2] = '#e2c5ff',
-      [3] = '#d2a8ff',
-      [4] = '#be8fff',
-      [5] = '#ab7df8',
-      [6] = '#8957e5',
-      [7] = '#6e40c9',
-      [8] = '#553098',
-      [9] = '#3c1e70',
-      [10] = '#271052',
-    }),
-    black = '#010409',
-    coral = m({
-      [1] = '#ffddd2',
-      [2] = '#ffc2b2',
-      [3] = '#ffa28b',
-      [4] = '#f78166',
-      [5] = '#ea6045',
-      [6] = '#cf462d',
-      [7] = '#ac3220',
-      [8] = '#872012',
-      [9] = '#640d04',
-      [10] = '#460701',
+        cyan = m({
+          [0] = '#001f29',
+          [1] = '#002e3d',
+          [2] = '#014156',
+          [3] = '#02536f',
+          [4] = '#036a8c',
+          [5] = '#0587b3',
+          [6] = '#07ace4',
+          [7] = '#09b7f1',
+          [8] = '#45cbf7',
+          [9] = '#80dbf9',
+        }),
+        white = '#ffffff',
+        plum = m({
+          [0] = '#2a0e3f',
+          [1] = '#40125e',
+          [2] = '#5c1688',
+          [3] = '#7517ab',
+          [4] = '#9518d8',
+          [5] = '#b643ef',
+          [6] = '#d07ef7',
+          [7] = '#d889fa',
+          [8] = '#e4a5fd',
+          [9] = '#edbdff',
+        }),
+      }),
     }),
-    blue = m({
-      [1] = '#cae8ff',
-      [2] = '#a5d6ff',
-      [3] = '#79c0ff',
-      [4] = '#58a6ff',
-      [5] = '#388bfd',
-      [6] = '#1f6feb',
-      [7] = '#1158c7',
-      [8] = '#0d419d',
-      [9] = '#0c2d6b',
-      [10] = '#051d4d',
+    color = m({
+      blue = m({
+        [0] = '#cae8ff',
+        [1] = '#a5d6ff',
+        [2] = '#79c0ff',
+        [3] = '#58a6ff',
+        [4] = '#388bfd',
+        [5] = '#1f6feb',
+        [6] = '#1158c7',
+        [7] = '#0d419d',
+        [8] = '#0c2d6b',
+        [9] = '#051d4d',
+      }),
+      pink = m({
+        [0] = '#ffdaec',
+        [1] = '#ffbedd',
+        [2] = '#ff9bce',
+        [3] = '#f778ba',
+        [4] = '#db61a2',
+        [5] = '#bf4b8a',
+        [6] = '#9e3670',
+        [7] = '#7d2457',
+        [8] = '#5e103e',
+        [9] = '#42062a',
+      }),
+      yellow = m({
+        [0] = '#f8e3a1',
+        [1] = '#f2cc60',
+        [2] = '#e3b341',
+        [3] = '#d29922',
+        [4] = '#bb8009',
+        [5] = '#9e6a03',
+        [6] = '#845306',
+        [7] = '#693e00',
+        [8] = '#4b2900',
+        [9] = '#341a00',
+      }),
+      neutral = m({
+        [0] = '#f0f6fc',
+        [1] = '#c9d1d9',
+        [2] = '#b1bac4',
+        [3] = '#8b949e',
+        [4] = '#6e7681',
+        [5] = '#484f58',
+        [6] = '#30363d',
+        [7] = '#21262d',
+        [8] = '#161b22',
+        [9] = '#0d1117',
+      }),
+      orange = m({
+        [0] = '#ffdfb6',
+        [1] = '#ffc680',
+        [2] = '#ffa657',
+        [3] = '#f0883e',
+        [4] = '#db6d28',
+        [5] = '#bd561d',
+        [6] = '#9b4215',
+        [7] = '#762d0a',
+        [8] = '#5a1e02',
+        [9] = '#3d1300',
+      }),
+      red = m({
+        [0] = '#ffdcd7',
+        [1] = '#ffc1ba',
+        [2] = '#ffa198',
+        [3] = '#ff7b72',
+        [4] = '#f85149',
+        [5] = '#da3633',
+        [6] = '#b62324',
+        [7] = '#8e1519',
+        [8] = '#67060c',
+        [9] = '#490202',
+      }),
+      black = '#010409',
+      transparent = '#00000000',
+      purple = m({
+        [0] = '#eddeff',
+        [1] = '#e2c5ff',
+        [2] = '#d2a8ff',
+        [3] = '#be8fff',
+        [4] = '#ab7df8',
+        [5] = '#8957e5',
+        [6] = '#6e40c9',
+        [7] = '#553098',
+        [8] = '#3c1e70',
+        [9] = '#271052',
+      }),
+      coral = m({
+        [0] = '#ffddd2',
+        [1] = '#ffc2b2',
+        [2] = '#ffa28b',
+        [3] = '#f78166',
+        [4] = '#ea6045',
+        [5] = '#cf462d',
+        [6] = '#ac3220',
+        [7] = '#872012',
+        [8] = '#640d04',
+        [9] = '#460701',
+      }),
+      white = '#ffffff',
+      green = m({
+        [0] = '#aff5b4',
+        [1] = '#7ee787',
+        [2] = '#56d364',
+        [3] = '#3fb950',
+        [4] = '#2ea043',
+        [5] = '#238636',
+        [6] = '#196c2e',
+        [7] = '#0f5323',
+        [8] = '#033a16',
+        [9] = '#04260f',
+      }),
     }),
   }),
   borderColor = m({
-    translucent = '#ffffff26',
-    emphasis = '#484f58',
-    open = m({
-      emphasis = '#db6d28',
-      muted = '#db6d2866',
-    }),
-    transparent = '#00000000',
-    neutral = m({
-      emphasis = '#6e7681',
-      muted = '#6e768166',
-    }),
-    upsell = m({
-      emphasis = '#8957e5',
-      muted = '#ab7df866',
-    }),
     success = m({
-      emphasis = '#1f6feb',
       muted = '#388bfd66',
+      emphasis = '#1f6feb',
     }),
     sponsors = m({
-      emphasis = '#bf4b8a',
       muted = '#db61a266',
+      emphasis = '#bf4b8a',
     }),
     severe = m({
-      emphasis = '#bd561d',
       muted = '#db6d2866',
+      emphasis = '#bd561d',
     }),
+    translucent = '#ffffff26',
     muted = '#30363db3',
     done = m({
-      emphasis = '#8957e5',
       muted = '#ab7df866',
+      emphasis = '#8957e5',
     }),
     disabled = '#21262db3',
     danger = m({
-      emphasis = '#bd561d',
       muted = '#db6d2866',
+      emphasis = '#bd561d',
     }),
     closed = m({
-      emphasis = '#6e7681',
       muted = '#6e768166',
+      emphasis = '#6e7681',
     }),
-    default = '#30363d',
     attention = m({
-      emphasis = '#9e6a03',
       muted = '#bb800966',
+      emphasis = '#9e6a03',
     }),
-    accent = m({
-      emphasis = '#1f6feb',
-      muted = '#388bfd66',
-    }),
-  }),
-  avatarStack = m({
-    fade = m({
-      bgColor = m({
-        default = '#30363d',
-        muted = '#21262d',
-      }),
-    }),
-  }),
-  bgColor = m({
-    emphasis = '#6e7681',
-    inset = '#010409',
     open = m({
-      emphasis = '#bd561d',
       muted = '#db6d2866',
+      emphasis = '#db6d28',
     }),
-    transparent = '#00000000',
+    emphasis = '#484f58',
+    default = '#30363d',
     neutral = m({
-      emphasis = '#6e7681',
       muted = '#6e768166',
-    }),
-    white = '#ffffff',
-    upsell = m({
-      emphasis = '#8957e5',
-      muted = '#ab7df826',
-    }),
-    success = m({
-      emphasis = '#1f6feb',
-      muted = '#388bfd26',
-    }),
-    sponsors = m({
-      emphasis = '#bf4b8a',
-      muted = '#db61a21a',
-    }),
-    severe = m({
-      emphasis = '#bd561d',
-      muted = '#db6d281a',
-    }),
-    inverse = '#ffffff',
-    muted = '#161b22',
-    closed = m({
       emphasis = '#6e7681',
-      muted = '#6e768166',
-    }),
-    done = m({
-      emphasis = '#8957e5',
-      muted = '#ab7df826',
-    }),
-    disabled = '#21262db3',
-    danger = m({
-      emphasis = '#bd561d',
-      muted = '#db6d281a',
-    }),
-    default = '#0d1117',
-    black = '#010409',
-    attention = m({
-      emphasis = '#9e6a03',
-      muted = '#bb800926',
     }),
     accent = m({
+      muted = '#388bfd66',
       emphasis = '#1f6feb',
-      muted = '#388bfd1a',
-    }),
-  }),
-  treeViewItem = m({
-    leadingVisual = m({
-      iconColor = m({
-        rest = '#8d96a0',
-      }),
-    }),
-  }),
-  highlight = m({
-    neutral = m({
-      bgColor = '#d2992266',
-    }),
-  }),
-  topicTag = m({
-    borderColor = '#00000000',
-  }),
-  timelineBadge = m({
-    bgColor = '#21262d',
-  }),
-  card = m({
-    bgColor = '#161b22',
-  }),
-  skeletonLoader = m({
-    bgColor = '#161b22',
+    }),
+    transparent = '#00000000',
+    upsell = m({
+      muted = '#ab7df866',
+      emphasis = '#8957e5',
+    }),
   }),
-  buttonCounter = m({
-    invisible = m({
+  display = m({
+    pink = m({
+      borderColor = m({
+        muted = '#451c35',
+        emphasis = '#d34591',
+      }),
+      fgColor = '#e57bb2',
       bgColor = m({
-        rest = '#30363d',
+        muted = '#2d1524',
+        emphasis = '#d34591',
       }),
     }),
-    danger = m({
-      fgColor = m({
-        disabled = '#db6d2880',
-        rest = '#db6d28',
-        hover = '#ffffff',
+    pine = m({
+      borderColor = m({
+        muted = '#0b3224',
+        emphasis = '#18915e',
       }),
+      fgColor = '#1bb673',
       bgColor = m({
-        disabled = '#bd561d0d',
-        rest = '#49020233',
-        hover = '#ffffff33',
+        muted = '#082119',
+        emphasis = '#18915e',
       }),
     }),
-    default = m({
-      bgColor = m({
-        rest = '#30363d',
+    orange = m({
+      borderColor = m({
+        muted = '#43200a',
+        emphasis = '#c46212',
       }),
-    }),
-    primary = m({
+      fgColor = '#ed8326',
       bgColor = m({
-        rest = '#04260f33',
+        muted = '#311708',
+        emphasis = '#c46212',
       }),
     }),
-    outline = m({
-      fgColor = m({
-        disabled = '#4493f880',
-        rest = '#388bfd',
-        hover = '#58a6ff',
+    coral = m({
+      borderColor = m({
+        muted = '#58091a',
+        emphasis = '#eb3342',
       }),
+      fgColor = '#f27d83',
       bgColor = m({
-        disabled = '#1f6feb0d',
-        rest = '#051d4d33',
-        hover = '#051d4d33',
+        muted = '#3c0614',
+        emphasis = '#eb3342',
       }),
     }),
-  }),
-  outline = m({
-    focus = '#1f6feb solid 2px',
-  }),
-  sideNav = m({
-    bgColor = m({
-      selected = '#21262d',
-    }),
-  }),
-  display = m({
-    brown = m({
-      fgColor = '#b69a6d',
+    lime = m({
+      borderColor = m({
+        muted = '#1f3116',
+        emphasis = '#5f892f',
+      }),
+      fgColor = '#7dae37',
       bgColor = m({
-        emphasis = '#94774c',
-        muted = '#241c14',
+        muted = '#141f0f',
+        emphasis = '#5f892f',
       }),
+    }),
+    lemon = m({
       borderColor = m({
-        emphasis = '#94774c',
-        muted = '#342a1d',
+        muted = '#372901',
+        emphasis = '#977b0c',
+      }),
+      fgColor = '#ba9b12',
+      bgColor = m({
+        muted = '#291d00',
+        emphasis = '#977b0c',
       }),
     }),
     yellow = m({
+      borderColor = m({
+        muted = '#3d2401',
+        emphasis = '#aa7109',
+      }),
       fgColor = '#d3910d',
       bgColor = m({
-        emphasis = '#aa7109',
         muted = '#2e1a00',
-      }),
-      borderColor = m({
         emphasis = '#aa7109',
-        muted = '#3d2401',
       }),
     }),
-    orange = m({
-      fgColor = '#ed8326',
+    indigo = m({
+      borderColor = m({
+        muted = '#25215f',
+        emphasis = '#7070e1',
+      }),
+      fgColor = '#9899ec',
       bgColor = m({
-        emphasis = '#c46212',
-        muted = '#311708',
+        muted = '#1b183f',
+        emphasis = '#7070e1',
       }),
+    }),
+    auburn = m({
       borderColor = m({
-        emphasis = '#c46212',
-        muted = '#43200a',
+        muted = '#3a2422',
+        emphasis = '#a86f6b',
+      }),
+      fgColor = '#bf9592',
+      bgColor = m({
+        muted = '#271817',
+        emphasis = '#a86f6b',
       }),
     }),
     teal = m({
+      borderColor = m({
+        muted = '#073036',
+        emphasis = '#158a8a',
+      }),
       fgColor = '#1cb0ab',
       bgColor = m({
-        emphasis = '#158a8a',
         muted = '#041f25',
-      }),
-      borderColor = m({
         emphasis = '#158a8a',
-        muted = '#073036',
       }),
     }),
-    olive = m({
-      fgColor = '#a2a626',
+    green = m({
+      borderColor = m({
+        muted = '#182f1f',
+        emphasis = '#388f3f',
+      }),
+      fgColor = '#41b445',
       bgColor = m({
-        emphasis = '#7a8321',
-        muted = '#171e0b',
+        muted = '#122117',
+        emphasis = '#388f3f',
       }),
+    }),
+    blue = m({
       borderColor = m({
-        emphasis = '#7a8321',
-        muted = '#252d10',
+        muted = '#002766',
+        emphasis = '#0576ff',
+      }),
+      fgColor = '#4da0ff',
+      bgColor = m({
+        muted = '#001a47',
+        emphasis = '#0576ff',
       }),
     }),
     red = m({
+      borderColor = m({
+        muted = '#58091a',
+        emphasis = '#eb3342',
+      }),
       fgColor = '#f27d83',
       bgColor = m({
-        emphasis = '#eb3342',
         muted = '#3c0614',
-      }),
-      borderColor = m({
         emphasis = '#eb3342',
-        muted = '#58091a',
       }),
     }),
-    lime = m({
-      fgColor = '#7dae37',
+    gray = m({
+      borderColor = m({
+        muted = '#2a2b2d',
+        emphasis = '#6e7f96',
+      }),
+      fgColor = '#92a1b5',
       bgColor = m({
-        emphasis = '#5f892f',
-        muted = '#141f0f',
+        muted = '#1c1c1c',
+        emphasis = '#6e7f96',
       }),
+    }),
+    brown = m({
       borderColor = m({
-        emphasis = '#5f892f',
-        muted = '#1f3116',
+        muted = '#342a1d',
+        emphasis = '#94774c',
+      }),
+      fgColor = '#b69a6d',
+      bgColor = m({
+        muted = '#241c14',
+        emphasis = '#94774c',
       }),
     }),
     purple = m({
+      borderColor = m({
+        muted = '#31146b',
+        emphasis = '#975bf1',
+      }),
       fgColor = '#b687f7',
       bgColor = m({
-        emphasis = '#975bf1',
         muted = '#211047',
-      }),
-      borderColor = m({
         emphasis = '#975bf1',
-        muted = '#31146b',
       }),
     }),
-    lemon = m({
-      fgColor = '#ba9b12',
+    cyan = m({
+      borderColor = m({
+        muted = '#002e3d',
+        emphasis = '#0587b3',
+      }),
+      fgColor = '#07ace4',
       bgColor = m({
-        emphasis = '#977b0c',
-        muted = '#291d00',
+        muted = '#001f29',
+        emphasis = '#0587b3',
       }),
+    }),
+    olive = m({
       borderColor = m({
-        emphasis = '#977b0c',
-        muted = '#372901',
+        muted = '#252d10',
+        emphasis = '#7a8321',
+      }),
+      fgColor = '#a2a626',
+      bgColor = m({
+        muted = '#171e0b',
+        emphasis = '#7a8321',
       }),
     }),
     plum = m({
+      borderColor = m({
+        muted = '#40125e',
+        emphasis = '#b643ef',
+      }),
       fgColor = '#d07ef7',
       bgColor = m({
-        emphasis = '#b643ef',
         muted = '#2a0e3f',
-      }),
-      borderColor = m({
         emphasis = '#b643ef',
-        muted = '#40125e',
       }),
     }),
-    indigo = m({
-      fgColor = '#9899ec',
-      bgColor = m({
-        emphasis = '#7070e1',
-        muted = '#1b183f',
+  }),
+  data = m({
+    blue = m({
+      color = m({
+        muted = '#001a47',
+        default = '#0576ff',
       }),
-      borderColor = m({
-        emphasis = '#7070e1',
-        muted = '#25215f',
+    }),
+    pink = m({
+      color = m({
+        muted = '#2d1524',
+        default = '#d34591',
+      }),
+    }),
+    yellow = m({
+      color = m({
+        muted = '#2e1a00',
+        default = '#895906',
+      }),
+    }),
+    auburn = m({
+      color = m({
+        muted = '#271817',
+        default = '#a86f6b',
       }),
     }),
-    pink = m({
-      fgColor = '#e57bb2',
-      bgColor = m({
-        emphasis = '#d34591',
-        muted = '#2d1524',
-      }),
-      borderColor = m({
-        emphasis = '#d34591',
-        muted = '#451c35',
+    teal = m({
+      color = m({
+        muted = '#041f25',
+        default = '#106c70',
       }),
     }),
     green = m({
-      fgColor = '#41b445',
-      bgColor = m({
-        emphasis = '#388f3f',
+      color = m({
         muted = '#122117',
-      }),
-      borderColor = m({
-        emphasis = '#388f3f',
-        muted = '#182f1f',
+        default = '#2f6f37',
       }),
     }),
-    pine = m({
-      fgColor = '#1bb673',
-      bgColor = m({
-        emphasis = '#18915e',
-        muted = '#082119',
+    orange = m({
+      color = m({
+        muted = '#311708',
+        default = '#984b10',
       }),
-      borderColor = m({
-        emphasis = '#18915e',
-        muted = '#0b3224',
+    }),
+    red = m({
+      color = m({
+        muted = '#3c0614',
+        default = '#eb3342',
       }),
     }),
     gray = m({
-      fgColor = '#92a1b5',
-      bgColor = m({
-        emphasis = '#6e7f96',
+      color = m({
         muted = '#1c1c1c',
+        default = '#576270',
       }),
-      borderColor = m({
-        emphasis = '#6e7f96',
-        muted = '#2a2b2d',
+    }),
+    purple = m({
+      color = m({
+        muted = '#211047',
+        default = '#975bf1',
       }),
     }),
-    cyan = m({
-      fgColor = '#07ace4',
+  }),
+  counter = m({
+    borderColor = '#00000000',
+  }),
+  control = m({
+    danger = m({
       bgColor = m({
-        emphasis = '#0587b3',
-        muted = '#001f29',
+        active = '#db6d2866',
+        hover = '#db6d281a',
       }),
-      borderColor = m({
-        emphasis = '#0587b3',
-        muted = '#002e3d',
+      fgColor = m({
+        hover = '#f0883e',
+        rest = '#db6d28',
       }),
     }),
-    auburn = m({
-      fgColor = '#bf9592',
+    bgColor = m({
+      active = '#31363e',
+      selected = '#161b22',
+      rest = '#21262d',
+      hover = '#292e36',
+      disabled = '#21262db3',
+    }),
+    transparent = m({
+      borderColor = m({
+        active = '#00000000',
+        rest = '#00000000',
+        hover = '#00000000',
+      }),
       bgColor = m({
-        emphasis = '#a86f6b',
-        muted = '#271817',
+        active = '#b1bac433',
+        selected = '#b1bac414',
+        rest = '#00000000',
+        hover = '#b1bac41f',
+        disabled = '#21262db3',
       }),
+    }),
+    borderColor = m({
+      success = '#1f6feb',
+      selected = '#f0f6fc',
+      rest = '#30363d',
+      danger = '#bd561d',
+      emphasis = '#666e79',
+      warning = '#9e6a03',
+      disabled = '#21262db3',
+    }),
+    iconColor = m({
+      rest = '#8d96a0',
+    }),
+    fgColor = m({
+      disabled = '#6e7681',
+      rest = '#c9d1d9',
+      placeholder = '#858e98',
+    }),
+    checked = m({
       borderColor = m({
-        emphasis = '#a86f6b',
-        muted = '#3a2422',
+        disabled = '#6e7681',
+        active = '#3685f3',
+        rest = '#1f6feb',
+        hover = '#2a7aef',
+      }),
+      fgColor = m({
+        disabled = '#010409',
+        rest = '#ffffff',
       }),
-    }),
-    coral = m({
-      fgColor = '#f27d83',
       bgColor = m({
-        emphasis = '#eb3342',
-        muted = '#3c0614',
+        disabled = '#6e7681',
+        active = '#3685f3',
+        rest = '#1f6feb',
+        hover = '#2a7aef',
       }),
-      borderColor = m({
-        emphasis = '#eb3342',
-        muted = '#58091a',
+    }),
+  }),
+  color = m({
+    prettylights = m({
+      syntax = m({
+        comment = '#8b949e',
+        carriage = m({
+          ['return'] = m({
+            text = '#f0f6fc',
+            bg = '#9b4215',
+          }),
+        }),
+        storage = m({
+          modifier = m({
+            import = '#c9d1d9',
+          }),
+        }),
+        brackethighlighter = m({
+          unmatched = '#db6d28',
+          angle = '#8b949e',
+        }),
+        keyword = '#f0883e',
+        invalid = m({
+          illegal = m({
+            text = '#f0f6fc',
+            bg = '#762d0a',
+          }),
+        }),
+        variable = '#ffa657',
+        meta = m({
+          diff = m({
+            range = '#d2a8ff',
+          }),
+        }),
+        string = m({
+          regexp = '#a5d6ff',
+          default = '#a5d6ff',
+        }),
+        entity = m({
+          tag = '#a5d6ff',
+          default = '#d2a8ff',
+        }),
+        constant = m({
+          other = m({
+            reference = m({
+              link = '#a5d6ff',
+            }),
+          }),
+          default = '#79c0ff',
+        }),
+        sublimelinter = m({
+          gutter = m({
+            mark = '#484f58',
+          }),
+        }),
+        markup = m({
+          list = '#f2cc60',
+          deleted = m({
+            text = '#ffdfb6',
+            bg = '#5a1e02',
+          }),
+          italic = '#c9d1d9',
+          changed = m({
+            text = '#ffdfb6',
+            bg = '#5a1e02',
+          }),
+          inserted = m({
+            text = '#cae8ff',
+            bg = '#0c2d6b',
+          }),
+          bold = '#c9d1d9',
+          heading = '#1f6feb',
+          ignored = m({
+            text = '#c9d1d9',
+            bg = '#1158c7',
+          }),
+        }),
       }),
     }),
-    blue = m({
-      fgColor = '#4da0ff',
-      bgColor = m({
-        emphasis = '#0576ff',
-        muted = '#001a47',
+    ansi = m({
+      blue = m({
+        default = '#58a6ff',
+        bright = '#79c0ff',
       }),
-      borderColor = m({
-        emphasis = '#0576ff',
-        muted = '#002766',
+      yellow = m({
+        default = '#d29922',
+        bright = '#e3b341',
+      }),
+      green = m({
+        default = '#58a6ff',
+        bright = '#79c0ff',
+      }),
+      red = m({
+        default = '#f0883e',
+        bright = '#ffa657',
+      }),
+      magenta = m({
+        default = '#be8fff',
+        bright = '#d2a8ff',
+      }),
+      black = m({
+        default = '#484f58',
+        bright = '#6e7681',
+      }),
+      cyan = m({
+        default = '#39c5cf',
+        bright = '#56d4dd',
+      }),
+      white = m({
+        default = '#b1bac4',
+        bright = '#ffffff',
       }),
+      gray = '#6e7681',
+    }),
+  }),
+  highlight = m({
+    neutral = m({
+      bgColor = '#d2992266',
     }),
   }),
 })
diff --git a/lua/github-theme/palette/primitives/dark_dimmed.lua b/lua/github-theme/palette/primitives/dark_dimmed.lua
index 7f0dd81..05c1c8e 100644
--- a/lua/github-theme/palette/primitives/dark_dimmed.lua
+++ b/lua/github-theme/palette/primitives/dark_dimmed.lua
@@ -11,240 +11,441 @@ local function m(tbl)
   return setmetatable(tbl, mt)
 end
 local M = m({
-  scale = m({
-    green = m({
-      [1] = '#b4f1b4',
-      [2] = '#8ddb8c',
-      [3] = '#6bc46d',
-      [4] = '#57ab5a',
-      [5] = '#46954a',
-      [6] = '#347d39',
-      [7] = '#2b6a30',
-      [8] = '#245829',
-      [9] = '#1b4721',
-      [10] = '#113417',
+  topicTag = m({
+    borderColor = '#00000000',
+  }),
+  timelineBadge = m({
+    bgColor = '#373e47',
+  }),
+  bgColor = m({
+    sponsors = m({
+      emphasis = '#ae4c82',
+      muted = '#c961981a',
     }),
-    orange = m({
-      [1] = '#ffddb0',
-      [2] = '#ffbc6f',
-      [3] = '#f69d50',
-      [4] = '#e0823d',
-      [5] = '#cc6b2c',
-      [6] = '#ae5622',
-      [7] = '#94471b',
-      [8] = '#7f3913',
-      [9] = '#682d0f',
-      [10] = '#4d210c',
+    severe = m({
+      emphasis = '#ae5622',
+      muted = '#cc6b2c1a',
+    }),
+    muted = '#2d333b',
+    done = m({
+      emphasis = '#8256d0',
+      muted = '#986ee226',
+    }),
+    disabled = '#373e47b3',
+    danger = m({
+      emphasis = '#c93c37',
+      muted = '#e5534b1a',
+    }),
+    closed = m({
+      emphasis = '#c93c37',
+      muted = '#e5534b26',
     }),
+    black = '#1c2128',
     transparent = '#00000000',
-    white = '#cdd9e5',
+    accent = m({
+      emphasis = '#316dca',
+      muted = '#4184e41a',
+    }),
+    inset = '#1c2128',
+    emphasis = '#636e7b',
     neutral = m({
-      [1] = '#cdd9e5',
-      [2] = '#adbac7',
-      [3] = '#909dab',
-      [4] = '#768390',
-      [5] = '#636e7b',
-      [6] = '#545d68',
-      [7] = '#444c56',
-      [8] = '#373e47',
-      [9] = '#2d333b',
-      [10] = '#22272e',
+      emphasis = '#636e7b',
+      muted = '#636e7b66',
     }),
-    coral = m({
-      [1] = '#ffdacf',
-      [2] = '#ffb9a5',
-      [3] = '#f79981',
-      [4] = '#ec775c',
-      [5] = '#de5b41',
-      [6] = '#c2442d',
-      [7] = '#a93524',
-      [8] = '#8d291b',
-      [9] = '#771d13',
-      [10] = '#5d1008',
+    attention = m({
+      emphasis = '#966600',
+      muted = '#ae7c1426',
     }),
-    purple = m({
-      [1] = '#eedcff',
-      [2] = '#dcbdfb',
-      [3] = '#dcbdfb',
-      [4] = '#b083f0',
-      [5] = '#986ee2',
-      [6] = '#8256d0',
-      [7] = '#6b44bc',
-      [8] = '#5936a2',
-      [9] = '#472c82',
-      [10] = '#352160',
+    inverse = '#cdd9e5',
+    upsell = m({
+      emphasis = '#8256d0',
+      muted = '#986ee226',
     }),
-    pink = m({
-      [1] = '#ffd7eb',
-      [2] = '#ffb3d8',
-      [3] = '#fc8dc7',
-      [4] = '#e275ad',
-      [5] = '#c96198',
-      [6] = '#ae4c82',
-      [7] = '#983b6e',
-      [8] = '#7e325a',
-      [9] = '#69264a',
-      [10] = '#551639',
+    open = m({
+      emphasis = '#347d39',
+      muted = '#46954a1a',
     }),
-    yellow = m({
-      [1] = '#fbe090',
-      [2] = '#eac55f',
-      [3] = '#daaa3f',
-      [4] = '#c69026',
-      [5] = '#ae7c14',
-      [6] = '#966600',
-      [7] = '#805400',
-      [8] = '#6c4400',
-      [9] = '#593600',
-      [10] = '#452700',
+    white = '#cdd9e5',
+    default = '#22272e',
+    success = m({
+      emphasis = '#347d39',
+      muted = '#46954a26',
     }),
-    red = m({
-      [1] = '#ffd8d3',
-      [2] = '#ffb8b0',
-      [3] = '#ff938a',
-      [4] = '#f47067',
-      [5] = '#e5534b',
-      [6] = '#c93c37',
-      [7] = '#ad2e2c',
-      [8] = '#922323',
-      [9] = '#78191b',
-      [10] = '#5d0f12',
+  }),
+  skeletonLoader = m({
+    bgColor = '#2d333b',
+  }),
+  controlKnob = m({
+    borderColor = m({
+      checked = '#316dca',
+      disabled = '#373e47b3',
+      rest = '#606b77',
     }),
-    black = '#1c2128',
-    blue = m({
-      [1] = '#c6e6ff',
-      [2] = '#96d0ff',
-      [3] = '#6cb6ff',
-      [4] = '#539bf5',
-      [5] = '#4184e4',
-      [6] = '#316dca',
-      [7] = '#255ab2',
-      [8] = '#1b4b91',
-      [9] = '#143d79',
-      [10] = '#0f2d5c',
+    bgColor = m({
+      checked = '#cdd9e5',
+      disabled = '#373e47b3',
+      rest = '#1c2128',
     }),
   }),
-  diffBlob = m({
-    expander = m({
-      iconColor = '#c5d1de',
+  sideNav = m({
+    bgColor = m({
+      selected = '#373e47',
     }),
-    deletion = m({
-      fgColor = m({
-        text = '#c5d1de',
-        num = '#c5d1de',
+  }),
+  control = m({
+    fgColor = m({
+      disabled = '#636e7b',
+      placeholder = '#727f8c',
+      rest = '#adbac7',
+    }),
+    transparent = m({
+      borderColor = m({
+        active = '#00000000',
+        rest = '#00000000',
+        hover = '#00000000',
       }),
       bgColor = m({
-        word = '#e5534b66',
-        line = '#e5534b26',
-        num = '#e5534b4d',
+        hover = '#909dab1f',
+        selected = '#909dab14',
+        active = '#909dab33',
+        disabled = '#373e47b3',
+        rest = '#00000000',
       }),
     }),
-    hunk = m({
-      bgColor = m({
-        num = '#4184e466',
-      }),
+    bgColor = m({
+      hover = '#3d444e',
+      selected = '#2d333b',
+      active = '#434a54',
+      disabled = '#373e47b3',
+      rest = '#373e47',
     }),
-    addition = m({
+    borderColor = m({
+      danger = '#c93c37',
+      disabled = '#373e47b3',
+      emphasis = '#606b77',
+      success = '#347d39',
+      warning = '#966600',
+      selected = '#cdd9e5',
+      rest = '#444c56',
+    }),
+    iconColor = m({
+      rest = '#778491',
+    }),
+    checked = m({
+      borderColor = m({
+        rest = '#316dca',
+        active = '#3f7fdb',
+        disabled = '#636e7b',
+        hover = '#3876d3',
+      }),
       fgColor = m({
-        text = '#c5d1de',
-        num = '#c5d1de',
+        disabled = '#1c2128',
+        rest = '#cdd9e5',
       }),
       bgColor = m({
-        word = '#46954a66',
-        line = '#46954a26',
-        num = '#57ab5a4d',
+        rest = '#316dca',
+        active = '#3f7fdb',
+        disabled = '#636e7b',
+        hover = '#3876d3',
       }),
     }),
-  }),
-  base = m({
-    color = m({
-      green = m({
-        [0] = '#b4f1b4',
-        [1] = '#8ddb8c',
-        [2] = '#6bc46d',
-        [3] = '#57ab5a',
-        [4] = '#46954a',
-        [5] = '#347d39',
-        [6] = '#2b6a30',
-        [7] = '#245829',
-        [8] = '#1b4721',
-        [9] = '#113417',
+    danger = m({
+      bgColor = m({
+        active = '#e5534b66',
+        hover = '#e5534b1a',
       }),
-      orange = m({
-        [0] = '#ffddb0',
-        [1] = '#ffbc6f',
-        [2] = '#f69d50',
-        [3] = '#e0823d',
-        [4] = '#cc6b2c',
-        [5] = '#ae5622',
-        [6] = '#94471b',
-        [7] = '#7f3913',
-        [8] = '#682d0f',
-        [9] = '#4d210c',
+      fgColor = m({
+        hover = '#f47067',
+        rest = '#e5534b',
       }),
-      transparent = '#00000000',
-      neutral = m({
-        [0] = '#cdd9e5',
-        [1] = '#adbac7',
-        [2] = '#909dab',
-        [3] = '#768390',
-        [4] = '#636e7b',
-        [5] = '#545d68',
-        [6] = '#444c56',
-        [7] = '#373e47',
-        [8] = '#2d333b',
-        [9] = '#22272e',
+    }),
+  }),
+  shadow = m({
+    floating = m({
+      xlarge = '0px 0px 0px 1px #444c56, 0px 32px 64px 0px #1c2128',
+      legacy = '0px 6px 12px -3px #1c212866, 0px 6px 18px 0px #1c212866',
+      large = '0px 0px 0px 1px #444c56, 0px 24px 48px 0px #1c2128',
+      small = '0px 0px 0px 1px #444c56, 0px 6px 12px -3px #1c212866, 0px 6px 18px 0px #1c212866',
+      medium = '0px 0px 0px 1px #444c56, 0px 8px 16px -4px #1c212866, 0px 4px 32px -4px #1c212866, 0px 24px 48px -12px #1c212866, 0px 48px 96px -24px #1c212866',
+    }),
+    inset = 'inset 0px 1px 0px 0px #1c21283d',
+    resting = m({
+      small = '0px 1px 0px 0px #1c212866',
+      xsmall = '0px 1px 0px 0px #1c2128cc',
+      medium = '0px 3px 6px 0px #1c2128cc',
+    }),
+  }),
+  codeMirror = m({
+    lineNumber = m({
+      fgColor = '#778491',
+    }),
+    bgColor = '#22272e',
+    gutters = m({
+      bgColor = '#22272e',
+    }),
+    gutterMarker = m({
+      fgColor = m({
+        default = '#22272e',
+        muted = '#778491',
       }),
-      black = '#1c2128',
-      coral = m({
-        [0] = '#ffdacf',
-        [1] = '#ffb9a5',
-        [2] = '#f79981',
-        [3] = '#ec775c',
-        [4] = '#de5b41',
-        [5] = '#c2442d',
-        [6] = '#a93524',
-        [7] = '#8d291b',
-        [8] = '#771d13',
-        [9] = '#5d1008',
+    }),
+    cursor = m({
+      fgColor = '#c5d1de',
+    }),
+    fgColor = '#c5d1de',
+    syntax = m({
+      fgColor = m({
+        variable = '#f69d50',
+        entity = '#dcbdfb',
+        storage = '#f47067',
+        string = '#96d0ff',
+        support = '#6cb6ff',
+        keyword = '#f47067',
+        constant = '#6cb6ff',
+        comment = '#768390',
       }),
-      white = '#cdd9e5',
-      pink = m({
-        [0] = '#ffd7eb',
-        [1] = '#ffb3d8',
-        [2] = '#fc8dc7',
-        [3] = '#e275ad',
-        [4] = '#c96198',
-        [5] = '#ae4c82',
-        [6] = '#983b6e',
-        [7] = '#7e325a',
-        [8] = '#69264a',
-        [9] = '#551639',
+    }),
+    activeline = m({
+      bgColor = '#636e7b66',
+    }),
+    lines = m({
+      bgColor = '#22272e',
+    }),
+    selection = m({
+      bgColor = '#4184e466',
+    }),
+    matchingBracket = m({
+      fgColor = '#c5d1de',
+    }),
+  }),
+  scale = m({
+    purple = m({
+      [1] = '#eedcff',
+      [2] = '#dcbdfb',
+      [3] = '#dcbdfb',
+      [4] = '#b083f0',
+      [5] = '#986ee2',
+      [6] = '#8256d0',
+      [7] = '#6b44bc',
+      [8] = '#5936a2',
+      [9] = '#472c82',
+      [10] = '#352160',
+    }),
+    red = m({
+      [1] = '#ffd8d3',
+      [2] = '#ffb8b0',
+      [3] = '#ff938a',
+      [4] = '#f47067',
+      [5] = '#e5534b',
+      [6] = '#c93c37',
+      [7] = '#ad2e2c',
+      [8] = '#922323',
+      [9] = '#78191b',
+      [10] = '#5d0f12',
+    }),
+    neutral = m({
+      [1] = '#cdd9e5',
+      [2] = '#adbac7',
+      [3] = '#909dab',
+      [4] = '#768390',
+      [5] = '#636e7b',
+      [6] = '#545d68',
+      [7] = '#444c56',
+      [8] = '#373e47',
+      [9] = '#2d333b',
+      [10] = '#22272e',
+    }),
+    yellow = m({
+      [1] = '#fbe090',
+      [2] = '#eac55f',
+      [3] = '#daaa3f',
+      [4] = '#c69026',
+      [5] = '#ae7c14',
+      [6] = '#966600',
+      [7] = '#805400',
+      [8] = '#6c4400',
+      [9] = '#593600',
+      [10] = '#452700',
+    }),
+    pink = m({
+      [1] = '#ffd7eb',
+      [2] = '#ffb3d8',
+      [3] = '#fc8dc7',
+      [4] = '#e275ad',
+      [5] = '#c96198',
+      [6] = '#ae4c82',
+      [7] = '#983b6e',
+      [8] = '#7e325a',
+      [9] = '#69264a',
+      [10] = '#551639',
+    }),
+    black = '#1c2128',
+    coral = m({
+      [1] = '#ffdacf',
+      [2] = '#ffb9a5',
+      [3] = '#f79981',
+      [4] = '#ec775c',
+      [5] = '#de5b41',
+      [6] = '#c2442d',
+      [7] = '#a93524',
+      [8] = '#8d291b',
+      [9] = '#771d13',
+      [10] = '#5d1008',
+    }),
+    green = m({
+      [1] = '#b4f1b4',
+      [2] = '#8ddb8c',
+      [3] = '#6bc46d',
+      [4] = '#57ab5a',
+      [5] = '#46954a',
+      [6] = '#347d39',
+      [7] = '#2b6a30',
+      [8] = '#245829',
+      [9] = '#1b4721',
+      [10] = '#113417',
+    }),
+    orange = m({
+      [1] = '#ffddb0',
+      [2] = '#ffbc6f',
+      [3] = '#f69d50',
+      [4] = '#e0823d',
+      [5] = '#cc6b2c',
+      [6] = '#ae5622',
+      [7] = '#94471b',
+      [8] = '#7f3913',
+      [9] = '#682d0f',
+      [10] = '#4d210c',
+    }),
+    white = '#cdd9e5',
+    blue = m({
+      [1] = '#c6e6ff',
+      [2] = '#96d0ff',
+      [3] = '#6cb6ff',
+      [4] = '#539bf5',
+      [5] = '#4184e4',
+      [6] = '#316dca',
+      [7] = '#255ab2',
+      [8] = '#1b4b91',
+      [9] = '#143d79',
+      [10] = '#0f2d5c',
+    }),
+    transparent = '#00000000',
+  }),
+  color = m({
+    ansi = m({
+      blue = m({
+        bright = '#6cb6ff',
+        default = '#539bf5',
+      }),
+      cyan = m({
+        bright = '#56d4dd',
+        default = '#39c5cf',
+      }),
+      magenta = m({
+        bright = '#dcbdfb',
+        default = '#b083f0',
+      }),
+      black = m({
+        bright = '#636e7b',
+        default = '#545d68',
+      }),
+      green = m({
+        bright = '#6bc46d',
+        default = '#57ab5a',
       }),
       yellow = m({
-        [0] = '#fbe090',
-        [1] = '#eac55f',
-        [2] = '#daaa3f',
-        [3] = '#c69026',
-        [4] = '#ae7c14',
-        [5] = '#966600',
-        [6] = '#805400',
-        [7] = '#6c4400',
-        [8] = '#593600',
-        [9] = '#452700',
+        bright = '#daaa3f',
+        default = '#c69026',
       }),
       red = m({
-        [0] = '#ffd8d3',
-        [1] = '#ffb8b0',
-        [2] = '#ff938a',
-        [3] = '#f47067',
-        [4] = '#e5534b',
-        [5] = '#c93c37',
-        [6] = '#ad2e2c',
-        [7] = '#922323',
-        [8] = '#78191b',
-        [9] = '#5d0f12',
+        bright = '#ff938a',
+        default = '#f47067',
+      }),
+      gray = '#636e7b',
+      white = m({
+        bright = '#cdd9e5',
+        default = '#909dab',
+      }),
+    }),
+    prettylights = m({
+      syntax = m({
+        carriage = m({
+          ['return'] = m({
+            bg = '#ad2e2c',
+            text = '#cdd9e5',
+          }),
+        }),
+        storage = m({
+          modifier = m({
+            import = '#adbac7',
+          }),
+        }),
+        brackethighlighter = m({
+          angle = '#768390',
+          unmatched = '#e5534b',
+        }),
+        meta = m({
+          diff = m({
+            range = '#dcbdfb',
+          }),
+        }),
+        invalid = m({
+          illegal = m({
+            bg = '#922323',
+            text = '#cdd9e5',
+          }),
+        }),
+        variable = '#f69d50',
+        keyword = '#f47067',
+        entity = m({
+          default = '#dcbdfb',
+          tag = '#8ddb8c',
+        }),
+        string = m({
+          default = '#96d0ff',
+          regexp = '#8ddb8c',
+        }),
+        constant = m({
+          default = '#6cb6ff',
+          other = m({
+            reference = m({
+              link = '#96d0ff',
+            }),
+          }),
+        }),
+        sublimelinter = m({
+          gutter = m({
+            mark = '#545d68',
+          }),
+        }),
+        markup = m({
+          deleted = m({
+            bg = '#78191b',
+            text = '#ffd8d3',
+          }),
+          italic = '#adbac7',
+          changed = m({
+            bg = '#682d0f',
+            text = '#ffddb0',
+          }),
+          inserted = m({
+            bg = '#1b4721',
+            text = '#b4f1b4',
+          }),
+          bold = '#adbac7',
+          heading = '#316dca',
+          ignored = m({
+            bg = '#255ab2',
+            text = '#adbac7',
+          }),
+          list = '#eac55f',
+        }),
+        comment = '#768390',
       }),
+    }),
+  }),
+  base = m({
+    color = m({
       purple = m({
         [0] = '#eedcff',
         [1] = '#dcbdfb',
@@ -257,6 +458,42 @@ local M = m({
         [8] = '#472c82',
         [9] = '#352160',
       }),
+      coral = m({
+        [0] = '#ffdacf',
+        [1] = '#ffb9a5',
+        [2] = '#f79981',
+        [3] = '#ec775c',
+        [4] = '#de5b41',
+        [5] = '#c2442d',
+        [6] = '#a93524',
+        [7] = '#8d291b',
+        [8] = '#771d13',
+        [9] = '#5d1008',
+      }),
+      neutral = m({
+        [0] = '#cdd9e5',
+        [1] = '#adbac7',
+        [2] = '#909dab',
+        [3] = '#768390',
+        [4] = '#636e7b',
+        [5] = '#545d68',
+        [6] = '#444c56',
+        [7] = '#373e47',
+        [8] = '#2d333b',
+        [9] = '#22272e',
+      }),
+      yellow = m({
+        [0] = '#fbe090',
+        [1] = '#eac55f',
+        [2] = '#daaa3f',
+        [3] = '#c69026',
+        [4] = '#ae7c14',
+        [5] = '#966600',
+        [6] = '#805400',
+        [7] = '#6c4400',
+        [8] = '#593600',
+        [9] = '#452700',
+      }),
       blue = m({
         [0] = '#c6e6ff',
         [1] = '#96d0ff',
@@ -269,9 +506,121 @@ local M = m({
         [8] = '#143d79',
         [9] = '#0f2d5c',
       }),
+      black = '#1c2128',
+      transparent = '#00000000',
+      green = m({
+        [0] = '#b4f1b4',
+        [1] = '#8ddb8c',
+        [2] = '#6bc46d',
+        [3] = '#57ab5a',
+        [4] = '#46954a',
+        [5] = '#347d39',
+        [6] = '#2b6a30',
+        [7] = '#245829',
+        [8] = '#1b4721',
+        [9] = '#113417',
+      }),
+      orange = m({
+        [0] = '#ffddb0',
+        [1] = '#ffbc6f',
+        [2] = '#f69d50',
+        [3] = '#e0823d',
+        [4] = '#cc6b2c',
+        [5] = '#ae5622',
+        [6] = '#94471b',
+        [7] = '#7f3913',
+        [8] = '#682d0f',
+        [9] = '#4d210c',
+      }),
+      white = '#cdd9e5',
+      pink = m({
+        [0] = '#ffd7eb',
+        [1] = '#ffb3d8',
+        [2] = '#fc8dc7',
+        [3] = '#e275ad',
+        [4] = '#c96198',
+        [5] = '#ae4c82',
+        [6] = '#983b6e',
+        [7] = '#7e325a',
+        [8] = '#69264a',
+        [9] = '#551639',
+      }),
+      red = m({
+        [0] = '#ffd8d3',
+        [1] = '#ffb8b0',
+        [2] = '#ff938a',
+        [3] = '#f47067',
+        [4] = '#e5534b',
+        [5] = '#c93c37',
+        [6] = '#ad2e2c',
+        [7] = '#922323',
+        [8] = '#78191b',
+        [9] = '#5d0f12',
+      }),
     }),
     display = m({
       color = m({
+        lime = m({
+          [0] = '#141f0f',
+          [1] = '#1f3116',
+          [2] = '#2c441d',
+          [3] = '#375421',
+          [4] = '#496c28',
+          [5] = '#5f892f',
+          [6] = '#7dae37',
+          [7] = '#89ba36',
+          [8] = '#9fcc3e',
+          [9] = '#bcda67',
+        }),
+        lemon = m({
+          [0] = '#291d00',
+          [1] = '#372901',
+          [2] = '#4f3c02',
+          [3] = '#614c05',
+          [4] = '#786008',
+          [5] = '#977b0c',
+          [6] = '#ba9b12',
+          [7] = '#c4a717',
+          [8] = '#d7bc1d',
+          [9] = '#e3d04f',
+        }),
+        cyan = m({
+          [0] = '#001f29',
+          [1] = '#002e3d',
+          [2] = '#014156',
+          [3] = '#02536f',
+          [4] = '#036a8c',
+          [5] = '#0587b3',
+          [6] = '#07ace4',
+          [7] = '#09b7f1',
+          [8] = '#45cbf7',
+          [9] = '#80dbf9',
+        }),
+        indigo = m({
+          [0] = '#1b183f',
+          [1] = '#25215f',
+          [2] = '#312c90',
+          [3] = '#3935c0',
+          [4] = '#514ed4',
+          [5] = '#7070e1',
+          [6] = '#9899ec',
+          [7] = '#a2a5f1',
+          [8] = '#b7baf6',
+          [9] = '#c8cbf9',
+        }),
+        black = '#0d1117',
+        teal = m({
+          [0] = '#041f25',
+          [1] = '#073036',
+          [2] = '#0a464d',
+          [3] = '#0c555a',
+          [4] = '#106c70',
+          [5] = '#158a8a',
+          [6] = '#1cb0ab',
+          [7] = '#1fbdb2',
+          [8] = '#24d6c4',
+          [9] = '#5fe3d1',
+        }),
         green = m({
           [0] = '#122117',
           [1] = '#182f1f',
@@ -284,7 +633,6 @@ local M = m({
           [8] = '#75d36f',
           [9] = '#99e090',
         }),
-        black = '#0d1117',
         red = m({
           [0] = '#3c0614',
           [1] = '#58091a',
@@ -321,18 +669,6 @@ local M = m({
           [8] = '#d2affd',
           [9] = '#e1c7ff',
         }),
-        cyan = m({
-          [0] = '#001f29',
-          [1] = '#002e3d',
-          [2] = '#014156',
-          [3] = '#02536f',
-          [4] = '#036a8c',
-          [5] = '#0587b3',
-          [6] = '#07ace4',
-          [7] = '#09b7f1',
-          [8] = '#45cbf7',
-          [9] = '#80dbf9',
-        }),
         plum = m({
           [0] = '#2a0e3f',
           [1] = '#40125e',
@@ -345,18 +681,6 @@ local M = m({
           [8] = '#e4a5fd',
           [9] = '#edbdff',
         }),
-        coral = m({
-          [0] = '#351008',
-          [1] = '#51180b',
-          [2] = '#72220d',
-          [3] = '#902a0e',
-          [4] = '#b3350f',
-          [5] = '#e1430e',
-          [6] = '#f7794b',
-          [7] = '#fa8c61',
-          [8] = '#fdaa86',
-          [9] = '#ffc0a3',
-        }),
         pink = m({
           [0] = '#2d1524',
           [1] = '#451c35',
@@ -369,54 +693,6 @@ local M = m({
           [8] = '#f4a9cd',
           [9] = '#f9bed9',
         }),
-        brown = m({
-          [0] = '#241c14',
-          [1] = '#342a1d',
-          [2] = '#483a28',
-          [3] = '#5d4a32',
-          [4] = '#755e3e',
-          [5] = '#94774c',
-          [6] = '#b69a6d',
-          [7] = '#bfa77d',
-          [8] = '#cdbb98',
-          [9] = '#dbceb3',
-        }),
-        pine = m({
-          [0] = '#082119',
-          [1] = '#0b3224',
-          [2] = '#0e4430',
-          [3] = '#115a3e',
-          [4] = '#14714c',
-          [5] = '#18915e',
-          [6] = '#1bb673',
-          [7] = '#1ac176',
-          [8] = '#1bda81',
-          [9] = '#3eea97',
-        }),
-        blue = m({
-          [0] = '#001a47',
-          [1] = '#002766',
-          [2] = '#00378a',
-          [3] = '#0046a8',
-          [4] = '#005bd1',
-          [5] = '#0576ff',
-          [6] = '#4da0ff',
-          [7] = '#61adff',
-          [8] = '#85c2ff',
-          [9] = '#a3d3ff',
-        }),
-        orange = m({
-          [0] = '#311708',
-          [1] = '#43200a',
-          [2] = '#632f0d',
-          [3] = '#7b3c0e',
-          [4] = '#984b10',
-          [5] = '#c46212',
-          [6] = '#ed8326',
-          [7] = '#f1933b',
-          [8] = '#f6b06a',
-          [9] = '#fac68f',
-        }),
         auburn = m({
           [0] = '#271817',
           [1] = '#3a2422',
@@ -429,1256 +705,980 @@ local M = m({
           [8] = '#d4b7b5',
           [9] = '#dfcac8',
         }),
-        olive = m({
-          [0] = '#171e0b',
-          [1] = '#252d10',
-          [2] = '#374115',
-          [3] = '#485219',
-          [4] = '#5e681d',
-          [5] = '#7a8321',
-          [6] = '#a2a626',
-          [7] = '#b2af24',
-          [8] = '#cbc025',
-          [9] = '#e2d04b',
-        }),
-        white = '#ffffff',
-        lime = m({
-          [0] = '#141f0f',
-          [1] = '#1f3116',
-          [2] = '#2c441d',
-          [3] = '#375421',
-          [4] = '#496c28',
-          [5] = '#5f892f',
-          [6] = '#7dae37',
-          [7] = '#89ba36',
-          [8] = '#9fcc3e',
-          [9] = '#bcda67',
-        }),
-        lemon = m({
-          [0] = '#291d00',
-          [1] = '#372901',
-          [2] = '#4f3c02',
-          [3] = '#614c05',
-          [4] = '#786008',
-          [5] = '#977b0c',
-          [6] = '#ba9b12',
-          [7] = '#c4a717',
-          [8] = '#d7bc1d',
-          [9] = '#e3d04f',
-        }),
-        yellow = m({
-          [0] = '#2e1a00',
-          [1] = '#3d2401',
-          [2] = '#5a3702',
-          [3] = '#6d4403',
-          [4] = '#895906',
-          [5] = '#aa7109',
-          [6] = '#d3910d',
-          [7] = '#df9e11',
-          [8] = '#edb431',
-          [9] = '#f0ca6a',
-        }),
-        indigo = m({
-          [0] = '#1b183f',
-          [1] = '#25215f',
-          [2] = '#312c90',
-          [3] = '#3935c0',
-          [4] = '#514ed4',
-          [5] = '#7070e1',
-          [6] = '#9899ec',
-          [7] = '#a2a5f1',
-          [8] = '#b7baf6',
-          [9] = '#c8cbf9',
+        blue = m({
+          [0] = '#001a47',
+          [1] = '#002766',
+          [2] = '#00378a',
+          [3] = '#0046a8',
+          [4] = '#005bd1',
+          [5] = '#0576ff',
+          [6] = '#4da0ff',
+          [7] = '#61adff',
+          [8] = '#85c2ff',
+          [9] = '#a3d3ff',
         }),
-        teal = m({
-          [0] = '#041f25',
-          [1] = '#073036',
-          [2] = '#0a464d',
-          [3] = '#0c555a',
-          [4] = '#106c70',
-          [5] = '#158a8a',
-          [6] = '#1cb0ab',
-          [7] = '#1fbdb2',
-          [8] = '#24d6c4',
-          [9] = '#5fe3d1',
+        pine = m({
+          [0] = '#082119',
+          [1] = '#0b3224',
+          [2] = '#0e4430',
+          [3] = '#115a3e',
+          [4] = '#14714c',
+          [5] = '#18915e',
+          [6] = '#1bb673',
+          [7] = '#1ac176',
+          [8] = '#1bda81',
+          [9] = '#3eea97',
+        }),
+        brown = m({
+          [0] = '#241c14',
+          [1] = '#342a1d',
+          [2] = '#483a28',
+          [3] = '#5d4a32',
+          [4] = '#755e3e',
+          [5] = '#94774c',
+          [6] = '#b69a6d',
+          [7] = '#bfa77d',
+          [8] = '#cdbb98',
+          [9] = '#dbceb3',
+        }),
+        coral = m({
+          [0] = '#351008',
+          [1] = '#51180b',
+          [2] = '#72220d',
+          [3] = '#902a0e',
+          [4] = '#b3350f',
+          [5] = '#e1430e',
+          [6] = '#f7794b',
+          [7] = '#fa8c61',
+          [8] = '#fdaa86',
+          [9] = '#ffc0a3',
+        }),
+        orange = m({
+          [0] = '#311708',
+          [1] = '#43200a',
+          [2] = '#632f0d',
+          [3] = '#7b3c0e',
+          [4] = '#984b10',
+          [5] = '#c46212',
+          [6] = '#ed8326',
+          [7] = '#f1933b',
+          [8] = '#f6b06a',
+          [9] = '#fac68f',
+        }),
+        white = '#ffffff',
+        yellow = m({
+          [0] = '#2e1a00',
+          [1] = '#3d2401',
+          [2] = '#5a3702',
+          [3] = '#6d4403',
+          [4] = '#895906',
+          [5] = '#aa7109',
+          [6] = '#d3910d',
+          [7] = '#df9e11',
+          [8] = '#edb431',
+          [9] = '#f0ca6a',
+        }),
+        olive = m({
+          [0] = '#171e0b',
+          [1] = '#252d10',
+          [2] = '#374115',
+          [3] = '#485219',
+          [4] = '#5e681d',
+          [5] = '#7a8321',
+          [6] = '#a2a626',
+          [7] = '#b2af24',
+          [8] = '#cbc025',
+          [9] = '#e2d04b',
         }),
       }),
     }),
-  }),
-  display = m({
-    green = m({
-      bgColor = m({
-        emphasis = '#388f3f',
-        muted = '#122117',
-      }),
-      borderColor = m({
-        emphasis = '#388f3f',
-        muted = '#182f1f',
-      }),
-      fgColor = '#41b445',
-    }),
-    red = m({
-      bgColor = m({
-        emphasis = '#eb3342',
-        muted = '#3c0614',
-      }),
-      borderColor = m({
-        emphasis = '#eb3342',
-        muted = '#58091a',
-      }),
-      fgColor = '#f27d83',
-    }),
-    gray = m({
-      bgColor = m({
-        emphasis = '#6e7f96',
-        muted = '#1c1c1c',
-      }),
-      borderColor = m({
-        emphasis = '#6e7f96',
-        muted = '#2a2b2d',
-      }),
-      fgColor = '#92a1b5',
-    }),
-    purple = m({
-      bgColor = m({
-        emphasis = '#975bf1',
-        muted = '#211047',
-      }),
-      borderColor = m({
-        emphasis = '#975bf1',
-        muted = '#31146b',
-      }),
-      fgColor = '#b687f7',
-    }),
-    cyan = m({
-      bgColor = m({
-        emphasis = '#0587b3',
-        muted = '#001f29',
-      }),
-      borderColor = m({
-        emphasis = '#0587b3',
-        muted = '#002e3d',
-      }),
-      fgColor = '#07ace4',
-    }),
-    plum = m({
-      bgColor = m({
-        emphasis = '#b643ef',
-        muted = '#2a0e3f',
-      }),
-      borderColor = m({
-        emphasis = '#b643ef',
-        muted = '#40125e',
-      }),
-      fgColor = '#d07ef7',
-    }),
-    coral = m({
-      bgColor = m({
-        emphasis = '#eb3342',
-        muted = '#3c0614',
-      }),
-      borderColor = m({
-        emphasis = '#eb3342',
-        muted = '#58091a',
-      }),
-      fgColor = '#f27d83',
-    }),
-    pink = m({
-      bgColor = m({
-        emphasis = '#d34591',
-        muted = '#2d1524',
-      }),
-      borderColor = m({
-        emphasis = '#d34591',
-        muted = '#451c35',
-      }),
-      fgColor = '#e57bb2',
-    }),
-    brown = m({
-      bgColor = m({
-        emphasis = '#94774c',
-        muted = '#241c14',
-      }),
-      borderColor = m({
-        emphasis = '#94774c',
-        muted = '#342a1d',
-      }),
-      fgColor = '#b69a6d',
-    }),
-    pine = m({
-      bgColor = m({
-        emphasis = '#18915e',
-        muted = '#082119',
-      }),
-      borderColor = m({
-        emphasis = '#18915e',
-        muted = '#0b3224',
-      }),
-      fgColor = '#1bb673',
-    }),
-    blue = m({
-      bgColor = m({
-        emphasis = '#0576ff',
-        muted = '#001a47',
-      }),
-      borderColor = m({
-        emphasis = '#0576ff',
-        muted = '#002766',
-      }),
-      fgColor = '#4da0ff',
-    }),
-    orange = m({
-      bgColor = m({
-        emphasis = '#c46212',
-        muted = '#311708',
-      }),
-      borderColor = m({
-        emphasis = '#c46212',
-        muted = '#43200a',
-      }),
-      fgColor = '#ed8326',
-    }),
-    auburn = m({
-      bgColor = m({
-        emphasis = '#a86f6b',
-        muted = '#271817',
-      }),
-      borderColor = m({
-        emphasis = '#a86f6b',
-        muted = '#3a2422',
-      }),
-      fgColor = '#bf9592',
-    }),
-    olive = m({
-      bgColor = m({
-        emphasis = '#7a8321',
-        muted = '#171e0b',
-      }),
-      borderColor = m({
-        emphasis = '#7a8321',
-        muted = '#252d10',
-      }),
-      fgColor = '#a2a626',
-    }),
-    lime = m({
-      bgColor = m({
-        emphasis = '#5f892f',
-        muted = '#141f0f',
-      }),
-      borderColor = m({
-        emphasis = '#5f892f',
-        muted = '#1f3116',
-      }),
-      fgColor = '#7dae37',
-    }),
-    lemon = m({
-      bgColor = m({
-        emphasis = '#977b0c',
-        muted = '#291d00',
-      }),
-      borderColor = m({
-        emphasis = '#977b0c',
-        muted = '#372901',
-      }),
-      fgColor = '#ba9b12',
-    }),
-    yellow = m({
-      bgColor = m({
-        emphasis = '#aa7109',
-        muted = '#2e1a00',
-      }),
-      borderColor = m({
-        emphasis = '#aa7109',
-        muted = '#3d2401',
-      }),
-      fgColor = '#d3910d',
-    }),
-    indigo = m({
-      bgColor = m({
-        emphasis = '#7070e1',
-        muted = '#1b183f',
-      }),
-      borderColor = m({
-        emphasis = '#7070e1',
-        muted = '#25215f',
-      }),
-      fgColor = '#9899ec',
+  }),
+  selection = m({
+    bgColor = '#316dcab3',
+  }),
+  selectMenu = m({
+    borderColor = '#545d68',
+    bgColor = m({
+      active = '#143d79',
     }),
-    teal = m({
+  }),
+  headerSearch = m({
+    borderColor = '#444c56',
+    bgColor = '#22272e',
+  }),
+  reactionButton = m({
+    selected = m({
       bgColor = m({
-        emphasis = '#158a8a',
-        muted = '#041f25',
+        hover = '#4285e55c',
+        rest = '#4184e433',
       }),
-      borderColor = m({
-        emphasis = '#158a8a',
-        muted = '#073036',
+      fgColor = m({
+        hover = '#6cb6ff',
+        rest = '#478be6',
       }),
-      fgColor = '#1cb0ab',
     }),
   }),
+  fgColor = m({
+    sponsors = '#c96198',
+    severe = '#cc6b2c',
+    onEmphasis = '#cdd9e5',
+    muted = '#778491',
+    link = '#478be6',
+    done = '#986ee2',
+    disabled = '#636e7b',
+    danger = '#e5534b',
+    closed = '#e5534b',
+    black = '#1c2128',
+    attention = '#c69026',
+    accent = '#478be6',
+    neutral = '#636e7b',
+    upsell = '#986ee2',
+    open = '#57ab5a',
+    white = '#cdd9e5',
+    default = '#c5d1de',
+    success = '#57ab5a',
+  }),
   card = m({
     bgColor = '#2d333b',
   }),
-  underlineNav = m({
-    iconColor = m({
-      rest = '#778491',
-    }),
-    borderColor = m({
-      hover = '#636e7b66',
-      active = '#ec775c',
+  page = m({
+    header = m({
+      bgColor = '#22272e',
     }),
   }),
   buttonCounter = m({
-    default = m({
-      bgColor = m({
-        rest = '#444c56',
-      }),
-    }),
-    invisible = m({
-      bgColor = m({
-        rest = '#444c56',
-      }),
-    }),
-    danger = m({
-      fgColor = m({
-        rest = '#e5534b',
-        disabled = '#e5534b80',
-        hover = '#cdd9e5',
-      }),
+    outline = m({
       bgColor = m({
-        rest = '#5d0f1233',
-        disabled = '#c93c370d',
-        hover = '#cdd9e533',
+        rest = '#0f2d5c33',
+        disabled = '#316dca0d',
+        hover = '#0f2d5c33',
       }),
-    }),
-    outline = m({
       fgColor = m({
         rest = '#4184e4',
         disabled = '#478be680',
         hover = '#539bf5',
       }),
-      bgColor = m({
-        rest = '#0f2d5c33',
-        disabled = '#316dca0d',
-        hover = '#0f2d5c33',
-      }),
     }),
     primary = m({
       bgColor = m({
         rest = '#11341733',
       }),
     }),
-  }),
-  highlight = m({
-    neutral = m({
-      bgColor = '#c6902666',
-    }),
-  }),
-  borderColor = m({
-    closed = m({
-      emphasis = '#c93c37',
-      muted = '#e5534b66',
-    }),
-    transparent = '#00000000',
-    accent = m({
-      emphasis = '#316dca',
-      muted = '#4184e466',
-    }),
-    emphasis = '#545d68',
-    open = m({
-      emphasis = '#347d39',
-      muted = '#46954a66',
-    }),
-    default = '#444c56',
-    translucent = '#cdd9e526',
-    neutral = m({
-      emphasis = '#636e7b',
-      muted = '#636e7b66',
-    }),
-    upsell = m({
-      emphasis = '#8256d0',
-      muted = '#986ee266',
-    }),
-    success = m({
-      emphasis = '#347d39',
-      muted = '#46954a66',
-    }),
-    sponsors = m({
-      emphasis = '#ae4c82',
-      muted = '#c9619866',
-    }),
-    severe = m({
-      emphasis = '#ae5622',
-      muted = '#cc6b2c66',
-    }),
-    muted = '#444c56b3',
-    attention = m({
-      emphasis = '#966600',
-      muted = '#ae7c1466',
-    }),
-    done = m({
-      emphasis = '#8256d0',
-      muted = '#986ee266',
-    }),
-    disabled = '#373e47b3',
-    danger = m({
-      emphasis = '#c93c37',
-      muted = '#e5534b66',
-    }),
-  }),
-  data = m({
-    green = m({
-      color = m({
-        default = '#2f6f37',
-        muted = '#122117',
-      }),
-    }),
-    orange = m({
-      color = m({
-        default = '#984b10',
-        muted = '#311708',
-      }),
-    }),
-    red = m({
-      color = m({
-        default = '#eb3342',
-        muted = '#3c0614',
-      }),
-    }),
-    gray = m({
-      color = m({
-        default = '#576270',
-        muted = '#1c1c1c',
-      }),
-    }),
-    purple = m({
-      color = m({
-        default = '#975bf1',
-        muted = '#211047',
-      }),
-    }),
-    pink = m({
-      color = m({
-        default = '#d34591',
-        muted = '#2d1524',
-      }),
-    }),
-    yellow = m({
-      color = m({
-        default = '#895906',
-        muted = '#2e1a00',
-      }),
-    }),
-    auburn = m({
-      color = m({
-        default = '#a86f6b',
-        muted = '#271817',
+    invisible = m({
+      bgColor = m({
+        rest = '#444c56',
       }),
     }),
-    blue = m({
-      color = m({
-        default = '#0576ff',
-        muted = '#001a47',
+    default = m({
+      bgColor = m({
+        rest = '#444c56',
       }),
     }),
-    teal = m({
-      color = m({
-        default = '#106c70',
-        muted = '#041f25',
+    danger = m({
+      bgColor = m({
+        rest = '#5d0f1233',
+        disabled = '#c93c370d',
+        hover = '#cdd9e533',
+      }),
+      fgColor = m({
+        rest = '#e5534b',
+        disabled = '#e5534b80',
+        hover = '#cdd9e5',
       }),
     }),
   }),
-  topicTag = m({
-    borderColor = '#00000000',
+  overlay = m({
+    borderColor = '#444c56b3',
+    backdrop = m({
+      bgColor = '#2d333b66',
+    }),
+    bgColor = '#2d333b',
   }),
-  counter = m({
-    borderColor = '#00000000',
+  avatar = m({
+    borderColor = '#cdd9e526',
+    shadow = '0px 0px 0px 2px #22272e',
+    bgColor = '#cdd9e51a',
   }),
-  button = m({
-    inactive = m({
-      fgColor = '#768390',
-      bgColor = '#373e47',
+  highlight = m({
+    neutral = m({
+      bgColor = '#c6902666',
     }),
-    star = m({
-      iconColor = '#daaa3f',
+  }),
+  outline = m({
+    focus = '#316dca solid 2px',
+  }),
+  focus = m({
+    outlineColor = '#316dca',
+  }),
+  menu = m({
+    bgColor = m({
+      active = '#2d333b',
     }),
-    invisible = m({
+  }),
+  label = m({
+    lime = m({
       bgColor = m({
-        rest = '#00000000',
-        active = '#909dab33',
-        disabled = '#373e47b3',
-        hover = '#909dab1f',
-      }),
-      borderColor = m({
-        rest = '#00000000',
-        disabled = '#373e47b3',
-        hover = '#00000000',
-      }),
-      iconColor = m({
-        rest = '#778491',
-        disabled = '#636e7b',
-        hover = '#778491',
+        active = '#2c441d',
+        rest = '#141f0f',
+        hover = '#1f3116',
       }),
       fgColor = m({
-        rest = '#478be6',
-        disabled = '#636e7b',
-        hover = '#539bf5',
+        active = '#9fcc3e',
+        rest = '#7dae37',
+        hover = '#89ba36',
       }),
     }),
-    danger = m({
+    lemon = m({
       bgColor = m({
-        rest = '#373e47',
-        active = '#c33d38',
-        disabled = '#373e47b3',
-        hover = '#ad2e2c',
+        active = '#4f3c02',
+        rest = '#291d00',
+        hover = '#372901',
       }),
-      borderColor = m({
-        rest = '#444c56',
-        active = '#cdd9e51a',
-        hover = '#cdd9e51a',
+      fgColor = m({
+        active = '#d7bc1d',
+        rest = '#ba9b12',
+        hover = '#c4a717',
       }),
-      iconColor = m({
-        rest = '#e5534b',
-        hover = '#cdd9e5',
+    }),
+    cyan = m({
+      bgColor = m({
+        active = '#014156',
+        rest = '#001f29',
+        hover = '#002e3d',
       }),
       fgColor = m({
-        rest = '#e5534b',
-        active = '#cdd9e5',
-        disabled = '#e5534b80',
-        hover = '#cdd9e5',
-      }),
-      shadow = m({
-        selected = '0px 0px 0px 0px #000000',
+        active = '#45cbf7',
+        rest = '#07ace4',
+        hover = '#09b7f1',
       }),
     }),
-    default = m({
+    indigo = m({
       bgColor = m({
-        hover = '#3d444e',
-        active = '#434a54',
-        selected = '#434a54',
-        rest = '#373e47',
-        disabled = '#373e47b3',
-      }),
-      borderColor = m({
-        rest = '#444c56',
-        active = '#444c56',
-        disabled = '#373e47b3',
-        hover = '#444c56',
+        active = '#312c90',
+        rest = '#1b183f',
+        hover = '#25215f',
       }),
       fgColor = m({
-        rest = '#adbac7',
-      }),
-      shadow = m({
-        resting = '0px 0px 0px 0px #000000',
+        active = '#b7baf6',
+        rest = '#9899ec',
+        hover = '#a2a5f1',
       }),
     }),
-    outline = m({
+    coral = m({
       bgColor = m({
-        rest = '#cdd9e5',
-        active = '#1b4b91',
-        disabled = '#22272e',
-        hover = '#444c56',
-      }),
-      borderColor = m({
-        hover = '#cdd9e51a',
-        selected = '#cdd9e51a',
+        active = '#72220d',
+        rest = '#351008',
+        hover = '#51180b',
       }),
       fgColor = m({
-        rest = '#4184e4',
-        active = '#cdd9e5',
-        disabled = '#478be680',
-        hover = '#539bf5',
-      }),
-      shadow = m({
-        selected = '0px 0px 0px 0px #000000',
+        active = '#fdaa86',
+        rest = '#f7794b',
+        hover = '#fa8c61',
       }),
     }),
-    primary = m({
+    green = m({
       bgColor = m({
-        rest = '#347d39',
-        active = '#428f46',
-        disabled = '#50a254',
-        hover = '#3b8640',
+        active = '#214529',
+        rest = '#122117',
+        hover = '#182f1f',
       }),
-      borderColor = m({
-        rest = '#cdd9e51a',
-        active = '#cdd9e51a',
-        disabled = '#50a254',
-        hover = '#cdd9e51a',
+      fgColor = m({
+        active = '#75d36f',
+        rest = '#41b445',
+        hover = '#46c144',
       }),
-      iconColor = m({
-        rest = '#ffffff',
+    }),
+    red = m({
+      bgColor = m({
+        active = '#790c20',
+        rest = '#3c0614',
+        hover = '#58091a',
       }),
       fgColor = m({
-        rest = '#ffffff',
-        disabled = '#cdd9e566',
-      }),
-      shadow = m({
-        selected = '0px 0px 0px 0px #000000',
+        active = '#f7adab',
+        rest = '#f27d83',
+        hover = '#f48b8d',
       }),
     }),
-  }),
-  skeletonLoader = m({
-    bgColor = '#2d333b',
-  }),
-  sideNav = m({
-    bgColor = m({
-      selected = '#373e47',
-    }),
-  }),
-  controlKnob = m({
-    bgColor = m({
-      rest = '#1c2128',
-      disabled = '#373e47b3',
-      checked = '#cdd9e5',
-    }),
-    borderColor = m({
-      rest = '#606b77',
-      disabled = '#373e47b3',
-      checked = '#316dca',
-    }),
-  }),
-  shadow = m({
-    resting = m({
-      small = '0px 1px 0px 0px #1c212866',
-      xsmall = '0px 1px 0px 0px #1c2128cc',
-      medium = '0px 3px 6px 0px #1c2128cc',
-    }),
-    floating = m({
-      large = '0px 0px 0px 1px #444c56, 0px 24px 48px 0px #1c2128',
-      small = '0px 0px 0px 1px #444c56, 0px 6px 12px -3px #1c212866, 0px 6px 18px 0px #1c212866',
-      medium = '0px 0px 0px 1px #444c56, 0px 8px 16px -4px #1c212866, 0px 4px 32px -4px #1c212866, 0px 24px 48px -12px #1c212866, 0px 48px 96px -24px #1c212866',
-      xlarge = '0px 0px 0px 1px #444c56, 0px 32px 64px 0px #1c2128',
-      legacy = '0px 6px 12px -3px #1c212866, 0px 6px 18px 0px #1c212866',
-    }),
-    inset = 'inset 0px 1px 0px 0px #1c21283d',
-  }),
-  control = m({
-    bgColor = m({
-      hover = '#3d444e',
-      active = '#434a54',
-      selected = '#2d333b',
-      rest = '#373e47',
-      disabled = '#373e47b3',
-    }),
-    borderColor = m({
-      danger = '#c93c37',
-      disabled = '#373e47b3',
-      selected = '#cdd9e5',
-      rest = '#444c56',
-      emphasis = '#606b77',
-      warning = '#966600',
-      success = '#347d39',
+    gray = m({
+      bgColor = m({
+        active = '#393d41',
+        rest = '#1c1c1c',
+        hover = '#2a2b2d',
+      }),
+      fgColor = m({
+        active = '#b3c0d1',
+        rest = '#92a1b5',
+        hover = '#9babbf',
+      }),
     }),
-    transparent = m({
+    purple = m({
       bgColor = m({
-        hover = '#909dab1f',
-        active = '#909dab33',
-        selected = '#909dab14',
-        rest = '#00000000',
-        disabled = '#373e47b3',
+        active = '#481a9e',
+        rest = '#211047',
+        hover = '#31146b',
       }),
-      borderColor = m({
-        rest = '#00000000',
-        active = '#00000000',
-        hover = '#00000000',
+      fgColor = m({
+        active = '#d2affd',
+        rest = '#b687f7',
+        hover = '#c398fb',
       }),
     }),
-    checked = m({
+    plum = m({
       bgColor = m({
-        rest = '#316dca',
-        active = '#3f7fdb',
-        disabled = '#636e7b',
-        hover = '#3876d3',
-      }),
-      borderColor = m({
-        rest = '#316dca',
-        active = '#3f7fdb',
-        disabled = '#636e7b',
-        hover = '#3876d3',
+        active = '#5c1688',
+        rest = '#2a0e3f',
+        hover = '#40125e',
       }),
       fgColor = m({
-        rest = '#cdd9e5',
-        disabled = '#1c2128',
+        active = '#e4a5fd',
+        rest = '#d07ef7',
+        hover = '#d889fa',
       }),
     }),
-    fgColor = m({
-      rest = '#adbac7',
-      placeholder = '#727f8c',
-      disabled = '#636e7b',
-    }),
-    iconColor = m({
-      rest = '#778491',
-    }),
-    danger = m({
+    pink = m({
+      bgColor = m({
+        active = '#65244a',
+        rest = '#2d1524',
+        hover = '#451c35',
+      }),
       fgColor = m({
-        rest = '#e5534b',
-        hover = '#f47067',
+        active = '#f4a9cd',
+        rest = '#e57bb2',
+        hover = '#ec8dbd',
       }),
+    }),
+    auburn = m({
       bgColor = m({
-        hover = '#e5534b1a',
-        active = '#e5534b66',
+        active = '#543331',
+        rest = '#271817',
+        hover = '#3a2422',
       }),
-    }),
-  }),
-  selection = m({
-    bgColor = '#316dcab3',
-  }),
-  selectMenu = m({
-    bgColor = m({
-      active = '#143d79',
-    }),
-    borderColor = '#545d68',
-  }),
-  reactionButton = m({
-    selected = m({
       fgColor = m({
-        rest = '#478be6',
-        hover = '#6cb6ff',
+        active = '#d4b7b5',
+        rest = '#bf9592',
+        hover = '#c6a19f',
       }),
+    }),
+    pine = m({
       bgColor = m({
-        rest = '#4184e433',
-        hover = '#4285e55c',
+        active = '#0e4430',
+        rest = '#082119',
+        hover = '#0b3224',
+      }),
+      fgColor = m({
+        active = '#1bda81',
+        rest = '#1bb673',
+        hover = '#1ac176',
       }),
     }),
-  }),
-  fgColor = m({
-    closed = '#e5534b',
-    black = '#1c2128',
-    attention = '#c69026',
-    accent = '#478be6',
-    open = '#57ab5a',
-    default = '#c5d1de',
-    neutral = '#636e7b',
-    white = '#cdd9e5',
-    upsell = '#986ee2',
-    success = '#57ab5a',
-    sponsors = '#c96198',
-    severe = '#cc6b2c',
-    onEmphasis = '#cdd9e5',
-    muted = '#778491',
-    link = '#478be6',
-    done = '#986ee2',
-    disabled = '#636e7b',
-    danger = '#e5534b',
-  }),
-  bgColor = m({
-    closed = m({
-      emphasis = '#c93c37',
-      muted = '#e5534b26',
-    }),
-    black = '#1c2128',
-    transparent = '#00000000',
-    inset = '#1c2128',
-    inverse = '#cdd9e5',
-    emphasis = '#636e7b',
-    open = m({
-      emphasis = '#347d39',
-      muted = '#46954a1a',
-    }),
-    default = '#22272e',
-    accent = m({
-      emphasis = '#316dca',
-      muted = '#4184e41a',
+    blue = m({
+      bgColor = m({
+        active = '#00378a',
+        rest = '#001a47',
+        hover = '#002766',
+      }),
+      fgColor = m({
+        active = '#85c2ff',
+        rest = '#4da0ff',
+        hover = '#61adff',
+      }),
     }),
-    white = '#cdd9e5',
-    upsell = m({
-      emphasis = '#8256d0',
-      muted = '#986ee226',
+    brown = m({
+      bgColor = m({
+        active = '#483a28',
+        rest = '#241c14',
+        hover = '#342a1d',
+      }),
+      fgColor = m({
+        active = '#cdbb98',
+        rest = '#b69a6d',
+        hover = '#bfa77d',
+      }),
     }),
-    success = m({
-      emphasis = '#347d39',
-      muted = '#46954a26',
+    orange = m({
+      bgColor = m({
+        active = '#632f0d',
+        rest = '#311708',
+        hover = '#43200a',
+      }),
+      fgColor = m({
+        active = '#f6b06a',
+        rest = '#ed8326',
+        hover = '#f1933b',
+      }),
     }),
-    sponsors = m({
-      emphasis = '#ae4c82',
-      muted = '#c961981a',
+    yellow = m({
+      bgColor = m({
+        active = '#5a3702',
+        rest = '#2e1a00',
+        hover = '#3d2401',
+      }),
+      fgColor = m({
+        active = '#edb431',
+        rest = '#d3910d',
+        hover = '#df9e11',
+      }),
     }),
-    severe = m({
-      emphasis = '#ae5622',
-      muted = '#cc6b2c1a',
+    teal = m({
+      bgColor = m({
+        active = '#0a464d',
+        rest = '#041f25',
+        hover = '#073036',
+      }),
+      fgColor = m({
+        active = '#24d6c4',
+        rest = '#1cb0ab',
+        hover = '#1fbdb2',
+      }),
     }),
-    attention = m({
-      emphasis = '#966600',
-      muted = '#ae7c1426',
+    olive = m({
+      bgColor = m({
+        active = '#374115',
+        rest = '#171e0b',
+        hover = '#252d10',
+      }),
+      fgColor = m({
+        active = '#cbc025',
+        rest = '#a2a626',
+        hover = '#b2af24',
+      }),
     }),
-    muted = '#2d333b',
-    neutral = m({
-      emphasis = '#636e7b',
-      muted = '#636e7b66',
+  }),
+  diffBlob = m({
+    expander = m({
+      iconColor = '#c5d1de',
     }),
-    done = m({
-      emphasis = '#8256d0',
-      muted = '#986ee226',
+    deletion = m({
+      bgColor = m({
+        word = '#e5534b66',
+        line = '#e5534b26',
+        num = '#e5534b4d',
+      }),
+      fgColor = m({
+        num = '#c5d1de',
+        text = '#c5d1de',
+      }),
     }),
-    disabled = '#373e47b3',
-    danger = m({
-      emphasis = '#c93c37',
-      muted = '#e5534b1a',
+    hunk = m({
+      bgColor = m({
+        num = '#4184e466',
+      }),
     }),
-  }),
-  page = m({
-    header = m({
-      bgColor = '#22272e',
+    addition = m({
+      bgColor = m({
+        word = '#46954a66',
+        line = '#46954a26',
+        num = '#57ab5a4d',
+      }),
+      fgColor = m({
+        num = '#c5d1de',
+        text = '#c5d1de',
+      }),
     }),
   }),
-  header = m({
-    bgColor = '#2d333bf2',
-    borderColor = m({
-      divider = '#768390',
+  display = m({
+    lime = m({
+      borderColor = m({
+        emphasis = '#5f892f',
+        muted = '#1f3116',
+      }),
+      fgColor = '#7dae37',
+      bgColor = m({
+        emphasis = '#5f892f',
+        muted = '#141f0f',
+      }),
     }),
-    fgColor = m({
-      logo = '#cdd9e5',
-      default = '#cdd9e5b3',
+    lemon = m({
+      borderColor = m({
+        emphasis = '#977b0c',
+        muted = '#372901',
+      }),
+      fgColor = '#ba9b12',
+      bgColor = m({
+        emphasis = '#977b0c',
+        muted = '#291d00',
+      }),
     }),
-  }),
-  overlay = m({
-    bgColor = '#2d333b',
-    borderColor = '#444c56b3',
-    backdrop = m({
-      bgColor = '#2d333b66',
+    cyan = m({
+      borderColor = m({
+        emphasis = '#0587b3',
+        muted = '#002e3d',
+      }),
+      fgColor = '#07ace4',
+      bgColor = m({
+        emphasis = '#0587b3',
+        muted = '#001f29',
+      }),
     }),
-  }),
-  avatarStack = m({
-    fade = m({
+    indigo = m({
+      borderColor = m({
+        emphasis = '#7070e1',
+        muted = '#25215f',
+      }),
+      fgColor = '#9899ec',
       bgColor = m({
-        default = '#444c56',
-        muted = '#373e47',
+        emphasis = '#7070e1',
+        muted = '#1b183f',
       }),
     }),
-  }),
-  avatar = m({
-    bgColor = '#cdd9e51a',
-    borderColor = '#cdd9e526',
-    shadow = '0px 0px 0px 2px #22272e',
-  }),
-  headerSearch = m({
-    bgColor = '#22272e',
-    borderColor = '#444c56',
-  }),
-  focus = m({
-    outlineColor = '#316dca',
-  }),
-  timelineBadge = m({
-    bgColor = '#373e47',
-  }),
-  menu = m({
-    bgColor = m({
-      active = '#2d333b',
+    coral = m({
+      borderColor = m({
+        emphasis = '#eb3342',
+        muted = '#58091a',
+      }),
+      fgColor = '#f27d83',
+      bgColor = m({
+        emphasis = '#eb3342',
+        muted = '#3c0614',
+      }),
     }),
-  }),
-  outline = m({
-    focus = '#316dca solid 2px',
-  }),
-  label = m({
     green = m({
-      fgColor = m({
-        rest = '#41b445',
-        active = '#75d36f',
-        hover = '#46c144',
+      borderColor = m({
+        emphasis = '#388f3f',
+        muted = '#182f1f',
       }),
+      fgColor = '#41b445',
       bgColor = m({
-        rest = '#122117',
-        active = '#214529',
-        hover = '#182f1f',
+        emphasis = '#388f3f',
+        muted = '#122117',
       }),
     }),
     red = m({
-      fgColor = m({
-        rest = '#f27d83',
-        active = '#f7adab',
-        hover = '#f48b8d',
+      borderColor = m({
+        emphasis = '#eb3342',
+        muted = '#58091a',
       }),
+      fgColor = '#f27d83',
       bgColor = m({
-        rest = '#3c0614',
-        active = '#790c20',
-        hover = '#58091a',
+        emphasis = '#eb3342',
+        muted = '#3c0614',
       }),
     }),
     gray = m({
-      fgColor = m({
-        rest = '#92a1b5',
-        active = '#b3c0d1',
-        hover = '#9babbf',
+      borderColor = m({
+        emphasis = '#6e7f96',
+        muted = '#2a2b2d',
       }),
+      fgColor = '#92a1b5',
       bgColor = m({
-        rest = '#1c1c1c',
-        active = '#393d41',
-        hover = '#2a2b2d',
+        emphasis = '#6e7f96',
+        muted = '#1c1c1c',
       }),
     }),
     purple = m({
-      fgColor = m({
-        rest = '#b687f7',
-        active = '#d2affd',
-        hover = '#c398fb',
+      borderColor = m({
+        emphasis = '#975bf1',
+        muted = '#31146b',
       }),
+      fgColor = '#b687f7',
       bgColor = m({
-        rest = '#211047',
-        active = '#481a9e',
-        hover = '#31146b',
+        emphasis = '#975bf1',
+        muted = '#211047',
       }),
     }),
-    cyan = m({
-      fgColor = m({
-        rest = '#07ace4',
-        active = '#45cbf7',
-        hover = '#09b7f1',
+    plum = m({
+      borderColor = m({
+        emphasis = '#b643ef',
+        muted = '#40125e',
       }),
+      fgColor = '#d07ef7',
       bgColor = m({
-        rest = '#001f29',
-        active = '#014156',
-        hover = '#002e3d',
+        emphasis = '#b643ef',
+        muted = '#2a0e3f',
       }),
     }),
-    plum = m({
-      fgColor = m({
-        rest = '#d07ef7',
-        active = '#e4a5fd',
-        hover = '#d889fa',
+    pink = m({
+      borderColor = m({
+        emphasis = '#d34591',
+        muted = '#451c35',
       }),
+      fgColor = '#e57bb2',
       bgColor = m({
-        rest = '#2a0e3f',
-        active = '#5c1688',
-        hover = '#40125e',
+        emphasis = '#d34591',
+        muted = '#2d1524',
       }),
     }),
-    coral = m({
-      fgColor = m({
-        rest = '#f7794b',
-        active = '#fdaa86',
-        hover = '#fa8c61',
+    auburn = m({
+      borderColor = m({
+        emphasis = '#a86f6b',
+        muted = '#3a2422',
+      }),
+      fgColor = '#bf9592',
+      bgColor = m({
+        emphasis = '#a86f6b',
+        muted = '#271817',
+      }),
+    }),
+    pine = m({
+      borderColor = m({
+        emphasis = '#18915e',
+        muted = '#0b3224',
       }),
+      fgColor = '#1bb673',
       bgColor = m({
-        rest = '#351008',
-        active = '#72220d',
-        hover = '#51180b',
+        emphasis = '#18915e',
+        muted = '#082119',
       }),
     }),
-    pink = m({
-      fgColor = m({
-        rest = '#e57bb2',
-        active = '#f4a9cd',
-        hover = '#ec8dbd',
+    blue = m({
+      borderColor = m({
+        emphasis = '#0576ff',
+        muted = '#002766',
+      }),
+      fgColor = '#4da0ff',
+      bgColor = m({
+        emphasis = '#0576ff',
+        muted = '#001a47',
+      }),
+    }),
+    brown = m({
+      borderColor = m({
+        emphasis = '#94774c',
+        muted = '#342a1d',
+      }),
+      fgColor = '#b69a6d',
+      bgColor = m({
+        emphasis = '#94774c',
+        muted = '#241c14',
+      }),
+    }),
+    orange = m({
+      borderColor = m({
+        emphasis = '#c46212',
+        muted = '#43200a',
+      }),
+      fgColor = '#ed8326',
+      bgColor = m({
+        emphasis = '#c46212',
+        muted = '#311708',
+      }),
+    }),
+    yellow = m({
+      borderColor = m({
+        emphasis = '#aa7109',
+        muted = '#3d2401',
+      }),
+      fgColor = '#d3910d',
+      bgColor = m({
+        emphasis = '#aa7109',
+        muted = '#2e1a00',
+      }),
+    }),
+    teal = m({
+      borderColor = m({
+        emphasis = '#158a8a',
+        muted = '#073036',
       }),
+      fgColor = '#1cb0ab',
       bgColor = m({
-        rest = '#2d1524',
-        active = '#65244a',
-        hover = '#451c35',
+        emphasis = '#158a8a',
+        muted = '#041f25',
       }),
     }),
-    brown = m({
-      fgColor = m({
-        rest = '#b69a6d',
-        active = '#cdbb98',
-        hover = '#bfa77d',
+    olive = m({
+      borderColor = m({
+        emphasis = '#7a8321',
+        muted = '#252d10',
       }),
+      fgColor = '#a2a626',
       bgColor = m({
-        rest = '#241c14',
-        active = '#483a28',
-        hover = '#342a1d',
+        emphasis = '#7a8321',
+        muted = '#171e0b',
       }),
     }),
-    pine = m({
-      fgColor = m({
-        rest = '#1bb673',
-        active = '#1bda81',
-        hover = '#1ac176',
-      }),
+  }),
+  avatarStack = m({
+    fade = m({
       bgColor = m({
-        rest = '#082119',
-        active = '#0e4430',
-        hover = '#0b3224',
+        default = '#444c56',
+        muted = '#373e47',
       }),
     }),
-    blue = m({
-      fgColor = m({
-        rest = '#4da0ff',
-        active = '#85c2ff',
-        hover = '#61adff',
+  }),
+  underlineNav = m({
+    borderColor = m({
+      active = '#ec775c',
+      hover = '#636e7b66',
+    }),
+    iconColor = m({
+      rest = '#778491',
+    }),
+  }),
+  data = m({
+    purple = m({
+      color = m({
+        default = '#975bf1',
+        muted = '#211047',
       }),
-      bgColor = m({
-        rest = '#001a47',
-        active = '#00378a',
-        hover = '#002766',
+    }),
+    auburn = m({
+      color = m({
+        default = '#a86f6b',
+        muted = '#271817',
       }),
     }),
-    orange = m({
-      fgColor = m({
-        rest = '#ed8326',
-        active = '#f6b06a',
-        hover = '#f1933b',
+    pink = m({
+      color = m({
+        default = '#d34591',
+        muted = '#2d1524',
       }),
-      bgColor = m({
-        rest = '#311708',
-        active = '#632f0d',
-        hover = '#43200a',
+    }),
+    yellow = m({
+      color = m({
+        default = '#895906',
+        muted = '#2e1a00',
       }),
     }),
-    auburn = m({
-      fgColor = m({
-        rest = '#bf9592',
-        active = '#d4b7b5',
-        hover = '#c6a19f',
+    teal = m({
+      color = m({
+        default = '#106c70',
+        muted = '#041f25',
       }),
-      bgColor = m({
-        rest = '#271817',
-        active = '#543331',
-        hover = '#3a2422',
+    }),
+    green = m({
+      color = m({
+        default = '#2f6f37',
+        muted = '#122117',
       }),
     }),
-    olive = m({
-      fgColor = m({
-        rest = '#a2a626',
-        active = '#cbc025',
-        hover = '#b2af24',
+    orange = m({
+      color = m({
+        default = '#984b10',
+        muted = '#311708',
       }),
-      bgColor = m({
-        rest = '#171e0b',
-        active = '#374115',
-        hover = '#252d10',
+    }),
+    red = m({
+      color = m({
+        default = '#eb3342',
+        muted = '#3c0614',
       }),
     }),
-    lime = m({
-      fgColor = m({
-        rest = '#7dae37',
-        active = '#9fcc3e',
-        hover = '#89ba36',
+    gray = m({
+      color = m({
+        default = '#576270',
+        muted = '#1c1c1c',
       }),
-      bgColor = m({
-        rest = '#141f0f',
-        active = '#2c441d',
-        hover = '#1f3116',
+    }),
+    blue = m({
+      color = m({
+        default = '#0576ff',
+        muted = '#001a47',
       }),
     }),
-    lemon = m({
+  }),
+  header = m({
+    borderColor = m({
+      divider = '#768390',
+    }),
+    fgColor = m({
+      default = '#cdd9e5b3',
+      logo = '#cdd9e5',
+    }),
+    bgColor = '#2d333bf2',
+  }),
+  treeViewItem = m({
+    leadingVisual = m({
+      iconColor = m({
+        rest = '#778491',
+      }),
+    }),
+  }),
+  borderColor = m({
+    sponsors = m({
+      emphasis = '#ae4c82',
+      muted = '#c9619866',
+    }),
+    severe = m({
+      emphasis = '#ae5622',
+      muted = '#cc6b2c66',
+    }),
+    muted = '#444c56b3',
+    done = m({
+      emphasis = '#8256d0',
+      muted = '#986ee266',
+    }),
+    disabled = '#373e47b3',
+    danger = m({
+      emphasis = '#c93c37',
+      muted = '#e5534b66',
+    }),
+    closed = m({
+      emphasis = '#c93c37',
+      muted = '#e5534b66',
+    }),
+    attention = m({
+      emphasis = '#966600',
+      muted = '#ae7c1466',
+    }),
+    accent = m({
+      emphasis = '#316dca',
+      muted = '#4184e466',
+    }),
+    emphasis = '#545d68',
+    neutral = m({
+      emphasis = '#636e7b',
+      muted = '#636e7b66',
+    }),
+    transparent = '#00000000',
+    upsell = m({
+      emphasis = '#8256d0',
+      muted = '#986ee266',
+    }),
+    open = m({
+      emphasis = '#347d39',
+      muted = '#46954a66',
+    }),
+    translucent = '#cdd9e526',
+    default = '#444c56',
+    success = m({
+      emphasis = '#347d39',
+      muted = '#46954a66',
+    }),
+  }),
+  button = m({
+    outline = m({
+      borderColor = m({
+        selected = '#cdd9e51a',
+        hover = '#cdd9e51a',
+      }),
       fgColor = m({
-        rest = '#ba9b12',
-        active = '#d7bc1d',
-        hover = '#c4a717',
+        rest = '#4184e4',
+        active = '#cdd9e5',
+        disabled = '#478be680',
+        hover = '#539bf5',
+      }),
+      shadow = m({
+        selected = '0px 0px 0px 0px #000000',
       }),
       bgColor = m({
-        rest = '#291d00',
-        active = '#4f3c02',
-        hover = '#372901',
+        rest = '#cdd9e5',
+        active = '#1b4b91',
+        disabled = '#22272e',
+        hover = '#444c56',
       }),
     }),
-    yellow = m({
+    inactive = m({
+      bgColor = '#373e47',
+      fgColor = '#768390',
+    }),
+    star = m({
+      iconColor = '#daaa3f',
+    }),
+    default = m({
+      borderColor = m({
+        rest = '#444c56',
+        active = '#444c56',
+        disabled = '#373e47b3',
+        hover = '#444c56',
+      }),
       fgColor = m({
-        rest = '#d3910d',
-        active = '#edb431',
-        hover = '#df9e11',
+        rest = '#adbac7',
+      }),
+      shadow = m({
+        resting = '0px 0px 0px 0px #000000',
       }),
       bgColor = m({
-        rest = '#2e1a00',
-        active = '#5a3702',
-        hover = '#3d2401',
+        hover = '#3d444e',
+        selected = '#434a54',
+        active = '#434a54',
+        disabled = '#373e47b3',
+        rest = '#373e47',
       }),
     }),
-    indigo = m({
+    invisible = m({
+      borderColor = m({
+        rest = '#00000000',
+        disabled = '#373e47b3',
+        hover = '#00000000',
+      }),
       fgColor = m({
-        rest = '#9899ec',
-        active = '#b7baf6',
-        hover = '#a2a5f1',
+        rest = '#478be6',
+        disabled = '#636e7b',
+        hover = '#539bf5',
+      }),
+      iconColor = m({
+        rest = '#778491',
+        disabled = '#636e7b',
+        hover = '#778491',
       }),
       bgColor = m({
-        rest = '#1b183f',
-        active = '#312c90',
-        hover = '#25215f',
+        rest = '#00000000',
+        active = '#909dab33',
+        disabled = '#373e47b3',
+        hover = '#909dab1f',
       }),
     }),
-    teal = m({
-      fgColor = m({
-        rest = '#1cb0ab',
-        active = '#24d6c4',
-        hover = '#1fbdb2',
+    primary = m({
+      iconColor = m({
+        rest = '#ffffff',
+      }),
+      shadow = m({
+        selected = '0px 0px 0px 0px #000000',
       }),
       bgColor = m({
-        rest = '#041f25',
-        active = '#0a464d',
-        hover = '#073036',
+        rest = '#347d39',
+        active = '#428f46',
+        disabled = '#50a254',
+        hover = '#3b8640',
       }),
-    }),
-  }),
-  codeMirror = m({
-    matchingBracket = m({
-      fgColor = '#c5d1de',
-    }),
-    lineNumber = m({
-      fgColor = '#778491',
-    }),
-    gutters = m({
-      bgColor = '#22272e',
-    }),
-    gutterMarker = m({
-      fgColor = m({
-        default = '#22272e',
-        muted = '#778491',
+      borderColor = m({
+        rest = '#cdd9e51a',
+        active = '#cdd9e51a',
+        disabled = '#50a254',
+        hover = '#cdd9e51a',
       }),
-    }),
-    bgColor = '#22272e',
-    selection = m({
-      bgColor = '#4184e466',
-    }),
-    syntax = m({
       fgColor = m({
-        comment = '#768390',
-        variable = '#f69d50',
-        constant = '#6cb6ff',
-        storage = '#f47067',
-        entity = '#dcbdfb',
-        support = '#6cb6ff',
-        keyword = '#f47067',
-        string = '#96d0ff',
+        disabled = '#cdd9e566',
+        rest = '#ffffff',
       }),
     }),
-    lines = m({
-      bgColor = '#22272e',
-    }),
-    activeline = m({
-      bgColor = '#636e7b66',
-    }),
-    fgColor = '#c5d1de',
-    cursor = m({
-      fgColor = '#c5d1de',
-    }),
-  }),
-  treeViewItem = m({
-    leadingVisual = m({
+    danger = m({
       iconColor = m({
-        rest = '#778491',
+        hover = '#cdd9e5',
+        rest = '#e5534b',
+      }),
+      shadow = m({
+        selected = '0px 0px 0px 0px #000000',
+      }),
+      bgColor = m({
+        rest = '#373e47',
+        active = '#c33d38',
+        disabled = '#373e47b3',
+        hover = '#ad2e2c',
+      }),
+      borderColor = m({
+        active = '#cdd9e51a',
+        rest = '#444c56',
+        hover = '#cdd9e51a',
+      }),
+      fgColor = m({
+        rest = '#e5534b',
+        active = '#cdd9e5',
+        disabled = '#e5534b80',
+        hover = '#cdd9e5',
       }),
     }),
   }),
   controlTrack = m({
-    bgColor = m({
-      rest = '#373e47',
-      active = '#434a54',
-      disabled = '#636e7b',
-      hover = '#3d444e',
-    }),
     borderColor = m({
-      rest = '#00000000',
       disabled = '#636e7b',
+      rest = '#00000000',
     }),
     fgColor = m({
-      rest = '#778491',
       disabled = '#cdd9e5',
+      rest = '#778491',
     }),
-  }),
-  color = m({
-    prettylights = m({
-      syntax = m({
-        comment = '#768390',
-        carriage = m({
-          ['return'] = m({
-            text = '#cdd9e5',
-            bg = '#ad2e2c',
-          }),
-        }),
-        storage = m({
-          modifier = m({
-            import = '#adbac7',
-          }),
-        }),
-        brackethighlighter = m({
-          unmatched = '#e5534b',
-          angle = '#768390',
-        }),
-        keyword = '#f47067',
-        invalid = m({
-          illegal = m({
-            text = '#cdd9e5',
-            bg = '#922323',
-          }),
-        }),
-        variable = '#f69d50',
-        constant = m({
-          other = m({
-            reference = m({
-              link = '#96d0ff',
-            }),
-          }),
-          default = '#6cb6ff',
-        }),
-        entity = m({
-          tag = '#8ddb8c',
-          default = '#dcbdfb',
-        }),
-        meta = m({
-          diff = m({
-            range = '#dcbdfb',
-          }),
-        }),
-        string = m({
-          regexp = '#8ddb8c',
-          default = '#96d0ff',
-        }),
-        sublimelinter = m({
-          gutter = m({
-            mark = '#545d68',
-          }),
-        }),
-        markup = m({
-          list = '#eac55f',
-          deleted = m({
-            text = '#ffd8d3',
-            bg = '#78191b',
-          }),
-          italic = '#adbac7',
-          changed = m({
-            text = '#ffddb0',
-            bg = '#682d0f',
-          }),
-          inserted = m({
-            text = '#b4f1b4',
-            bg = '#1b4721',
-          }),
-          bold = '#adbac7',
-          heading = '#316dca',
-          ignored = m({
-            text = '#adbac7',
-            bg = '#255ab2',
-          }),
-        }),
-      }),
-    }),
-    ansi = m({
-      green = m({
-        default = '#57ab5a',
-        bright = '#6bc46d',
-      }),
-      black = m({
-        default = '#545d68',
-        bright = '#636e7b',
-      }),
-      red = m({
-        default = '#f47067',
-        bright = '#ff938a',
-      }),
-      gray = '#636e7b',
-      white = m({
-        default = '#909dab',
-        bright = '#cdd9e5',
-      }),
-      cyan = m({
-        default = '#39c5cf',
-        bright = '#56d4dd',
-      }),
-      magenta = m({
-        default = '#b083f0',
-        bright = '#dcbdfb',
-      }),
-      yellow = m({
-        default = '#c69026',
-        bright = '#daaa3f',
-      }),
-      blue = m({
-        default = '#539bf5',
-        bright = '#6cb6ff',
-      }),
+    bgColor = m({
+      rest = '#373e47',
+      active = '#434a54',
+      disabled = '#636e7b',
+      hover = '#3d444e',
     }),
   }),
+  counter = m({
+    borderColor = '#00000000',
+  }),
 })
 M._VERSION =
   vim.json.decode([=["8.2.3"]=], { luanil = { object = false, array = false } })
diff --git a/lua/github-theme/palette/primitives/dark_high_contrast.lua b/lua/github-theme/palette/primitives/dark_high_contrast.lua
index 9485695..346eccb 100644
--- a/lua/github-theme/palette/primitives/dark_high_contrast.lua
+++ b/lua/github-theme/palette/primitives/dark_high_contrast.lua
@@ -11,11 +11,111 @@ local function m(tbl)
   return setmetatable(tbl, mt)
 end
 local M = m({
+  timelineBadge = m({
+    bgColor = '#3d424d',
+  }),
+  bgColor = m({
+    neutral = m({
+      emphasis = '#9ea7b3',
+      muted = '#9ea7b366',
+    }),
+    inverse = '#ffffff',
+    inset = '#010409',
+    white = '#ffffff',
+    upsell = m({
+      emphasis = '#b87fff',
+      muted = '#bf8fff26',
+    }),
+    success = m({
+      emphasis = '#09b43a',
+      muted = '#0ac74026',
+    }),
+    sponsors = m({
+      emphasis = '#ef6eb1',
+      muted = '#f87cbd1a',
+    }),
+    severe = m({
+      emphasis = '#e7811d',
+      muted = '#f48b251a',
+    }),
+    open = m({
+      emphasis = '#09b43a',
+      muted = '#0ac7401a',
+    }),
+    muted = '#272b33',
+    default = '#0a0c10',
+    done = m({
+      emphasis = '#b87fff',
+      muted = '#bf8fff26',
+    }),
+    disabled = '#3d424db3',
+    danger = m({
+      emphasis = '#ff6a69',
+      muted = '#ff80801a',
+    }),
+    closed = m({
+      emphasis = '#ff6a69',
+      muted = '#ff808026',
+    }),
+    black = '#010409',
+    transparent = '#00000000',
+    accent = m({
+      emphasis = '#409eff',
+      muted = '#5cacff1a',
+    }),
+    attention = m({
+      emphasis = '#e09b13',
+      muted = '#edaa2726',
+    }),
+    emphasis = '#ffffff',
+  }),
+  skeletonLoader = m({
+    bgColor = '#272b33',
+  }),
+  header = m({
+    bgColor = '#272b33f2',
+    borderColor = m({
+      divider = '#bdc4cc',
+    }),
+    fgColor = m({
+      default = '#ffffffb3',
+      logo = '#ffffff',
+    }),
+  }),
+  overlay = m({
+    bgColor = '#272b33',
+    borderColor = '#7a828e',
+    backdrop = m({
+      bgColor = '#272b3366',
+    }),
+  }),
+  sideNav = m({
+    bgColor = m({
+      selected = '#3d424d',
+    }),
+  }),
+  highlight = m({
+    neutral = m({
+      bgColor = '#f0b72f66',
+    }),
+  }),
   outline = m({
     focus = '#409eff solid 2px',
   }),
-  focus = m({
-    outlineColor = '#409eff',
+  shadow = m({
+    inset = 'inset 0px 1px 0px 0px #0104093d',
+    resting = m({
+      medium = '0px 3px 6px 0px #010409cc',
+      small = '0px 1px 0px 0px #01040966',
+      xsmall = '0px 1px 0px 0px #010409cc',
+    }),
+    floating = m({
+      legacy = '0px 6px 12px -3px #01040966, 0px 6px 18px 0px #01040966',
+      large = '0px 0px 0px 1px #7a828e, 0px 24px 48px 0px #010409',
+      small = '0px 0px 0px 1px #7a828e, 0px 6px 12px -3px #01040966, 0px 6px 18px 0px #01040966',
+      medium = '0px 0px 0px 1px #7a828e, 0px 8px 16px -4px #01040966, 0px 4px 32px -4px #01040966, 0px 24px 48px -12px #01040966, 0px 48px 96px -24px #01040966',
+      xlarge = '0px 0px 0px 1px #7a828e, 0px 32px 64px 0px #010409',
+    }),
   }),
   menu = m({
     bgColor = m({
@@ -23,607 +123,527 @@ local M = m({
     }),
   }),
   label = m({
+    blue = m({
+      bgColor = m({
+        hover = '#002766',
+        rest = '#001a47',
+        active = '#00378a',
+      }),
+      fgColor = m({
+        hover = '#61adff',
+        rest = '#4da0ff',
+        active = '#85c2ff',
+      }),
+    }),
+    orange = m({
+      bgColor = m({
+        hover = '#43200a',
+        rest = '#311708',
+        active = '#632f0d',
+      }),
+      fgColor = m({
+        hover = '#f1933b',
+        rest = '#ed8326',
+        active = '#f6b06a',
+      }),
+    }),
+    auburn = m({
+      bgColor = m({
+        hover = '#3a2422',
+        rest = '#271817',
+        active = '#543331',
+      }),
+      fgColor = m({
+        hover = '#c6a19f',
+        rest = '#bf9592',
+        active = '#d4b7b5',
+      }),
+    }),
+    olive = m({
+      bgColor = m({
+        hover = '#252d10',
+        rest = '#171e0b',
+        active = '#374115',
+      }),
+      fgColor = m({
+        hover = '#b2af24',
+        rest = '#a2a626',
+        active = '#cbc025',
+      }),
+    }),
     lime = m({
       bgColor = m({
-        active = '#2c441d',
-        rest = '#141f0f',
         hover = '#1f3116',
+        rest = '#141f0f',
+        active = '#2c441d',
       }),
       fgColor = m({
-        active = '#9fcc3e',
-        rest = '#7dae37',
         hover = '#89ba36',
+        rest = '#7dae37',
+        active = '#9fcc3e',
       }),
     }),
     lemon = m({
       bgColor = m({
-        active = '#4f3c02',
-        rest = '#291d00',
         hover = '#372901',
+        rest = '#291d00',
+        active = '#4f3c02',
       }),
       fgColor = m({
-        active = '#d7bc1d',
-        rest = '#ba9b12',
         hover = '#c4a717',
+        rest = '#ba9b12',
+        active = '#d7bc1d',
       }),
     }),
     yellow = m({
       bgColor = m({
-        active = '#5a3702',
-        rest = '#2e1a00',
         hover = '#3d2401',
+        rest = '#2e1a00',
+        active = '#5a3702',
       }),
       fgColor = m({
-        active = '#edb431',
-        rest = '#d3910d',
         hover = '#df9e11',
+        rest = '#d3910d',
+        active = '#edb431',
       }),
     }),
     indigo = m({
       bgColor = m({
-        active = '#312c90',
-        rest = '#1b183f',
         hover = '#25215f',
+        rest = '#1b183f',
+        active = '#312c90',
       }),
       fgColor = m({
-        active = '#b7baf6',
-        rest = '#9899ec',
         hover = '#a2a5f1',
+        rest = '#9899ec',
+        active = '#b7baf6',
       }),
     }),
     teal = m({
       bgColor = m({
-        active = '#0a464d',
-        rest = '#041f25',
         hover = '#073036',
+        rest = '#041f25',
+        active = '#0a464d',
       }),
       fgColor = m({
-        active = '#24d6c4',
-        rest = '#1cb0ab',
         hover = '#1fbdb2',
+        rest = '#1cb0ab',
+        active = '#24d6c4',
       }),
     }),
     green = m({
       bgColor = m({
-        active = '#214529',
-        rest = '#122117',
         hover = '#182f1f',
+        rest = '#122117',
+        active = '#214529',
       }),
       fgColor = m({
-        active = '#75d36f',
-        rest = '#41b445',
         hover = '#46c144',
+        rest = '#41b445',
+        active = '#75d36f',
       }),
     }),
     red = m({
       bgColor = m({
-        active = '#790c20',
-        rest = '#3c0614',
         hover = '#58091a',
+        rest = '#3c0614',
+        active = '#790c20',
       }),
       fgColor = m({
-        active = '#f7adab',
-        rest = '#f27d83',
         hover = '#f48b8d',
+        rest = '#f27d83',
+        active = '#f7adab',
       }),
     }),
     gray = m({
       bgColor = m({
-        active = '#393d41',
-        rest = '#1c1c1c',
         hover = '#2a2b2d',
+        rest = '#1c1c1c',
+        active = '#393d41',
       }),
       fgColor = m({
-        active = '#b3c0d1',
-        rest = '#92a1b5',
         hover = '#9babbf',
+        rest = '#92a1b5',
+        active = '#b3c0d1',
       }),
     }),
     purple = m({
       bgColor = m({
-        active = '#481a9e',
-        rest = '#211047',
         hover = '#31146b',
+        rest = '#211047',
+        active = '#481a9e',
       }),
       fgColor = m({
-        active = '#d2affd',
-        rest = '#b687f7',
         hover = '#c398fb',
+        rest = '#b687f7',
+        active = '#d2affd',
       }),
     }),
     cyan = m({
       bgColor = m({
-        active = '#014156',
-        rest = '#001f29',
         hover = '#002e3d',
+        rest = '#001f29',
+        active = '#014156',
       }),
       fgColor = m({
-        active = '#45cbf7',
-        rest = '#07ace4',
         hover = '#09b7f1',
+        rest = '#07ace4',
+        active = '#45cbf7',
       }),
     }),
     plum = m({
       bgColor = m({
-        active = '#5c1688',
-        rest = '#2a0e3f',
         hover = '#40125e',
+        rest = '#2a0e3f',
+        active = '#5c1688',
       }),
       fgColor = m({
-        active = '#e4a5fd',
-        rest = '#d07ef7',
         hover = '#d889fa',
+        rest = '#d07ef7',
+        active = '#e4a5fd',
       }),
     }),
     coral = m({
       bgColor = m({
-        active = '#72220d',
-        rest = '#351008',
         hover = '#51180b',
+        rest = '#351008',
+        active = '#72220d',
       }),
       fgColor = m({
-        active = '#fdaa86',
-        rest = '#f7794b',
         hover = '#fa8c61',
+        rest = '#f7794b',
+        active = '#fdaa86',
       }),
     }),
     pink = m({
       bgColor = m({
-        active = '#65244a',
-        rest = '#2d1524',
         hover = '#451c35',
+        rest = '#2d1524',
+        active = '#65244a',
       }),
       fgColor = m({
-        active = '#f4a9cd',
-        rest = '#e57bb2',
         hover = '#ec8dbd',
+        rest = '#e57bb2',
+        active = '#f4a9cd',
       }),
     }),
     brown = m({
       bgColor = m({
-        active = '#483a28',
-        rest = '#241c14',
         hover = '#342a1d',
+        rest = '#241c14',
+        active = '#483a28',
       }),
       fgColor = m({
-        active = '#cdbb98',
-        rest = '#b69a6d',
         hover = '#bfa77d',
+        rest = '#b69a6d',
+        active = '#cdbb98',
       }),
     }),
     pine = m({
       bgColor = m({
-        active = '#0e4430',
-        rest = '#082119',
         hover = '#0b3224',
+        rest = '#082119',
+        active = '#0e4430',
       }),
       fgColor = m({
-        active = '#1bda81',
-        rest = '#1bb673',
         hover = '#1ac176',
+        rest = '#1bb673',
+        active = '#1bda81',
       }),
     }),
-    blue = m({
-      bgColor = m({
-        active = '#00378a',
-        rest = '#001a47',
-        hover = '#002766',
-      }),
-      fgColor = m({
-        active = '#85c2ff',
-        rest = '#4da0ff',
-        hover = '#61adff',
-      }),
+  }),
+  diffBlob = m({
+    expander = m({
+      iconColor = '#fbfcfd',
     }),
-    orange = m({
+    deletion = m({
       bgColor = m({
-        active = '#632f0d',
-        rest = '#311708',
-        hover = '#43200a',
+        word = '#ff6a69',
+        line = '#ff808026',
+        num = '#ff80804d',
       }),
       fgColor = m({
-        active = '#f6b06a',
-        rest = '#ed8326',
-        hover = '#f1933b',
+        text = '#0a0c10',
+        num = '#fbfcfd',
       }),
     }),
-    auburn = m({
+    hunk = m({
       bgColor = m({
-        active = '#543331',
-        rest = '#271817',
-        hover = '#3a2422',
-      }),
-      fgColor = m({
-        active = '#d4b7b5',
-        rest = '#bf9592',
-        hover = '#c6a19f',
+        num = '#5cacff66',
       }),
     }),
-    olive = m({
+    addition = m({
       bgColor = m({
-        active = '#374115',
-        rest = '#171e0b',
-        hover = '#252d10',
+        word = '#0ac740',
+        line = '#0ac74026',
+        num = '#28d7514d',
       }),
       fgColor = m({
-        active = '#cbc025',
-        rest = '#a2a626',
-        hover = '#b2af24',
+        text = '#0a0c10',
+        num = '#fbfcfd',
       }),
     }),
   }),
-  avatarStack = m({
-    fade = m({
+  display = m({
+    blue = m({
       bgColor = m({
-        default = '#525964',
-        muted = '#3d424d',
-      }),
-    }),
-  }),
-  avatar = m({
-    borderColor = '#ffffffe6',
-    shadow = '0px 0px 0px 2px #0a0c10',
-    bgColor = '#ffffff1a',
-  }),
-  highlight = m({
-    neutral = m({
-      bgColor = '#f0b72f66',
-    }),
-  }),
-  data = m({
-    purple = m({
-      color = m({
-        default = '#975bf1',
-        muted = '#211047',
-      }),
-    }),
-    pink = m({
-      color = m({
-        default = '#d34591',
-        muted = '#2d1524',
-      }),
-    }),
-    yellow = m({
-      color = m({
-        default = '#895906',
-        muted = '#2e1a00',
-      }),
-    }),
-    auburn = m({
-      color = m({
-        default = '#a86f6b',
-        muted = '#271817',
-      }),
-    }),
-    teal = m({
-      color = m({
-        default = '#106c70',
-        muted = '#041f25',
+        emphasis = '#0576ff',
+        muted = '#001a47',
       }),
-    }),
-    green = m({
-      color = m({
-        default = '#2f6f37',
-        muted = '#122117',
+      borderColor = m({
+        emphasis = '#0576ff',
+        muted = '#002766',
       }),
+      fgColor = '#4da0ff',
     }),
     orange = m({
-      color = m({
-        default = '#984b10',
+      bgColor = m({
+        emphasis = '#c46212',
         muted = '#311708',
       }),
-    }),
-    red = m({
-      color = m({
-        default = '#eb3342',
-        muted = '#3c0614',
-      }),
-    }),
-    gray = m({
-      color = m({
-        default = '#576270',
-        muted = '#1c1c1c',
-      }),
-    }),
-    blue = m({
-      color = m({
-        default = '#0576ff',
-        muted = '#001a47',
-      }),
-    }),
-  }),
-  diffBlob = m({
-    hunk = m({
-      bgColor = m({
-        num = '#5cacff66',
+      borderColor = m({
+        emphasis = '#c46212',
+        muted = '#43200a',
       }),
+      fgColor = '#ed8326',
     }),
-    addition = m({
+    auburn = m({
       bgColor = m({
-        num = '#28d7514d',
-        word = '#0ac740',
-        line = '#0ac74026',
+        emphasis = '#a86f6b',
+        muted = '#271817',
       }),
-      fgColor = m({
-        text = '#0a0c10',
-        num = '#fbfcfd',
+      borderColor = m({
+        emphasis = '#a86f6b',
+        muted = '#3a2422',
       }),
+      fgColor = '#bf9592',
     }),
-    expander = m({
-      iconColor = '#fbfcfd',
-    }),
-    deletion = m({
+    olive = m({
       bgColor = m({
-        num = '#ff80804d',
-        word = '#ff6a69',
-        line = '#ff808026',
+        emphasis = '#7a8321',
+        muted = '#171e0b',
       }),
-      fgColor = m({
-        text = '#0a0c10',
-        num = '#fbfcfd',
+      borderColor = m({
+        emphasis = '#7a8321',
+        muted = '#252d10',
       }),
+      fgColor = '#a2a626',
     }),
-  }),
-  display = m({
     lime = m({
+      bgColor = m({
+        emphasis = '#5f892f',
+        muted = '#141f0f',
+      }),
       borderColor = m({
         emphasis = '#5f892f',
         muted = '#1f3116',
       }),
       fgColor = '#7dae37',
-      bgColor = m({
-        emphasis = '#5f892f',
-        muted = '#141f0f',
-      }),
     }),
     lemon = m({
+      bgColor = m({
+        emphasis = '#977b0c',
+        muted = '#291d00',
+      }),
       borderColor = m({
         emphasis = '#977b0c',
         muted = '#372901',
       }),
       fgColor = '#ba9b12',
-      bgColor = m({
-        emphasis = '#977b0c',
-        muted = '#291d00',
-      }),
     }),
     yellow = m({
+      bgColor = m({
+        emphasis = '#aa7109',
+        muted = '#2e1a00',
+      }),
       borderColor = m({
         emphasis = '#aa7109',
         muted = '#3d2401',
       }),
       fgColor = '#d3910d',
-      bgColor = m({
-        emphasis = '#aa7109',
-        muted = '#2e1a00',
-      }),
     }),
     indigo = m({
+      bgColor = m({
+        emphasis = '#7070e1',
+        muted = '#1b183f',
+      }),
       borderColor = m({
         emphasis = '#7070e1',
         muted = '#25215f',
       }),
       fgColor = '#9899ec',
-      bgColor = m({
-        emphasis = '#7070e1',
-        muted = '#1b183f',
-      }),
     }),
     teal = m({
+      bgColor = m({
+        emphasis = '#158a8a',
+        muted = '#041f25',
+      }),
       borderColor = m({
         emphasis = '#158a8a',
         muted = '#073036',
       }),
       fgColor = '#1cb0ab',
-      bgColor = m({
-        emphasis = '#158a8a',
-        muted = '#041f25',
-      }),
     }),
     green = m({
+      bgColor = m({
+        emphasis = '#388f3f',
+        muted = '#122117',
+      }),
       borderColor = m({
         emphasis = '#388f3f',
         muted = '#182f1f',
       }),
       fgColor = '#41b445',
-      bgColor = m({
-        emphasis = '#388f3f',
-        muted = '#122117',
-      }),
     }),
     red = m({
+      bgColor = m({
+        emphasis = '#eb3342',
+        muted = '#3c0614',
+      }),
       borderColor = m({
         emphasis = '#eb3342',
         muted = '#58091a',
       }),
       fgColor = '#f27d83',
-      bgColor = m({
-        emphasis = '#eb3342',
-        muted = '#3c0614',
-      }),
     }),
     gray = m({
+      bgColor = m({
+        emphasis = '#6e7f96',
+        muted = '#1c1c1c',
+      }),
       borderColor = m({
         emphasis = '#6e7f96',
         muted = '#2a2b2d',
       }),
       fgColor = '#92a1b5',
-      bgColor = m({
-        emphasis = '#6e7f96',
-        muted = '#1c1c1c',
-      }),
     }),
     purple = m({
+      bgColor = m({
+        emphasis = '#975bf1',
+        muted = '#211047',
+      }),
       borderColor = m({
         emphasis = '#975bf1',
         muted = '#31146b',
       }),
       fgColor = '#b687f7',
-      bgColor = m({
-        emphasis = '#975bf1',
-        muted = '#211047',
-      }),
     }),
     cyan = m({
+      bgColor = m({
+        emphasis = '#0587b3',
+        muted = '#001f29',
+      }),
       borderColor = m({
         emphasis = '#0587b3',
         muted = '#002e3d',
       }),
       fgColor = '#07ace4',
-      bgColor = m({
-        emphasis = '#0587b3',
-        muted = '#001f29',
-      }),
     }),
     plum = m({
+      bgColor = m({
+        emphasis = '#b643ef',
+        muted = '#2a0e3f',
+      }),
       borderColor = m({
         emphasis = '#b643ef',
         muted = '#40125e',
       }),
       fgColor = '#d07ef7',
-      bgColor = m({
-        emphasis = '#b643ef',
-        muted = '#2a0e3f',
-      }),
     }),
     coral = m({
+      bgColor = m({
+        emphasis = '#eb3342',
+        muted = '#3c0614',
+      }),
       borderColor = m({
         emphasis = '#eb3342',
         muted = '#58091a',
       }),
       fgColor = '#f27d83',
-      bgColor = m({
-        emphasis = '#eb3342',
-        muted = '#3c0614',
-      }),
     }),
     pink = m({
+      bgColor = m({
+        emphasis = '#d34591',
+        muted = '#2d1524',
+      }),
       borderColor = m({
         emphasis = '#d34591',
         muted = '#451c35',
       }),
       fgColor = '#e57bb2',
-      bgColor = m({
-        emphasis = '#d34591',
-        muted = '#2d1524',
-      }),
     }),
     brown = m({
+      bgColor = m({
+        emphasis = '#94774c',
+        muted = '#241c14',
+      }),
       borderColor = m({
         emphasis = '#94774c',
         muted = '#342a1d',
       }),
       fgColor = '#b69a6d',
-      bgColor = m({
-        emphasis = '#94774c',
-        muted = '#241c14',
-      }),
     }),
     pine = m({
-      borderColor = m({
-        emphasis = '#18915e',
-        muted = '#0b3224',
-      }),
-      fgColor = '#1bb673',
       bgColor = m({
         emphasis = '#18915e',
         muted = '#082119',
       }),
-    }),
-    blue = m({
       borderColor = m({
-        emphasis = '#0576ff',
-        muted = '#002766',
-      }),
-      fgColor = '#4da0ff',
-      bgColor = m({
-        emphasis = '#0576ff',
-        muted = '#001a47',
+        emphasis = '#18915e',
+        muted = '#0b3224',
       }),
+      fgColor = '#1bb673',
     }),
-    orange = m({
-      borderColor = m({
-        emphasis = '#c46212',
-        muted = '#43200a',
-      }),
-      fgColor = '#ed8326',
-      bgColor = m({
-        emphasis = '#c46212',
-        muted = '#311708',
-      }),
+  }),
+  codeMirror = m({
+    lines = m({
+      bgColor = '#0a0c10',
     }),
-    auburn = m({
-      borderColor = m({
-        emphasis = '#a86f6b',
-        muted = '#3a2422',
-      }),
-      fgColor = '#bf9592',
-      bgColor = m({
-        emphasis = '#a86f6b',
-        muted = '#271817',
-      }),
+    bgColor = '#0a0c10',
+    matchingBracket = m({
+      fgColor = '#fbfcfd',
     }),
-    olive = m({
-      borderColor = m({
-        emphasis = '#7a8321',
-        muted = '#252d10',
+    lineNumber = m({
+      fgColor = '#f0f3f6',
+    }),
+    gutters = m({
+      bgColor = '#0a0c10',
+    }),
+    gutterMarker = m({
+      fgColor = m({
+        default = '#0a0c10',
+        muted = '#f0f3f6',
       }),
-      fgColor = '#a2a626',
-      bgColor = m({
-        emphasis = '#7a8321',
-        muted = '#171e0b',
+    }),
+    syntax = m({
+      fgColor = m({
+        variable = '#ffb757',
+        string = '#addcff',
+        storage = '#ff9492',
+        comment = '#bdc4cc',
+        constant = '#91cbff',
+        keyword = '#ff9492',
+        entity = '#dbb7ff',
+        support = '#91cbff',
       }),
     }),
-  }),
-  underlineNav = m({
-    borderColor = m({
-      active = '#ff967d',
-      hover = '#bdc4cc',
+    cursor = m({
+      fgColor = '#fbfcfd',
     }),
-    iconColor = m({
-      rest = '#f0f3f6',
+    activeline = m({
+      bgColor = '#9ea7b366',
     }),
+    selection = m({
+      bgColor = '#5cacff66',
+    }),
+    fgColor = '#fbfcfd',
+  }),
+  avatar = m({
+    shadow = '0px 0px 0px 2px #0a0c10',
+    bgColor = '#ffffff1a',
+    borderColor = '#ffffffe6',
   }),
   scale = m({
-    purple = m({
-      [1] = '#f0dfff',
-      [2] = '#e6ccff',
-      [3] = '#dbb7ff',
-      [4] = '#cb9eff',
-      [5] = '#bf8fff',
-      [6] = '#b87fff',
-      [7] = '#a66bff',
-      [8] = '#954ffd',
-      [9] = '#8031f7',
-      [10] = '#6921d7',
-    }),
-    black = '#010409',
-    transparent = '#00000000',
-    pink = m({
-      [1] = '#ffdceb',
-      [2] = '#ffc7e1',
-      [3] = '#ffadd4',
-      [4] = '#ff8dc7',
-      [5] = '#f87cbd',
-      [6] = '#ef6eb1',
-      [7] = '#e456a3',
-      [8] = '#d23d91',
-      [9] = '#b72c7d',
-      [10] = '#9c1d6a',
-    }),
-    white = '#ffffff',
-    neutral = m({
-      [1] = '#ffffff',
-      [2] = '#f0f3f6',
-      [3] = '#d9dee3',
-      [4] = '#bdc4cc',
-      [5] = '#9ea7b3',
-      [6] = '#7a828e',
-      [7] = '#525964',
-      [8] = '#3d424d',
-      [9] = '#272b33',
-      [10] = '#0a0c10',
-    }),
     blue = m({
       [1] = '#caeaff',
       [2] = '#addcff',
@@ -672,18 +692,19 @@ local M = m({
       [9] = '#cc1421',
       [10] = '#ad0116',
     }),
-    yellow = m({
-      [1] = '#fbe59e',
-      [2] = '#fbd669',
-      [3] = '#f7c843',
-      [4] = '#f0b72f',
-      [5] = '#edaa27',
-      [6] = '#e09b13',
-      [7] = '#c88508',
-      [8] = '#ae7104',
-      [9] = '#945d02',
-      [10] = '#7b4900',
+    neutral = m({
+      [1] = '#ffffff',
+      [2] = '#f0f3f6',
+      [3] = '#d9dee3',
+      [4] = '#bdc4cc',
+      [5] = '#9ea7b3',
+      [6] = '#7a828e',
+      [7] = '#525964',
+      [8] = '#3d424d',
+      [9] = '#272b33',
+      [10] = '#0a0c10',
     }),
+    black = '#010409',
     coral = m({
       [1] = '#ffded4',
       [2] = '#ffcbb9',
@@ -696,161 +717,55 @@ local M = m({
       [9] = '#c62612',
       [10] = '#a91500',
     }),
+    purple = m({
+      [1] = '#f0dfff',
+      [2] = '#e6ccff',
+      [3] = '#dbb7ff',
+      [4] = '#cb9eff',
+      [5] = '#bf8fff',
+      [6] = '#b87fff',
+      [7] = '#a66bff',
+      [8] = '#954ffd',
+      [9] = '#8031f7',
+      [10] = '#6921d7',
+    }),
+    pink = m({
+      [1] = '#ffdceb',
+      [2] = '#ffc7e1',
+      [3] = '#ffadd4',
+      [4] = '#ff8dc7',
+      [5] = '#f87cbd',
+      [6] = '#ef6eb1',
+      [7] = '#e456a3',
+      [8] = '#d23d91',
+      [9] = '#b72c7d',
+      [10] = '#9c1d6a',
+    }),
+    yellow = m({
+      [1] = '#fbe59e',
+      [2] = '#fbd669',
+      [3] = '#f7c843',
+      [4] = '#f0b72f',
+      [5] = '#edaa27',
+      [6] = '#e09b13',
+      [7] = '#c88508',
+      [8] = '#ae7104',
+      [9] = '#945d02',
+      [10] = '#7b4900',
+    }),
+    white = '#ffffff',
+    transparent = '#00000000',
   }),
-  color = m({
-    prettylights = m({
-      syntax = m({
-        invalid = m({
-          illegal = m({
-            text = '#ffffff',
-            bg = '#e82a2f',
-          }),
-        }),
-        string = m({
-          regexp = '#72f088',
-          default = '#addcff',
-        }),
-        variable = '#ffb757',
-        entity = m({
-          tag = '#72f088',
-          default = '#dbb7ff',
-        }),
-        constant = m({
-          other = m({
-            reference = m({
-              link = '#addcff',
-            }),
-          }),
-          default = '#91cbff',
-        }),
-        sublimelinter = m({
-          gutter = m({
-            mark = '#7a828e',
-          }),
-        }),
-        comment = '#bdc4cc',
-        carriage = m({
-          ['return'] = m({
-            text = '#ffffff',
-            bg = '#ff4445',
-          }),
-        }),
-        storage = m({
-          modifier = m({
-            import = '#f0f3f6',
-          }),
-        }),
-        meta = m({
-          diff = m({
-            range = '#dbb7ff',
-          }),
-        }),
-        brackethighlighter = m({
-          unmatched = '#ff8080',
-          angle = '#bdc4cc',
-        }),
-        keyword = '#ff9492',
-        markup = m({
-          list = '#fbd669',
-          deleted = m({
-            text = '#ffdedb',
-            bg = '#cc1421',
-          }),
-          italic = '#f0f3f6',
-          changed = m({
-            text = '#ffe1b4',
-            bg = '#a74c00',
-          }),
-          inserted = m({
-            text = '#acf7b6',
-            bg = '#007728',
-          }),
-          bold = '#f0f3f6',
-          heading = '#409eff',
-          ignored = m({
-            text = '#f0f3f6',
-            bg = '#318bf8',
-          }),
-        }),
-      }),
-    }),
-    ansi = m({
-      cyan = m({
-        default = '#39c5cf',
-        bright = '#56d4dd',
-      }),
-      magenta = m({
-        default = '#cb9eff',
-        bright = '#dbb7ff',
-      }),
-      black = m({
-        default = '#7a828e',
-        bright = '#9ea7b3',
-      }),
-      white = m({
-        default = '#d9dee3',
-        bright = '#ffffff',
-      }),
-      blue = m({
-        default = '#71b7ff',
-        bright = '#91cbff',
-      }),
-      green = m({
-        default = '#28d751',
-        bright = '#4ae168',
-      }),
-      red = m({
-        default = '#ff9492',
-        bright = '#ffb1af',
-      }),
-      gray = '#9ea7b3',
-      yellow = m({
-        default = '#f0b72f',
-        bright = '#f7c843',
+  avatarStack = m({
+    fade = m({
+      bgColor = m({
+        default = '#525964',
+        muted = '#3d424d',
       }),
     }),
   }),
   base = m({
     color = m({
-      purple = m({
-        [0] = '#f0dfff',
-        [1] = '#e6ccff',
-        [2] = '#dbb7ff',
-        [3] = '#cb9eff',
-        [4] = '#bf8fff',
-        [5] = '#b87fff',
-        [6] = '#a66bff',
-        [7] = '#954ffd',
-        [8] = '#8031f7',
-        [9] = '#6921d7',
-      }),
-      black = '#010409',
-      transparent = '#00000000',
-      pink = m({
-        [0] = '#ffdceb',
-        [1] = '#ffc7e1',
-        [2] = '#ffadd4',
-        [3] = '#ff8dc7',
-        [4] = '#f87cbd',
-        [5] = '#ef6eb1',
-        [6] = '#e456a3',
-        [7] = '#d23d91',
-        [8] = '#b72c7d',
-        [9] = '#9c1d6a',
-      }),
-      white = '#ffffff',
-      coral = m({
-        [0] = '#ffded4',
-        [1] = '#ffcbb9',
-        [2] = '#ffb39b',
-        [3] = '#ff967d',
-        [4] = '#fd8468',
-        [5] = '#fc704f',
-        [6] = '#f75133',
-        [7] = '#e03b21',
-        [8] = '#c62612',
-        [9] = '#a91500',
-      }),
       blue = m({
         [0] = '#caeaff',
         [1] = '#addcff',
@@ -899,6 +814,44 @@ local M = m({
         [8] = '#cc1421',
         [9] = '#ad0116',
       }),
+      neutral = m({
+        [0] = '#ffffff',
+        [1] = '#f0f3f6',
+        [2] = '#d9dee3',
+        [3] = '#bdc4cc',
+        [4] = '#9ea7b3',
+        [5] = '#7a828e',
+        [6] = '#525964',
+        [7] = '#3d424d',
+        [8] = '#272b33',
+        [9] = '#0a0c10',
+      }),
+      black = '#010409',
+      transparent = '#00000000',
+      coral = m({
+        [0] = '#ffded4',
+        [1] = '#ffcbb9',
+        [2] = '#ffb39b',
+        [3] = '#ff967d',
+        [4] = '#fd8468',
+        [5] = '#fc704f',
+        [6] = '#f75133',
+        [7] = '#e03b21',
+        [8] = '#c62612',
+        [9] = '#a91500',
+      }),
+      pink = m({
+        [0] = '#ffdceb',
+        [1] = '#ffc7e1',
+        [2] = '#ffadd4',
+        [3] = '#ff8dc7',
+        [4] = '#f87cbd',
+        [5] = '#ef6eb1',
+        [6] = '#e456a3',
+        [7] = '#d23d91',
+        [8] = '#b72c7d',
+        [9] = '#9c1d6a',
+      }),
       yellow = m({
         [0] = '#fbe59e',
         [1] = '#fbd669',
@@ -911,21 +864,70 @@ local M = m({
         [8] = '#945d02',
         [9] = '#7b4900',
       }),
-      neutral = m({
-        [0] = '#ffffff',
-        [1] = '#f0f3f6',
-        [2] = '#d9dee3',
-        [3] = '#bdc4cc',
-        [4] = '#9ea7b3',
-        [5] = '#7a828e',
-        [6] = '#525964',
-        [7] = '#3d424d',
-        [8] = '#272b33',
-        [9] = '#0a0c10',
+      white = '#ffffff',
+      purple = m({
+        [0] = '#f0dfff',
+        [1] = '#e6ccff',
+        [2] = '#dbb7ff',
+        [3] = '#cb9eff',
+        [4] = '#bf8fff',
+        [5] = '#b87fff',
+        [6] = '#a66bff',
+        [7] = '#954ffd',
+        [8] = '#8031f7',
+        [9] = '#6921d7',
       }),
     }),
     display = m({
       color = m({
+        blue = m({
+          [0] = '#001a47',
+          [1] = '#002766',
+          [2] = '#00378a',
+          [3] = '#0046a8',
+          [4] = '#005bd1',
+          [5] = '#0576ff',
+          [6] = '#4da0ff',
+          [7] = '#61adff',
+          [8] = '#85c2ff',
+          [9] = '#a3d3ff',
+        }),
+        orange = m({
+          [0] = '#311708',
+          [1] = '#43200a',
+          [2] = '#632f0d',
+          [3] = '#7b3c0e',
+          [4] = '#984b10',
+          [5] = '#c46212',
+          [6] = '#ed8326',
+          [7] = '#f1933b',
+          [8] = '#f6b06a',
+          [9] = '#fac68f',
+        }),
+        auburn = m({
+          [0] = '#271817',
+          [1] = '#3a2422',
+          [2] = '#543331',
+          [3] = '#6d4340',
+          [4] = '#87534f',
+          [5] = '#a86f6b',
+          [6] = '#bf9592',
+          [7] = '#c6a19f',
+          [8] = '#d4b7b5',
+          [9] = '#dfcac8',
+        }),
+        olive = m({
+          [0] = '#171e0b',
+          [1] = '#252d10',
+          [2] = '#374115',
+          [3] = '#485219',
+          [4] = '#5e681d',
+          [5] = '#7a8321',
+          [6] = '#a2a626',
+          [7] = '#b2af24',
+          [8] = '#cbc025',
+          [9] = '#e2d04b',
+        }),
         lime = m({
           [0] = '#141f0f',
           [1] = '#1f3116',
@@ -950,18 +952,7 @@ local M = m({
           [8] = '#d7bc1d',
           [9] = '#e3d04f',
         }),
-        yellow = m({
-          [0] = '#2e1a00',
-          [1] = '#3d2401',
-          [2] = '#5a3702',
-          [3] = '#6d4403',
-          [4] = '#895906',
-          [5] = '#aa7109',
-          [6] = '#d3910d',
-          [7] = '#df9e11',
-          [8] = '#edb431',
-          [9] = '#f0ca6a',
-        }),
+        white = '#ffffff',
         indigo = m({
           [0] = '#1b183f',
           [1] = '#25215f',
@@ -1070,6 +1061,7 @@ local M = m({
           [8] = '#fdaa86',
           [9] = '#ffc0a3',
         }),
+        black = '#0d1117',
         pink = m({
           [0] = '#2d1524',
           [1] = '#451c35',
@@ -1094,6 +1086,18 @@ local M = m({
           [8] = '#cdbb98',
           [9] = '#dbceb3',
         }),
+        yellow = m({
+          [0] = '#2e1a00',
+          [1] = '#3d2401',
+          [2] = '#5a3702',
+          [3] = '#6d4403',
+          [4] = '#895906',
+          [5] = '#aa7109',
+          [6] = '#d3910d',
+          [7] = '#df9e11',
+          [8] = '#edb431',
+          [9] = '#f0ca6a',
+        }),
         pine = m({
           [0] = '#082119',
           [1] = '#0b3224',
@@ -1106,56 +1110,6 @@ local M = m({
           [8] = '#1bda81',
           [9] = '#3eea97',
         }),
-        blue = m({
-          [0] = '#001a47',
-          [1] = '#002766',
-          [2] = '#00378a',
-          [3] = '#0046a8',
-          [4] = '#005bd1',
-          [5] = '#0576ff',
-          [6] = '#4da0ff',
-          [7] = '#61adff',
-          [8] = '#85c2ff',
-          [9] = '#a3d3ff',
-        }),
-        black = '#0d1117',
-        orange = m({
-          [0] = '#311708',
-          [1] = '#43200a',
-          [2] = '#632f0d',
-          [3] = '#7b3c0e',
-          [4] = '#984b10',
-          [5] = '#c46212',
-          [6] = '#ed8326',
-          [7] = '#f1933b',
-          [8] = '#f6b06a',
-          [9] = '#fac68f',
-        }),
-        auburn = m({
-          [0] = '#271817',
-          [1] = '#3a2422',
-          [2] = '#543331',
-          [3] = '#6d4340',
-          [4] = '#87534f',
-          [5] = '#a86f6b',
-          [6] = '#bf9592',
-          [7] = '#c6a19f',
-          [8] = '#d4b7b5',
-          [9] = '#dfcac8',
-        }),
-        white = '#ffffff',
-        olive = m({
-          [0] = '#171e0b',
-          [1] = '#252d10',
-          [2] = '#374115',
-          [3] = '#485219',
-          [4] = '#5e681d',
-          [5] = '#7a8321',
-          [6] = '#a2a626',
-          [7] = '#b2af24',
-          [8] = '#cbc025',
-          [9] = '#e2d04b',
-        }),
       }),
     }),
   }),
@@ -1164,7 +1118,6 @@ local M = m({
       emphasis = '#9ea7b3',
       muted = '#9ea7b3',
     }),
-    translucent = '#7a828e',
     upsell = m({
       emphasis = '#b87fff',
       muted = '#bf8fff66',
@@ -1173,20 +1126,28 @@ local M = m({
       emphasis = '#09b43a',
       muted = '#0ac740',
     }),
-    default = '#7a828e',
+    sponsors = m({
+      emphasis = '#ef6eb1',
+      muted = '#f87cbd',
+    }),
     severe = m({
       emphasis = '#e7811d',
       muted = '#f48b25',
     }),
+    open = m({
+      emphasis = '#09b43a',
+      muted = '#0ac740',
+    }),
     muted = '#7a828e',
+    default = '#7a828e',
     done = m({
       emphasis = '#b87fff',
       muted = '#bf8fff',
     }),
     disabled = '#3d424db3',
-    open = m({
-      emphasis = '#09b43a',
-      muted = '#0ac740',
+    danger = m({
+      emphasis = '#ff6a69',
+      muted = '#ff8080',
     }),
     closed = m({
       emphasis = '#ff6a69',
@@ -1200,152 +1161,67 @@ local M = m({
       emphasis = '#409eff',
       muted = '#5cacff',
     }),
-    emphasis = '#7a828e',
-    sponsors = m({
-      emphasis = '#ef6eb1',
-      muted = '#f87cbd',
-    }),
-    danger = m({
-      emphasis = '#ff6a69',
-      muted = '#ff8080',
-    }),
+    translucent = '#7a828e',
     transparent = '#00000000',
-  }),
-  treeViewItem = m({
-    leadingVisual = m({
-      iconColor = m({
-        rest = '#f0f3f6',
-      }),
-    }),
+    emphasis = '#7a828e',
   }),
   topicTag = m({
     borderColor = '#409eff',
   }),
-  timelineBadge = m({
-    bgColor = '#3d424d',
+  card = m({
+    bgColor = '#272b33',
   }),
-  bgColor = m({
-    neutral = m({
-      emphasis = '#9ea7b3',
-      muted = '#9ea7b366',
-    }),
-    white = '#ffffff',
-    upsell = m({
-      emphasis = '#b87fff',
-      muted = '#bf8fff26',
-    }),
-    success = m({
-      emphasis = '#09b43a',
-      muted = '#0ac74026',
-    }),
-    default = '#0a0c10',
-    severe = m({
-      emphasis = '#e7811d',
-      muted = '#f48b251a',
-    }),
-    muted = '#272b33',
-    inset = '#010409',
-    done = m({
-      emphasis = '#b87fff',
-      muted = '#bf8fff26',
-    }),
-    disabled = '#3d424db3',
-    open = m({
-      emphasis = '#09b43a',
-      muted = '#0ac7401a',
-    }),
-    closed = m({
-      emphasis = '#ff6a69',
-      muted = '#ff808026',
-    }),
-    black = '#010409',
-    transparent = '#00000000',
-    accent = m({
-      emphasis = '#409eff',
-      muted = '#5cacff1a',
+  counter = m({
+    borderColor = '#00000000',
+  }),
+  buttonCounter = m({
+    primary = m({
+      bgColor = m({
+        rest = '#01040926',
+      }),
     }),
-    inverse = '#ffffff',
-    emphasis = '#ffffff',
-    attention = m({
-      emphasis = '#e09b13',
-      muted = '#edaa2726',
+    default = m({
+      bgColor = m({
+        rest = '#525964',
+      }),
     }),
-    sponsors = m({
-      emphasis = '#ef6eb1',
-      muted = '#f87cbd1a',
+    invisible = m({
+      bgColor = m({
+        rest = '#525964',
+      }),
     }),
     danger = m({
-      emphasis = '#ff6a69',
-      muted = '#ff80801a',
-    }),
-  }),
-  codeMirror = m({
-    cursor = m({
-      fgColor = '#fbfcfd',
-    }),
-    syntax = m({
+      bgColor = m({
+        hover = '#01040926',
+        disabled = '#ff6a690d',
+        rest = '#01040926',
+      }),
       fgColor = m({
-        comment = '#bdc4cc',
-        string = '#addcff',
-        variable = '#ffb757',
-        storage = '#ff9492',
-        constant = '#91cbff',
-        support = '#91cbff',
-        keyword = '#ff9492',
-        entity = '#dbb7ff',
+        hover = '#ffffff',
+        disabled = '#ff808080',
+        rest = '#ff8080',
       }),
     }),
-    selection = m({
-      bgColor = '#5cacff66',
-    }),
-    matchingBracket = m({
-      fgColor = '#fbfcfd',
-    }),
-    fgColor = '#fbfcfd',
-    activeline = m({
-      bgColor = '#9ea7b366',
-    }),
-    lineNumber = m({
-      fgColor = '#f0f3f6',
-    }),
-    bgColor = '#0a0c10',
-    gutters = m({
-      bgColor = '#0a0c10',
-    }),
-    lines = m({
-      bgColor = '#0a0c10',
-    }),
-    gutterMarker = m({
+    outline = m({
+      bgColor = m({
+        hover = '#194fb133',
+        disabled = '#409eff0d',
+        rest = '#194fb133',
+      }),
       fgColor = m({
-        default = '#0a0c10',
-        muted = '#f0f3f6',
+        hover = '#71b7ff',
+        disabled = '#60aeff80',
+        rest = '#5cacff',
       }),
     }),
   }),
-  sideNav = m({
+  controlTrack = m({
     bgColor = m({
-      selected = '#3d424d',
-    }),
-  }),
-  counter = m({
-    borderColor = '#00000000',
-  }),
-  shadow = m({
-    floating = m({
-      xlarge = '0px 0px 0px 1px #7a828e, 0px 32px 64px 0px #010409',
-      legacy = '0px 6px 12px -3px #01040966, 0px 6px 18px 0px #01040966',
-      large = '0px 0px 0px 1px #7a828e, 0px 24px 48px 0px #010409',
-      small = '0px 0px 0px 1px #7a828e, 0px 6px 12px -3px #01040966, 0px 6px 18px 0px #01040966',
-      medium = '0px 0px 0px 1px #7a828e, 0px 8px 16px -4px #01040966, 0px 4px 32px -4px #01040966, 0px 24px 48px -12px #01040966, 0px 48px 96px -24px #01040966',
-    }),
-    inset = 'inset 0px 1px 0px 0px #0104093d',
-    resting = m({
-      small = '0px 1px 0px 0px #01040966',
-      xsmall = '0px 1px 0px 0px #010409cc',
-      medium = '0px 3px 6px 0px #010409cc',
+      rest = '#3d424d',
+      hover = '#494f5a',
+      disabled = '#9ea7b3',
+      active = '#555c67',
     }),
-  }),
-  controlTrack = m({
     borderColor = m({
       disabled = '#9ea7b3',
       rest = '#00000000',
@@ -1354,206 +1230,283 @@ local M = m({
       disabled = '#0a0c10',
       rest = '#fbfcfd',
     }),
-    bgColor = m({
-      disabled = '#9ea7b3',
-      active = '#555c67',
-      rest = '#3d424d',
-      hover = '#494f5a',
-    }),
   }),
-  button = m({
-    outline = m({
-      borderColor = m({
-        selected = '#ffffff1a',
-        hover = '#ffffff1a',
+  headerSearch = m({
+    borderColor = '#525964',
+    bgColor = '#0a0c10',
+  }),
+  data = m({
+    teal = m({
+      color = m({
+        default = '#106c70',
+        muted = '#041f25',
       }),
-      fgColor = m({
-        disabled = '#60aeff80',
-        active = '#ffffff',
-        rest = '#5cacff',
-        hover = '#71b7ff',
+    }),
+    green = m({
+      color = m({
+        default = '#2f6f37',
+        muted = '#122117',
       }),
-      shadow = m({
-        selected = '0px 0px 0px 0px #000000',
+    }),
+    orange = m({
+      color = m({
+        default = '#984b10',
+        muted = '#311708',
       }),
-      bgColor = m({
-        disabled = '#0a0c10',
-        active = '#2672f3',
-        rest = '#ffffff',
-        hover = '#525964',
+    }),
+    red = m({
+      color = m({
+        default = '#eb3342',
+        muted = '#3c0614',
       }),
     }),
-    default = m({
-      borderColor = m({
-        disabled = '#3d424db3',
-        active = '#7a828e',
-        rest = '#7a828e',
-        hover = '#7a828e',
+    gray = m({
+      color = m({
+        default = '#576270',
+        muted = '#1c1c1c',
       }),
-      fgColor = m({
-        rest = '#f0f3f6',
+    }),
+    purple = m({
+      color = m({
+        default = '#975bf1',
+        muted = '#211047',
+      }),
+    }),
+    pink = m({
+      color = m({
+        default = '#d34591',
+        muted = '#2d1524',
+      }),
+    }),
+    yellow = m({
+      color = m({
+        default = '#895906',
+        muted = '#2e1a00',
       }),
+    }),
+    auburn = m({
+      color = m({
+        default = '#a86f6b',
+        muted = '#271817',
+      }),
+    }),
+    blue = m({
+      color = m({
+        default = '#0576ff',
+        muted = '#001a47',
+      }),
+    }),
+  }),
+  underlineNav = m({
+    borderColor = m({
+      active = '#ff967d',
+      hover = '#bdc4cc',
+    }),
+    iconColor = m({
+      rest = '#f0f3f6',
+    }),
+  }),
+  controlKnob = m({
+    borderColor = m({
+      rest = '#7a828e',
+      disabled = '#3d424db3',
+      checked = '#409eff',
+    }),
+    bgColor = m({
+      rest = '#010409',
+      disabled = '#3d424db3',
+      checked = '#ffffff',
+    }),
+  }),
+  button = m({
+    primary = m({
       shadow = m({
-        resting = '0px 0px 0px 0px #000000',
+        selected = '0px 0px 0px 0px #000000',
       }),
       bgColor = m({
-        disabled = '#3d424db3',
-        hover = '#494f5a',
-        active = '#555c67',
-        selected = '#555c67',
-        rest = '#3d424d',
+        rest = '#09b43a',
+        hover = '#0fbb3f',
+        disabled = '#048f2f',
+        active = '#15c243',
+      }),
+      borderColor = m({
+        rest = '#4ae168',
+        hover = '#4ae168',
+        disabled = '#4ae16866',
+        active = '#4ae168',
       }),
-    }),
-    danger = m({
       iconColor = m({
-        hover = '#ffffff',
-        rest = '#ff8080',
+        rest = '#0a0c10',
+      }),
+      fgColor = m({
+        disabled = '#0a0c1080',
+        rest = '#0a0c10',
       }),
+    }),
+    danger = m({
       shadow = m({
         selected = '0px 0px 0px 0px #000000',
       }),
       bgColor = m({
-        disabled = '#3d424db3',
-        active = '#ff5c5d',
         rest = '#3d424d',
         hover = '#ff4445',
+        disabled = '#3d424db3',
+        active = '#ff5c5d',
       }),
       borderColor = m({
-        active = '#ffffff1a',
-        rest = '#7a828e',
         hover = '#ffffff1a',
+        rest = '#7a828e',
+        active = '#ffffff1a',
+      }),
+      iconColor = m({
+        hover = '#ffffff',
+        rest = '#ff8080',
       }),
       fgColor = m({
-        disabled = '#ff808080',
-        active = '#ffffff',
         rest = '#ff9492',
         hover = '#ffffff',
+        disabled = '#ff808080',
+        active = '#ffffff',
       }),
     }),
     inactive = m({
       bgColor = '#3d424d',
       fgColor = '#bdc4cc',
     }),
-    star = m({
-      iconColor = '#f7c843',
-    }),
-    primary = m({
-      iconColor = m({
-        rest = '#0a0c10',
-      }),
+    default = m({
       shadow = m({
-        selected = '0px 0px 0px 0px #000000',
+        resting = '0px 0px 0px 0px #000000',
       }),
       bgColor = m({
-        disabled = '#048f2f',
-        active = '#15c243',
-        rest = '#09b43a',
-        hover = '#0fbb3f',
+        hover = '#494f5a',
+        active = '#555c67',
+        selected = '#555c67',
+        rest = '#3d424d',
+        disabled = '#3d424db3',
       }),
       borderColor = m({
-        disabled = '#4ae16866',
-        active = '#4ae168',
-        rest = '#4ae168',
-        hover = '#4ae168',
+        rest = '#7a828e',
+        hover = '#7a828e',
+        disabled = '#3d424db3',
+        active = '#7a828e',
       }),
       fgColor = m({
-        disabled = '#0a0c1080',
-        rest = '#0a0c10',
+        rest = '#f0f3f6',
       }),
     }),
     invisible = m({
-      borderColor = m({
-        disabled = '#3d424db3',
-        rest = '#00000000',
-        hover = '#7a828e',
-      }),
-      fgColor = m({
-        disabled = '#9ea7b3',
-        rest = '#60aeff',
-        hover = '#1e60d5',
-      }),
       iconColor = m({
+        hover = '#0a0c10',
         disabled = '#9ea7b3',
         rest = '#f0f3f6',
-        hover = '#0a0c10',
       }),
       bgColor = m({
+        rest = '#00000000',
+        hover = '#f0f3f6',
         disabled = '#3d424db3',
         active = '#d9dee3',
+      }),
+      borderColor = m({
+        hover = '#7a828e',
+        disabled = '#3d424db3',
         rest = '#00000000',
-        hover = '#f0f3f6',
+      }),
+      fgColor = m({
+        hover = '#1e60d5',
+        disabled = '#9ea7b3',
+        rest = '#60aeff',
       }),
     }),
-  }),
-  controlKnob = m({
-    borderColor = m({
-      disabled = '#3d424db3',
-      checked = '#409eff',
-      rest = '#7a828e',
-    }),
-    bgColor = m({
-      disabled = '#3d424db3',
-      checked = '#ffffff',
-      rest = '#010409',
+    star = m({
+      iconColor = '#f7c843',
     }),
-  }),
-  control = m({
-    checked = m({
+    outline = m({
+      shadow = m({
+        selected = '0px 0px 0px 0px #000000',
+      }),
+      bgColor = m({
+        rest = '#ffffff',
+        hover = '#525964',
+        disabled = '#0a0c10',
+        active = '#2672f3',
+      }),
       borderColor = m({
-        disabled = '#9ea7b3',
-        active = '#54a8ff',
-        rest = '#409eff',
-        hover = '#4aa3ff',
+        selected = '#ffffff1a',
+        hover = '#ffffff1a',
       }),
       fgColor = m({
-        disabled = '#010409',
-        rest = '#0a0c10',
-      }),
-      bgColor = m({
-        disabled = '#9ea7b3',
-        active = '#54a8ff',
-        rest = '#409eff',
-        hover = '#4aa3ff',
+        rest = '#5cacff',
+        hover = '#71b7ff',
+        disabled = '#60aeff80',
+        active = '#ffffff',
       }),
     }),
-    iconColor = m({
-      rest = '#f0f3f6',
+  }),
+  page = m({
+    header = m({
+      bgColor = '#0a0c10',
     }),
+  }),
+  focus = m({
+    outlineColor = '#409eff',
+  }),
+  control = m({
     bgColor = m({
-      disabled = '#3d424db3',
       hover = '#494f5a',
       active = '#555c67',
       selected = '#525964',
       rest = '#3d424d',
+      disabled = '#3d424db3',
     }),
     transparent = m({
       borderColor = m({
-        active = '#9ea7b3',
-        rest = '#00000000',
         hover = '#7a828e',
+        rest = '#00000000',
+        active = '#9ea7b3',
       }),
       bgColor = m({
-        disabled = '#3d424db3',
         hover = '#272b33',
         active = '#525964',
         selected = '#525964',
         rest = '#00000000',
+        disabled = '#3d424db3',
       }),
     }),
     borderColor = m({
-      disabled = '#3d424db3',
-      success = '#09b43a',
       danger = '#ff6a69',
+      rest = '#7a828e',
       emphasis = '#7a828e',
-      warning = '#e09b13',
       selected = '#ffffff',
-      rest = '#7a828e',
+      warning = '#e09b13',
+      disabled = '#3d424db3',
+      success = '#09b43a',
     }),
     fgColor = m({
+      rest = '#f0f3f6',
       placeholder = '#b7bec7',
       disabled = '#9ea7b3',
+    }),
+    iconColor = m({
       rest = '#f0f3f6',
     }),
+    checked = m({
+      bgColor = m({
+        rest = '#409eff',
+        hover = '#4aa3ff',
+        disabled = '#9ea7b3',
+        active = '#54a8ff',
+      }),
+      borderColor = m({
+        rest = '#409eff',
+        hover = '#4aa3ff',
+        disabled = '#9ea7b3',
+        active = '#54a8ff',
+      }),
+      fgColor = m({
+        disabled = '#010409',
+        rest = '#0a0c10',
+      }),
+    }),
     danger = m({
       bgColor = m({
         active = '#f65052',
@@ -1565,8 +1518,8 @@ local M = m({
       }),
     }),
   }),
-  card = m({
-    bgColor = '#272b33',
+  selection = m({
+    bgColor = '#409effb3',
   }),
   selectMenu = m({
     borderColor = '#7a828e',
@@ -1574,44 +1527,123 @@ local M = m({
       active = '#1e60d5',
     }),
   }),
-  buttonCounter = m({
-    outline = m({
-      bgColor = m({
-        disabled = '#409eff0d',
-        rest = '#194fb133',
-        hover = '#194fb133',
+  color = m({
+    ansi = m({
+      blue = m({
+        default = '#71b7ff',
+        bright = '#91cbff',
       }),
-      fgColor = m({
-        disabled = '#60aeff80',
-        rest = '#5cacff',
-        hover = '#71b7ff',
+      green = m({
+        default = '#28d751',
+        bright = '#4ae168',
       }),
-    }),
-    default = m({
-      bgColor = m({
-        rest = '#525964',
+      red = m({
+        default = '#ff9492',
+        bright = '#ffb1af',
       }),
-    }),
-    danger = m({
-      bgColor = m({
-        disabled = '#ff6a690d',
-        rest = '#01040926',
-        hover = '#01040926',
+      gray = '#9ea7b3',
+      cyan = m({
+        default = '#39c5cf',
+        bright = '#56d4dd',
       }),
-      fgColor = m({
-        disabled = '#ff808080',
-        rest = '#ff8080',
-        hover = '#ffffff',
+      black = m({
+        default = '#7a828e',
+        bright = '#9ea7b3',
+      }),
+      magenta = m({
+        default = '#cb9eff',
+        bright = '#dbb7ff',
+      }),
+      yellow = m({
+        default = '#f0b72f',
+        bright = '#f7c843',
+      }),
+      white = m({
+        default = '#d9dee3',
+        bright = '#ffffff',
       }),
     }),
-    primary = m({
-      bgColor = m({
-        rest = '#01040926',
+    prettylights = m({
+      syntax = m({
+        string = m({
+          default = '#addcff',
+          regexp = '#72f088',
+        }),
+        storage = m({
+          modifier = m({
+            import = '#f0f3f6',
+          }),
+        }),
+        carriage = m({
+          ['return'] = m({
+            text = '#ffffff',
+            bg = '#ff4445',
+          }),
+        }),
+        keyword = '#ff9492',
+        brackethighlighter = m({
+          unmatched = '#ff8080',
+          angle = '#bdc4cc',
+        }),
+        variable = '#ffb757',
+        comment = '#bdc4cc',
+        invalid = m({
+          illegal = m({
+            text = '#ffffff',
+            bg = '#e82a2f',
+          }),
+        }),
+        markup = m({
+          deleted = m({
+            text = '#ffdedb',
+            bg = '#cc1421',
+          }),
+          italic = '#f0f3f6',
+          changed = m({
+            text = '#ffe1b4',
+            bg = '#a74c00',
+          }),
+          inserted = m({
+            text = '#acf7b6',
+            bg = '#007728',
+          }),
+          bold = '#f0f3f6',
+          heading = '#409eff',
+          ignored = m({
+            text = '#f0f3f6',
+            bg = '#318bf8',
+          }),
+          list = '#fbd669',
+        }),
+        entity = m({
+          tag = '#72f088',
+          default = '#dbb7ff',
+        }),
+        sublimelinter = m({
+          gutter = m({
+            mark = '#7a828e',
+          }),
+        }),
+        meta = m({
+          diff = m({
+            range = '#dbb7ff',
+          }),
+        }),
+        constant = m({
+          other = m({
+            reference = m({
+              link = '#addcff',
+            }),
+          }),
+          default = '#91cbff',
+        }),
       }),
     }),
-    invisible = m({
-      bgColor = m({
-        rest = '#525964',
+  }),
+  treeViewItem = m({
+    leadingVisual = m({
+      iconColor = m({
+        rest = '#f0f3f6',
       }),
     }),
   }),
@@ -1632,52 +1664,20 @@ local M = m({
     white = '#ffffff',
     upsell = '#bf8fff',
     success = '#28d751',
-    default = '#fbfcfd',
+    sponsors = '#f87cbd',
     severe = '#f48b25',
-    onEmphasis = '#0a0c10',
+    open = '#28d751',
     muted = '#f0f3f6',
     link = '#60aeff',
     done = '#bf8fff',
     disabled = '#9ea7b3',
-    open = '#28d751',
+    danger = '#ff8080',
     closed = '#ff8080',
     black = '#010409',
     attention = '#f0b72f',
     accent = '#60aeff',
-    sponsors = '#f87cbd',
-    danger = '#ff8080',
-  }),
-  selection = m({
-    bgColor = '#409effb3',
-  }),
-  skeletonLoader = m({
-    bgColor = '#272b33',
-  }),
-  page = m({
-    header = m({
-      bgColor = '#0a0c10',
-    }),
-  }),
-  header = m({
-    borderColor = m({
-      divider = '#bdc4cc',
-    }),
-    fgColor = m({
-      default = '#ffffffb3',
-      logo = '#ffffff',
-    }),
-    bgColor = '#272b33f2',
-  }),
-  overlay = m({
-    borderColor = '#7a828e',
-    backdrop = m({
-      bgColor = '#272b3366',
-    }),
-    bgColor = '#272b33',
-  }),
-  headerSearch = m({
-    borderColor = '#525964',
-    bgColor = '#0a0c10',
+    onEmphasis = '#0a0c10',
+    default = '#fbfcfd',
   }),
 })
 M._VERSION =
diff --git a/lua/github-theme/palette/primitives/dark_tritanopia.lua b/lua/github-theme/palette/primitives/dark_tritanopia.lua
index 85daeb6..fae026f 100644
--- a/lua/github-theme/palette/primitives/dark_tritanopia.lua
+++ b/lua/github-theme/palette/primitives/dark_tritanopia.lua
@@ -11,181 +11,256 @@ local function m(tbl)
   return setmetatable(tbl, mt)
 end
 local M = m({
-  timelineBadge = m({
-    bgColor = '#21262d',
-  }),
-  bgColor = m({
-    severe = m({
-      muted = '#f851491a',
-      emphasis = '#da3633',
-    }),
-    disabled = '#21262db3',
-    danger = m({
-      muted = '#f851491a',
-      emphasis = '#da3633',
-    }),
-    closed = m({
-      muted = '#6e768126',
-      emphasis = '#484f58',
-    }),
-    black = '#010409',
-    attention = m({
-      muted = '#bb800926',
-      emphasis = '#9e6a03',
-    }),
-    accent = m({
-      muted = '#388bfd1a',
-      emphasis = '#1f6feb',
-    }),
-    emphasis = '#6e7681',
-    transparent = '#00000000',
-    inset = '#010409',
-    open = m({
-      muted = '#f851491a',
-      emphasis = '#da3633',
-    }),
-    inverse = '#ffffff',
-    neutral = m({
-      muted = '#6e768166',
-      emphasis = '#6e7681',
-    }),
-    done = m({
-      muted = '#ab7df826',
-      emphasis = '#8957e5',
-    }),
-    success = m({
-      muted = '#388bfd26',
-      emphasis = '#1f6feb',
-    }),
-    white = '#ffffff',
-    default = '#0d1117',
-    upsell = m({
-      muted = '#ab7df826',
-      emphasis = '#8957e5',
-    }),
-    muted = '#161b22',
-    sponsors = m({
-      muted = '#db61a21a',
-      emphasis = '#bf4b8a',
-    }),
-  }),
-  controlTrack = m({
-    bgColor = m({
-      rest = '#21262d',
-      hover = '#292e36',
-      disabled = '#6e7681',
-      active = '#31363e',
-    }),
-    borderColor = m({
-      disabled = '#6e7681',
-      rest = '#00000000',
-    }),
-    fgColor = m({
-      disabled = '#ffffff',
-      rest = '#8d96a0',
-    }),
-  }),
-  sideNav = m({
-    bgColor = m({
-      selected = '#21262d',
-    }),
-  }),
-  controlKnob = m({
-    borderColor = m({
-      disabled = '#21262db3',
-      rest = '#666e79',
-      checked = '#1f6feb',
-    }),
-    bgColor = m({
-      disabled = '#21262db3',
-      rest = '#010409',
-      checked = '#ffffff',
-    }),
-  }),
-  shadow = m({
-    inset = 'inset 0px 1px 0px 0px #0104093d',
-    resting = m({
-      medium = '0px 3px 6px 0px #010409cc',
-      small = '0px 1px 0px 0px #01040966',
-      xsmall = '0px 1px 0px 0px #010409cc',
-    }),
-    floating = m({
-      legacy = '0px 6px 12px -3px #01040966, 0px 6px 18px 0px #01040966',
-      large = '0px 0px 0px 1px #30363d, 0px 24px 48px 0px #010409',
-      small = '0px 0px 0px 1px #30363d, 0px 6px 12px -3px #01040966, 0px 6px 18px 0px #01040966',
-      medium = '0px 0px 0px 1px #30363d, 0px 8px 16px -4px #01040966, 0px 4px 32px -4px #01040966, 0px 24px 48px -12px #01040966, 0px 48px 96px -24px #01040966',
-      xlarge = '0px 0px 0px 1px #30363d, 0px 32px 64px 0px #010409',
-    }),
-  }),
-  control = m({
-    bgColor = m({
-      disabled = '#21262db3',
-      active = '#31363e',
-      selected = '#161b22',
-      rest = '#21262d',
-      hover = '#292e36',
-    }),
+  button = m({
     danger = m({
-      bgColor = m({
-        active = '#f8514966',
-        hover = '#f851491a',
-      }),
       fgColor = m({
-        hover = '#ff7b72',
+        active = '#ffffff',
+        hover = '#ffffff',
         rest = '#f85149',
+        disabled = '#f8514980',
       }),
-    }),
-    transparent = m({
-      borderColor = m({
-        hover = '#00000000',
-        rest = '#00000000',
-        active = '#00000000',
+      iconColor = m({
+        rest = '#f85149',
+        hover = '#ffffff',
+      }),
+      shadow = m({
+        selected = '0px 0px 0px 0px #000000',
       }),
       bgColor = m({
+        active = '#d03533',
+        hover = '#b62324',
+        rest = '#21262d',
         disabled = '#21262db3',
-        active = '#b1bac433',
-        selected = '#b1bac414',
-        rest = '#00000000',
-        hover = '#b1bac41f',
+      }),
+      borderColor = m({
+        active = '#f0f6fc1a',
+        rest = '#30363d',
+        hover = '#f0f6fc1a',
       }),
     }),
-    borderColor = m({
-      disabled = '#21262db3',
-      emphasis = '#666e79',
-      danger = '#da3633',
-      selected = '#f0f6fc',
-      rest = '#30363d',
-      warning = '#9e6a03',
-      success = '#1f6feb',
+    default = m({
+      fgColor = m({
+        rest = '#c9d1d9',
+      }),
+      shadow = m({
+        resting = '0px 0px 0px 0px #000000',
+      }),
+      bgColor = m({
+        active = '#31363e',
+        selected = '#31363e',
+        rest = '#21262d',
+        disabled = '#21262db3',
+        hover = '#292e36',
+      }),
+      borderColor = m({
+        active = '#30363d',
+        hover = '#30363d',
+        rest = '#30363d',
+        disabled = '#21262db3',
+      }),
     }),
-    checked = m({
+    primary = m({
+      fgColor = m({
+        rest = '#ffffff',
+        disabled = '#ffffff66',
+      }),
+      iconColor = m({
+        rest = '#ffffff',
+      }),
+      shadow = m({
+        selected = '0px 0px 0px 0px #000000',
+      }),
       bgColor = m({
-        rest = '#1f6feb',
-        hover = '#2a7aef',
-        disabled = '#6e7681',
         active = '#3685f3',
+        hover = '#2a7aef',
+        rest = '#1f6feb',
+        disabled = '#5fabfe',
       }),
       borderColor = m({
-        rest = '#1f6feb',
-        hover = '#2a7aef',
-        disabled = '#6e7681',
-        active = '#3685f3',
+        active = '#f0f6fc1a',
+        hover = '#f0f6fc1a',
+        rest = '#f0f6fc1a',
+        disabled = '#5fabfe',
       }),
+    }),
+    outline = m({
       fgColor = m({
-        disabled = '#010409',
-        rest = '#ffffff',
+        active = '#ffffff',
+        hover = '#58a6ff',
+        rest = '#388bfd',
+        disabled = '#4493f880',
+      }),
+      shadow = m({
+        selected = '0px 0px 0px 0px #000000',
+      }),
+      bgColor = m({
+        active = '#0d419d',
+        hover = '#30363d',
+        rest = '#f0f6fc',
+        disabled = '#0d1117',
+      }),
+      borderColor = m({
+        hover = '#f0f6fc1a',
+        selected = '#f0f6fc1a',
       }),
     }),
-    iconColor = m({
-      rest = '#8d96a0',
+    star = m({
+      iconColor = '#e3b341',
     }),
-    fgColor = m({
-      rest = '#c9d1d9',
-      disabled = '#6e7681',
-      placeholder = '#858e98',
+    inactive = m({
+      fgColor = '#8b949e',
+      bgColor = '#21262d',
+    }),
+    invisible = m({
+      iconColor = m({
+        hover = '#e6edf3',
+        rest = '#8d96a0',
+        disabled = '#6e7681',
+      }),
+      fgColor = m({
+        hover = '#58a6ff',
+        rest = '#4493f8',
+        disabled = '#6e7681',
+      }),
+      bgColor = m({
+        active = '#b1bac433',
+        hover = '#b1bac41f',
+        rest = '#00000000',
+        disabled = '#21262db3',
+      }),
+      borderColor = m({
+        hover = '#00000000',
+        rest = '#00000000',
+        disabled = '#21262db3',
+      }),
     }),
   }),
+  diffBlob = m({
+    addition = m({
+      fgColor = m({
+        text = '#e6edf3',
+        num = '#e6edf3',
+      }),
+      bgColor = m({
+        num = '#58a6ff4d',
+        line = '#388bfd26',
+        word = '#388bfd66',
+      }),
+    }),
+    expander = m({
+      iconColor = '#8d96a0',
+    }),
+    deletion = m({
+      fgColor = m({
+        text = '#e6edf3',
+        num = '#e6edf3',
+      }),
+      bgColor = m({
+        num = '#f851494d',
+        line = '#f8514926',
+        word = '#f8514966',
+      }),
+    }),
+    hunk = m({
+      bgColor = m({
+        num = '#388bfd66',
+      }),
+    }),
+  }),
+  selection = m({
+    bgColor = '#1f6febb3',
+  }),
+  selectMenu = m({
+    bgColor = m({
+      active = '#0c2d6b',
+    }),
+    borderColor = '#484f58',
+  }),
+  reactionButton = m({
+    selected = m({
+      fgColor = m({
+        rest = '#4493f8',
+        hover = '#79c0ff',
+      }),
+      bgColor = m({
+        rest = '#388bfd33',
+        hover = '#3a8cfd5c',
+      }),
+    }),
+  }),
+  fgColor = m({
+    muted = '#8d96a0',
+    link = '#4493f8',
+    done = '#ab7df8',
+    disabled = '#6e7681',
+    default = '#e6edf3',
+    closed = '#6e7681',
+    open = '#f85149',
+    attention = '#d29922',
+    accent = '#4493f8',
+    neutral = '#6e7681',
+    black = '#010409',
+    danger = '#f85149',
+    white = '#ffffff',
+    upsell = '#ab7df8',
+    success = '#58a6ff',
+    sponsors = '#db61a2',
+    severe = '#f85149',
+    onEmphasis = '#ffffff',
+  }),
+  highlight = m({
+    neutral = m({
+      bgColor = '#d2992266',
+    }),
+  }),
+  header = m({
+    fgColor = m({
+      logo = '#f0f6fc',
+      default = '#ffffffb3',
+    }),
+    bgColor = '#161b22f2',
+    borderColor = m({
+      divider = '#8b949e',
+    }),
+  }),
+  overlay = m({
+    backdrop = m({
+      bgColor = '#161b2266',
+    }),
+    bgColor = '#161b22',
+    borderColor = '#30363db3',
+  }),
+  avatar = m({
+    shadow = '0px 0px 0px 2px #0d1117',
+    bgColor = '#ffffff1a',
+    borderColor = '#ffffff26',
+  }),
   scale = m({
+    red = m({
+      [1] = '#ffdcd7',
+      [2] = '#ffc1ba',
+      [3] = '#ffa198',
+      [4] = '#ff7b72',
+      [5] = '#f85149',
+      [6] = '#da3633',
+      [7] = '#b62324',
+      [8] = '#8e1519',
+      [9] = '#67060c',
+      [10] = '#490202',
+    }),
+    purple = m({
+      [1] = '#eddeff',
+      [2] = '#e2c5ff',
+      [3] = '#d2a8ff',
+      [4] = '#be8fff',
+      [5] = '#ab7df8',
+      [6] = '#8957e5',
+      [7] = '#6e40c9',
+      [8] = '#553098',
+      [9] = '#3c1e70',
+      [10] = '#271052',
+    }),
+    black = '#010409',
     coral = m({
       [1] = '#ffddd2',
       [2] = '#ffc2b2',
@@ -198,6 +273,7 @@ local M = m({
       [9] = '#640d04',
       [10] = '#460701',
     }),
+    white = '#ffffff',
     pink = m({
       [1] = '#ffdaec',
       [2] = '#ffbedd',
@@ -210,18 +286,6 @@ local M = m({
       [9] = '#5e103e',
       [10] = '#42062a',
     }),
-    neutral = m({
-      [1] = '#f0f6fc',
-      [2] = '#c9d1d9',
-      [3] = '#b1bac4',
-      [4] = '#8b949e',
-      [5] = '#6e7681',
-      [6] = '#484f58',
-      [7] = '#30363d',
-      [8] = '#21262d',
-      [9] = '#161b22',
-      [10] = '#0d1117',
-    }),
     yellow = m({
       [1] = '#f8e3a1',
       [2] = '#f2cc60',
@@ -234,6 +298,19 @@ local M = m({
       [9] = '#4b2900',
       [10] = '#341a00',
     }),
+    transparent = '#00000000',
+    neutral = m({
+      [1] = '#f0f6fc',
+      [2] = '#c9d1d9',
+      [3] = '#b1bac4',
+      [4] = '#8b949e',
+      [5] = '#6e7681',
+      [6] = '#484f58',
+      [7] = '#30363d',
+      [8] = '#21262d',
+      [9] = '#161b22',
+      [10] = '#0d1117',
+    }),
     blue = m({
       [1] = '#cae8ff',
       [2] = '#a5d6ff',
@@ -270,1046 +347,599 @@ local M = m({
       [9] = '#5a1e02',
       [10] = '#3d1300',
     }),
-    red = m({
-      [1] = '#ffdcd7',
-      [2] = '#ffc1ba',
-      [3] = '#ffa198',
-      [4] = '#ff7b72',
-      [5] = '#f85149',
-      [6] = '#da3633',
-      [7] = '#b62324',
-      [8] = '#8e1519',
-      [9] = '#67060c',
-      [10] = '#490202',
-    }),
-    white = '#ffffff',
-    transparent = '#00000000',
-    purple = m({
-      [1] = '#eddeff',
-      [2] = '#e2c5ff',
-      [3] = '#d2a8ff',
-      [4] = '#be8fff',
-      [5] = '#ab7df8',
-      [6] = '#8957e5',
-      [7] = '#6e40c9',
-      [8] = '#553098',
-      [9] = '#3c1e70',
-      [10] = '#271052',
-    }),
-    black = '#010409',
   }),
-  codeMirror = m({
-    matchingBracket = m({
-      fgColor = '#e6edf3',
-    }),
+  headerSearch = m({
     bgColor = '#0d1117',
-    selection = m({
-      bgColor = '#388bfd66',
-    }),
-    lineNumber = m({
-      fgColor = '#8d96a0',
-    }),
-    gutters = m({
-      bgColor = '#0d1117',
-    }),
-    fgColor = '#e6edf3',
-    cursor = m({
-      fgColor = '#e6edf3',
+    borderColor = '#30363d',
+  }),
+  focus = m({
+    outlineColor = '#1f6feb',
+  }),
+  menu = m({
+    bgColor = m({
+      active = '#161b22',
     }),
-    syntax = m({
+  }),
+  label = m({
+    red = m({
       fgColor = m({
-        comment = '#8b949e',
-        variable = '#ffa198',
-        constant = '#79c0ff',
-        storage = '#ff7b72',
-        string = '#a5d6ff',
-        support = '#79c0ff',
-        keyword = '#ff7b72',
-        entity = '#d2a8ff',
+        active = '#f7adab',
+        rest = '#f27d83',
+        hover = '#f48b8d',
+      }),
+      bgColor = m({
+        active = '#790c20',
+        rest = '#3c0614',
+        hover = '#58091a',
       }),
     }),
-    activeline = m({
-      bgColor = '#6e768166',
-    }),
-    gutterMarker = m({
+    gray = m({
       fgColor = m({
-        muted = '#8d96a0',
-        default = '#0d1117',
+        active = '#b3c0d1',
+        rest = '#92a1b5',
+        hover = '#9babbf',
+      }),
+      bgColor = m({
+        active = '#393d41',
+        rest = '#1c1c1c',
+        hover = '#2a2b2d',
       }),
     }),
-    lines = m({
-      bgColor = '#0d1117',
+    purple = m({
+      fgColor = m({
+        active = '#d2affd',
+        rest = '#b687f7',
+        hover = '#c398fb',
+      }),
+      bgColor = m({
+        active = '#481a9e',
+        rest = '#211047',
+        hover = '#31146b',
+      }),
     }),
-  }),
-  base = m({
-    display = m({
-      color = m({
-        lime = m({
-          [0] = '#141f0f',
-          [1] = '#1f3116',
-          [2] = '#2c441d',
-          [3] = '#375421',
-          [4] = '#496c28',
-          [5] = '#5f892f',
-          [6] = '#7dae37',
-          [7] = '#89ba36',
-          [8] = '#9fcc3e',
-          [9] = '#bcda67',
-        }),
-        lemon = m({
-          [0] = '#291d00',
-          [1] = '#372901',
-          [2] = '#4f3c02',
-          [3] = '#614c05',
-          [4] = '#786008',
-          [5] = '#977b0c',
-          [6] = '#ba9b12',
-          [7] = '#c4a717',
-          [8] = '#d7bc1d',
-          [9] = '#e3d04f',
-        }),
-        black = '#0d1117',
-        yellow = m({
-          [0] = '#2e1a00',
-          [1] = '#3d2401',
-          [2] = '#5a3702',
-          [3] = '#6d4403',
-          [4] = '#895906',
-          [5] = '#aa7109',
-          [6] = '#d3910d',
-          [7] = '#df9e11',
-          [8] = '#edb431',
-          [9] = '#f0ca6a',
-        }),
-        indigo = m({
-          [0] = '#1b183f',
-          [1] = '#25215f',
-          [2] = '#312c90',
-          [3] = '#3935c0',
-          [4] = '#514ed4',
-          [5] = '#7070e1',
-          [6] = '#9899ec',
-          [7] = '#a2a5f1',
-          [8] = '#b7baf6',
-          [9] = '#c8cbf9',
-        }),
-        teal = m({
-          [0] = '#041f25',
-          [1] = '#073036',
-          [2] = '#0a464d',
-          [3] = '#0c555a',
-          [4] = '#106c70',
-          [5] = '#158a8a',
-          [6] = '#1cb0ab',
-          [7] = '#1fbdb2',
-          [8] = '#24d6c4',
-          [9] = '#5fe3d1',
-        }),
-        green = m({
-          [0] = '#122117',
-          [1] = '#182f1f',
-          [2] = '#214529',
-          [3] = '#285830',
-          [4] = '#2f6f37',
-          [5] = '#388f3f',
-          [6] = '#41b445',
-          [7] = '#46c144',
-          [8] = '#75d36f',
-          [9] = '#99e090',
-        }),
-        red = m({
-          [0] = '#3c0614',
-          [1] = '#58091a',
-          [2] = '#790c20',
-          [3] = '#990f24',
-          [4] = '#c31328',
-          [5] = '#eb3342',
-          [6] = '#f27d83',
-          [7] = '#f48b8d',
-          [8] = '#f7adab',
-          [9] = '#f9c1be',
-        }),
-        gray = m({
-          [0] = '#1c1c1c',
-          [1] = '#2a2b2d',
-          [2] = '#393d41',
-          [3] = '#474e57',
-          [4] = '#576270',
-          [5] = '#6e7f96',
-          [6] = '#92a1b5',
-          [7] = '#9babbf',
-          [8] = '#b3c0d1',
-          [9] = '#c4cfde',
-        }),
-        purple = m({
-          [0] = '#211047',
-          [1] = '#31146b',
-          [2] = '#481a9e',
-          [3] = '#5b1cca',
-          [4] = '#7730e8',
-          [5] = '#975bf1',
-          [6] = '#b687f7',
-          [7] = '#c398fb',
-          [8] = '#d2affd',
-          [9] = '#e1c7ff',
-        }),
-        cyan = m({
-          [0] = '#001f29',
-          [1] = '#002e3d',
-          [2] = '#014156',
-          [3] = '#02536f',
-          [4] = '#036a8c',
-          [5] = '#0587b3',
-          [6] = '#07ace4',
-          [7] = '#09b7f1',
-          [8] = '#45cbf7',
-          [9] = '#80dbf9',
-        }),
-        plum = m({
-          [0] = '#2a0e3f',
-          [1] = '#40125e',
-          [2] = '#5c1688',
-          [3] = '#7517ab',
-          [4] = '#9518d8',
-          [5] = '#b643ef',
-          [6] = '#d07ef7',
-          [7] = '#d889fa',
-          [8] = '#e4a5fd',
-          [9] = '#edbdff',
-        }),
-        coral = m({
-          [0] = '#351008',
-          [1] = '#51180b',
-          [2] = '#72220d',
-          [3] = '#902a0e',
-          [4] = '#b3350f',
-          [5] = '#e1430e',
-          [6] = '#f7794b',
-          [7] = '#fa8c61',
-          [8] = '#fdaa86',
-          [9] = '#ffc0a3',
-        }),
-        pink = m({
-          [0] = '#2d1524',
-          [1] = '#451c35',
-          [2] = '#65244a',
-          [3] = '#842a5d',
-          [4] = '#ac2f74',
-          [5] = '#d34591',
-          [6] = '#e57bb2',
-          [7] = '#ec8dbd',
-          [8] = '#f4a9cd',
-          [9] = '#f9bed9',
-        }),
-        brown = m({
-          [0] = '#241c14',
-          [1] = '#342a1d',
-          [2] = '#483a28',
-          [3] = '#5d4a32',
-          [4] = '#755e3e',
-          [5] = '#94774c',
-          [6] = '#b69a6d',
-          [7] = '#bfa77d',
-          [8] = '#cdbb98',
-          [9] = '#dbceb3',
-        }),
-        pine = m({
-          [0] = '#082119',
-          [1] = '#0b3224',
-          [2] = '#0e4430',
-          [3] = '#115a3e',
-          [4] = '#14714c',
-          [5] = '#18915e',
-          [6] = '#1bb673',
-          [7] = '#1ac176',
-          [8] = '#1bda81',
-          [9] = '#3eea97',
-        }),
-        blue = m({
-          [0] = '#001a47',
-          [1] = '#002766',
-          [2] = '#00378a',
-          [3] = '#0046a8',
-          [4] = '#005bd1',
-          [5] = '#0576ff',
-          [6] = '#4da0ff',
-          [7] = '#61adff',
-          [8] = '#85c2ff',
-          [9] = '#a3d3ff',
-        }),
-        orange = m({
-          [0] = '#311708',
-          [1] = '#43200a',
-          [2] = '#632f0d',
-          [3] = '#7b3c0e',
-          [4] = '#984b10',
-          [5] = '#c46212',
-          [6] = '#ed8326',
-          [7] = '#f1933b',
-          [8] = '#f6b06a',
-          [9] = '#fac68f',
-        }),
-        auburn = m({
-          [0] = '#271817',
-          [1] = '#3a2422',
-          [2] = '#543331',
-          [3] = '#6d4340',
-          [4] = '#87534f',
-          [5] = '#a86f6b',
-          [6] = '#bf9592',
-          [7] = '#c6a19f',
-          [8] = '#d4b7b5',
-          [9] = '#dfcac8',
-        }),
-        white = '#ffffff',
-        olive = m({
-          [0] = '#171e0b',
-          [1] = '#252d10',
-          [2] = '#374115',
-          [3] = '#485219',
-          [4] = '#5e681d',
-          [5] = '#7a8321',
-          [6] = '#a2a626',
-          [7] = '#b2af24',
-          [8] = '#cbc025',
-          [9] = '#e2d04b',
-        }),
-      }),
-    }),
-    color = m({
-      coral = m({
-        [0] = '#ffddd2',
-        [1] = '#ffc2b2',
-        [2] = '#ffa28b',
-        [3] = '#f78166',
-        [4] = '#ea6045',
-        [5] = '#cf462d',
-        [6] = '#ac3220',
-        [7] = '#872012',
-        [8] = '#640d04',
-        [9] = '#460701',
-      }),
-      pink = m({
-        [0] = '#ffdaec',
-        [1] = '#ffbedd',
-        [2] = '#ff9bce',
-        [3] = '#f778ba',
-        [4] = '#db61a2',
-        [5] = '#bf4b8a',
-        [6] = '#9e3670',
-        [7] = '#7d2457',
-        [8] = '#5e103e',
-        [9] = '#42062a',
-      }),
-      neutral = m({
-        [0] = '#f0f6fc',
-        [1] = '#c9d1d9',
-        [2] = '#b1bac4',
-        [3] = '#8b949e',
-        [4] = '#6e7681',
-        [5] = '#484f58',
-        [6] = '#30363d',
-        [7] = '#21262d',
-        [8] = '#161b22',
-        [9] = '#0d1117',
-      }),
-      black = '#010409',
-      blue = m({
-        [0] = '#cae8ff',
-        [1] = '#a5d6ff',
-        [2] = '#79c0ff',
-        [3] = '#58a6ff',
-        [4] = '#388bfd',
-        [5] = '#1f6feb',
-        [6] = '#1158c7',
-        [7] = '#0d419d',
-        [8] = '#0c2d6b',
-        [9] = '#051d4d',
-      }),
-      green = m({
-        [0] = '#aff5b4',
-        [1] = '#7ee787',
-        [2] = '#56d364',
-        [3] = '#3fb950',
-        [4] = '#2ea043',
-        [5] = '#238636',
-        [6] = '#196c2e',
-        [7] = '#0f5323',
-        [8] = '#033a16',
-        [9] = '#04260f',
-      }),
-      orange = m({
-        [0] = '#ffdfb6',
-        [1] = '#ffc680',
-        [2] = '#ffa657',
-        [3] = '#f0883e',
-        [4] = '#db6d28',
-        [5] = '#bd561d',
-        [6] = '#9b4215',
-        [7] = '#762d0a',
-        [8] = '#5a1e02',
-        [9] = '#3d1300',
-      }),
-      red = m({
-        [0] = '#ffdcd7',
-        [1] = '#ffc1ba',
-        [2] = '#ffa198',
-        [3] = '#ff7b72',
-        [4] = '#f85149',
-        [5] = '#da3633',
-        [6] = '#b62324',
-        [7] = '#8e1519',
-        [8] = '#67060c',
-        [9] = '#490202',
-      }),
-      white = '#ffffff',
-      transparent = '#00000000',
-      purple = m({
-        [0] = '#eddeff',
-        [1] = '#e2c5ff',
-        [2] = '#d2a8ff',
-        [3] = '#be8fff',
-        [4] = '#ab7df8',
-        [5] = '#8957e5',
-        [6] = '#6e40c9',
-        [7] = '#553098',
-        [8] = '#3c1e70',
-        [9] = '#271052',
-      }),
-      yellow = m({
-        [0] = '#f8e3a1',
-        [1] = '#f2cc60',
-        [2] = '#e3b341',
-        [3] = '#d29922',
-        [4] = '#bb8009',
-        [5] = '#9e6a03',
-        [6] = '#845306',
-        [7] = '#693e00',
-        [8] = '#4b2900',
-        [9] = '#341a00',
-      }),
-    }),
-  }),
-  selection = m({
-    bgColor = '#1f6febb3',
-  }),
-  selectMenu = m({
-    borderColor = '#484f58',
-    bgColor = m({
-      active = '#0c2d6b',
-    }),
-  }),
-  reactionButton = m({
-    selected = m({
-      bgColor = m({
-        hover = '#3a8cfd5c',
-        rest = '#388bfd33',
-      }),
-      fgColor = m({
-        hover = '#79c0ff',
-        rest = '#4493f8',
-      }),
-    }),
-  }),
-  fgColor = m({
-    severe = '#f85149',
-    disabled = '#6e7681',
-    danger = '#f85149',
-    closed = '#6e7681',
-    black = '#010409',
-    attention = '#d29922',
-    accent = '#4493f8',
-    open = '#f85149',
-    neutral = '#6e7681',
-    sponsors = '#db61a2',
-    success = '#58a6ff',
-    onEmphasis = '#ffffff',
-    white = '#ffffff',
-    done = '#ab7df8',
-    default = '#e6edf3',
-    upsell = '#ab7df8',
-    muted = '#8d96a0',
-    link = '#4493f8',
-  }),
-  page = m({
-    header = m({
-      bgColor = '#0d1117',
-    }),
-  }),
-  header = m({
-    bgColor = '#161b22f2',
-    borderColor = m({
-      divider = '#8b949e',
-    }),
-    fgColor = m({
-      logo = '#f0f6fc',
-      default = '#ffffffb3',
-    }),
-  }),
-  card = m({
-    bgColor = '#161b22',
-  }),
-  buttonCounter = m({
-    danger = m({
-      bgColor = m({
-        hover = '#ffffff33',
-        disabled = '#da36330d',
-        rest = '#49020233',
-      }),
+    cyan = m({
       fgColor = m({
-        hover = '#ffffff',
-        disabled = '#f8514980',
-        rest = '#f85149',
-      }),
-    }),
-    invisible = m({
-      bgColor = m({
-        rest = '#30363d',
+        active = '#45cbf7',
+        rest = '#07ace4',
+        hover = '#09b7f1',
       }),
-    }),
-    default = m({
       bgColor = m({
-        rest = '#30363d',
+        active = '#014156',
+        rest = '#001f29',
+        hover = '#002e3d',
       }),
     }),
-    outline = m({
-      bgColor = m({
-        hover = '#051d4d33',
-        disabled = '#1f6feb0d',
-        rest = '#051d4d33',
-      }),
+    plum = m({
       fgColor = m({
-        hover = '#58a6ff',
-        disabled = '#4493f880',
-        rest = '#388bfd',
+        active = '#e4a5fd',
+        rest = '#d07ef7',
+        hover = '#d889fa',
       }),
-    }),
-    primary = m({
       bgColor = m({
-        rest = '#04260f33',
+        active = '#5c1688',
+        rest = '#2a0e3f',
+        hover = '#40125e',
       }),
     }),
-  }),
-  outline = m({
-    focus = '#1f6feb solid 2px',
-  }),
-  focus = m({
-    outlineColor = '#1f6feb',
-  }),
-  menu = m({
-    bgColor = m({
-      active = '#161b22',
-    }),
-  }),
-  label = m({
-    lime = m({
-      bgColor = m({
-        hover = '#1f3116',
-        rest = '#141f0f',
-        active = '#2c441d',
-      }),
+    coral = m({
       fgColor = m({
-        hover = '#89ba36',
-        rest = '#7dae37',
-        active = '#9fcc3e',
+        active = '#fdaa86',
+        rest = '#f7794b',
+        hover = '#fa8c61',
       }),
-    }),
-    lemon = m({
       bgColor = m({
-        hover = '#372901',
-        rest = '#291d00',
-        active = '#4f3c02',
-      }),
-      fgColor = m({
-        hover = '#c4a717',
-        rest = '#ba9b12',
-        active = '#d7bc1d',
+        active = '#72220d',
+        rest = '#351008',
+        hover = '#51180b',
       }),
     }),
-    yellow = m({
-      bgColor = m({
-        hover = '#3d2401',
-        rest = '#2e1a00',
-        active = '#5a3702',
-      }),
+    pink = m({
       fgColor = m({
-        hover = '#df9e11',
-        rest = '#d3910d',
-        active = '#edb431',
+        active = '#f4a9cd',
+        rest = '#e57bb2',
+        hover = '#ec8dbd',
       }),
-    }),
-    indigo = m({
       bgColor = m({
-        hover = '#25215f',
-        rest = '#1b183f',
-        active = '#312c90',
-      }),
-      fgColor = m({
-        hover = '#a2a5f1',
-        rest = '#9899ec',
-        active = '#b7baf6',
+        active = '#65244a',
+        rest = '#2d1524',
+        hover = '#451c35',
       }),
     }),
-    teal = m({
-      bgColor = m({
-        hover = '#073036',
-        rest = '#041f25',
-        active = '#0a464d',
-      }),
+    brown = m({
       fgColor = m({
-        hover = '#1fbdb2',
-        rest = '#1cb0ab',
-        active = '#24d6c4',
+        active = '#cdbb98',
+        rest = '#b69a6d',
+        hover = '#bfa77d',
       }),
-    }),
-    green = m({
       bgColor = m({
-        hover = '#182f1f',
-        rest = '#122117',
-        active = '#214529',
-      }),
-      fgColor = m({
-        hover = '#46c144',
-        rest = '#41b445',
-        active = '#75d36f',
+        active = '#483a28',
+        rest = '#241c14',
+        hover = '#342a1d',
       }),
     }),
-    red = m({
-      bgColor = m({
-        hover = '#58091a',
-        rest = '#3c0614',
-        active = '#790c20',
-      }),
+    pine = m({
       fgColor = m({
-        hover = '#f48b8d',
-        rest = '#f27d83',
-        active = '#f7adab',
+        active = '#1bda81',
+        rest = '#1bb673',
+        hover = '#1ac176',
       }),
-    }),
-    gray = m({
       bgColor = m({
-        hover = '#2a2b2d',
-        rest = '#1c1c1c',
-        active = '#393d41',
-      }),
-      fgColor = m({
-        hover = '#9babbf',
-        rest = '#92a1b5',
-        active = '#b3c0d1',
+        active = '#0e4430',
+        rest = '#082119',
+        hover = '#0b3224',
       }),
     }),
-    purple = m({
-      bgColor = m({
-        hover = '#31146b',
-        rest = '#211047',
-        active = '#481a9e',
-      }),
+    blue = m({
       fgColor = m({
-        hover = '#c398fb',
-        rest = '#b687f7',
-        active = '#d2affd',
+        active = '#85c2ff',
+        rest = '#4da0ff',
+        hover = '#61adff',
       }),
-    }),
-    cyan = m({
       bgColor = m({
-        hover = '#002e3d',
-        rest = '#001f29',
-        active = '#014156',
-      }),
-      fgColor = m({
-        hover = '#09b7f1',
-        rest = '#07ace4',
-        active = '#45cbf7',
+        active = '#00378a',
+        rest = '#001a47',
+        hover = '#002766',
       }),
     }),
-    plum = m({
-      bgColor = m({
-        hover = '#40125e',
-        rest = '#2a0e3f',
-        active = '#5c1688',
-      }),
+    orange = m({
       fgColor = m({
-        hover = '#d889fa',
-        rest = '#d07ef7',
-        active = '#e4a5fd',
+        active = '#f6b06a',
+        rest = '#ed8326',
+        hover = '#f1933b',
       }),
-    }),
-    coral = m({
       bgColor = m({
-        hover = '#51180b',
-        rest = '#351008',
-        active = '#72220d',
+        active = '#632f0d',
+        rest = '#311708',
+        hover = '#43200a',
       }),
-      fgColor = m({
-        hover = '#fa8c61',
-        rest = '#f7794b',
-        active = '#fdaa86',
+    }),
+    auburn = m({
+      fgColor = m({
+        active = '#d4b7b5',
+        rest = '#bf9592',
+        hover = '#c6a19f',
       }),
-    }),
-    pink = m({
       bgColor = m({
-        hover = '#451c35',
-        rest = '#2d1524',
-        active = '#65244a',
+        active = '#543331',
+        rest = '#271817',
+        hover = '#3a2422',
       }),
+    }),
+    olive = m({
       fgColor = m({
-        hover = '#ec8dbd',
-        rest = '#e57bb2',
-        active = '#f4a9cd',
+        active = '#cbc025',
+        rest = '#a2a626',
+        hover = '#b2af24',
       }),
-    }),
-    brown = m({
       bgColor = m({
-        hover = '#342a1d',
-        rest = '#241c14',
-        active = '#483a28',
+        active = '#374115',
+        rest = '#171e0b',
+        hover = '#252d10',
       }),
+    }),
+    lime = m({
       fgColor = m({
-        hover = '#bfa77d',
-        rest = '#b69a6d',
-        active = '#cdbb98',
+        active = '#9fcc3e',
+        rest = '#7dae37',
+        hover = '#89ba36',
       }),
-    }),
-    pine = m({
       bgColor = m({
-        hover = '#0b3224',
-        rest = '#082119',
-        active = '#0e4430',
+        active = '#2c441d',
+        rest = '#141f0f',
+        hover = '#1f3116',
       }),
+    }),
+    lemon = m({
       fgColor = m({
-        hover = '#1ac176',
-        rest = '#1bb673',
-        active = '#1bda81',
+        active = '#d7bc1d',
+        rest = '#ba9b12',
+        hover = '#c4a717',
       }),
-    }),
-    blue = m({
       bgColor = m({
-        hover = '#002766',
-        rest = '#001a47',
-        active = '#00378a',
+        active = '#4f3c02',
+        rest = '#291d00',
+        hover = '#372901',
       }),
+    }),
+    yellow = m({
       fgColor = m({
-        hover = '#61adff',
-        rest = '#4da0ff',
-        active = '#85c2ff',
+        active = '#edb431',
+        rest = '#d3910d',
+        hover = '#df9e11',
       }),
-    }),
-    orange = m({
       bgColor = m({
-        hover = '#43200a',
-        rest = '#311708',
-        active = '#632f0d',
+        active = '#5a3702',
+        rest = '#2e1a00',
+        hover = '#3d2401',
       }),
+    }),
+    indigo = m({
       fgColor = m({
-        hover = '#f1933b',
-        rest = '#ed8326',
-        active = '#f6b06a',
+        active = '#b7baf6',
+        rest = '#9899ec',
+        hover = '#a2a5f1',
       }),
-    }),
-    auburn = m({
       bgColor = m({
-        hover = '#3a2422',
-        rest = '#271817',
-        active = '#543331',
+        active = '#312c90',
+        rest = '#1b183f',
+        hover = '#25215f',
       }),
+    }),
+    teal = m({
       fgColor = m({
-        hover = '#c6a19f',
-        rest = '#bf9592',
-        active = '#d4b7b5',
+        active = '#24d6c4',
+        rest = '#1cb0ab',
+        hover = '#1fbdb2',
       }),
-    }),
-    olive = m({
       bgColor = m({
-        hover = '#252d10',
-        rest = '#171e0b',
-        active = '#374115',
+        active = '#0a464d',
+        rest = '#041f25',
+        hover = '#073036',
       }),
+    }),
+    green = m({
       fgColor = m({
-        hover = '#b2af24',
-        rest = '#a2a626',
-        active = '#cbc025',
+        active = '#75d36f',
+        rest = '#41b445',
+        hover = '#46c144',
+      }),
+      bgColor = m({
+        active = '#214529',
+        rest = '#122117',
+        hover = '#182f1f',
       }),
     }),
   }),
-  button = m({
-    inactive = m({
-      bgColor = '#21262d',
-      fgColor = '#8b949e',
+  counter = m({
+    borderColor = '#00000000',
+  }),
+  controlTrack = m({
+    fgColor = m({
+      rest = '#8d96a0',
+      disabled = '#ffffff',
     }),
-    star = m({
-      iconColor = '#e3b341',
+    bgColor = m({
+      active = '#31363e',
+      hover = '#292e36',
+      rest = '#21262d',
+      disabled = '#6e7681',
     }),
-    danger = m({
-      shadow = m({
-        selected = '0px 0px 0px 0px #000000',
+    borderColor = m({
+      rest = '#00000000',
+      disabled = '#6e7681',
+    }),
+  }),
+  data = m({
+    red = m({
+      color = m({
+        muted = '#3c0614',
+        default = '#eb3342',
       }),
-      bgColor = m({
-        rest = '#21262d',
-        hover = '#b62324',
-        disabled = '#21262db3',
-        active = '#d03533',
+    }),
+    gray = m({
+      color = m({
+        muted = '#1c1c1c',
+        default = '#576270',
       }),
-      borderColor = m({
-        hover = '#f0f6fc1a',
-        rest = '#30363d',
-        active = '#f0f6fc1a',
+    }),
+    purple = m({
+      color = m({
+        muted = '#211047',
+        default = '#975bf1',
       }),
-      iconColor = m({
-        hover = '#ffffff',
-        rest = '#f85149',
+    }),
+    pink = m({
+      color = m({
+        muted = '#2d1524',
+        default = '#d34591',
       }),
-      fgColor = m({
-        rest = '#f85149',
-        hover = '#ffffff',
-        disabled = '#f8514980',
-        active = '#ffffff',
+    }),
+    yellow = m({
+      color = m({
+        muted = '#2e1a00',
+        default = '#895906',
       }),
     }),
-    invisible = m({
-      iconColor = m({
-        hover = '#e6edf3',
-        disabled = '#6e7681',
-        rest = '#8d96a0',
+    auburn = m({
+      color = m({
+        muted = '#271817',
+        default = '#a86f6b',
       }),
-      bgColor = m({
-        rest = '#00000000',
-        hover = '#b1bac41f',
-        disabled = '#21262db3',
-        active = '#b1bac433',
+    }),
+    blue = m({
+      color = m({
+        muted = '#001a47',
+        default = '#0576ff',
       }),
-      borderColor = m({
-        hover = '#00000000',
-        disabled = '#21262db3',
-        rest = '#00000000',
+    }),
+    teal = m({
+      color = m({
+        muted = '#041f25',
+        default = '#106c70',
       }),
-      fgColor = m({
-        hover = '#58a6ff',
-        disabled = '#6e7681',
-        rest = '#4493f8',
+    }),
+    green = m({
+      color = m({
+        muted = '#122117',
+        default = '#2f6f37',
+      }),
+    }),
+    orange = m({
+      color = m({
+        muted = '#311708',
+        default = '#984b10',
       }),
     }),
-    default = m({
-      shadow = m({
-        resting = '0px 0px 0px 0px #000000',
+  }),
+  controlKnob = m({
+    bgColor = m({
+      checked = '#ffffff',
+      rest = '#010409',
+      disabled = '#21262db3',
+    }),
+    borderColor = m({
+      checked = '#1f6feb',
+      rest = '#666e79',
+      disabled = '#21262db3',
+    }),
+  }),
+  control = m({
+    fgColor = m({
+      disabled = '#6e7681',
+      rest = '#c9d1d9',
+      placeholder = '#858e98',
+    }),
+    borderColor = m({
+      selected = '#f0f6fc',
+      warning = '#9e6a03',
+      disabled = '#21262db3',
+      success = '#1f6feb',
+      danger = '#da3633',
+      emphasis = '#666e79',
+      rest = '#30363d',
+    }),
+    checked = m({
+      fgColor = m({
+        rest = '#ffffff',
+        disabled = '#010409',
       }),
       bgColor = m({
-        disabled = '#21262db3',
-        active = '#31363e',
-        selected = '#31363e',
-        rest = '#21262d',
-        hover = '#292e36',
+        active = '#3685f3',
+        hover = '#2a7aef',
+        rest = '#1f6feb',
+        disabled = '#6e7681',
       }),
       borderColor = m({
-        rest = '#30363d',
-        hover = '#30363d',
-        disabled = '#21262db3',
-        active = '#30363d',
+        active = '#3685f3',
+        hover = '#2a7aef',
+        rest = '#1f6feb',
+        disabled = '#6e7681',
       }),
+    }),
+    iconColor = m({
+      rest = '#8d96a0',
+    }),
+    danger = m({
       fgColor = m({
-        rest = '#c9d1d9',
+        rest = '#f85149',
+        hover = '#ff7b72',
       }),
-    }),
-    primary = m({
-      shadow = m({
-        selected = '0px 0px 0px 0px #000000',
+      bgColor = m({
+        hover = '#f851491a',
+        active = '#f8514966',
       }),
+    }),
+    bgColor = m({
+      active = '#31363e',
+      selected = '#161b22',
+      rest = '#21262d',
+      disabled = '#21262db3',
+      hover = '#292e36',
+    }),
+    transparent = m({
       bgColor = m({
-        rest = '#1f6feb',
-        hover = '#2a7aef',
-        disabled = '#5fabfe',
-        active = '#3685f3',
+        active = '#b1bac433',
+        selected = '#b1bac414',
+        rest = '#00000000',
+        disabled = '#21262db3',
+        hover = '#b1bac41f',
       }),
       borderColor = m({
-        rest = '#f0f6fc1a',
-        hover = '#f0f6fc1a',
-        disabled = '#5fabfe',
-        active = '#f0f6fc1a',
-      }),
-      iconColor = m({
-        rest = '#ffffff',
+        active = '#00000000',
+        rest = '#00000000',
+        hover = '#00000000',
       }),
+    }),
+  }),
+  codeMirror = m({
+    gutters = m({
+      bgColor = '#0d1117',
+    }),
+    gutterMarker = m({
       fgColor = m({
-        disabled = '#ffffff66',
-        rest = '#ffffff',
+        muted = '#8d96a0',
+        default = '#0d1117',
       }),
     }),
-    outline = m({
-      shadow = m({
-        selected = '0px 0px 0px 0px #000000',
-      }),
-      bgColor = m({
-        rest = '#f0f6fc',
-        hover = '#30363d',
-        disabled = '#0d1117',
-        active = '#0d419d',
-      }),
-      borderColor = m({
-        selected = '#f0f6fc1a',
-        hover = '#f0f6fc1a',
-      }),
+    lines = m({
+      bgColor = '#0d1117',
+    }),
+    cursor = m({
+      fgColor = '#e6edf3',
+    }),
+    bgColor = '#0d1117',
+    selection = m({
+      bgColor = '#388bfd66',
+    }),
+    activeline = m({
+      bgColor = '#6e768166',
+    }),
+    fgColor = '#e6edf3',
+    syntax = m({
       fgColor = m({
-        rest = '#388bfd',
-        hover = '#58a6ff',
-        disabled = '#4493f880',
-        active = '#ffffff',
+        entity = '#d2a8ff',
+        support = '#79c0ff',
+        keyword = '#ff7b72',
+        constant = '#79c0ff',
+        comment = '#8b949e',
+        variable = '#ffa198',
+        string = '#a5d6ff',
+        storage = '#ff7b72',
       }),
     }),
+    matchingBracket = m({
+      fgColor = '#e6edf3',
+    }),
+    lineNumber = m({
+      fgColor = '#8d96a0',
+    }),
   }),
-  diffBlob = m({
-    addition = m({
+  display = m({
+    red = m({
+      fgColor = '#f27d83',
       bgColor = m({
-        num = '#58a6ff4d',
-        line = '#388bfd26',
-        word = '#388bfd66',
+        muted = '#3c0614',
+        emphasis = '#eb3342',
       }),
-      fgColor = m({
-        num = '#e6edf3',
-        text = '#e6edf3',
+      borderColor = m({
+        muted = '#58091a',
+        emphasis = '#eb3342',
       }),
     }),
-    expander = m({
-      iconColor = '#8d96a0',
-    }),
-    deletion = m({
+    gray = m({
+      fgColor = '#92a1b5',
       bgColor = m({
-        num = '#f851494d',
-        line = '#f8514926',
-        word = '#f8514966',
+        muted = '#1c1c1c',
+        emphasis = '#6e7f96',
       }),
-      fgColor = m({
-        num = '#e6edf3',
-        text = '#e6edf3',
+      borderColor = m({
+        muted = '#2a2b2d',
+        emphasis = '#6e7f96',
       }),
     }),
-    hunk = m({
+    purple = m({
+      fgColor = '#b687f7',
       bgColor = m({
-        num = '#388bfd66',
+        muted = '#211047',
+        emphasis = '#975bf1',
       }),
-    }),
-  }),
-  avatar = m({
-    shadow = '0px 0px 0px 2px #0d1117',
-    bgColor = '#ffffff1a',
-    borderColor = '#ffffff26',
-  }),
-  counter = m({
-    borderColor = '#00000000',
-  }),
-  color = m({
-    prettylights = m({
-      syntax = m({
-        comment = '#8b949e',
-        carriage = m({
-          ['return'] = m({
-            bg = '#b62324',
-            text = '#f0f6fc',
-          }),
-        }),
-        storage = m({
-          modifier = m({
-            import = '#c9d1d9',
-          }),
-        }),
-        brackethighlighter = m({
-          unmatched = '#f85149',
-          angle = '#8b949e',
-        }),
-        keyword = '#ff7b72',
-        invalid = m({
-          illegal = m({
-            bg = '#8e1519',
-            text = '#f0f6fc',
-          }),
-        }),
-        variable = '#ffa198',
-        meta = m({
-          diff = m({
-            range = '#d2a8ff',
-          }),
-        }),
-        entity = m({
-          tag = '#a5d6ff',
-          default = '#d2a8ff',
-        }),
-        string = m({
-          regexp = '#a5d6ff',
-          default = '#a5d6ff',
-        }),
-        constant = m({
-          other = m({
-            reference = m({
-              link = '#a5d6ff',
-            }),
-          }),
-          default = '#79c0ff',
-        }),
-        sublimelinter = m({
-          gutter = m({
-            mark = '#484f58',
-          }),
-        }),
-        markup = m({
-          list = '#f2cc60',
-          deleted = m({
-            bg = '#67060c',
-            text = '#ffdcd7',
-          }),
-          italic = '#c9d1d9',
-          changed = m({
-            bg = '#67060c',
-            text = '#ffdcd7',
-          }),
-          inserted = m({
-            bg = '#0c2d6b',
-            text = '#cae8ff',
-          }),
-          bold = '#c9d1d9',
-          heading = '#1f6feb',
-          ignored = m({
-            bg = '#1158c7',
-            text = '#c9d1d9',
-          }),
-        }),
+      borderColor = m({
+        muted = '#31146b',
+        emphasis = '#975bf1',
       }),
     }),
-    ansi = m({
-      black = m({
-        default = '#484f58',
-        bright = '#6e7681',
+    cyan = m({
+      fgColor = '#07ace4',
+      bgColor = m({
+        muted = '#001f29',
+        emphasis = '#0587b3',
       }),
-      yellow = m({
-        default = '#d29922',
-        bright = '#e3b341',
+      borderColor = m({
+        muted = '#002e3d',
+        emphasis = '#0587b3',
       }),
-      blue = m({
-        default = '#58a6ff',
-        bright = '#79c0ff',
+    }),
+    plum = m({
+      fgColor = '#d07ef7',
+      bgColor = m({
+        muted = '#2a0e3f',
+        emphasis = '#b643ef',
       }),
-      green = m({
-        default = '#58a6ff',
-        bright = '#79c0ff',
+      borderColor = m({
+        muted = '#40125e',
+        emphasis = '#b643ef',
       }),
-      magenta = m({
-        default = '#be8fff',
-        bright = '#d2a8ff',
+    }),
+    coral = m({
+      fgColor = '#f27d83',
+      bgColor = m({
+        muted = '#3c0614',
+        emphasis = '#eb3342',
       }),
-      red = m({
-        default = '#ff7b72',
-        bright = '#ffa198',
+      borderColor = m({
+        muted = '#58091a',
+        emphasis = '#eb3342',
       }),
-      white = m({
-        default = '#b1bac4',
-        bright = '#ffffff',
+    }),
+    pink = m({
+      fgColor = '#e57bb2',
+      bgColor = m({
+        muted = '#2d1524',
+        emphasis = '#d34591',
       }),
-      gray = '#6e7681',
-      cyan = m({
-        default = '#39c5cf',
-        bright = '#56d4dd',
+      borderColor = m({
+        muted = '#451c35',
+        emphasis = '#d34591',
+      }),
+    }),
+    brown = m({
+      fgColor = '#b69a6d',
+      bgColor = m({
+        muted = '#241c14',
+        emphasis = '#94774c',
+      }),
+      borderColor = m({
+        muted = '#342a1d',
+        emphasis = '#94774c',
+      }),
+    }),
+    pine = m({
+      fgColor = '#1bb673',
+      bgColor = m({
+        muted = '#082119',
+        emphasis = '#18915e',
+      }),
+      borderColor = m({
+        muted = '#0b3224',
+        emphasis = '#18915e',
+      }),
+    }),
+    blue = m({
+      fgColor = '#4da0ff',
+      bgColor = m({
+        muted = '#001a47',
+        emphasis = '#0576ff',
+      }),
+      borderColor = m({
+        muted = '#002766',
+        emphasis = '#0576ff',
+      }),
+    }),
+    orange = m({
+      fgColor = '#ed8326',
+      bgColor = m({
+        muted = '#311708',
+        emphasis = '#c46212',
+      }),
+      borderColor = m({
+        muted = '#43200a',
+        emphasis = '#c46212',
+      }),
+    }),
+    auburn = m({
+      fgColor = '#bf9592',
+      bgColor = m({
+        muted = '#271817',
+        emphasis = '#a86f6b',
+      }),
+      borderColor = m({
+        muted = '#3a2422',
+        emphasis = '#a86f6b',
+      }),
+    }),
+    olive = m({
+      fgColor = '#a2a626',
+      bgColor = m({
+        muted = '#171e0b',
+        emphasis = '#7a8321',
+      }),
+      borderColor = m({
+        muted = '#252d10',
+        emphasis = '#7a8321',
       }),
     }),
-  }),
-  display = m({
     lime = m({
+      fgColor = '#7dae37',
       bgColor = m({
         muted = '#141f0f',
         emphasis = '#5f892f',
@@ -1318,9 +948,9 @@ local M = m({
         muted = '#1f3116',
         emphasis = '#5f892f',
       }),
-      fgColor = '#7dae37',
     }),
     lemon = m({
+      fgColor = '#ba9b12',
       bgColor = m({
         muted = '#291d00',
         emphasis = '#977b0c',
@@ -1329,9 +959,9 @@ local M = m({
         muted = '#372901',
         emphasis = '#977b0c',
       }),
-      fgColor = '#ba9b12',
     }),
     yellow = m({
+      fgColor = '#d3910d',
       bgColor = m({
         muted = '#2e1a00',
         emphasis = '#aa7109',
@@ -1340,9 +970,9 @@ local M = m({
         muted = '#3d2401',
         emphasis = '#aa7109',
       }),
-      fgColor = '#d3910d',
     }),
     indigo = m({
+      fgColor = '#9899ec',
       bgColor = m({
         muted = '#1b183f',
         emphasis = '#7070e1',
@@ -1351,9 +981,9 @@ local M = m({
         muted = '#25215f',
         emphasis = '#7070e1',
       }),
-      fgColor = '#9899ec',
     }),
     teal = m({
+      fgColor = '#1cb0ab',
       bgColor = m({
         muted = '#041f25',
         emphasis = '#158a8a',
@@ -1362,9 +992,9 @@ local M = m({
         muted = '#073036',
         emphasis = '#158a8a',
       }),
-      fgColor = '#1cb0ab',
     }),
     green = m({
+      fgColor = '#41b445',
       bgColor = m({
         muted = '#122117',
         emphasis = '#388f3f',
@@ -1373,312 +1003,682 @@ local M = m({
         muted = '#182f1f',
         emphasis = '#388f3f',
       }),
-      fgColor = '#41b445',
     }),
-    red = m({
-      bgColor = m({
-        muted = '#3c0614',
-        emphasis = '#eb3342',
-      }),
-      borderColor = m({
-        muted = '#58091a',
-        emphasis = '#eb3342',
+  }),
+  underlineNav = m({
+    iconColor = m({
+      rest = '#8d96a0',
+    }),
+    borderColor = m({
+      hover = '#6e768166',
+      active = '#f78166',
+    }),
+  }),
+  borderColor = m({
+    muted = '#30363db3',
+    done = m({
+      muted = '#ab7df866',
+      emphasis = '#8957e5',
+    }),
+    disabled = '#21262db3',
+    default = '#30363d',
+    closed = m({
+      muted = '#6e768166',
+      emphasis = '#484f58',
+    }),
+    open = m({
+      muted = '#f8514966',
+      emphasis = '#da3633',
+    }),
+    attention = m({
+      muted = '#bb800966',
+      emphasis = '#9e6a03',
+    }),
+    accent = m({
+      muted = '#388bfd66',
+      emphasis = '#1f6feb',
+    }),
+    emphasis = '#484f58',
+    translucent = '#ffffff26',
+    neutral = m({
+      muted = '#6e768166',
+      emphasis = '#6e7681',
+    }),
+    danger = m({
+      muted = '#f8514966',
+      emphasis = '#da3633',
+    }),
+    upsell = m({
+      muted = '#ab7df866',
+      emphasis = '#8957e5',
+    }),
+    success = m({
+      muted = '#388bfd66',
+      emphasis = '#1f6feb',
+    }),
+    sponsors = m({
+      muted = '#db61a266',
+      emphasis = '#bf4b8a',
+    }),
+    severe = m({
+      muted = '#f8514966',
+      emphasis = '#da3633',
+    }),
+    transparent = '#00000000',
+  }),
+  treeViewItem = m({
+    leadingVisual = m({
+      iconColor = m({
+        rest = '#8d96a0',
       }),
-      fgColor = '#f27d83',
     }),
-    gray = m({
+  }),
+  avatarStack = m({
+    fade = m({
       bgColor = m({
-        muted = '#1c1c1c',
-        emphasis = '#6e7f96',
-      }),
-      borderColor = m({
-        muted = '#2a2b2d',
-        emphasis = '#6e7f96',
+        muted = '#21262d',
+        default = '#30363d',
       }),
-      fgColor = '#92a1b5',
     }),
-    purple = m({
-      bgColor = m({
-        muted = '#211047',
-        emphasis = '#975bf1',
-      }),
-      borderColor = m({
-        muted = '#31146b',
-        emphasis = '#975bf1',
-      }),
-      fgColor = '#b687f7',
+  }),
+  topicTag = m({
+    borderColor = '#00000000',
+  }),
+  timelineBadge = m({
+    bgColor = '#21262d',
+  }),
+  bgColor = m({
+    muted = '#161b22',
+    inverse = '#ffffff',
+    done = m({
+      muted = '#ab7df826',
+      emphasis = '#8957e5',
+    }),
+    disabled = '#21262db3',
+    default = '#0d1117',
+    closed = m({
+      muted = '#6e768126',
+      emphasis = '#484f58',
+    }),
+    open = m({
+      muted = '#f851491a',
+      emphasis = '#da3633',
+    }),
+    transparent = '#00000000',
+    accent = m({
+      muted = '#388bfd1a',
+      emphasis = '#1f6feb',
+    }),
+    emphasis = '#6e7681',
+    neutral = m({
+      muted = '#6e768166',
+      emphasis = '#6e7681',
     }),
-    cyan = m({
-      bgColor = m({
-        muted = '#001f29',
-        emphasis = '#0587b3',
-      }),
-      borderColor = m({
-        muted = '#002e3d',
-        emphasis = '#0587b3',
-      }),
-      fgColor = '#07ace4',
+    attention = m({
+      muted = '#bb800926',
+      emphasis = '#9e6a03',
     }),
-    plum = m({
-      bgColor = m({
-        muted = '#2a0e3f',
-        emphasis = '#b643ef',
-      }),
-      borderColor = m({
-        muted = '#40125e',
-        emphasis = '#b643ef',
-      }),
-      fgColor = '#d07ef7',
+    black = '#010409',
+    inset = '#010409',
+    white = '#ffffff',
+    upsell = m({
+      muted = '#ab7df826',
+      emphasis = '#8957e5',
     }),
-    coral = m({
-      bgColor = m({
-        muted = '#3c0614',
-        emphasis = '#eb3342',
-      }),
-      borderColor = m({
-        muted = '#58091a',
-        emphasis = '#eb3342',
-      }),
-      fgColor = '#f27d83',
+    success = m({
+      muted = '#388bfd26',
+      emphasis = '#1f6feb',
     }),
-    pink = m({
-      bgColor = m({
-        muted = '#2d1524',
-        emphasis = '#d34591',
-      }),
-      borderColor = m({
-        muted = '#451c35',
-        emphasis = '#d34591',
-      }),
-      fgColor = '#e57bb2',
+    sponsors = m({
+      muted = '#db61a21a',
+      emphasis = '#bf4b8a',
     }),
-    brown = m({
-      bgColor = m({
-        muted = '#241c14',
-        emphasis = '#94774c',
-      }),
-      borderColor = m({
-        muted = '#342a1d',
-        emphasis = '#94774c',
+    severe = m({
+      muted = '#f851491a',
+      emphasis = '#da3633',
+    }),
+    danger = m({
+      muted = '#f851491a',
+      emphasis = '#da3633',
+    }),
+  }),
+  skeletonLoader = m({
+    bgColor = '#161b22',
+  }),
+  card = m({
+    bgColor = '#161b22',
+  }),
+  base = m({
+    display = m({
+      color = m({
+        red = m({
+          [0] = '#3c0614',
+          [1] = '#58091a',
+          [2] = '#790c20',
+          [3] = '#990f24',
+          [4] = '#c31328',
+          [5] = '#eb3342',
+          [6] = '#f27d83',
+          [7] = '#f48b8d',
+          [8] = '#f7adab',
+          [9] = '#f9c1be',
+        }),
+        gray = m({
+          [0] = '#1c1c1c',
+          [1] = '#2a2b2d',
+          [2] = '#393d41',
+          [3] = '#474e57',
+          [4] = '#576270',
+          [5] = '#6e7f96',
+          [6] = '#92a1b5',
+          [7] = '#9babbf',
+          [8] = '#b3c0d1',
+          [9] = '#c4cfde',
+        }),
+        purple = m({
+          [0] = '#211047',
+          [1] = '#31146b',
+          [2] = '#481a9e',
+          [3] = '#5b1cca',
+          [4] = '#7730e8',
+          [5] = '#975bf1',
+          [6] = '#b687f7',
+          [7] = '#c398fb',
+          [8] = '#d2affd',
+          [9] = '#e1c7ff',
+        }),
+        cyan = m({
+          [0] = '#001f29',
+          [1] = '#002e3d',
+          [2] = '#014156',
+          [3] = '#02536f',
+          [4] = '#036a8c',
+          [5] = '#0587b3',
+          [6] = '#07ace4',
+          [7] = '#09b7f1',
+          [8] = '#45cbf7',
+          [9] = '#80dbf9',
+        }),
+        plum = m({
+          [0] = '#2a0e3f',
+          [1] = '#40125e',
+          [2] = '#5c1688',
+          [3] = '#7517ab',
+          [4] = '#9518d8',
+          [5] = '#b643ef',
+          [6] = '#d07ef7',
+          [7] = '#d889fa',
+          [8] = '#e4a5fd',
+          [9] = '#edbdff',
+        }),
+        coral = m({
+          [0] = '#351008',
+          [1] = '#51180b',
+          [2] = '#72220d',
+          [3] = '#902a0e',
+          [4] = '#b3350f',
+          [5] = '#e1430e',
+          [6] = '#f7794b',
+          [7] = '#fa8c61',
+          [8] = '#fdaa86',
+          [9] = '#ffc0a3',
+        }),
+        pink = m({
+          [0] = '#2d1524',
+          [1] = '#451c35',
+          [2] = '#65244a',
+          [3] = '#842a5d',
+          [4] = '#ac2f74',
+          [5] = '#d34591',
+          [6] = '#e57bb2',
+          [7] = '#ec8dbd',
+          [8] = '#f4a9cd',
+          [9] = '#f9bed9',
+        }),
+        brown = m({
+          [0] = '#241c14',
+          [1] = '#342a1d',
+          [2] = '#483a28',
+          [3] = '#5d4a32',
+          [4] = '#755e3e',
+          [5] = '#94774c',
+          [6] = '#b69a6d',
+          [7] = '#bfa77d',
+          [8] = '#cdbb98',
+          [9] = '#dbceb3',
+        }),
+        pine = m({
+          [0] = '#082119',
+          [1] = '#0b3224',
+          [2] = '#0e4430',
+          [3] = '#115a3e',
+          [4] = '#14714c',
+          [5] = '#18915e',
+          [6] = '#1bb673',
+          [7] = '#1ac176',
+          [8] = '#1bda81',
+          [9] = '#3eea97',
+        }),
+        blue = m({
+          [0] = '#001a47',
+          [1] = '#002766',
+          [2] = '#00378a',
+          [3] = '#0046a8',
+          [4] = '#005bd1',
+          [5] = '#0576ff',
+          [6] = '#4da0ff',
+          [7] = '#61adff',
+          [8] = '#85c2ff',
+          [9] = '#a3d3ff',
+        }),
+        orange = m({
+          [0] = '#311708',
+          [1] = '#43200a',
+          [2] = '#632f0d',
+          [3] = '#7b3c0e',
+          [4] = '#984b10',
+          [5] = '#c46212',
+          [6] = '#ed8326',
+          [7] = '#f1933b',
+          [8] = '#f6b06a',
+          [9] = '#fac68f',
+        }),
+        auburn = m({
+          [0] = '#271817',
+          [1] = '#3a2422',
+          [2] = '#543331',
+          [3] = '#6d4340',
+          [4] = '#87534f',
+          [5] = '#a86f6b',
+          [6] = '#bf9592',
+          [7] = '#c6a19f',
+          [8] = '#d4b7b5',
+          [9] = '#dfcac8',
+        }),
+        olive = m({
+          [0] = '#171e0b',
+          [1] = '#252d10',
+          [2] = '#374115',
+          [3] = '#485219',
+          [4] = '#5e681d',
+          [5] = '#7a8321',
+          [6] = '#a2a626',
+          [7] = '#b2af24',
+          [8] = '#cbc025',
+          [9] = '#e2d04b',
+        }),
+        lime = m({
+          [0] = '#141f0f',
+          [1] = '#1f3116',
+          [2] = '#2c441d',
+          [3] = '#375421',
+          [4] = '#496c28',
+          [5] = '#5f892f',
+          [6] = '#7dae37',
+          [7] = '#89ba36',
+          [8] = '#9fcc3e',
+          [9] = '#bcda67',
+        }),
+        lemon = m({
+          [0] = '#291d00',
+          [1] = '#372901',
+          [2] = '#4f3c02',
+          [3] = '#614c05',
+          [4] = '#786008',
+          [5] = '#977b0c',
+          [6] = '#ba9b12',
+          [7] = '#c4a717',
+          [8] = '#d7bc1d',
+          [9] = '#e3d04f',
+        }),
+        white = '#ffffff',
+        indigo = m({
+          [0] = '#1b183f',
+          [1] = '#25215f',
+          [2] = '#312c90',
+          [3] = '#3935c0',
+          [4] = '#514ed4',
+          [5] = '#7070e1',
+          [6] = '#9899ec',
+          [7] = '#a2a5f1',
+          [8] = '#b7baf6',
+          [9] = '#c8cbf9',
+        }),
+        black = '#0d1117',
+        teal = m({
+          [0] = '#041f25',
+          [1] = '#073036',
+          [2] = '#0a464d',
+          [3] = '#0c555a',
+          [4] = '#106c70',
+          [5] = '#158a8a',
+          [6] = '#1cb0ab',
+          [7] = '#1fbdb2',
+          [8] = '#24d6c4',
+          [9] = '#5fe3d1',
+        }),
+        green = m({
+          [0] = '#122117',
+          [1] = '#182f1f',
+          [2] = '#214529',
+          [3] = '#285830',
+          [4] = '#2f6f37',
+          [5] = '#388f3f',
+          [6] = '#41b445',
+          [7] = '#46c144',
+          [8] = '#75d36f',
+          [9] = '#99e090',
+        }),
+        yellow = m({
+          [0] = '#2e1a00',
+          [1] = '#3d2401',
+          [2] = '#5a3702',
+          [3] = '#6d4403',
+          [4] = '#895906',
+          [5] = '#aa7109',
+          [6] = '#d3910d',
+          [7] = '#df9e11',
+          [8] = '#edb431',
+          [9] = '#f0ca6a',
+        }),
       }),
-      fgColor = '#b69a6d',
     }),
-    pine = m({
-      bgColor = m({
-        muted = '#082119',
-        emphasis = '#18915e',
-      }),
-      borderColor = m({
-        muted = '#0b3224',
-        emphasis = '#18915e',
+    color = m({
+      red = m({
+        [0] = '#ffdcd7',
+        [1] = '#ffc1ba',
+        [2] = '#ffa198',
+        [3] = '#ff7b72',
+        [4] = '#f85149',
+        [5] = '#da3633',
+        [6] = '#b62324',
+        [7] = '#8e1519',
+        [8] = '#67060c',
+        [9] = '#490202',
       }),
-      fgColor = '#1bb673',
-    }),
-    blue = m({
-      bgColor = m({
-        muted = '#001a47',
-        emphasis = '#0576ff',
+      purple = m({
+        [0] = '#eddeff',
+        [1] = '#e2c5ff',
+        [2] = '#d2a8ff',
+        [3] = '#be8fff',
+        [4] = '#ab7df8',
+        [5] = '#8957e5',
+        [6] = '#6e40c9',
+        [7] = '#553098',
+        [8] = '#3c1e70',
+        [9] = '#271052',
       }),
-      borderColor = m({
-        muted = '#002766',
-        emphasis = '#0576ff',
+      black = '#010409',
+      transparent = '#00000000',
+      yellow = m({
+        [0] = '#f8e3a1',
+        [1] = '#f2cc60',
+        [2] = '#e3b341',
+        [3] = '#d29922',
+        [4] = '#bb8009',
+        [5] = '#9e6a03',
+        [6] = '#845306',
+        [7] = '#693e00',
+        [8] = '#4b2900',
+        [9] = '#341a00',
       }),
-      fgColor = '#4da0ff',
-    }),
-    orange = m({
-      bgColor = m({
-        muted = '#311708',
-        emphasis = '#c46212',
+      pink = m({
+        [0] = '#ffdaec',
+        [1] = '#ffbedd',
+        [2] = '#ff9bce',
+        [3] = '#f778ba',
+        [4] = '#db61a2',
+        [5] = '#bf4b8a',
+        [6] = '#9e3670',
+        [7] = '#7d2457',
+        [8] = '#5e103e',
+        [9] = '#42062a',
       }),
-      borderColor = m({
-        muted = '#43200a',
-        emphasis = '#c46212',
+      white = '#ffffff',
+      coral = m({
+        [0] = '#ffddd2',
+        [1] = '#ffc2b2',
+        [2] = '#ffa28b',
+        [3] = '#f78166',
+        [4] = '#ea6045',
+        [5] = '#cf462d',
+        [6] = '#ac3220',
+        [7] = '#872012',
+        [8] = '#640d04',
+        [9] = '#460701',
       }),
-      fgColor = '#ed8326',
-    }),
-    auburn = m({
-      bgColor = m({
-        muted = '#271817',
-        emphasis = '#a86f6b',
+      neutral = m({
+        [0] = '#f0f6fc',
+        [1] = '#c9d1d9',
+        [2] = '#b1bac4',
+        [3] = '#8b949e',
+        [4] = '#6e7681',
+        [5] = '#484f58',
+        [6] = '#30363d',
+        [7] = '#21262d',
+        [8] = '#161b22',
+        [9] = '#0d1117',
       }),
-      borderColor = m({
-        muted = '#3a2422',
-        emphasis = '#a86f6b',
+      blue = m({
+        [0] = '#cae8ff',
+        [1] = '#a5d6ff',
+        [2] = '#79c0ff',
+        [3] = '#58a6ff',
+        [4] = '#388bfd',
+        [5] = '#1f6feb',
+        [6] = '#1158c7',
+        [7] = '#0d419d',
+        [8] = '#0c2d6b',
+        [9] = '#051d4d',
       }),
-      fgColor = '#bf9592',
-    }),
-    olive = m({
-      bgColor = m({
-        muted = '#171e0b',
-        emphasis = '#7a8321',
+      green = m({
+        [0] = '#aff5b4',
+        [1] = '#7ee787',
+        [2] = '#56d364',
+        [3] = '#3fb950',
+        [4] = '#2ea043',
+        [5] = '#238636',
+        [6] = '#196c2e',
+        [7] = '#0f5323',
+        [8] = '#033a16',
+        [9] = '#04260f',
       }),
-      borderColor = m({
-        muted = '#252d10',
-        emphasis = '#7a8321',
+      orange = m({
+        [0] = '#ffdfb6',
+        [1] = '#ffc680',
+        [2] = '#ffa657',
+        [3] = '#f0883e',
+        [4] = '#db6d28',
+        [5] = '#bd561d',
+        [6] = '#9b4215',
+        [7] = '#762d0a',
+        [8] = '#5a1e02',
+        [9] = '#3d1300',
       }),
-      fgColor = '#a2a626',
-    }),
-  }),
-  underlineNav = m({
-    borderColor = m({
-      active = '#f78166',
-      hover = '#6e768166',
-    }),
-    iconColor = m({
-      rest = '#8d96a0',
     }),
   }),
-  data = m({
-    pink = m({
-      color = m({
-        muted = '#2d1524',
-        default = '#d34591',
-      }),
-    }),
-    yellow = m({
-      color = m({
-        muted = '#2e1a00',
-        default = '#895906',
-      }),
-    }),
-    teal = m({
-      color = m({
-        muted = '#041f25',
-        default = '#106c70',
-      }),
-    }),
-    green = m({
-      color = m({
-        muted = '#122117',
-        default = '#2f6f37',
+  buttonCounter = m({
+    primary = m({
+      bgColor = m({
+        rest = '#04260f33',
       }),
     }),
-    orange = m({
-      color = m({
-        muted = '#311708',
-        default = '#984b10',
+    outline = m({
+      fgColor = m({
+        hover = '#58a6ff',
+        rest = '#388bfd',
+        disabled = '#4493f880',
       }),
-    }),
-    red = m({
-      color = m({
-        muted = '#3c0614',
-        default = '#eb3342',
+      bgColor = m({
+        hover = '#051d4d33',
+        rest = '#051d4d33',
+        disabled = '#1f6feb0d',
       }),
     }),
-    gray = m({
-      color = m({
-        muted = '#1c1c1c',
-        default = '#576270',
+    danger = m({
+      fgColor = m({
+        hover = '#ffffff',
+        rest = '#f85149',
+        disabled = '#f8514980',
       }),
-    }),
-    auburn = m({
-      color = m({
-        muted = '#271817',
-        default = '#a86f6b',
+      bgColor = m({
+        hover = '#ffffff33',
+        rest = '#49020233',
+        disabled = '#da36330d',
       }),
     }),
-    purple = m({
-      color = m({
-        muted = '#211047',
-        default = '#975bf1',
+    default = m({
+      bgColor = m({
+        rest = '#30363d',
       }),
     }),
-    blue = m({
-      color = m({
-        muted = '#001a47',
-        default = '#0576ff',
+    invisible = m({
+      bgColor = m({
+        rest = '#30363d',
       }),
     }),
   }),
-  highlight = m({
-    neutral = m({
-      bgColor = '#d2992266',
+  sideNav = m({
+    bgColor = m({
+      selected = '#21262d',
     }),
   }),
-  skeletonLoader = m({
-    bgColor = '#161b22',
-  }),
-  borderColor = m({
-    severe = m({
-      muted = '#f8514966',
-      emphasis = '#da3633',
-    }),
-    disabled = '#21262db3',
-    danger = m({
-      muted = '#f8514966',
-      emphasis = '#da3633',
-    }),
-    translucent = '#ffffff26',
-    attention = m({
-      muted = '#bb800966',
-      emphasis = '#9e6a03',
-    }),
-    accent = m({
-      muted = '#388bfd66',
-      emphasis = '#1f6feb',
-    }),
-    emphasis = '#484f58',
-    transparent = '#00000000',
-    open = m({
-      muted = '#f8514966',
-      emphasis = '#da3633',
-    }),
-    neutral = m({
-      muted = '#6e768166',
-      emphasis = '#6e7681',
-    }),
-    closed = m({
-      muted = '#6e768166',
-      emphasis = '#484f58',
-    }),
-    success = m({
-      muted = '#388bfd66',
-      emphasis = '#1f6feb',
-    }),
-    done = m({
-      muted = '#ab7df866',
-      emphasis = '#8957e5',
-    }),
-    default = '#30363d',
-    upsell = m({
-      muted = '#ab7df866',
-      emphasis = '#8957e5',
-    }),
-    muted = '#30363db3',
-    sponsors = m({
-      muted = '#db61a266',
-      emphasis = '#bf4b8a',
+  page = m({
+    header = m({
+      bgColor = '#0d1117',
     }),
   }),
-  overlay = m({
-    bgColor = '#161b22',
-    borderColor = '#30363db3',
-    backdrop = m({
-      bgColor = '#161b2266',
+  shadow = m({
+    floating = m({
+      medium = '0px 0px 0px 1px #30363d, 0px 8px 16px -4px #01040966, 0px 4px 32px -4px #01040966, 0px 24px 48px -12px #01040966, 0px 48px 96px -24px #01040966',
+      xlarge = '0px 0px 0px 1px #30363d, 0px 32px 64px 0px #010409',
+      legacy = '0px 6px 12px -3px #01040966, 0px 6px 18px 0px #01040966',
+      large = '0px 0px 0px 1px #30363d, 0px 24px 48px 0px #010409',
+      small = '0px 0px 0px 1px #30363d, 0px 6px 12px -3px #01040966, 0px 6px 18px 0px #01040966',
+    }),
+    inset = 'inset 0px 1px 0px 0px #0104093d',
+    resting = m({
+      xsmall = '0px 1px 0px 0px #010409cc',
+      medium = '0px 3px 6px 0px #010409cc',
+      small = '0px 1px 0px 0px #01040966',
     }),
   }),
-  headerSearch = m({
-    borderColor = '#30363d',
-    bgColor = '#0d1117',
+  outline = m({
+    focus = '#1f6feb solid 2px',
   }),
-  treeViewItem = m({
-    leadingVisual = m({
-      iconColor = m({
-        rest = '#8d96a0',
+  color = m({
+    prettylights = m({
+      syntax = m({
+        brackethighlighter = m({
+          unmatched = '#f85149',
+          angle = '#8b949e',
+        }),
+        meta = m({
+          diff = m({
+            range = '#d2a8ff',
+          }),
+        }),
+        invalid = m({
+          illegal = m({
+            text = '#f0f6fc',
+            bg = '#8e1519',
+          }),
+        }),
+        markup = m({
+          inserted = m({
+            text = '#cae8ff',
+            bg = '#0c2d6b',
+          }),
+          bold = '#c9d1d9',
+          changed = m({
+            text = '#ffdcd7',
+            bg = '#67060c',
+          }),
+          ignored = m({
+            text = '#c9d1d9',
+            bg = '#1158c7',
+          }),
+          list = '#f2cc60',
+          deleted = m({
+            text = '#ffdcd7',
+            bg = '#67060c',
+          }),
+          italic = '#c9d1d9',
+          heading = '#1f6feb',
+        }),
+        entity = m({
+          tag = '#a5d6ff',
+          default = '#d2a8ff',
+        }),
+        variable = '#ffa198',
+        constant = m({
+          other = m({
+            reference = m({
+              link = '#a5d6ff',
+            }),
+          }),
+          default = '#79c0ff',
+        }),
+        sublimelinter = m({
+          gutter = m({
+            mark = '#484f58',
+          }),
+        }),
+        storage = m({
+          modifier = m({
+            import = '#c9d1d9',
+          }),
+        }),
+        comment = '#8b949e',
+        keyword = '#ff7b72',
+        carriage = m({
+          ['return'] = m({
+            text = '#f0f6fc',
+            bg = '#b62324',
+          }),
+        }),
+        string = m({
+          regexp = '#a5d6ff',
+          default = '#a5d6ff',
+        }),
       }),
     }),
-  }),
-  avatarStack = m({
-    fade = m({
-      bgColor = m({
-        muted = '#21262d',
-        default = '#30363d',
+    ansi = m({
+      red = m({
+        default = '#ff7b72',
+        bright = '#ffa198',
+      }),
+      gray = '#6e7681',
+      cyan = m({
+        default = '#39c5cf',
+        bright = '#56d4dd',
+      }),
+      magenta = m({
+        default = '#be8fff',
+        bright = '#d2a8ff',
+      }),
+      yellow = m({
+        default = '#d29922',
+        bright = '#e3b341',
+      }),
+      black = m({
+        default = '#484f58',
+        bright = '#6e7681',
+      }),
+      blue = m({
+        default = '#58a6ff',
+        bright = '#79c0ff',
+      }),
+      green = m({
+        default = '#58a6ff',
+        bright = '#79c0ff',
+      }),
+      white = m({
+        default = '#b1bac4',
+        bright = '#ffffff',
       }),
     }),
   }),
-  topicTag = m({
-    borderColor = '#00000000',
-  }),
 })
 M._VERSION =
   vim.json.decode([=["8.2.3"]=], { luanil = { object = false, array = false } })
diff --git a/lua/github-theme/palette/primitives/light.lua b/lua/github-theme/palette/primitives/light.lua
index 14f2d93..9e34a8f 100644
--- a/lua/github-theme/palette/primitives/light.lua
+++ b/lua/github-theme/palette/primitives/light.lua
@@ -11,38 +11,114 @@ local function m(tbl)
   return setmetatable(tbl, mt)
 end
 local M = m({
-  bgColor = m({
-    emphasis = '#24292f',
-    inset = '#f6f8fa',
-    default = '#ffffff',
-    open = m({
-      emphasis = '#1f883d',
-      muted = '#dafbe1',
+  diffBlob = m({
+    hunk = m({
+      bgColor = m({
+        num = '#54aeff66',
+      }),
     }),
-    black = '#1f2328',
-    white = '#ffffff',
-    upsell = m({
+    addition = m({
+      fgColor = m({
+        text = '#1f2328',
+        num = '#1f2328',
+      }),
+      bgColor = m({
+        num = '#d1f8d9',
+        word = '#aceebb',
+        line = '#dafbe1',
+      }),
+    }),
+    expander = m({
+      iconColor = '#636c76',
+    }),
+    deletion = m({
+      fgColor = m({
+        text = '#1f2328',
+        num = '#1f2328',
+      }),
+      bgColor = m({
+        num = '#ffcecb',
+        word = '#ff818266',
+        line = '#ffebe9',
+      }),
+    }),
+  }),
+  underlineNav = m({
+    iconColor = m({
+      rest = '#636c76',
+    }),
+    borderColor = m({
+      hover = '#afb8c133',
+      active = '#fd8c73',
+    }),
+  }),
+  borderColor = m({
+    muted = '#d0d7deb3',
+    done = m({
       emphasis = '#8250df',
-      muted = '#fbefff',
+      muted = '#c297ff66',
     }),
-    success = m({
-      emphasis = '#1f883d',
-      muted = '#dafbe1',
+    disabled = '#eaeef2b3',
+    danger = m({
+      emphasis = '#cf222e',
+      muted = '#ff818266',
     }),
-    transparent = '#ffffff00',
-    severe = m({
-      emphasis = '#bc4c00',
-      muted = '#fff1e5',
+    closed = m({
+      emphasis = '#cf222e',
+      muted = '#ff818266',
+    }),
+    attention = m({
+      emphasis = '#bf8700',
+      muted = '#d4a72c66',
+    }),
+    accent = m({
+      emphasis = '#0969da',
+      muted = '#54aeff66',
     }),
+    emphasis = '#6e7781',
     neutral = m({
       emphasis = '#6e7781',
       muted = '#afb8c133',
     }),
-    muted = '#f6f8fa',
+    open = m({
+      emphasis = '#1a7f37',
+      muted = '#4ac26b66',
+    }),
+    translucent = '#1f232826',
+    default = '#d0d7de',
+    upsell = m({
+      emphasis = '#8250df',
+      muted = '#c297ff66',
+    }),
+    success = m({
+      emphasis = '#1a7f37',
+      muted = '#4ac26b66',
+    }),
     sponsors = m({
       emphasis = '#bf3989',
-      muted = '#ffeff7',
+      muted = '#ff80c866',
+    }),
+    transparent = '#ffffff00',
+    severe = m({
+      emphasis = '#bc4c00',
+      muted = '#fb8f4466',
+    }),
+  }),
+  treeViewItem = m({
+    leadingVisual = m({
+      iconColor = m({
+        rest = '#54aeff',
+      }),
     }),
+  }),
+  topicTag = m({
+    borderColor = '#ffffff00',
+  }),
+  timelineBadge = m({
+    bgColor = '#eaeef2',
+  }),
+  bgColor = m({
+    inset = '#f6f8fa',
     done = m({
       emphasis = '#8250df',
       muted = '#fbefff',
@@ -56,15 +132,45 @@ local M = m({
       emphasis = '#cf222e',
       muted = '#ffebe9',
     }),
+    black = '#1f2328',
+    transparent = '#ffffff00',
     inverse = '#24292f',
-    attention = m({
-      emphasis = '#9a6700',
-      muted = '#fff8c5',
+    emphasis = '#24292f',
+    neutral = m({
+      emphasis = '#6e7781',
+      muted = '#afb8c133',
+    }),
+    open = m({
+      emphasis = '#1f883d',
+      muted = '#dafbe1',
     }),
     accent = m({
       emphasis = '#0969da',
       muted = '#ddf4ff',
     }),
+    attention = m({
+      emphasis = '#9a6700',
+      muted = '#fff8c5',
+    }),
+    white = '#ffffff',
+    default = '#ffffff',
+    upsell = m({
+      emphasis = '#8250df',
+      muted = '#fbefff',
+    }),
+    success = m({
+      emphasis = '#1f883d',
+      muted = '#dafbe1',
+    }),
+    sponsors = m({
+      emphasis = '#bf3989',
+      muted = '#ffeff7',
+    }),
+    muted = '#f6f8fa',
+    severe = m({
+      emphasis = '#bc4c00',
+      muted = '#fff1e5',
+    }),
   }),
   skeletonLoader = m({
     bgColor = '#f6f8fa',
@@ -74,119 +180,88 @@ local M = m({
       selected = '#ffffff',
     }),
   }),
-  shadow = m({
-    resting = m({
-      small = '0px 1px 0px 0px #1f23280a',
-      xsmall = '0px 1px 0px 0px #1f23281a',
-      medium = '0px 3px 6px 0px #424a531f',
-    }),
-    floating = m({
-      large = '0px 0px 0px 1px #d0d7de, 0px 40px 80px 0px #424a533d',
-      small = '0px 0px 0px 1px #d0d7de80, 0px 6px 12px -3px #424a530a, 0px 6px 18px 0px #424a531f',
-      medium = '0px 0px 0px 1px #d0d7de, 0px 8px 16px -4px #424a5314, 0px 4px 32px -4px #424a5314, 0px 24px 48px -12px #424a5314, 0px 48px 96px -24px #424a5314',
-      xlarge = '0px 0px 0px 1px #d0d7de, 0px 56px 112px 0px #424a5352',
-      legacy = '0px 6px 12px -3px #424a530a, 0px 6px 18px 0px #424a531f',
-    }),
-    inset = 'inset 0px 1px 0px 0px #1f23280a',
-  }),
-  headerSearch = m({
-    bgColor = '#24292f',
-    borderColor = '#57606a',
+  counter = m({
+    borderColor = '#ffffff00',
   }),
   controlTrack = m({
+    fgColor = m({
+      rest = '#636c76',
+      disabled = '#ffffff',
+    }),
     bgColor = m({
-      rest = '#eaeef2',
-      active = '#d2d8de',
       disabled = '#8c959f',
+      active = '#d2d8de',
+      rest = '#eaeef2',
       hover = '#dee3e8',
     }),
     borderColor = m({
       rest = '#ffffff00',
       disabled = '#8c959f',
     }),
-    fgColor = m({
-      rest = '#636c76',
-      disabled = '#ffffff',
-    }),
   }),
-  data = m({
-    pink = m({
-      color = m({
-        default = '#ce2c85',
-        muted = '#ffe5f1',
-      }),
+  codeMirror = m({
+    activeline = m({
+      bgColor = '#afb8c133',
     }),
-    yellow = m({
-      color = m({
-        default = '#b88700',
-        muted = '#ffec9e',
-      }),
+    lines = m({
+      bgColor = '#ffffff',
     }),
-    teal = m({
-      color = m({
-        default = '#179b9b',
-        muted = '#c7f5ef',
-      }),
+    matchingBracket = m({
+      fgColor = '#1f2328',
     }),
-    green = m({
-      color = m({
-        default = '#30a147',
-        muted = '#caf7ca',
-      }),
+    bgColor = '#ffffff',
+    selection = m({
+      bgColor = '#54aeff66',
     }),
-    orange = m({
-      color = m({
-        default = '#eb670f',
-        muted = '#ffe7d1',
+    syntax = m({
+      fgColor = m({
+        storage = '#cf222e',
+        entity = '#8250df',
+        support = '#0550ae',
+        string = '#0a3069',
+        constant = '#0550ae',
+        comment = '#24292f',
+        variable = '#953800',
+        keyword = '#cf222e',
       }),
     }),
-    red = m({
-      color = m({
-        default = '#df0c24',
-        muted = '#ffe2e0',
-      }),
+    gutters = m({
+      bgColor = '#ffffff',
     }),
-    gray = m({
-      color = m({
-        default = '#808fa3',
-        muted = '#e8ecf2',
-      }),
+    fgColor = '#1f2328',
+    lineNumber = m({
+      fgColor = '#636c76',
     }),
-    purple = m({
-      color = m({
-        default = '#894ceb',
-        muted = '#f1e5ff',
+    cursor = m({
+      fgColor = '#1f2328',
+    }),
+    gutterMarker = m({
+      fgColor = m({
+        default = '#ffffff',
+        muted = '#636c76',
       }),
     }),
-    auburn = m({
-      color = m({
-        default = '#9d615c',
-        muted = '#f2e9e9',
-      }),
-    }),
-    blue = m({
-      color = m({
-        default = '#006edb',
-        muted = '#d1f0ff',
-      }),
-    }),
-  }),
-  focus = m({
-    outline = '#0969da solid 2px',
-    outlineColor = '#0969da',
   }),
   controlKnob = m({
     bgColor = m({
-      rest = '#ffffff',
       disabled = '#eaeef2b3',
+      rest = '#ffffff',
       checked = '#ffffff',
     }),
     borderColor = m({
-      rest = '#868f99',
       disabled = '#eaeef2b3',
+      rest = '#868f99',
       checked = '#0969da',
     }),
   }),
+  avatarStack = m({
+    fade = m({
+      bgColor = m({
+        default = '#afb8c1',
+        muted = '#d0d7de',
+      }),
+    }),
+  }),
   selection = m({
     bgColor = '#0969da33',
   }),
@@ -196,136 +271,263 @@ local M = m({
     }),
     borderColor = '#ffffff00',
   }),
-  control = m({
-    checked = m({
-      bgColor = m({
-        rest = '#0969da',
-        active = '#0757ba',
-        disabled = '#8c959f',
-        hover = '#0860ca',
-      }),
-      borderColor = m({
-        rest = '#0969da',
-        active = '#0757ba',
-        disabled = '#8c959f',
-        hover = '#0860ca',
-      }),
-      fgColor = m({
-        rest = '#ffffff',
-        disabled = '#ffffff',
-      }),
+  scale = m({
+    purple = m({
+      [1] = '#fbefff',
+      [2] = '#ecd8ff',
+      [3] = '#d8b9ff',
+      [4] = '#c297ff',
+      [5] = '#a475f9',
+      [6] = '#8250df',
+      [7] = '#6639ba',
+      [8] = '#512a97',
+      [9] = '#3e1f79',
+      [10] = '#2e1461',
     }),
-    borderColor = m({
-      danger = '#cf222e',
-      disabled = '#eaeef2b3',
-      selected = '#f6f8fa',
-      rest = '#d0d7de',
-      emphasis = '#868f99',
-      success = '#1a7f37',
-      warning = '#bf8700',
+    coral = m({
+      [1] = '#fff0eb',
+      [2] = '#ffd6cc',
+      [3] = '#ffb4a1',
+      [4] = '#fd8c73',
+      [5] = '#ec6547',
+      [6] = '#c4432b',
+      [7] = '#9e2f1c',
+      [8] = '#801f0f',
+      [9] = '#691105',
+      [10] = '#510901',
     }),
-    danger = m({
-      fgColor = m({
-        rest = '#d1242f',
-        hover = '#d1242f',
-      }),
-      bgColor = m({
-        hover = '#ffebe9',
-        active = '#ffebe966',
-      }),
+    neutral = m({
+      [1] = '#f6f8fa',
+      [2] = '#eaeef2',
+      [3] = '#d0d7de',
+      [4] = '#afb8c1',
+      [5] = '#8c959f',
+      [6] = '#6e7781',
+      [7] = '#57606a',
+      [8] = '#424a53',
+      [9] = '#32383f',
+      [10] = '#24292f',
     }),
-    transparent = m({
-      bgColor = m({
-        hover = '#d0d7de33',
-        disabled = '#eaeef2b3',
-        selected = '#d0d7de33',
-        rest = '#ffffff00',
-        active = '#d0d7de66',
-      }),
-      borderColor = m({
-        rest = '#ffffff00',
-        active = '#ffffff00',
-        hover = '#ffffff00',
-      }),
+    black = '#1f2328',
+    yellow = m({
+      [1] = '#fff8c5',
+      [2] = '#fae17d',
+      [3] = '#eac54f',
+      [4] = '#d4a72c',
+      [5] = '#bf8700',
+      [6] = '#9a6700',
+      [7] = '#7d4e00',
+      [8] = '#633c01',
+      [9] = '#4d2d00',
+      [10] = '#3b2300',
     }),
-    bgColor = m({
-      hover = '#eef1f4',
-      disabled = '#eaeef2b3',
-      selected = '#f6f8fa',
-      rest = '#f6f8fa',
-      active = '#e7ebef',
+    pink = m({
+      [1] = '#ffeff7',
+      [2] = '#ffd3eb',
+      [3] = '#ffadda',
+      [4] = '#ff80c8',
+      [5] = '#e85aad',
+      [6] = '#bf3989',
+      [7] = '#99286e',
+      [8] = '#772057',
+      [9] = '#611347',
+      [10] = '#4d0336',
     }),
-    fgColor = m({
-      rest = '#24292f',
-      disabled = '#8c959f',
-      placeholder = '#69727c',
+    white = '#ffffff',
+    blue = m({
+      [1] = '#ddf4ff',
+      [2] = '#b6e3ff',
+      [3] = '#80ccff',
+      [4] = '#54aeff',
+      [5] = '#218bff',
+      [6] = '#0969da',
+      [7] = '#0550ae',
+      [8] = '#033d8b',
+      [9] = '#0a3069',
+      [10] = '#002155',
     }),
-    iconColor = m({
-      rest = '#636c76',
+    green = m({
+      [1] = '#dafbe1',
+      [2] = '#aceebb',
+      [3] = '#6fdd8b',
+      [4] = '#4ac26b',
+      [5] = '#2da44e',
+      [6] = '#1a7f37',
+      [7] = '#116329',
+      [8] = '#044f1e',
+      [9] = '#003d16',
+      [10] = '#002d11',
     }),
-  }),
-  codeMirror = m({
-    gutterMarker = m({
-      fgColor = m({
-        default = '#ffffff',
-        muted = '#636c76',
-      }),
+    orange = m({
+      [1] = '#fff1e5',
+      [2] = '#ffd8b5',
+      [3] = '#ffb77c',
+      [4] = '#fb8f44',
+      [5] = '#e16f24',
+      [6] = '#bc4c00',
+      [7] = '#953800',
+      [8] = '#762c00',
+      [9] = '#5c2200',
+      [10] = '#471700',
     }),
-    selection = m({
-      bgColor = '#54aeff66',
+    red = m({
+      [1] = '#ffebe9',
+      [2] = '#ffcecb',
+      [3] = '#ffaba8',
+      [4] = '#ff8182',
+      [5] = '#fa4549',
+      [6] = '#cf222e',
+      [7] = '#a40e26',
+      [8] = '#82071e',
+      [9] = '#660018',
+      [10] = '#4c0014',
     }),
-    cursor = m({
-      fgColor = '#1f2328',
+    transparent = '#ffffff00',
+  }),
+  color = m({
+    ansi = m({
+      cyan = m({
+        bright = '#3192aa',
+        default = '#1b7c83',
+      }),
+      black = m({
+        bright = '#57606a',
+        default = '#24292f',
+      }),
+      yellow = m({
+        bright = '#633c01',
+        default = '#4d2d00',
+      }),
+      white = m({
+        bright = '#8c959f',
+        default = '#6e7781',
+      }),
+      blue = m({
+        bright = '#218bff',
+        default = '#0969da',
+      }),
+      green = m({
+        bright = '#1a7f37',
+        default = '#116329',
+      }),
+      magenta = m({
+        bright = '#a475f9',
+        default = '#8250df',
+      }),
+      red = m({
+        bright = '#a40e26',
+        default = '#cf222e',
+      }),
+      gray = '#6e7781',
     }),
-    syntax = m({
-      fgColor = m({
-        string = '#0a3069',
-        comment = '#24292f',
+    prettylights = m({
+      syntax = m({
+        entity = m({
+          default = '#6639ba',
+          tag = '#0550ae',
+        }),
+        constant = m({
+          default = '#0550ae',
+          other = m({
+            reference = m({
+              link = '#0a3069',
+            }),
+          }),
+        }),
+        string = m({
+          default = '#0a3069',
+          regexp = '#116329',
+        }),
+        comment = '#57606a',
         variable = '#953800',
-        constant = '#0550ae',
-        storage = '#cf222e',
-        entity = '#8250df',
-        support = '#0550ae',
+        carriage = m({
+          ['return'] = m({
+            text = '#f6f8fa',
+            bg = '#cf222e',
+          }),
+        }),
+        storage = m({
+          modifier = m({
+            import = '#24292f',
+          }),
+        }),
+        brackethighlighter = m({
+          angle = '#57606a',
+          unmatched = '#82071e',
+        }),
+        meta = m({
+          diff = m({
+            range = '#8250df',
+          }),
+        }),
+        sublimelinter = m({
+          gutter = m({
+            mark = '#8c959f',
+          }),
+        }),
+        invalid = m({
+          illegal = m({
+            text = '#f6f8fa',
+            bg = '#82071e',
+          }),
+        }),
+        markup = m({
+          changed = m({
+            text = '#953800',
+            bg = '#ffd8b5',
+          }),
+          inserted = m({
+            text = '#116329',
+            bg = '#dafbe1',
+          }),
+          bold = '#24292f',
+          deleted = m({
+            text = '#82071e',
+            bg = '#ffebe9',
+          }),
+          ignored = m({
+            text = '#eaeef2',
+            bg = '#0550ae',
+          }),
+          list = '#3b2300',
+          heading = '#0550ae',
+          italic = '#24292f',
+        }),
         keyword = '#cf222e',
       }),
     }),
-    fgColor = '#1f2328',
-    lines = m({
-      bgColor = '#ffffff',
-    }),
-    matchingBracket = m({
-      fgColor = '#1f2328',
-    }),
-    lineNumber = m({
-      fgColor = '#636c76',
-    }),
-    activeline = m({
-      bgColor = '#afb8c133',
-    }),
-    gutters = m({
-      bgColor = '#ffffff',
+  }),
+  reactionButton = m({
+    selected = m({
+      fgColor = m({
+        rest = '#0969da',
+        hover = '#0550ae',
+      }),
+      bgColor = m({
+        rest = '#ddf4ff',
+        hover = '#caecff',
+      }),
     }),
-    bgColor = '#ffffff',
   }),
   fgColor = m({
-    neutral = '#6e7781',
-    default = '#1f2328',
-    done = '#8250df',
-    white = '#ffffff',
-    upsell = '#8250df',
-    success = '#1a7f37',
-    sponsors = '#bf3989',
-    severe = '#bc4c00',
     onEmphasis = '#ffffff',
     muted = '#636c76',
     link = '#0969da',
-    open = '#1a7f37',
+    done = '#8250df',
     disabled = '#8c959f',
     danger = '#d1242f',
     closed = '#d1242f',
     black = '#1f2328',
     attention = '#9a6700',
     accent = '#0969da',
+    neutral = '#6e7781',
+    open = '#1a7f37',
+    default = '#1f2328',
+    upsell = '#8250df',
+    success = '#1a7f37',
+    sponsors = '#bf3989',
+    white = '#ffffff',
+    severe = '#bc4c00',
   }),
   page = m({
     header = m({
@@ -333,373 +535,404 @@ local M = m({
     }),
   }),
   header = m({
+    fgColor = m({
+      logo = '#ffffff',
+      default = '#ffffffb3',
+    }),
     bgColor = '#24292f',
     borderColor = m({
       divider = '#57606a',
     }),
-    fgColor = m({
-      default = '#ffffffb3',
-      logo = '#ffffff',
-    }),
   }),
-  overlay = m({
+  card = m({
     bgColor = '#ffffff',
-    borderColor = '#d0d7de80',
-    backdrop = m({
-      bgColor = '#8c959f33',
-    }),
   }),
-  menu = m({
-    bgColor = m({
-      active = '#ffffff00',
-    }),
+  headerSearch = m({
+    bgColor = '#24292f',
+    borderColor = '#57606a',
   }),
-  label = m({
-    lemon = m({
+  buttonCounter = m({
+    invisible = m({
+      bgColor = m({
+        rest = '#afb8c133',
+      }),
+    }),
+    outline = m({
       fgColor = m({
-        rest = '#786002',
-        active = '#523f00',
-        hover = '#654f01',
+        disabled = '#0969da80',
+        rest = '#0550ae',
+        hover = '#ffffff',
       }),
       bgColor = m({
-        rest = '#f7eea1',
-        active = '#d8bd0e',
-        hover = '#f0db3d',
+        disabled = '#0969da0d',
+        rest = '#0969da1a',
+        hover = '#ffffff33',
       }),
     }),
-    yellow = m({
-      fgColor = m({
-        rest = '#805900',
-        active = '#5c3d00',
-        hover = '#704d00',
+    default = m({
+      bgColor = m({
+        rest = '#afb8c133',
       }),
+    }),
+    primary = m({
       bgColor = m({
-        rest = '#ffec9e',
-        active = '#ebb400',
-        hover = '#ffd642',
+        rest = '#002d1133',
       }),
     }),
-    indigo = m({
+    danger = m({
       fgColor = m({
-        rest = '#494edf',
-        active = '#2d2db4',
-        hover = '#393cd5',
+        disabled = '#d1242f80',
+        rest = '#c21c2c',
+        hover = '#ffffff',
       }),
       bgColor = m({
-        rest = '#e5e9ff',
-        active = '#b1b9fb',
-        hover = '#d2d7fe',
+        disabled = '#cf222e0d',
+        rest = '#cf222e1a',
+        hover = '#ffffff33',
+      }),
+    }),
+  }),
+  data = m({
+    purple = m({
+      color = m({
+        default = '#894ceb',
+        muted = '#f1e5ff',
+      }),
+    }),
+    pink = m({
+      color = m({
+        default = '#ce2c85',
+        muted = '#ffe5f1',
+      }),
+    }),
+    yellow = m({
+      color = m({
+        default = '#b88700',
+        muted = '#ffec9e',
+      }),
+    }),
+    auburn = m({
+      color = m({
+        default = '#9d615c',
+        muted = '#f2e9e9',
+      }),
+    }),
+    blue = m({
+      color = m({
+        default = '#006edb',
+        muted = '#d1f0ff',
       }),
     }),
     teal = m({
-      fgColor = m({
-        rest = '#106e75',
-        active = '#0a4852',
-        hover = '#0d5b63',
-      }),
-      bgColor = m({
-        rest = '#c7f5ef',
-        active = '#22d3c7',
-        hover = '#89ebe1',
+      color = m({
+        default = '#179b9b',
+        muted = '#c7f5ef',
       }),
     }),
     green = m({
-      fgColor = m({
-        rest = '#2b6e3f',
-        active = '#254b34',
-        hover = '#285c3b',
+      color = m({
+        default = '#30a147',
+        muted = '#caf7ca',
       }),
-      bgColor = m({
-        rest = '#caf7ca',
-        active = '#54d961',
-        hover = '#9ceda0',
+    }),
+    orange = m({
+      color = m({
+        default = '#eb670f',
+        muted = '#ffe7d1',
       }),
     }),
     red = m({
-      fgColor = m({
-        rest = '#c50d28',
-        active = '#880c27',
-        hover = '#a60c29',
-      }),
-      bgColor = m({
-        rest = '#ffe2e0',
-        active = '#fda5a7',
-        hover = '#fecdcd',
+      color = m({
+        default = '#df0c24',
+        muted = '#ffe2e0',
       }),
     }),
     gray = m({
-      fgColor = m({
-        rest = '#5c6570',
-        active = '#424448',
-        hover = '#4e535a',
-      }),
-      bgColor = m({
-        rest = '#e8ecf2',
-        active = '#b4c0cf',
-        hover = '#d2dae4',
+      color = m({
+        default = '#808fa3',
+        muted = '#e8ecf2',
       }),
     }),
+  }),
+  menu = m({
+    bgColor = m({
+      active = '#ffffff00',
+    }),
+  }),
+  avatar = m({
+    shadow = '0px 0px 0px 2px #ffffffcc',
+    bgColor = '#ffffff',
+    borderColor = '#1f232826',
+  }),
+  label = m({
     purple = m({
       fgColor = m({
-        rest = '#783ae4',
         active = '#4f21ab',
+        rest = '#783ae4',
         hover = '#6223d7',
       }),
       bgColor = m({
-        rest = '#f1e5ff',
         active = '#d1b1fc',
+        rest = '#f1e5ff',
         hover = '#e6d2fe',
       }),
     }),
     cyan = m({
       fgColor = m({
-        rest = '#006a80',
         active = '#004857',
+        rest = '#006a80',
         hover = '#00596b',
       }),
       bgColor = m({
-        rest = '#bdf4ff',
         active = '#00d0fa',
+        rest = '#bdf4ff',
         hover = '#7ae9ff',
       }),
     }),
     plum = m({
       fgColor = m({
-        rest = '#961edc',
         active = '#651d96',
+        rest = '#961edc',
         hover = '#7d1eb8',
       }),
       bgColor = m({
-        rest = '#f8e5ff',
         active = '#e2a7fb',
+        rest = '#f8e5ff',
         hover = '#f0cdfe',
       }),
     }),
     coral = m({
       fgColor = m({
-        rest = '#ba2e12',
         active = '#7e2011',
+        rest = '#ba2e12',
         hover = '#9b2712',
       }),
       bgColor = m({
-        rest = '#ffe5db',
         active = '#fcab92',
+        rest = '#ffe5db',
         hover = '#fecebe',
       }),
     }),
     pink = m({
       fgColor = m({
-        rest = '#b12f79',
         active = '#6e2b53',
+        rest = '#b12f79',
         hover = '#8e2e66',
       }),
       bgColor = m({
-        rest = '#ffe5f1',
         active = '#f8a5cf',
+        rest = '#ffe5f1',
         hover = '#fdc9e2',
       }),
     }),
     brown = m({
       fgColor = m({
-        rest = '#755f43',
         active = '#51412f',
+        rest = '#755f43',
         hover = '#64513a',
       }),
       bgColor = m({
-        rest = '#eeeae2',
         active = '#cbbda4',
+        rest = '#eeeae2',
         hover = '#dfd7c8',
       }),
     }),
     pine = m({
       fgColor = m({
-        rest = '#156f4b',
         active = '#114b36',
+        rest = '#156f4b',
         hover = '#135d41',
       }),
       bgColor = m({
-        rest = '#bff8db',
         active = '#1dd781',
+        rest = '#bff8db',
         hover = '#80efb9',
       }),
     }),
     blue = m({
       fgColor = m({
-        rest = '#005fcc',
         active = '#003d99',
+        rest = '#005fcc',
         hover = '#004db3',
       }),
       bgColor = m({
-        rest = '#d1f0ff',
         active = '#75c8ff',
+        rest = '#d1f0ff',
         hover = '#ade1ff',
       }),
     }),
     orange = m({
       fgColor = m({
-        rest = '#a24610',
         active = '#70300f',
+        rest = '#a24610',
         hover = '#8d3c11',
       }),
       bgColor = m({
-        rest = '#ffe7d1',
         active = '#fbaf74',
+        rest = '#ffe7d1',
         hover = '#fecfaa',
       }),
     }),
     auburn = m({
       fgColor = m({
-        rest = '#8a5551',
         active = '#5d3937',
+        rest = '#8a5551',
         hover = '#744744',
       }),
       bgColor = m({
-        rest = '#f2e9e9',
         active = '#d4b7b5',
+        rest = '#f2e9e9',
         hover = '#e6d6d5',
       }),
     }),
     olive = m({
       fgColor = m({
-        rest = '#56682c',
         active = '#3b4927',
+        rest = '#56682c',
         hover = '#495a2b',
       }),
       bgColor = m({
-        rest = '#f0f0ad',
         active = '#b9c832',
+        rest = '#f0f0ad',
         hover = '#dbe170',
       }),
     }),
     lime = m({
       fgColor = m({
-        rest = '#476c28',
         active = '#2f4a21',
+        rest = '#476c28',
         hover = '#3a5b25',
       }),
       bgColor = m({
-        rest = '#e3f2b5',
         active = '#9bd039',
+        rest = '#e3f2b5',
         hover = '#c7e580',
       }),
     }),
-  }),
-  color = m({
-    ansi = m({
-      white = m({
-        bright = '#8c959f',
-        default = '#6e7781',
+    lemon = m({
+      fgColor = m({
+        active = '#523f00',
+        rest = '#786002',
+        hover = '#654f01',
       }),
-      yellow = m({
-        bright = '#633c01',
-        default = '#4d2d00',
+      bgColor = m({
+        active = '#d8bd0e',
+        rest = '#f7eea1',
+        hover = '#f0db3d',
       }),
-      magenta = m({
-        bright = '#a475f9',
-        default = '#8250df',
+    }),
+    yellow = m({
+      fgColor = m({
+        active = '#5c3d00',
+        rest = '#805900',
+        hover = '#704d00',
       }),
-      blue = m({
-        bright = '#218bff',
-        default = '#0969da',
+      bgColor = m({
+        active = '#ebb400',
+        rest = '#ffec9e',
+        hover = '#ffd642',
       }),
-      green = m({
-        bright = '#1a7f37',
-        default = '#116329',
+    }),
+    indigo = m({
+      fgColor = m({
+        active = '#2d2db4',
+        rest = '#494edf',
+        hover = '#393cd5',
       }),
-      red = m({
-        bright = '#a40e26',
-        default = '#cf222e',
+      bgColor = m({
+        active = '#b1b9fb',
+        rest = '#e5e9ff',
+        hover = '#d2d7fe',
       }),
-      gray = '#6e7781',
-      cyan = m({
-        bright = '#3192aa',
-        default = '#1b7c83',
+    }),
+    teal = m({
+      fgColor = m({
+        active = '#0a4852',
+        rest = '#106e75',
+        hover = '#0d5b63',
       }),
-      black = m({
-        bright = '#57606a',
-        default = '#24292f',
+      bgColor = m({
+        active = '#22d3c7',
+        rest = '#c7f5ef',
+        hover = '#89ebe1',
       }),
     }),
-    prettylights = m({
-      syntax = m({
-        invalid = m({
-          illegal = m({
-            text = '#f6f8fa',
-            bg = '#82071e',
-          }),
-        }),
-        variable = '#953800',
-        entity = m({
-          default = '#6639ba',
-          tag = '#0550ae',
-        }),
-        constant = m({
-          default = '#0550ae',
-          other = m({
-            reference = m({
-              link = '#0a3069',
-            }),
-          }),
-        }),
-        sublimelinter = m({
-          gutter = m({
-            mark = '#8c959f',
-          }),
-        }),
-        string = m({
-          default = '#0a3069',
-          regexp = '#116329',
-        }),
-        comment = '#57606a',
-        markup = m({
-          ignored = m({
-            text = '#eaeef2',
-            bg = '#0550ae',
-          }),
-          list = '#3b2300',
-          deleted = m({
-            text = '#82071e',
-            bg = '#ffebe9',
-          }),
-          italic = '#24292f',
-          changed = m({
-            text = '#953800',
-            bg = '#ffd8b5',
-          }),
-          inserted = m({
-            text = '#116329',
-            bg = '#dafbe1',
-          }),
-          bold = '#24292f',
-          heading = '#0550ae',
-        }),
-        carriage = m({
-          ['return'] = m({
-            text = '#f6f8fa',
-            bg = '#cf222e',
-          }),
-        }),
-        storage = m({
-          modifier = m({
-            import = '#24292f',
-          }),
-        }),
-        meta = m({
-          diff = m({
-            range = '#8250df',
-          }),
-        }),
-        brackethighlighter = m({
-          angle = '#57606a',
-          unmatched = '#82071e',
-        }),
-        keyword = '#cf222e',
+    green = m({
+      fgColor = m({
+        active = '#254b34',
+        rest = '#2b6e3f',
+        hover = '#285c3b',
+      }),
+      bgColor = m({
+        active = '#54d961',
+        rest = '#caf7ca',
+        hover = '#9ceda0',
+      }),
+    }),
+    red = m({
+      fgColor = m({
+        active = '#880c27',
+        rest = '#c50d28',
+        hover = '#a60c29',
+      }),
+      bgColor = m({
+        active = '#fda5a7',
+        rest = '#ffe2e0',
+        hover = '#fecdcd',
+      }),
+    }),
+    gray = m({
+      fgColor = m({
+        active = '#424448',
+        rest = '#5c6570',
+        hover = '#4e535a',
+      }),
+      bgColor = m({
+        active = '#b4c0cf',
+        rest = '#e8ecf2',
+        hover = '#d2dae4',
       }),
     }),
   }),
   base = m({
     color = m({
-      white = '#ffffff',
+      purple = m({
+        [0] = '#fbefff',
+        [1] = '#ecd8ff',
+        [2] = '#d8b9ff',
+        [3] = '#c297ff',
+        [4] = '#a475f9',
+        [5] = '#8250df',
+        [6] = '#6639ba',
+        [7] = '#512a97',
+        [8] = '#3e1f79',
+        [9] = '#2e1461',
+      }),
+      coral = m({
+        [0] = '#fff0eb',
+        [1] = '#ffd6cc',
+        [2] = '#ffb4a1',
+        [3] = '#fd8c73',
+        [4] = '#ec6547',
+        [5] = '#c4432b',
+        [6] = '#9e2f1c',
+        [7] = '#801f0f',
+        [8] = '#691105',
+        [9] = '#510901',
+      }),
+      black = '#1f2328',
+      pink = m({
+        [0] = '#ffeff7',
+        [1] = '#ffd3eb',
+        [2] = '#ffadda',
+        [3] = '#ff80c8',
+        [4] = '#e85aad',
+        [5] = '#bf3989',
+        [6] = '#99286e',
+        [7] = '#772057',
+        [8] = '#611347',
+        [9] = '#4d0336',
+      }),
       yellow = m({
         [0] = '#fff8c5',
         [1] = '#fae17d',
@@ -713,6 +946,7 @@ local M = m({
         [9] = '#3b2300',
       }),
       transparent = '#ffffff00',
+      white = '#ffffff',
       blue = m({
         [0] = '#ddf4ff',
         [1] = '#b6e3ff',
@@ -761,18 +995,6 @@ local M = m({
         [8] = '#660018',
         [9] = '#4c0014',
       }),
-      purple = m({
-        [0] = '#fbefff',
-        [1] = '#ecd8ff',
-        [2] = '#d8b9ff',
-        [3] = '#c297ff',
-        [4] = '#a475f9',
-        [5] = '#8250df',
-        [6] = '#6639ba',
-        [7] = '#512a97',
-        [8] = '#3e1f79',
-        [9] = '#2e1461',
-      }),
       neutral = m({
         [0] = '#f6f8fa',
         [1] = '#eaeef2',
@@ -785,118 +1007,9 @@ local M = m({
         [8] = '#32383f',
         [9] = '#24292f',
       }),
-      black = '#1f2328',
-      pink = m({
-        [0] = '#ffeff7',
-        [1] = '#ffd3eb',
-        [2] = '#ffadda',
-        [3] = '#ff80c8',
-        [4] = '#e85aad',
-        [5] = '#bf3989',
-        [6] = '#99286e',
-        [7] = '#772057',
-        [8] = '#611347',
-        [9] = '#4d0336',
-      }),
-      coral = m({
-        [0] = '#fff0eb',
-        [1] = '#ffd6cc',
-        [2] = '#ffb4a1',
-        [3] = '#fd8c73',
-        [4] = '#ec6547',
-        [5] = '#c4432b',
-        [6] = '#9e2f1c',
-        [7] = '#801f0f',
-        [8] = '#691105',
-        [9] = '#510901',
-      }),
     }),
     display = m({
       color = m({
-        lemon = m({
-          [0] = '#f7eea1',
-          [1] = '#f0db3d',
-          [2] = '#d8bd0e',
-          [3] = '#c2a60a',
-          [4] = '#a68c07',
-          [5] = '#866e04',
-          [6] = '#786002',
-          [7] = '#654f01',
-          [8] = '#523f00',
-          [9] = '#3d2e00',
-        }),
-        yellow = m({
-          [0] = '#ffec9e',
-          [1] = '#ffd642',
-          [2] = '#ebb400',
-          [3] = '#d19d00',
-          [4] = '#b88700',
-          [5] = '#946a00',
-          [6] = '#805900',
-          [7] = '#704d00',
-          [8] = '#5c3d00',
-          [9] = '#422b00',
-        }),
-        indigo = m({
-          [0] = '#e5e9ff',
-          [1] = '#d2d7fe',
-          [2] = '#b1b9fb',
-          [3] = '#979ff7',
-          [4] = '#7a82f0',
-          [5] = '#5a61e7',
-          [6] = '#494edf',
-          [7] = '#393cd5',
-          [8] = '#2d2db4',
-          [9] = '#25247b',
-        }),
-        teal = m({
-          [0] = '#c7f5ef',
-          [1] = '#89ebe1',
-          [2] = '#22d3c7',
-          [3] = '#1db9b4',
-          [4] = '#179b9b',
-          [5] = '#127e81',
-          [6] = '#106e75',
-          [7] = '#0d5b63',
-          [8] = '#0a4852',
-          [9] = '#073740',
-        }),
-        green = m({
-          [0] = '#caf7ca',
-          [1] = '#9ceda0',
-          [2] = '#54d961',
-          [3] = '#31bf46',
-          [4] = '#30a147',
-          [5] = '#2c8141',
-          [6] = '#2b6e3f',
-          [7] = '#285c3b',
-          [8] = '#254b34',
-          [9] = '#1d3528',
-        }),
-        red = m({
-          [0] = '#ffe2e0',
-          [1] = '#fecdcd',
-          [2] = '#fda5a7',
-          [3] = '#fb8389',
-          [4] = '#f85461',
-          [5] = '#df0c24',
-          [6] = '#c50d28',
-          [7] = '#a60c29',
-          [8] = '#880c27',
-          [9] = '#610a20',
-        }),
-        gray = m({
-          [0] = '#e8ecf2',
-          [1] = '#d2dae4',
-          [2] = '#b4c0cf',
-          [3] = '#9ba9bb',
-          [4] = '#808fa3',
-          [5] = '#647182',
-          [6] = '#5c6570',
-          [7] = '#4e535a',
-          [8] = '#424448',
-          [9] = '#303031',
-        }),
         purple = m({
           [0] = '#f1e5ff',
           [1] = '#e6d2fe',
@@ -945,7 +1058,18 @@ local M = m({
           [8] = '#7e2011',
           [9] = '#5d180e',
         }),
-        white = '#ffffff',
+        pink = m({
+          [0] = '#ffe5f1',
+          [1] = '#fdc9e2',
+          [2] = '#f8a5cf',
+          [3] = '#f184bc',
+          [4] = '#e55da5',
+          [5] = '#ce2c85',
+          [6] = '#b12f79',
+          [7] = '#8e2e66',
+          [8] = '#6e2b53',
+          [9] = '#4d233d',
+        }),
         brown = m({
           [0] = '#eeeae2',
           [1] = '#dfd7c8',
@@ -1030,354 +1154,254 @@ local M = m({
           [8] = '#2f4a21',
           [9] = '#213319',
         }),
+        lemon = m({
+          [0] = '#f7eea1',
+          [1] = '#f0db3d',
+          [2] = '#d8bd0e',
+          [3] = '#c2a60a',
+          [4] = '#a68c07',
+          [5] = '#866e04',
+          [6] = '#786002',
+          [7] = '#654f01',
+          [8] = '#523f00',
+          [9] = '#3d2e00',
+        }),
+        yellow = m({
+          [0] = '#ffec9e',
+          [1] = '#ffd642',
+          [2] = '#ebb400',
+          [3] = '#d19d00',
+          [4] = '#b88700',
+          [5] = '#946a00',
+          [6] = '#805900',
+          [7] = '#704d00',
+          [8] = '#5c3d00',
+          [9] = '#422b00',
+        }),
+        indigo = m({
+          [0] = '#e5e9ff',
+          [1] = '#d2d7fe',
+          [2] = '#b1b9fb',
+          [3] = '#979ff7',
+          [4] = '#7a82f0',
+          [5] = '#5a61e7',
+          [6] = '#494edf',
+          [7] = '#393cd5',
+          [8] = '#2d2db4',
+          [9] = '#25247b',
+        }),
+        white = '#ffffff',
+        teal = m({
+          [0] = '#c7f5ef',
+          [1] = '#89ebe1',
+          [2] = '#22d3c7',
+          [3] = '#1db9b4',
+          [4] = '#179b9b',
+          [5] = '#127e81',
+          [6] = '#106e75',
+          [7] = '#0d5b63',
+          [8] = '#0a4852',
+          [9] = '#073740',
+        }),
+        green = m({
+          [0] = '#caf7ca',
+          [1] = '#9ceda0',
+          [2] = '#54d961',
+          [3] = '#31bf46',
+          [4] = '#30a147',
+          [5] = '#2c8141',
+          [6] = '#2b6e3f',
+          [7] = '#285c3b',
+          [8] = '#254b34',
+          [9] = '#1d3528',
+        }),
         black = '#0d1117',
-        pink = m({
-          [0] = '#ffe5f1',
-          [1] = '#fdc9e2',
-          [2] = '#f8a5cf',
-          [3] = '#f184bc',
-          [4] = '#e55da5',
-          [5] = '#ce2c85',
-          [6] = '#b12f79',
-          [7] = '#8e2e66',
-          [8] = '#6e2b53',
-          [9] = '#4d233d',
+        red = m({
+          [0] = '#ffe2e0',
+          [1] = '#fecdcd',
+          [2] = '#fda5a7',
+          [3] = '#fb8389',
+          [4] = '#f85461',
+          [5] = '#df0c24',
+          [6] = '#c50d28',
+          [7] = '#a60c29',
+          [8] = '#880c27',
+          [9] = '#610a20',
+        }),
+        gray = m({
+          [0] = '#e8ecf2',
+          [1] = '#d2dae4',
+          [2] = '#b4c0cf',
+          [3] = '#9ba9bb',
+          [4] = '#808fa3',
+          [5] = '#647182',
+          [6] = '#5c6570',
+          [7] = '#4e535a',
+          [8] = '#424448',
+          [9] = '#303031',
         }),
       }),
     }),
   }),
-  card = m({
-    bgColor = '#ffffff',
+  shadow = m({
+    floating = m({
+      medium = '0px 0px 0px 1px #d0d7de, 0px 8px 16px -4px #424a5314, 0px 4px 32px -4px #424a5314, 0px 24px 48px -12px #424a5314, 0px 48px 96px -24px #424a5314',
+      xlarge = '0px 0px 0px 1px #d0d7de, 0px 56px 112px 0px #424a5352',
+      legacy = '0px 6px 12px -3px #424a530a, 0px 6px 18px 0px #424a531f',
+      large = '0px 0px 0px 1px #d0d7de, 0px 40px 80px 0px #424a533d',
+      small = '0px 0px 0px 1px #d0d7de80, 0px 6px 12px -3px #424a530a, 0px 6px 18px 0px #424a531f',
+    }),
+    inset = 'inset 0px 1px 0px 0px #1f23280a',
+    resting = m({
+      xsmall = '0px 1px 0px 0px #1f23281a',
+      medium = '0px 3px 6px 0px #424a531f',
+      small = '0px 1px 0px 0px #1f23280a',
+    }),
   }),
-  buttonCounter = m({
-    primary = m({
-      bgColor = m({
-        rest = '#002d1133',
-      }),
+  focus = m({
+    outlineColor = '#0969da',
+    outline = '#0969da solid 2px',
+  }),
+  highlight = m({
+    neutral = m({
+      bgColor = '#fff8c5',
     }),
-    default = m({
+  }),
+  display = m({
+    purple = m({
+      fgColor = '#783ae4',
       bgColor = m({
-        rest = '#afb8c133',
-      }),
-    }),
-    danger = m({
-      fgColor = m({
-        rest = '#c21c2c',
-        disabled = '#d1242f80',
-        hover = '#ffffff',
+        emphasis = '#894ceb',
+        muted = '#f1e5ff',
       }),
-      bgColor = m({
-        rest = '#cf222e1a',
-        disabled = '#cf222e0d',
-        hover = '#ffffff33',
+      borderColor = m({
+        emphasis = '#894ceb',
+        muted = '#e6d2fe',
       }),
     }),
-    invisible = m({
+    cyan = m({
+      fgColor = '#006a80',
       bgColor = m({
-        rest = '#afb8c133',
-      }),
-    }),
-    outline = m({
-      fgColor = m({
-        rest = '#0550ae',
-        disabled = '#0969da80',
-        hover = '#ffffff',
+        emphasis = '#007b94',
+        muted = '#bdf4ff',
       }),
-      bgColor = m({
-        rest = '#0969da1a',
-        disabled = '#0969da0d',
-        hover = '#ffffff33',
+      borderColor = m({
+        emphasis = '#007b94',
+        muted = '#7ae9ff',
       }),
     }),
-  }),
-  button = m({
-    primary = m({
+    plum = m({
+      fgColor = '#961edc',
       bgColor = m({
-        rest = '#1f883d',
-        active = '#197935',
-        disabled = '#95d8a6',
-        hover = '#1c8139',
+        emphasis = '#a830e8',
+        muted = '#f8e5ff',
       }),
       borderColor = m({
-        rest = '#1f232826',
-        active = '#1f232826',
-        disabled = '#95d8a6',
-        hover = '#1f232826',
-      }),
-      iconColor = m({
-        rest = '#ffffffcc',
-      }),
-      fgColor = m({
-        rest = '#ffffff',
-        disabled = '#ffffffcc',
-      }),
-      shadow = m({
-        selected = 'inset 0px 1px 0px 0px #002d114d',
+        emphasis = '#a830e8',
+        muted = '#f0cdfe',
       }),
     }),
-    inactive = m({
-      fgColor = '#57606a',
-      bgColor = '#eaeef2',
-    }),
-    star = m({
-      iconColor = '#eac54f',
-    }),
-    danger = m({
+    coral = m({
+      fgColor = '#ba2e12',
       bgColor = m({
-        rest = '#f6f8fa',
-        active = '#8b0820',
-        disabled = '#eaeef2b3',
-        hover = '#a40e26',
+        emphasis = '#d43511',
+        muted = '#ffe5db',
       }),
       borderColor = m({
-        rest = '#d0d7de',
-        active = '#1f232826',
-        hover = '#1f232826',
-      }),
-      iconColor = m({
-        rest = '#d1242f',
-        hover = '#ffffff',
-      }),
-      fgColor = m({
-        rest = '#d1242f',
-        active = '#ffffff',
-        disabled = '#d1242f80',
-        hover = '#ffffff',
-      }),
-      shadow = m({
-        selected = 'inset 0px 1px 0px 0px #4c001433',
+        emphasis = '#d43511',
+        muted = '#fecebe',
       }),
     }),
-    invisible = m({
+    pink = m({
+      fgColor = '#b12f79',
       bgColor = m({
-        rest = '#ffffff00',
-        active = '#d0d7de66',
-        disabled = '#eaeef2b3',
-        hover = '#d0d7de33',
+        emphasis = '#ce2c85',
+        muted = '#ffe5f1',
       }),
       borderColor = m({
-        rest = '#ffffff00',
-        disabled = '#eaeef2b3',
-        hover = '#ffffff00',
-      }),
-      iconColor = m({
-        rest = '#636c76',
-        disabled = '#8c959f',
-        hover = '#636c76',
-      }),
-      fgColor = m({
-        rest = '#0969da',
-        disabled = '#8c959f',
-        hover = '#0969da',
+        emphasis = '#ce2c85',
+        muted = '#fdc9e2',
       }),
     }),
-    default = m({
+    brown = m({
+      fgColor = '#755f43',
       bgColor = m({
-        hover = '#eef1f4',
-        disabled = '#eaeef2b3',
-        selected = '#e7ebef',
-        rest = '#f6f8fa',
-        active = '#e7ebef',
+        emphasis = '#856d4c',
+        muted = '#eeeae2',
       }),
       borderColor = m({
-        rest = '#d0d7de',
-        active = '#d0d7de',
-        disabled = '#eaeef2b3',
-        hover = '#d0d7de',
+        emphasis = '#856d4c',
+        muted = '#dfd7c8',
       }),
-      fgColor = m({
-        rest = '#24292f',
+    }),
+    pine = m({
+      fgColor = '#156f4b',
+      bgColor = m({
+        emphasis = '#167e53',
+        muted = '#bff8db',
       }),
-      shadow = m({
-        resting = '0px 1px 0px 0px #1f23280a',
+      borderColor = m({
+        emphasis = '#167e53',
+        muted = '#80efb9',
       }),
     }),
-    outline = m({
+    blue = m({
+      fgColor = '#005fcc',
       bgColor = m({
-        rest = '#f6f8fa',
-        active = '#0757ba',
-        disabled = '#f6f8fa',
-        hover = '#0969da',
+        emphasis = '#006edb',
+        muted = '#d1f0ff',
       }),
       borderColor = m({
-        hover = '#1f232826',
-        active = '#1f232826',
-      }),
-      fgColor = m({
-        rest = '#0969da',
-        active = '#ffffff',
-        disabled = '#0969da80',
-        hover = '#ffffff',
+        emphasis = '#006edb',
+        muted = '#ade1ff',
       }),
-      shadow = m({
-        selected = 'inset 0px 1px 0px 0px #00215533',
+    }),
+    orange = m({
+      fgColor = '#a24610',
+      bgColor = m({
+        emphasis = '#b8500f',
+        muted = '#ffe7d1',
+      }),
+      borderColor = m({
+        emphasis = '#b8500f',
+        muted = '#fecfaa',
       }),
     }),
-  }),
-  diffBlob = m({
-    hunk = m({
+    auburn = m({
+      fgColor = '#8a5551',
       bgColor = m({
-        num = '#54aeff66',
+        emphasis = '#9d615c',
+        muted = '#f2e9e9',
       }),
-    }),
-    addition = m({
-      fgColor = m({
-        text = '#1f2328',
-        num = '#1f2328',
+      borderColor = m({
+        emphasis = '#9d615c',
+        muted = '#e6d6d5',
       }),
+    }),
+    olive = m({
+      fgColor = '#56682c',
       bgColor = m({
-        num = '#d1f8d9',
-        word = '#aceebb',
-        line = '#dafbe1',
+        emphasis = '#64762d',
+        muted = '#f0f0ad',
       }),
-    }),
-    expander = m({
-      iconColor = '#636c76',
-    }),
-    deletion = m({
-      fgColor = m({
-        text = '#1f2328',
-        num = '#1f2328',
+      borderColor = m({
+        emphasis = '#64762d',
+        muted = '#dbe170',
       }),
+    }),
+    lime = m({
+      fgColor = '#476c28',
       bgColor = m({
-        num = '#ffcecb',
-        word = '#ff818266',
-        line = '#ffebe9',
+        emphasis = '#527a29',
+        muted = '#e3f2b5',
+      }),
+      borderColor = m({
+        emphasis = '#527a29',
+        muted = '#c7e580',
       }),
     }),
-  }),
-  scale = m({
-    white = '#ffffff',
-    yellow = m({
-      [1] = '#fff8c5',
-      [2] = '#fae17d',
-      [3] = '#eac54f',
-      [4] = '#d4a72c',
-      [5] = '#bf8700',
-      [6] = '#9a6700',
-      [7] = '#7d4e00',
-      [8] = '#633c01',
-      [9] = '#4d2d00',
-      [10] = '#3b2300',
-    }),
-    transparent = '#ffffff00',
-    blue = m({
-      [1] = '#ddf4ff',
-      [2] = '#b6e3ff',
-      [3] = '#80ccff',
-      [4] = '#54aeff',
-      [5] = '#218bff',
-      [6] = '#0969da',
-      [7] = '#0550ae',
-      [8] = '#033d8b',
-      [9] = '#0a3069',
-      [10] = '#002155',
-    }),
-    green = m({
-      [1] = '#dafbe1',
-      [2] = '#aceebb',
-      [3] = '#6fdd8b',
-      [4] = '#4ac26b',
-      [5] = '#2da44e',
-      [6] = '#1a7f37',
-      [7] = '#116329',
-      [8] = '#044f1e',
-      [9] = '#003d16',
-      [10] = '#002d11',
-    }),
-    orange = m({
-      [1] = '#fff1e5',
-      [2] = '#ffd8b5',
-      [3] = '#ffb77c',
-      [4] = '#fb8f44',
-      [5] = '#e16f24',
-      [6] = '#bc4c00',
-      [7] = '#953800',
-      [8] = '#762c00',
-      [9] = '#5c2200',
-      [10] = '#471700',
-    }),
-    red = m({
-      [1] = '#ffebe9',
-      [2] = '#ffcecb',
-      [3] = '#ffaba8',
-      [4] = '#ff8182',
-      [5] = '#fa4549',
-      [6] = '#cf222e',
-      [7] = '#a40e26',
-      [8] = '#82071e',
-      [9] = '#660018',
-      [10] = '#4c0014',
-    }),
-    purple = m({
-      [1] = '#fbefff',
-      [2] = '#ecd8ff',
-      [3] = '#d8b9ff',
-      [4] = '#c297ff',
-      [5] = '#a475f9',
-      [6] = '#8250df',
-      [7] = '#6639ba',
-      [8] = '#512a97',
-      [9] = '#3e1f79',
-      [10] = '#2e1461',
-    }),
-    neutral = m({
-      [1] = '#f6f8fa',
-      [2] = '#eaeef2',
-      [3] = '#d0d7de',
-      [4] = '#afb8c1',
-      [5] = '#8c959f',
-      [6] = '#6e7781',
-      [7] = '#57606a',
-      [8] = '#424a53',
-      [9] = '#32383f',
-      [10] = '#24292f',
-    }),
-    black = '#1f2328',
-    pink = m({
-      [1] = '#ffeff7',
-      [2] = '#ffd3eb',
-      [3] = '#ffadda',
-      [4] = '#ff80c8',
-      [5] = '#e85aad',
-      [6] = '#bf3989',
-      [7] = '#99286e',
-      [8] = '#772057',
-      [9] = '#611347',
-      [10] = '#4d0336',
-    }),
-    coral = m({
-      [1] = '#fff0eb',
-      [2] = '#ffd6cc',
-      [3] = '#ffb4a1',
-      [4] = '#fd8c73',
-      [5] = '#ec6547',
-      [6] = '#c4432b',
-      [7] = '#9e2f1c',
-      [8] = '#801f0f',
-      [9] = '#691105',
-      [10] = '#510901',
-    }),
-  }),
-  underlineNav = m({
-    iconColor = m({
-      rest = '#636c76',
-    }),
-    borderColor = m({
-      hover = '#afb8c133',
-      active = '#fd8c73',
-    }),
-  }),
-  avatar = m({
-    bgColor = '#ffffff',
-    borderColor = '#1f232826',
-    shadow = '0px 0px 0px 2px #ffffffcc',
-  }),
-  counter = m({
-    borderColor = '#ffffff00',
-  }),
-  display = m({
     lemon = m({
+      fgColor = '#786002',
       bgColor = m({
         emphasis = '#866e04',
         muted = '#f7eea1',
@@ -1386,9 +1410,9 @@ local M = m({
         emphasis = '#866e04',
         muted = '#f0db3d',
       }),
-      fgColor = '#786002',
     }),
     yellow = m({
+      fgColor = '#805900',
       bgColor = m({
         emphasis = '#946a00',
         muted = '#ffec9e',
@@ -1397,9 +1421,9 @@ local M = m({
         emphasis = '#946a00',
         muted = '#ffd642',
       }),
-      fgColor = '#805900',
     }),
     indigo = m({
+      fgColor = '#494edf',
       bgColor = m({
         emphasis = '#5a61e7',
         muted = '#e5e9ff',
@@ -1408,9 +1432,9 @@ local M = m({
         emphasis = '#5a61e7',
         muted = '#d2d7fe',
       }),
-      fgColor = '#494edf',
     }),
     teal = m({
+      fgColor = '#106e75',
       bgColor = m({
         emphasis = '#127e81',
         muted = '#c7f5ef',
@@ -1419,9 +1443,9 @@ local M = m({
         emphasis = '#127e81',
         muted = '#89ebe1',
       }),
-      fgColor = '#106e75',
     }),
     green = m({
+      fgColor = '#2b6e3f',
       bgColor = m({
         emphasis = '#2c8141',
         muted = '#caf7ca',
@@ -1430,9 +1454,9 @@ local M = m({
         emphasis = '#2c8141',
         muted = '#9ceda0',
       }),
-      fgColor = '#2b6e3f',
     }),
     red = m({
+      fgColor = '#c50d28',
       bgColor = m({
         emphasis = '#df0c24',
         muted = '#ffe2e0',
@@ -1441,9 +1465,9 @@ local M = m({
         emphasis = '#df0c24',
         muted = '#fecdcd',
       }),
-      fgColor = '#c50d28',
     }),
     gray = m({
+      fgColor = '#5c6570',
       bgColor = m({
         emphasis = '#647182',
         muted = '#e8ecf2',
@@ -1452,231 +1476,207 @@ local M = m({
         emphasis = '#647182',
         muted = '#d2dae4',
       }),
-      fgColor = '#5c6570',
-    }),
-    purple = m({
-      bgColor = m({
-        emphasis = '#894ceb',
-        muted = '#f1e5ff',
-      }),
-      borderColor = m({
-        emphasis = '#894ceb',
-        muted = '#e6d2fe',
-      }),
-      fgColor = '#783ae4',
     }),
-    cyan = m({
-      bgColor = m({
-        emphasis = '#007b94',
-        muted = '#bdf4ff',
+  }),
+  button = m({
+    invisible = m({
+      iconColor = m({
+        disabled = '#8c959f',
+        rest = '#636c76',
+        hover = '#636c76',
       }),
-      borderColor = m({
-        emphasis = '#007b94',
-        muted = '#7ae9ff',
+      fgColor = m({
+        disabled = '#8c959f',
+        rest = '#0969da',
+        hover = '#0969da',
       }),
-      fgColor = '#006a80',
-    }),
-    plum = m({
       bgColor = m({
-        emphasis = '#a830e8',
-        muted = '#f8e5ff',
+        disabled = '#eaeef2b3',
+        active = '#d0d7de66',
+        rest = '#ffffff00',
+        hover = '#d0d7de33',
       }),
       borderColor = m({
-        emphasis = '#a830e8',
-        muted = '#f0cdfe',
+        disabled = '#eaeef2b3',
+        rest = '#ffffff00',
+        hover = '#ffffff00',
       }),
-      fgColor = '#961edc',
     }),
-    coral = m({
-      bgColor = m({
-        emphasis = '#d43511',
-        muted = '#ffe5db',
+    outline = m({
+      fgColor = m({
+        disabled = '#0969da80',
+        active = '#ffffff',
+        rest = '#0969da',
+        hover = '#ffffff',
       }),
-      borderColor = m({
-        emphasis = '#d43511',
-        muted = '#fecebe',
+      shadow = m({
+        selected = 'inset 0px 1px 0px 0px #00215533',
       }),
-      fgColor = '#ba2e12',
-    }),
-    pink = m({
       bgColor = m({
-        emphasis = '#ce2c85',
-        muted = '#ffe5f1',
+        disabled = '#f6f8fa',
+        active = '#0757ba',
+        rest = '#f6f8fa',
+        hover = '#0969da',
       }),
       borderColor = m({
-        emphasis = '#ce2c85',
-        muted = '#fdc9e2',
+        hover = '#1f232826',
+        active = '#1f232826',
       }),
-      fgColor = '#b12f79',
     }),
-    brown = m({
-      bgColor = m({
-        emphasis = '#856d4c',
-        muted = '#eeeae2',
+    default = m({
+      fgColor = m({
+        rest = '#24292f',
       }),
-      borderColor = m({
-        emphasis = '#856d4c',
-        muted = '#dfd7c8',
+      shadow = m({
+        resting = '0px 1px 0px 0px #1f23280a',
       }),
-      fgColor = '#755f43',
-    }),
-    pine = m({
       bgColor = m({
-        emphasis = '#167e53',
-        muted = '#bff8db',
+        active = '#e7ebef',
+        selected = '#e7ebef',
+        rest = '#f6f8fa',
+        disabled = '#eaeef2b3',
+        hover = '#eef1f4',
       }),
       borderColor = m({
-        emphasis = '#167e53',
-        muted = '#80efb9',
+        disabled = '#eaeef2b3',
+        active = '#d0d7de',
+        rest = '#d0d7de',
+        hover = '#d0d7de',
       }),
-      fgColor = '#156f4b',
     }),
-    blue = m({
-      bgColor = m({
-        emphasis = '#006edb',
-        muted = '#d1f0ff',
+    primary = m({
+      fgColor = m({
+        rest = '#ffffff',
+        disabled = '#ffffffcc',
       }),
-      borderColor = m({
-        emphasis = '#006edb',
-        muted = '#ade1ff',
+      iconColor = m({
+        rest = '#ffffffcc',
+      }),
+      shadow = m({
+        selected = 'inset 0px 1px 0px 0px #002d114d',
       }),
-      fgColor = '#005fcc',
-    }),
-    orange = m({
       bgColor = m({
-        emphasis = '#b8500f',
-        muted = '#ffe7d1',
+        disabled = '#95d8a6',
+        active = '#197935',
+        rest = '#1f883d',
+        hover = '#1c8139',
       }),
       borderColor = m({
-        emphasis = '#b8500f',
-        muted = '#fecfaa',
+        disabled = '#95d8a6',
+        active = '#1f232826',
+        rest = '#1f232826',
+        hover = '#1f232826',
       }),
-      fgColor = '#a24610',
     }),
-    auburn = m({
+    inactive = m({
+      fgColor = '#57606a',
+      bgColor = '#eaeef2',
+    }),
+    star = m({
+      iconColor = '#eac54f',
+    }),
+    danger = m({
+      fgColor = m({
+        disabled = '#d1242f80',
+        active = '#ffffff',
+        rest = '#d1242f',
+        hover = '#ffffff',
+      }),
+      iconColor = m({
+        rest = '#d1242f',
+        hover = '#ffffff',
+      }),
+      shadow = m({
+        selected = 'inset 0px 1px 0px 0px #4c001433',
+      }),
       bgColor = m({
-        emphasis = '#9d615c',
-        muted = '#f2e9e9',
+        disabled = '#eaeef2b3',
+        active = '#8b0820',
+        rest = '#f6f8fa',
+        hover = '#a40e26',
       }),
       borderColor = m({
-        emphasis = '#9d615c',
-        muted = '#e6d6d5',
+        active = '#1f232826',
+        rest = '#d0d7de',
+        hover = '#1f232826',
       }),
-      fgColor = '#8a5551',
     }),
-    olive = m({
+  }),
+  overlay = m({
+    backdrop = m({
+      bgColor = '#8c959f33',
+    }),
+    bgColor = '#ffffff',
+    borderColor = '#d0d7de80',
+  }),
+  control = m({
+    transparent = m({
       bgColor = m({
-        emphasis = '#64762d',
-        muted = '#f0f0ad',
+        active = '#d0d7de66',
+        selected = '#d0d7de33',
+        rest = '#ffffff00',
+        disabled = '#eaeef2b3',
+        hover = '#d0d7de33',
       }),
       borderColor = m({
-        emphasis = '#64762d',
-        muted = '#dbe170',
+        active = '#ffffff00',
+        rest = '#ffffff00',
+        hover = '#ffffff00',
       }),
-      fgColor = '#56682c',
     }),
-    lime = m({
+    checked = m({
+      fgColor = m({
+        rest = '#ffffff',
+        disabled = '#ffffff',
+      }),
       bgColor = m({
-        emphasis = '#527a29',
-        muted = '#e3f2b5',
+        disabled = '#8c959f',
+        active = '#0757ba',
+        rest = '#0969da',
+        hover = '#0860ca',
       }),
       borderColor = m({
-        emphasis = '#527a29',
-        muted = '#c7e580',
+        disabled = '#8c959f',
+        active = '#0757ba',
+        rest = '#0969da',
+        hover = '#0860ca',
       }),
-      fgColor = '#476c28',
-    }),
-  }),
-  borderColor = m({
-    emphasis = '#6e7781',
-    translucent = '#1f232826',
-    default = '#d0d7de',
-    upsell = m({
-      emphasis = '#8250df',
-      muted = '#c297ff66',
-    }),
-    success = m({
-      emphasis = '#1a7f37',
-      muted = '#4ac26b66',
-    }),
-    transparent = '#ffffff00',
-    severe = m({
-      emphasis = '#bc4c00',
-      muted = '#fb8f4466',
-    }),
-    sponsors = m({
-      emphasis = '#bf3989',
-      muted = '#ff80c866',
     }),
-    muted = '#d0d7deb3',
-    neutral = m({
-      emphasis = '#6e7781',
-      muted = '#afb8c133',
+    iconColor = m({
+      rest = '#636c76',
     }),
-    open = m({
-      emphasis = '#1a7f37',
-      muted = '#4ac26b66',
+    fgColor = m({
+      placeholder = '#69727c',
+      rest = '#24292f',
+      disabled = '#8c959f',
     }),
-    disabled = '#eaeef2b3',
     danger = m({
-      emphasis = '#cf222e',
-      muted = '#ff818266',
-    }),
-    closed = m({
-      emphasis = '#cf222e',
-      muted = '#ff818266',
-    }),
-    done = m({
-      emphasis = '#8250df',
-      muted = '#c297ff66',
-    }),
-    attention = m({
-      emphasis = '#bf8700',
-      muted = '#d4a72c66',
-    }),
-    accent = m({
-      emphasis = '#0969da',
-      muted = '#54aeff66',
-    }),
-  }),
-  reactionButton = m({
-    selected = m({
       fgColor = m({
-        rest = '#0969da',
-        hover = '#0550ae',
+        rest = '#d1242f',
+        hover = '#d1242f',
       }),
       bgColor = m({
-        rest = '#ddf4ff',
-        hover = '#caecff',
+        hover = '#ffebe9',
+        active = '#ffebe966',
       }),
     }),
-  }),
-  highlight = m({
-    neutral = m({
-      bgColor = '#fff8c5',
-    }),
-  }),
-  treeViewItem = m({
-    leadingVisual = m({
-      iconColor = m({
-        rest = '#54aeff',
-      }),
+    bgColor = m({
+      active = '#e7ebef',
+      selected = '#f6f8fa',
+      rest = '#f6f8fa',
+      disabled = '#eaeef2b3',
+      hover = '#eef1f4',
     }),
-  }),
-  avatarStack = m({
-    fade = m({
-      bgColor = m({
-        default = '#afb8c1',
-        muted = '#d0d7de',
-      }),
+    borderColor = m({
+      selected = '#f6f8fa',
+      rest = '#d0d7de',
+      warning = '#bf8700',
+      success = '#1a7f37',
+      emphasis = '#868f99',
+      danger = '#cf222e',
+      disabled = '#eaeef2b3',
     }),
   }),
-  topicTag = m({
-    borderColor = '#ffffff00',
-  }),
-  timelineBadge = m({
-    bgColor = '#eaeef2',
-  }),
 })
 M._VERSION =
   vim.json.decode([=["8.2.3"]=], { luanil = { object = false, array = false } })
diff --git a/lua/github-theme/palette/primitives/light_colorblind.lua b/lua/github-theme/palette/primitives/light_colorblind.lua
index 25a746a..4865945 100644
--- a/lua/github-theme/palette/primitives/light_colorblind.lua
+++ b/lua/github-theme/palette/primitives/light_colorblind.lua
@@ -17,10 +17,11 @@ local M = m({
     }),
   }),
   shadow = m({
+    inset = 'inset 0px 1px 0px 0px #1f23280a',
     resting = m({
+      medium = '0px 3px 6px 0px #424a531f',
       small = '0px 1px 0px 0px #1f23280a',
       xsmall = '0px 1px 0px 0px #1f23281a',
-      medium = '0px 3px 6px 0px #424a531f',
     }),
     floating = m({
       xlarge = '0px 0px 0px 1px #d0d7de, 0px 56px 112px 0px #424a5352',
@@ -29,59 +30,70 @@ local M = m({
       small = '0px 0px 0px 1px #d0d7de80, 0px 6px 12px -3px #424a530a, 0px 6px 18px 0px #424a531f',
       medium = '0px 0px 0px 1px #d0d7de, 0px 8px 16px -4px #424a5314, 0px 4px 32px -4px #424a5314, 0px 24px 48px -12px #424a5314, 0px 48px 96px -24px #424a5314',
     }),
-    inset = 'inset 0px 1px 0px 0px #1f23280a',
-  }),
-  avatarStack = m({
-    fade = m({
-      bgColor = m({
-        muted = '#d0d7de',
-        default = '#afb8c1',
-      }),
-    }),
   }),
   selection = m({
     bgColor = '#0969da33',
   }),
   selectMenu = m({
+    borderColor = '#ffffff00',
     bgColor = m({
       active = '#b6e3ff',
     }),
-    borderColor = '#ffffff00',
   }),
-  counter = m({
-    borderColor = '#ffffff00',
+  card = m({
+    bgColor = '#ffffff',
   }),
   reactionButton = m({
     selected = m({
+      bgColor = m({
+        hover = '#caecff',
+        rest = '#ddf4ff',
+      }),
       fgColor = m({
-        rest = '#0969da',
         hover = '#0550ae',
+        rest = '#0969da',
       }),
+    }),
+  }),
+  buttonCounter = m({
+    invisible = m({
       bgColor = m({
-        rest = '#ddf4ff',
-        hover = '#caecff',
+        rest = '#afb8c133',
       }),
     }),
-  }),
-  controlTrack = m({
-    bgColor = m({
-      rest = '#eaeef2',
-      disabled = '#8c959f',
-      active = '#d2d8de',
-      hover = '#dee3e8',
+    danger = m({
+      bgColor = m({
+        hover = '#ffffff33',
+        disabled = '#bc4c000d',
+        rest = '#bc4c001a',
+      }),
+      fgColor = m({
+        hover = '#ffffff',
+        disabled = '#be4e0280',
+        rest = '#c21c2c',
+      }),
     }),
-    borderColor = m({
-      rest = '#ffffff00',
-      disabled = '#8c959f',
+    primary = m({
+      bgColor = m({
+        rest = '#002d1133',
+      }),
     }),
-    fgColor = m({
-      rest = '#636c76',
-      disabled = '#ffffff',
+    default = m({
+      bgColor = m({
+        rest = '#afb8c133',
+      }),
     }),
-  }),
-  highlight = m({
-    neutral = m({
-      bgColor = '#fff8c5',
+    outline = m({
+      bgColor = m({
+        hover = '#ffffff33',
+        disabled = '#0969da0d',
+        rest = '#0969da1a',
+      }),
+      fgColor = m({
+        hover = '#ffffff',
+        disabled = '#0969da80',
+        rest = '#0550ae',
+      }),
     }),
   }),
   page = m({
@@ -89,16 +101,14 @@ local M = m({
       bgColor = '#f6f8fa',
     }),
   }),
-  controlKnob = m({
-    bgColor = m({
-      rest = '#ffffff',
-      disabled = '#eaeef2b3',
-      checked = '#ffffff',
-    }),
+  header = m({
+    bgColor = '#24292f',
     borderColor = m({
-      rest = '#868f99',
-      disabled = '#eaeef2b3',
-      checked = '#0969da',
+      divider = '#57606a',
+    }),
+    fgColor = m({
+      default = '#ffffffb3',
+      logo = '#ffffff',
     }),
   }),
   overlay = m({
@@ -109,144 +119,254 @@ local M = m({
     }),
   }),
   headerSearch = m({
-    bgColor = '#24292f',
     borderColor = '#57606a',
+    bgColor = '#24292f',
   }),
-  codeMirror = m({
-    lineNumber = m({
-      fgColor = '#636c76',
-    }),
-    fgColor = '#1f2328',
-    gutterMarker = m({
+  diffBlob = m({
+    deletion = m({
+      bgColor = m({
+        line = '#fff1e580',
+        word = '#ffb77c80',
+        num = '#fb8f4466',
+      }),
       fgColor = m({
-        muted = '#636c76',
-        default = '#ffffff',
+        text = '#1f2328',
+        num = '#1f2328',
       }),
     }),
-    lines = m({
-      bgColor = '#ffffff',
-    }),
-    activeline = m({
-      bgColor = '#afb8c133',
-    }),
-    cursor = m({
-      fgColor = '#1f2328',
+    hunk = m({
+      bgColor = m({
+        num = '#54aeff66',
+      }),
     }),
-    syntax = m({
+    addition = m({
+      bgColor = m({
+        line = '#ddf4ff80',
+        word = '#54aeff66',
+        num = '#54aeff66',
+      }),
       fgColor = m({
-        entity = '#8250df',
-        variable = '#953800',
-        support = '#0550ae',
-        storage = '#bc4c00',
-        constant = '#0550ae',
-        comment = '#24292f',
-        keyword = '#bc4c00',
-        string = '#0a3069',
+        text = '#1f2328',
+        num = '#1f2328',
       }),
     }),
-    bgColor = '#ffffff',
-    matchingBracket = m({
-      fgColor = '#1f2328',
-    }),
-    selection = m({
-      bgColor = '#54aeff66',
-    }),
-    gutters = m({
-      bgColor = '#ffffff',
+    expander = m({
+      iconColor = '#636c76',
     }),
   }),
-  control = m({
-    fgColor = m({
-      rest = '#24292f',
-      disabled = '#8c959f',
-      placeholder = '#69727c',
-    }),
-    danger = m({
-      fgColor = m({
-        rest = '#be4e02',
-        hover = '#be4e02',
-      }),
-      bgColor = m({
-        hover = '#fff1e5',
-        active = '#fff1e566',
+  button = m({
+    invisible = m({
+      iconColor = m({
+        hover = '#636c76',
+        disabled = '#8c959f',
+        rest = '#636c76',
       }),
-    }),
-    transparent = m({
       bgColor = m({
         rest = '#ffffff00',
-        disabled = '#eaeef2b3',
         hover = '#d0d7de33',
+        disabled = '#eaeef2b3',
         active = '#d0d7de66',
-        selected = '#d0d7de33',
       }),
       borderColor = m({
-        rest = '#ffffff00',
-        active = '#ffffff00',
         hover = '#ffffff00',
+        disabled = '#eaeef2b3',
+        rest = '#ffffff00',
+      }),
+      fgColor = m({
+        hover = '#0969da',
+        disabled = '#8c959f',
+        rest = '#0969da',
       }),
     }),
-    bgColor = m({
-      rest = '#f6f8fa',
-      disabled = '#eaeef2b3',
-      hover = '#eef1f4',
-      active = '#e7ebef',
-      selected = '#f6f8fa',
-    }),
-    borderColor = m({
-      rest = '#d0d7de',
-      disabled = '#eaeef2b3',
-      success = '#218bff',
-      danger = '#bc4c00',
-      emphasis = '#868f99',
-      warning = '#bf8700',
-      selected = '#f6f8fa',
-    }),
-    iconColor = m({
-      rest = '#636c76',
-    }),
-    checked = m({
+    default = m({
+      shadow = m({
+        resting = '0px 1px 0px 0px #1f23280a',
+      }),
       bgColor = m({
-        rest = '#0969da',
-        disabled = '#8c959f',
-        active = '#0757ba',
-        hover = '#0860ca',
+        selected = '#e7ebef',
+        rest = '#f6f8fa',
+        disabled = '#eaeef2b3',
+        hover = '#eef1f4',
+        active = '#e7ebef',
       }),
       borderColor = m({
-        rest = '#0969da',
-        disabled = '#8c959f',
-        active = '#0757ba',
-        hover = '#0860ca',
+        rest = '#d0d7de',
+        hover = '#d0d7de',
+        disabled = '#eaeef2b3',
+        active = '#d0d7de',
       }),
       fgColor = m({
-        rest = '#ffffff',
-        disabled = '#ffffff',
+        rest = '#24292f',
       }),
     }),
-  }),
-  menu = m({
-    bgColor = m({
-      active = '#ffffff00',
-    }),
-  }),
-  focus = m({
-    outlineColor = '#0969da',
-    outline = '#0969da solid 2px',
-  }),
-  scale = m({
-    white = '#ffffff',
-    blue = m({
-      [1] = '#ddf4ff',
-      [2] = '#b6e3ff',
-      [3] = '#80ccff',
-      [4] = '#54aeff',
-      [5] = '#218bff',
-      [6] = '#0969da',
-      [7] = '#0550ae',
-      [8] = '#033d8b',
-      [9] = '#0a3069',
-      [10] = '#002155',
-    }),
-    green = m({
+    danger = m({
+      fgColor = m({
+        rest = '#be4e02',
+        hover = '#ffffff',
+        disabled = '#be4e0280',
+        active = '#ffffff',
+      }),
+      shadow = m({
+        selected = 'inset 0px 1px 0px 0px #47170033',
+      }),
+      bgColor = m({
+        rest = '#f6f8fa',
+        hover = '#953800',
+        disabled = '#eaeef2b3',
+        active = '#7e2f00',
+      }),
+      borderColor = m({
+        hover = '#1f232826',
+        rest = '#d0d7de',
+        active = '#1f232826',
+      }),
+      iconColor = m({
+        hover = '#ffffff',
+        rest = '#be4e02',
+      }),
+    }),
+    primary = m({
+      fgColor = m({
+        disabled = '#ffffffcc',
+        rest = '#ffffff',
+      }),
+      shadow = m({
+        selected = 'inset 0px 1px 0px 0px #0021554d',
+      }),
+      bgColor = m({
+        rest = '#0f72e3',
+        hover = '#0d6bd8',
+        disabled = '#92caff',
+        active = '#0b64ce',
+      }),
+      borderColor = m({
+        rest = '#1f232826',
+        hover = '#1f232826',
+        disabled = '#92caff',
+        active = '#1f232826',
+      }),
+      iconColor = m({
+        rest = '#ffffffcc',
+      }),
+    }),
+    inactive = m({
+      bgColor = '#eaeef2',
+      fgColor = '#57606a',
+    }),
+    star = m({
+      iconColor = '#eac54f',
+    }),
+    outline = m({
+      shadow = m({
+        selected = 'inset 0px 1px 0px 0px #00215533',
+      }),
+      bgColor = m({
+        rest = '#f6f8fa',
+        hover = '#0969da',
+        disabled = '#f6f8fa',
+        active = '#0757ba',
+      }),
+      borderColor = m({
+        active = '#1f232826',
+        hover = '#1f232826',
+      }),
+      fgColor = m({
+        rest = '#0969da',
+        hover = '#ffffff',
+        disabled = '#0969da80',
+        active = '#ffffff',
+      }),
+    }),
+  }),
+  focus = m({
+    outline = '#0969da solid 2px',
+    outlineColor = '#0969da',
+  }),
+  data = m({
+    teal = m({
+      color = m({
+        default = '#179b9b',
+        muted = '#c7f5ef',
+      }),
+    }),
+    green = m({
+      color = m({
+        default = '#30a147',
+        muted = '#caf7ca',
+      }),
+    }),
+    orange = m({
+      color = m({
+        default = '#eb670f',
+        muted = '#ffe7d1',
+      }),
+    }),
+    red = m({
+      color = m({
+        default = '#df0c24',
+        muted = '#ffe2e0',
+      }),
+    }),
+    gray = m({
+      color = m({
+        default = '#808fa3',
+        muted = '#e8ecf2',
+      }),
+    }),
+    purple = m({
+      color = m({
+        default = '#894ceb',
+        muted = '#f1e5ff',
+      }),
+    }),
+    auburn = m({
+      color = m({
+        default = '#9d615c',
+        muted = '#f2e9e9',
+      }),
+    }),
+    blue = m({
+      color = m({
+        default = '#006edb',
+        muted = '#d1f0ff',
+      }),
+    }),
+    pink = m({
+      color = m({
+        default = '#ce2c85',
+        muted = '#ffe5f1',
+      }),
+    }),
+    yellow = m({
+      color = m({
+        default = '#b88700',
+        muted = '#ffec9e',
+      }),
+    }),
+  }),
+  highlight = m({
+    neutral = m({
+      bgColor = '#fff8c5',
+    }),
+  }),
+  timelineBadge = m({
+    bgColor = '#eaeef2',
+  }),
+  scale = m({
+    white = '#ffffff',
+    blue = m({
+      [1] = '#ddf4ff',
+      [2] = '#b6e3ff',
+      [3] = '#80ccff',
+      [4] = '#54aeff',
+      [5] = '#218bff',
+      [6] = '#0969da',
+      [7] = '#0550ae',
+      [8] = '#033d8b',
+      [9] = '#0a3069',
+      [10] = '#002155',
+    }),
+    green = m({
       [1] = '#dafbe1',
       [2] = '#aceebb',
       [3] = '#6fdd8b',
@@ -282,18 +402,6 @@ local M = m({
       [9] = '#660018',
       [10] = '#4c0014',
     }),
-    neutral = m({
-      [1] = '#f6f8fa',
-      [2] = '#eaeef2',
-      [3] = '#d0d7de',
-      [4] = '#afb8c1',
-      [5] = '#8c959f',
-      [6] = '#6e7781',
-      [7] = '#57606a',
-      [8] = '#424a53',
-      [9] = '#32383f',
-      [10] = '#24292f',
-    }),
     purple = m({
       [1] = '#fbefff',
       [2] = '#ecd8ff',
@@ -306,7 +414,31 @@ local M = m({
       [9] = '#3e1f79',
       [10] = '#2e1461',
     }),
+    neutral = m({
+      [1] = '#f6f8fa',
+      [2] = '#eaeef2',
+      [3] = '#d0d7de',
+      [4] = '#afb8c1',
+      [5] = '#8c959f',
+      [6] = '#6e7781',
+      [7] = '#57606a',
+      [8] = '#424a53',
+      [9] = '#32383f',
+      [10] = '#24292f',
+    }),
     transparent = '#ffffff00',
+    coral = m({
+      [1] = '#fff0eb',
+      [2] = '#ffd6cc',
+      [3] = '#ffb4a1',
+      [4] = '#fd8c73',
+      [5] = '#ec6547',
+      [6] = '#c4432b',
+      [7] = '#9e2f1c',
+      [8] = '#801f0f',
+      [9] = '#691105',
+      [10] = '#510901',
+    }),
     black = '#1f2328',
     pink = m({
       [1] = '#ffeff7',
@@ -332,135 +464,248 @@ local M = m({
       [9] = '#4d2d00',
       [10] = '#3b2300',
     }),
-    coral = m({
-      [1] = '#fff0eb',
-      [2] = '#ffd6cc',
-      [3] = '#ffb4a1',
-      [4] = '#fd8c73',
-      [5] = '#ec6547',
-      [6] = '#c4432b',
-      [7] = '#9e2f1c',
-      [8] = '#801f0f',
-      [9] = '#691105',
-      [10] = '#510901',
-    }),
   }),
   color = m({
     prettylights = m({
       syntax = m({
-        brackethighlighter = m({
-          angle = '#57606a',
-          unmatched = '#762c00',
+        sublimelinter = m({
+          gutter = m({
+            mark = '#8c959f',
+          }),
         }),
-        keyword = '#bc4c00',
-        invalid = m({
-          illegal = m({
-            bg = '#762c00',
+        comment = '#57606a',
+        carriage = m({
+          ['return'] = m({
             text = '#f6f8fa',
+            bg = '#bc4c00',
           }),
         }),
-        meta = m({
-          diff = m({
-            range = '#8250df',
+        storage = m({
+          modifier = m({
+            import = '#24292f',
           }),
         }),
-        string = m({
-          regexp = '#0550ae',
-          default = '#0a3069',
-        }),
-        entity = m({
-          default = '#6639ba',
-          tag = '#0550ae',
+        brackethighlighter = m({
+          unmatched = '#762c00',
+          angle = '#57606a',
         }),
-        variable = '#953800',
+        keyword = '#bc4c00',
         constant = m({
-          default = '#0550ae',
           other = m({
             reference = m({
               link = '#0a3069',
             }),
           }),
+          default = '#0550ae',
         }),
-        storage = m({
-          modifier = m({
-            import = '#24292f',
-          }),
-        }),
+        invalid = m({
+          illegal = m({
+            text = '#f6f8fa',
+            bg = '#762c00',
+          }),
+        }),
+        variable = '#953800',
         markup = m({
+          heading = '#0550ae',
+          ignored = m({
+            text = '#eaeef2',
+            bg = '#0550ae',
+          }),
           list = '#3b2300',
           changed = m({
-            bg = '#ffd8b5',
             text = '#953800',
+            bg = '#ffd8b5',
           }),
           italic = '#24292f',
-          bold = '#24292f',
-          ignored = m({
-            bg = '#0550ae',
-            text = '#eaeef2',
+          deleted = m({
+            text = '#762c00',
+            bg = '#fff1e5',
           }),
-          heading = '#0550ae',
           inserted = m({
-            bg = '#ddf4ff',
             text = '#0550ae',
+            bg = '#ddf4ff',
           }),
-          deleted = m({
-            bg = '#fff1e5',
-            text = '#762c00',
-          }),
+          bold = '#24292f',
         }),
-        comment = '#57606a',
-        sublimelinter = m({
-          gutter = m({
-            mark = '#8c959f',
-          }),
+        entity = m({
+          tag = '#0550ae',
+          default = '#6639ba',
         }),
-        carriage = m({
-          ['return'] = m({
-            bg = '#bc4c00',
-            text = '#f6f8fa',
+        meta = m({
+          diff = m({
+            range = '#8250df',
           }),
         }),
+        string = m({
+          regexp = '#0550ae',
+          default = '#0a3069',
+        }),
       }),
     }),
     ansi = m({
       white = m({
-        bright = '#8c959f',
         default = '#6e7781',
+        bright = '#8c959f',
       }),
       blue = m({
-        bright = '#218bff',
         default = '#0969da',
+        bright = '#218bff',
       }),
       green = m({
-        bright = '#0969da',
         default = '#0550ae',
+        bright = '#0969da',
       }),
       red = m({
-        bright = '#953800',
         default = '#bc4c00',
+        bright = '#953800',
       }),
       gray = '#6e7781',
-      magenta = m({
-        bright = '#a475f9',
-        default = '#8250df',
-      }),
       cyan = m({
-        bright = '#3192aa',
         default = '#1b7c83',
+        bright = '#3192aa',
+      }),
+      magenta = m({
+        default = '#8250df',
+        bright = '#a475f9',
       }),
       black = m({
-        bright = '#57606a',
         default = '#24292f',
+        bright = '#57606a',
       }),
       yellow = m({
-        bright = '#633c01',
         default = '#4d2d00',
+        bright = '#633c01',
       }),
     }),
   }),
   base = m({
+    color = m({
+      white = '#ffffff',
+      blue = m({
+        [0] = '#ddf4ff',
+        [1] = '#b6e3ff',
+        [2] = '#80ccff',
+        [3] = '#54aeff',
+        [4] = '#218bff',
+        [5] = '#0969da',
+        [6] = '#0550ae',
+        [7] = '#033d8b',
+        [8] = '#0a3069',
+        [9] = '#002155',
+      }),
+      green = m({
+        [0] = '#dafbe1',
+        [1] = '#aceebb',
+        [2] = '#6fdd8b',
+        [3] = '#4ac26b',
+        [4] = '#2da44e',
+        [5] = '#1a7f37',
+        [6] = '#116329',
+        [7] = '#044f1e',
+        [8] = '#003d16',
+        [9] = '#002d11',
+      }),
+      orange = m({
+        [0] = '#fff1e5',
+        [1] = '#ffd8b5',
+        [2] = '#ffb77c',
+        [3] = '#fb8f44',
+        [4] = '#e16f24',
+        [5] = '#bc4c00',
+        [6] = '#953800',
+        [7] = '#762c00',
+        [8] = '#5c2200',
+        [9] = '#471700',
+      }),
+      red = m({
+        [0] = '#ffebe9',
+        [1] = '#ffcecb',
+        [2] = '#ffaba8',
+        [3] = '#ff8182',
+        [4] = '#fa4549',
+        [5] = '#cf222e',
+        [6] = '#a40e26',
+        [7] = '#82071e',
+        [8] = '#660018',
+        [9] = '#4c0014',
+      }),
+      purple = m({
+        [0] = '#fbefff',
+        [1] = '#ecd8ff',
+        [2] = '#d8b9ff',
+        [3] = '#c297ff',
+        [4] = '#a475f9',
+        [5] = '#8250df',
+        [6] = '#6639ba',
+        [7] = '#512a97',
+        [8] = '#3e1f79',
+        [9] = '#2e1461',
+      }),
+      black = '#1f2328',
+      neutral = m({
+        [0] = '#f6f8fa',
+        [1] = '#eaeef2',
+        [2] = '#d0d7de',
+        [3] = '#afb8c1',
+        [4] = '#8c959f',
+        [5] = '#6e7781',
+        [6] = '#57606a',
+        [7] = '#424a53',
+        [8] = '#32383f',
+        [9] = '#24292f',
+      }),
+      coral = m({
+        [0] = '#fff0eb',
+        [1] = '#ffd6cc',
+        [2] = '#ffb4a1',
+        [3] = '#fd8c73',
+        [4] = '#ec6547',
+        [5] = '#c4432b',
+        [6] = '#9e2f1c',
+        [7] = '#801f0f',
+        [8] = '#691105',
+        [9] = '#510901',
+      }),
+      transparent = '#ffffff00',
+      pink = m({
+        [0] = '#ffeff7',
+        [1] = '#ffd3eb',
+        [2] = '#ffadda',
+        [3] = '#ff80c8',
+        [4] = '#e85aad',
+        [5] = '#bf3989',
+        [6] = '#99286e',
+        [7] = '#772057',
+        [8] = '#611347',
+        [9] = '#4d0336',
+      }),
+      yellow = m({
+        [0] = '#fff8c5',
+        [1] = '#fae17d',
+        [2] = '#eac54f',
+        [3] = '#d4a72c',
+        [4] = '#bf8700',
+        [5] = '#9a6700',
+        [6] = '#7d4e00',
+        [7] = '#633c01',
+        [8] = '#4d2d00',
+        [9] = '#3b2300',
+      }),
+    }),
     display = m({
       color = m({
+        indigo = m({
+          [0] = '#e5e9ff',
+          [1] = '#d2d7fe',
+          [2] = '#b1b9fb',
+          [3] = '#979ff7',
+          [4] = '#7a82f0',
+          [5] = '#5a61e7',
+          [6] = '#494edf',
+          [7] = '#393cd5',
+          [8] = '#2d2db4',
+          [9] = '#25247b',
+        }),
         white = '#ffffff',
         teal = m({
           [0] = '#c7f5ef',
@@ -679,1002 +924,757 @@ local M = m({
           [8] = '#5c3d00',
           [9] = '#422b00',
         }),
-        indigo = m({
-          [0] = '#e5e9ff',
-          [1] = '#d2d7fe',
-          [2] = '#b1b9fb',
-          [3] = '#979ff7',
-          [4] = '#7a82f0',
-          [5] = '#5a61e7',
-          [6] = '#494edf',
-          [7] = '#393cd5',
-          [8] = '#2d2db4',
-          [9] = '#25247b',
-        }),
       }),
     }),
-    color = m({
-      white = '#ffffff',
-      blue = m({
-        [0] = '#ddf4ff',
-        [1] = '#b6e3ff',
-        [2] = '#80ccff',
-        [3] = '#54aeff',
-        [4] = '#218bff',
-        [5] = '#0969da',
-        [6] = '#0550ae',
-        [7] = '#033d8b',
-        [8] = '#0a3069',
-        [9] = '#002155',
-      }),
-      green = m({
-        [0] = '#dafbe1',
-        [1] = '#aceebb',
-        [2] = '#6fdd8b',
-        [3] = '#4ac26b',
-        [4] = '#2da44e',
-        [5] = '#1a7f37',
-        [6] = '#116329',
-        [7] = '#044f1e',
-        [8] = '#003d16',
-        [9] = '#002d11',
-      }),
-      orange = m({
-        [0] = '#fff1e5',
-        [1] = '#ffd8b5',
-        [2] = '#ffb77c',
-        [3] = '#fb8f44',
-        [4] = '#e16f24',
-        [5] = '#bc4c00',
-        [6] = '#953800',
-        [7] = '#762c00',
-        [8] = '#5c2200',
-        [9] = '#471700',
-      }),
-      red = m({
-        [0] = '#ffebe9',
-        [1] = '#ffcecb',
-        [2] = '#ffaba8',
-        [3] = '#ff8182',
-        [4] = '#fa4549',
-        [5] = '#cf222e',
-        [6] = '#a40e26',
-        [7] = '#82071e',
-        [8] = '#660018',
-        [9] = '#4c0014',
-      }),
-      neutral = m({
-        [0] = '#f6f8fa',
-        [1] = '#eaeef2',
-        [2] = '#d0d7de',
-        [3] = '#afb8c1',
-        [4] = '#8c959f',
-        [5] = '#6e7781',
-        [6] = '#57606a',
-        [7] = '#424a53',
-        [8] = '#32383f',
-        [9] = '#24292f',
-      }),
-      coral = m({
-        [0] = '#fff0eb',
-        [1] = '#ffd6cc',
-        [2] = '#ffb4a1',
-        [3] = '#fd8c73',
-        [4] = '#ec6547',
-        [5] = '#c4432b',
-        [6] = '#9e2f1c',
-        [7] = '#801f0f',
-        [8] = '#691105',
-        [9] = '#510901',
-      }),
-      transparent = '#ffffff00',
-      black = '#1f2328',
-      pink = m({
-        [0] = '#ffeff7',
-        [1] = '#ffd3eb',
-        [2] = '#ffadda',
-        [3] = '#ff80c8',
-        [4] = '#e85aad',
-        [5] = '#bf3989',
-        [6] = '#99286e',
-        [7] = '#772057',
-        [8] = '#611347',
-        [9] = '#4d0336',
-      }),
-      yellow = m({
-        [0] = '#fff8c5',
-        [1] = '#fae17d',
-        [2] = '#eac54f',
-        [3] = '#d4a72c',
-        [4] = '#bf8700',
-        [5] = '#9a6700',
-        [6] = '#7d4e00',
-        [7] = '#633c01',
-        [8] = '#4d2d00',
-        [9] = '#3b2300',
-      }),
-      purple = m({
-        [0] = '#fbefff',
-        [1] = '#ecd8ff',
-        [2] = '#d8b9ff',
-        [3] = '#c297ff',
-        [4] = '#a475f9',
-        [5] = '#8250df',
-        [6] = '#6639ba',
-        [7] = '#512a97',
-        [8] = '#3e1f79',
-        [9] = '#2e1461',
+  }),
+  avatarStack = m({
+    fade = m({
+      bgColor = m({
+        default = '#afb8c1',
+        muted = '#d0d7de',
       }),
     }),
   }),
-  card = m({
-    bgColor = '#ffffff',
+  fgColor = m({
+    white = '#ffffff',
+    upsell = '#8250df',
+    success = '#0969da',
+    sponsors = '#bf3989',
+    severe = '#bc4c00',
+    onEmphasis = '#ffffff',
+    muted = '#636c76',
+    link = '#0969da',
+    done = '#8250df',
+    disabled = '#8c959f',
+    danger = '#be4e02',
+    closed = '#6e7781',
+    black = '#1f2328',
+    attention = '#9a6700',
+    accent = '#0969da',
+    open = '#bc4c00',
+    neutral = '#6e7781',
+    default = '#1f2328',
   }),
-  buttonCounter = m({
-    invisible = m({
-      bgColor = m({
-        rest = '#afb8c133',
-      }),
-    }),
-    danger = m({
-      fgColor = m({
-        rest = '#c21c2c',
-        disabled = '#be4e0280',
-        hover = '#ffffff',
-      }),
-      bgColor = m({
-        rest = '#bc4c001a',
-        disabled = '#bc4c000d',
-        hover = '#ffffff33',
-      }),
-    }),
-    primary = m({
-      bgColor = m({
-        rest = '#002d1133',
-      }),
-    }),
-    default = m({
-      bgColor = m({
-        rest = '#afb8c133',
-      }),
-    }),
-    outline = m({
-      fgColor = m({
-        rest = '#0550ae',
-        disabled = '#0969da80',
-        hover = '#ffffff',
-      }),
+  display = m({
+    indigo = m({
       bgColor = m({
-        rest = '#0969da1a',
-        disabled = '#0969da0d',
-        hover = '#ffffff33',
-      }),
-    }),
-  }),
-  data = m({
-    teal = m({
-      color = m({
-        muted = '#c7f5ef',
-        default = '#179b9b',
-      }),
-    }),
-    green = m({
-      color = m({
-        muted = '#caf7ca',
-        default = '#30a147',
-      }),
-    }),
-    orange = m({
-      color = m({
-        muted = '#ffe7d1',
-        default = '#eb670f',
-      }),
-    }),
-    red = m({
-      color = m({
-        muted = '#ffe2e0',
-        default = '#df0c24',
-      }),
-    }),
-    gray = m({
-      color = m({
-        muted = '#e8ecf2',
-        default = '#808fa3',
-      }),
-    }),
-    purple = m({
-      color = m({
-        muted = '#f1e5ff',
-        default = '#894ceb',
-      }),
-    }),
-    auburn = m({
-      color = m({
-        muted = '#f2e9e9',
-        default = '#9d615c',
-      }),
-    }),
-    pink = m({
-      color = m({
-        muted = '#ffe5f1',
-        default = '#ce2c85',
-      }),
-    }),
-    yellow = m({
-      color = m({
-        muted = '#ffec9e',
-        default = '#b88700',
+        emphasis = '#5a61e7',
+        muted = '#e5e9ff',
       }),
-    }),
-    blue = m({
-      color = m({
-        muted = '#d1f0ff',
-        default = '#006edb',
+      borderColor = m({
+        emphasis = '#5a61e7',
+        muted = '#d2d7fe',
       }),
+      fgColor = '#494edf',
     }),
-  }),
-  display = m({
     teal = m({
       bgColor = m({
-        muted = '#c7f5ef',
         emphasis = '#127e81',
+        muted = '#c7f5ef',
       }),
       borderColor = m({
-        muted = '#89ebe1',
         emphasis = '#127e81',
+        muted = '#89ebe1',
       }),
       fgColor = '#106e75',
     }),
     green = m({
       bgColor = m({
-        muted = '#caf7ca',
         emphasis = '#2c8141',
+        muted = '#caf7ca',
       }),
       borderColor = m({
-        muted = '#9ceda0',
         emphasis = '#2c8141',
+        muted = '#9ceda0',
       }),
       fgColor = '#2b6e3f',
     }),
     red = m({
       bgColor = m({
-        muted = '#ffe2e0',
         emphasis = '#df0c24',
+        muted = '#ffe2e0',
       }),
       borderColor = m({
-        muted = '#fecdcd',
         emphasis = '#df0c24',
+        muted = '#fecdcd',
       }),
       fgColor = '#c50d28',
     }),
     gray = m({
       bgColor = m({
-        muted = '#e8ecf2',
         emphasis = '#647182',
+        muted = '#e8ecf2',
       }),
       borderColor = m({
-        muted = '#d2dae4',
         emphasis = '#647182',
+        muted = '#d2dae4',
       }),
       fgColor = '#5c6570',
     }),
     purple = m({
       bgColor = m({
-        muted = '#f1e5ff',
         emphasis = '#894ceb',
+        muted = '#f1e5ff',
       }),
       borderColor = m({
-        muted = '#e6d2fe',
         emphasis = '#894ceb',
+        muted = '#e6d2fe',
       }),
       fgColor = '#783ae4',
     }),
     cyan = m({
       bgColor = m({
-        muted = '#bdf4ff',
         emphasis = '#007b94',
+        muted = '#bdf4ff',
       }),
       borderColor = m({
-        muted = '#7ae9ff',
         emphasis = '#007b94',
+        muted = '#7ae9ff',
       }),
       fgColor = '#006a80',
     }),
     plum = m({
       bgColor = m({
-        muted = '#f8e5ff',
         emphasis = '#a830e8',
+        muted = '#f8e5ff',
       }),
       borderColor = m({
-        muted = '#f0cdfe',
         emphasis = '#a830e8',
+        muted = '#f0cdfe',
       }),
       fgColor = '#961edc',
     }),
     coral = m({
       bgColor = m({
-        muted = '#ffe5db',
         emphasis = '#d43511',
+        muted = '#ffe5db',
       }),
       borderColor = m({
-        muted = '#fecebe',
         emphasis = '#d43511',
+        muted = '#fecebe',
       }),
       fgColor = '#ba2e12',
     }),
     pink = m({
       bgColor = m({
-        muted = '#ffe5f1',
         emphasis = '#ce2c85',
+        muted = '#ffe5f1',
       }),
       borderColor = m({
-        muted = '#fdc9e2',
         emphasis = '#ce2c85',
+        muted = '#fdc9e2',
       }),
       fgColor = '#b12f79',
     }),
     brown = m({
       bgColor = m({
-        muted = '#eeeae2',
         emphasis = '#856d4c',
+        muted = '#eeeae2',
       }),
       borderColor = m({
-        muted = '#dfd7c8',
         emphasis = '#856d4c',
+        muted = '#dfd7c8',
       }),
       fgColor = '#755f43',
     }),
     pine = m({
       bgColor = m({
-        muted = '#bff8db',
         emphasis = '#167e53',
+        muted = '#bff8db',
       }),
       borderColor = m({
-        muted = '#80efb9',
         emphasis = '#167e53',
+        muted = '#80efb9',
       }),
       fgColor = '#156f4b',
     }),
     blue = m({
       bgColor = m({
-        muted = '#d1f0ff',
         emphasis = '#006edb',
+        muted = '#d1f0ff',
       }),
       borderColor = m({
-        muted = '#ade1ff',
         emphasis = '#006edb',
+        muted = '#ade1ff',
       }),
       fgColor = '#005fcc',
     }),
     orange = m({
       bgColor = m({
-        muted = '#ffe7d1',
         emphasis = '#b8500f',
+        muted = '#ffe7d1',
       }),
       borderColor = m({
-        muted = '#fecfaa',
         emphasis = '#b8500f',
+        muted = '#fecfaa',
       }),
       fgColor = '#a24610',
     }),
     auburn = m({
       bgColor = m({
-        muted = '#f2e9e9',
         emphasis = '#9d615c',
+        muted = '#f2e9e9',
       }),
       borderColor = m({
-        muted = '#e6d6d5',
         emphasis = '#9d615c',
+        muted = '#e6d6d5',
       }),
       fgColor = '#8a5551',
     }),
     olive = m({
       bgColor = m({
-        muted = '#f0f0ad',
         emphasis = '#64762d',
+        muted = '#f0f0ad',
       }),
       borderColor = m({
-        muted = '#dbe170',
         emphasis = '#64762d',
+        muted = '#dbe170',
       }),
       fgColor = '#56682c',
     }),
     lime = m({
       bgColor = m({
-        muted = '#e3f2b5',
         emphasis = '#527a29',
+        muted = '#e3f2b5',
       }),
       borderColor = m({
-        muted = '#c7e580',
         emphasis = '#527a29',
+        muted = '#c7e580',
       }),
       fgColor = '#476c28',
     }),
     lemon = m({
       bgColor = m({
-        muted = '#f7eea1',
         emphasis = '#866e04',
+        muted = '#f7eea1',
       }),
       borderColor = m({
-        muted = '#f0db3d',
         emphasis = '#866e04',
+        muted = '#f0db3d',
       }),
       fgColor = '#786002',
     }),
     yellow = m({
       bgColor = m({
-        muted = '#ffec9e',
         emphasis = '#946a00',
+        muted = '#ffec9e',
       }),
       borderColor = m({
-        muted = '#ffd642',
         emphasis = '#946a00',
+        muted = '#ffd642',
       }),
       fgColor = '#805900',
     }),
-    indigo = m({
-      bgColor = m({
-        muted = '#e5e9ff',
-        emphasis = '#5a61e7',
-      }),
-      borderColor = m({
-        muted = '#d2d7fe',
-        emphasis = '#5a61e7',
-      }),
-      fgColor = '#494edf',
-    }),
-  }),
-  underlineNav = m({
-    iconColor = m({
-      rest = '#636c76',
-    }),
-    borderColor = m({
-      hover = '#afb8c133',
-      active = '#fd8c73',
-    }),
-  }),
-  avatar = m({
-    bgColor = '#ffffff',
-    borderColor = '#1f232826',
-    shadow = '0px 0px 0px 2px #ffffffcc',
-  }),
-  borderColor = m({
-    upsell = m({
-      muted = '#c297ff66',
-      emphasis = '#8250df',
-    }),
-    success = m({
-      muted = '#54aeff66',
-      emphasis = '#218bff',
-    }),
-    sponsors = m({
-      muted = '#ff80c866',
-      emphasis = '#bf3989',
-    }),
-    severe = m({
-      muted = '#fb8f4466',
-      emphasis = '#bc4c00',
-    }),
-    muted = '#d0d7deb3',
-    open = m({
-      muted = '#fb8f4466',
-      emphasis = '#e16f24',
-    }),
-    disabled = '#eaeef2b3',
-    danger = m({
-      muted = '#fb8f4466',
-      emphasis = '#bc4c00',
-    }),
-    closed = m({
-      muted = '#afb8c166',
-      emphasis = '#6e7781',
-    }),
-    attention = m({
-      muted = '#d4a72c66',
-      emphasis = '#bf8700',
-    }),
-    accent = m({
-      muted = '#54aeff66',
-      emphasis = '#0969da',
-    }),
-    translucent = '#1f232826',
-    emphasis = '#6e7781',
-    default = '#d0d7de',
-    neutral = m({
-      muted = '#afb8c133',
-      emphasis = '#6e7781',
-    }),
-    transparent = '#ffffff00',
-    done = m({
-      muted = '#c297ff66',
-      emphasis = '#8250df',
-    }),
-  }),
-  header = m({
-    bgColor = '#24292f',
-    borderColor = m({
-      divider = '#57606a',
-    }),
-    fgColor = m({
-      logo = '#ffffff',
-      default = '#ffffffb3',
-    }),
   }),
-  topicTag = m({
+  counter = m({
     borderColor = '#ffffff00',
   }),
-  treeViewItem = m({
-    leadingVisual = m({
-      iconColor = m({
-        rest = '#54aeff',
-      }),
-    }),
-  }),
   label = m({
-    teal = m({
+    indigo = m({
+      bgColor = m({
+        hover = '#d2d7fe',
+        rest = '#e5e9ff',
+        active = '#b1b9fb',
+      }),
       fgColor = m({
-        rest = '#106e75',
-        active = '#0a4852',
-        hover = '#0d5b63',
+        hover = '#393cd5',
+        rest = '#494edf',
+        active = '#2d2db4',
       }),
+    }),
+    teal = m({
       bgColor = m({
+        hover = '#89ebe1',
         rest = '#c7f5ef',
         active = '#22d3c7',
-        hover = '#89ebe1',
       }),
-    }),
-    green = m({
       fgColor = m({
-        rest = '#2b6e3f',
-        active = '#254b34',
-        hover = '#285c3b',
+        hover = '#0d5b63',
+        rest = '#106e75',
+        active = '#0a4852',
       }),
+    }),
+    green = m({
       bgColor = m({
+        hover = '#9ceda0',
         rest = '#caf7ca',
         active = '#54d961',
-        hover = '#9ceda0',
       }),
-    }),
-    red = m({
       fgColor = m({
-        rest = '#c50d28',
-        active = '#880c27',
-        hover = '#a60c29',
+        hover = '#285c3b',
+        rest = '#2b6e3f',
+        active = '#254b34',
       }),
+    }),
+    red = m({
       bgColor = m({
+        hover = '#fecdcd',
         rest = '#ffe2e0',
         active = '#fda5a7',
-        hover = '#fecdcd',
       }),
-    }),
-    gray = m({
       fgColor = m({
-        rest = '#5c6570',
-        active = '#424448',
-        hover = '#4e535a',
+        hover = '#a60c29',
+        rest = '#c50d28',
+        active = '#880c27',
       }),
+    }),
+    gray = m({
       bgColor = m({
+        hover = '#d2dae4',
         rest = '#e8ecf2',
         active = '#b4c0cf',
-        hover = '#d2dae4',
       }),
-    }),
-    purple = m({
       fgColor = m({
-        rest = '#783ae4',
-        active = '#4f21ab',
-        hover = '#6223d7',
+        hover = '#4e535a',
+        rest = '#5c6570',
+        active = '#424448',
       }),
+    }),
+    purple = m({
       bgColor = m({
+        hover = '#e6d2fe',
         rest = '#f1e5ff',
         active = '#d1b1fc',
-        hover = '#e6d2fe',
       }),
-    }),
-    cyan = m({
       fgColor = m({
-        rest = '#006a80',
-        active = '#004857',
-        hover = '#00596b',
+        hover = '#6223d7',
+        rest = '#783ae4',
+        active = '#4f21ab',
       }),
+    }),
+    cyan = m({
       bgColor = m({
+        hover = '#7ae9ff',
         rest = '#bdf4ff',
         active = '#00d0fa',
-        hover = '#7ae9ff',
       }),
-    }),
-    plum = m({
       fgColor = m({
-        rest = '#961edc',
-        active = '#651d96',
-        hover = '#7d1eb8',
+        hover = '#00596b',
+        rest = '#006a80',
+        active = '#004857',
       }),
+    }),
+    plum = m({
       bgColor = m({
+        hover = '#f0cdfe',
         rest = '#f8e5ff',
         active = '#e2a7fb',
-        hover = '#f0cdfe',
       }),
-    }),
-    coral = m({
       fgColor = m({
-        rest = '#ba2e12',
-        active = '#7e2011',
-        hover = '#9b2712',
+        hover = '#7d1eb8',
+        rest = '#961edc',
+        active = '#651d96',
       }),
+    }),
+    coral = m({
       bgColor = m({
+        hover = '#fecebe',
         rest = '#ffe5db',
         active = '#fcab92',
-        hover = '#fecebe',
       }),
-    }),
-    pink = m({
       fgColor = m({
-        rest = '#b12f79',
-        active = '#6e2b53',
-        hover = '#8e2e66',
+        hover = '#9b2712',
+        rest = '#ba2e12',
+        active = '#7e2011',
       }),
+    }),
+    pink = m({
       bgColor = m({
+        hover = '#fdc9e2',
         rest = '#ffe5f1',
         active = '#f8a5cf',
-        hover = '#fdc9e2',
       }),
-    }),
-    brown = m({
       fgColor = m({
-        rest = '#755f43',
-        active = '#51412f',
-        hover = '#64513a',
+        hover = '#8e2e66',
+        rest = '#b12f79',
+        active = '#6e2b53',
       }),
+    }),
+    brown = m({
       bgColor = m({
+        hover = '#dfd7c8',
         rest = '#eeeae2',
         active = '#cbbda4',
-        hover = '#dfd7c8',
       }),
-    }),
-    pine = m({
       fgColor = m({
-        rest = '#156f4b',
-        active = '#114b36',
-        hover = '#135d41',
+        hover = '#64513a',
+        rest = '#755f43',
+        active = '#51412f',
       }),
+    }),
+    pine = m({
       bgColor = m({
+        hover = '#80efb9',
         rest = '#bff8db',
         active = '#1dd781',
-        hover = '#80efb9',
       }),
-    }),
-    blue = m({
       fgColor = m({
-        rest = '#005fcc',
-        active = '#003d99',
-        hover = '#004db3',
+        hover = '#135d41',
+        rest = '#156f4b',
+        active = '#114b36',
       }),
+    }),
+    blue = m({
       bgColor = m({
+        hover = '#ade1ff',
         rest = '#d1f0ff',
         active = '#75c8ff',
-        hover = '#ade1ff',
       }),
-    }),
-    orange = m({
       fgColor = m({
-        rest = '#a24610',
-        active = '#70300f',
-        hover = '#8d3c11',
+        hover = '#004db3',
+        rest = '#005fcc',
+        active = '#003d99',
       }),
+    }),
+    orange = m({
       bgColor = m({
+        hover = '#fecfaa',
         rest = '#ffe7d1',
         active = '#fbaf74',
-        hover = '#fecfaa',
       }),
-    }),
-    auburn = m({
       fgColor = m({
-        rest = '#8a5551',
-        active = '#5d3937',
-        hover = '#744744',
+        hover = '#8d3c11',
+        rest = '#a24610',
+        active = '#70300f',
       }),
+    }),
+    auburn = m({
       bgColor = m({
+        hover = '#e6d6d5',
         rest = '#f2e9e9',
         active = '#d4b7b5',
-        hover = '#e6d6d5',
       }),
-    }),
-    olive = m({
       fgColor = m({
-        rest = '#56682c',
-        active = '#3b4927',
-        hover = '#495a2b',
+        hover = '#744744',
+        rest = '#8a5551',
+        active = '#5d3937',
       }),
+    }),
+    olive = m({
       bgColor = m({
+        hover = '#dbe170',
         rest = '#f0f0ad',
         active = '#b9c832',
-        hover = '#dbe170',
       }),
-    }),
-    lime = m({
       fgColor = m({
-        rest = '#476c28',
-        active = '#2f4a21',
-        hover = '#3a5b25',
+        hover = '#495a2b',
+        rest = '#56682c',
+        active = '#3b4927',
       }),
+    }),
+    lime = m({
       bgColor = m({
+        hover = '#c7e580',
         rest = '#e3f2b5',
         active = '#9bd039',
-        hover = '#c7e580',
       }),
-    }),
-    lemon = m({
       fgColor = m({
-        rest = '#786002',
-        active = '#523f00',
-        hover = '#654f01',
+        hover = '#3a5b25',
+        rest = '#476c28',
+        active = '#2f4a21',
       }),
+    }),
+    lemon = m({
       bgColor = m({
+        hover = '#f0db3d',
         rest = '#f7eea1',
         active = '#d8bd0e',
-        hover = '#f0db3d',
       }),
-    }),
-    yellow = m({
       fgColor = m({
-        rest = '#805900',
-        active = '#5c3d00',
-        hover = '#704d00',
+        hover = '#654f01',
+        rest = '#786002',
+        active = '#523f00',
       }),
+    }),
+    yellow = m({
       bgColor = m({
+        hover = '#ffd642',
         rest = '#ffec9e',
         active = '#ebb400',
-        hover = '#ffd642',
       }),
-    }),
-    indigo = m({
       fgColor = m({
-        rest = '#494edf',
-        active = '#2d2db4',
-        hover = '#393cd5',
-      }),
-      bgColor = m({
-        rest = '#e5e9ff',
-        active = '#b1b9fb',
-        hover = '#d2d7fe',
+        hover = '#704d00',
+        rest = '#805900',
+        active = '#5c3d00',
       }),
     }),
   }),
-  diffBlob = m({
-    addition = m({
-      fgColor = m({
-        num = '#1f2328',
-        text = '#1f2328',
-      }),
-      bgColor = m({
-        num = '#54aeff66',
-        line = '#ddf4ff80',
-        word = '#54aeff66',
-      }),
-    }),
-    expander = m({
-      iconColor = '#636c76',
+  controlTrack = m({
+    bgColor = m({
+      rest = '#eaeef2',
+      hover = '#dee3e8',
+      disabled = '#8c959f',
+      active = '#d2d8de',
     }),
-    deletion = m({
-      fgColor = m({
-        num = '#1f2328',
-        text = '#1f2328',
-      }),
-      bgColor = m({
-        num = '#fb8f4466',
-        line = '#fff1e580',
-        word = '#ffb77c80',
-      }),
+    borderColor = m({
+      disabled = '#8c959f',
+      rest = '#ffffff00',
     }),
-    hunk = m({
-      bgColor = m({
-        num = '#54aeff66',
-      }),
+    fgColor = m({
+      disabled = '#ffffff',
+      rest = '#636c76',
     }),
   }),
-  timelineBadge = m({
-    bgColor = '#eaeef2',
+  menu = m({
+    bgColor = m({
+      active = '#ffffff00',
+    }),
   }),
-  bgColor = m({
-    white = '#ffffff',
+  borderColor = m({
     upsell = m({
-      muted = '#fbefff',
       emphasis = '#8250df',
+      muted = '#c297ff66',
     }),
     success = m({
-      muted = '#ddf4ff',
-      emphasis = '#0f72e3',
+      emphasis = '#218bff',
+      muted = '#54aeff66',
     }),
     sponsors = m({
-      muted = '#ffeff7',
       emphasis = '#bf3989',
+      muted = '#ff80c866',
     }),
     severe = m({
-      muted = '#fff1e5',
       emphasis = '#bc4c00',
-    }),
-    muted = '#f6f8fa',
-    inset = '#f6f8fa',
-    open = m({
       muted = '#fb8f4466',
-      emphasis = '#e16f24',
+    }),
+    muted = '#d0d7deb3',
+    done = m({
+      emphasis = '#8250df',
+      muted = '#c297ff66',
     }),
     disabled = '#eaeef2b3',
     danger = m({
-      muted = '#fff1e5',
       emphasis = '#bc4c00',
+      muted = '#fb8f4466',
     }),
     closed = m({
-      muted = '#afb8c166',
       emphasis = '#6e7781',
+      muted = '#afb8c166',
     }),
-    black = '#1f2328',
     attention = m({
-      muted = '#fff8c5',
-      emphasis = '#9a6700',
+      emphasis = '#bf8700',
+      muted = '#d4a72c66',
     }),
     accent = m({
-      muted = '#ddf4ff',
       emphasis = '#0969da',
+      muted = '#54aeff66',
     }),
-    emphasis = '#24292f',
-    default = '#ffffff',
+    open = m({
+      emphasis = '#e16f24',
+      muted = '#fb8f4466',
+    }),
+    emphasis = '#6e7781',
+    translucent = '#1f232826',
+    default = '#d0d7de',
     neutral = m({
-      muted = '#afb8c133',
       emphasis = '#6e7781',
+      muted = '#afb8c133',
     }),
     transparent = '#ffffff00',
-    inverse = '#24292f',
-    done = m({
-      muted = '#fbefff',
-      emphasis = '#8250df',
-    }),
   }),
   skeletonLoader = m({
     bgColor = '#f6f8fa',
   }),
-  fgColor = m({
-    white = '#ffffff',
-    upsell = '#8250df',
-    success = '#0969da',
-    sponsors = '#bf3989',
-    severe = '#bc4c00',
-    onEmphasis = '#ffffff',
-    muted = '#636c76',
-    link = '#0969da',
-    open = '#bc4c00',
-    disabled = '#8c959f',
-    danger = '#be4e02',
-    closed = '#6e7781',
-    black = '#1f2328',
-    attention = '#9a6700',
-    accent = '#0969da',
-    default = '#1f2328',
-    neutral = '#6e7781',
-    done = '#8250df',
+  controlKnob = m({
+    borderColor = m({
+      rest = '#868f99',
+      disabled = '#eaeef2b3',
+      checked = '#0969da',
+    }),
+    bgColor = m({
+      rest = '#ffffff',
+      disabled = '#eaeef2b3',
+      checked = '#ffffff',
+    }),
   }),
-  button = m({
-    invisible = m({
+  treeViewItem = m({
+    leadingVisual = m({
+      iconColor = m({
+        rest = '#54aeff',
+      }),
+    }),
+  }),
+  avatar = m({
+    shadow = '0px 0px 0px 2px #ffffffcc',
+    bgColor = '#ffffff',
+    borderColor = '#1f232826',
+  }),
+  topicTag = m({
+    borderColor = '#ffffff00',
+  }),
+  control = m({
+    checked = m({
       bgColor = m({
-        rest = '#ffffff00',
-        disabled = '#eaeef2b3',
-        active = '#d0d7de66',
-        hover = '#d0d7de33',
+        rest = '#0969da',
+        hover = '#0860ca',
+        disabled = '#8c959f',
+        active = '#0757ba',
       }),
       borderColor = m({
-        rest = '#ffffff00',
-        disabled = '#eaeef2b3',
-        hover = '#ffffff00',
-      }),
-      iconColor = m({
-        rest = '#636c76',
+        rest = '#0969da',
+        hover = '#0860ca',
         disabled = '#8c959f',
-        hover = '#636c76',
+        active = '#0757ba',
       }),
       fgColor = m({
-        rest = '#0969da',
-        disabled = '#8c959f',
-        hover = '#0969da',
+        disabled = '#ffffff',
+        rest = '#ffffff',
       }),
     }),
+    bgColor = m({
+      selected = '#f6f8fa',
+      rest = '#f6f8fa',
+      disabled = '#eaeef2b3',
+      hover = '#eef1f4',
+      active = '#e7ebef',
+    }),
     danger = m({
-      fgColor = m({
-        rest = '#be4e02',
-        disabled = '#be4e0280',
-        active = '#ffffff',
-        hover = '#ffffff',
-      }),
-      shadow = m({
-        selected = 'inset 0px 1px 0px 0px #47170033',
-      }),
       bgColor = m({
-        rest = '#f6f8fa',
-        disabled = '#eaeef2b3',
-        active = '#7e2f00',
-        hover = '#953800',
-      }),
-      borderColor = m({
-        rest = '#d0d7de',
-        active = '#1f232826',
-        hover = '#1f232826',
+        active = '#fff1e566',
+        hover = '#fff1e5',
       }),
-      iconColor = m({
+      fgColor = m({
+        hover = '#be4e02',
         rest = '#be4e02',
-        hover = '#ffffff',
       }),
     }),
-    default = m({
-      bgColor = m({
-        rest = '#f6f8fa',
-        disabled = '#eaeef2b3',
-        hover = '#eef1f4',
-        active = '#e7ebef',
-        selected = '#e7ebef',
-      }),
+    iconColor = m({
+      rest = '#636c76',
+    }),
+    transparent = m({
       borderColor = m({
-        rest = '#d0d7de',
+        hover = '#ffffff00',
+        rest = '#ffffff00',
+        active = '#ffffff00',
+      }),
+      bgColor = m({
+        selected = '#d0d7de33',
+        rest = '#ffffff00',
         disabled = '#eaeef2b3',
-        active = '#d0d7de',
-        hover = '#d0d7de',
+        hover = '#d0d7de33',
+        active = '#d0d7de66',
       }),
+    }),
+    borderColor = m({
+      warning = '#bf8700',
+      rest = '#d0d7de',
+      disabled = '#eaeef2b3',
+      success = '#218bff',
+      danger = '#bc4c00',
+      emphasis = '#868f99',
+      selected = '#f6f8fa',
+    }),
+    fgColor = m({
+      placeholder = '#69727c',
+      disabled = '#8c959f',
+      rest = '#24292f',
+    }),
+  }),
+  bgColor = m({
+    white = '#ffffff',
+    upsell = m({
+      emphasis = '#8250df',
+      muted = '#fbefff',
+    }),
+    success = m({
+      emphasis = '#0f72e3',
+      muted = '#ddf4ff',
+    }),
+    sponsors = m({
+      emphasis = '#bf3989',
+      muted = '#ffeff7',
+    }),
+    severe = m({
+      emphasis = '#bc4c00',
+      muted = '#fff1e5',
+    }),
+    muted = '#f6f8fa',
+    inset = '#f6f8fa',
+    inverse = '#24292f',
+    disabled = '#eaeef2b3',
+    danger = m({
+      emphasis = '#bc4c00',
+      muted = '#fff1e5',
+    }),
+    closed = m({
+      emphasis = '#6e7781',
+      muted = '#afb8c166',
+    }),
+    black = '#1f2328',
+    attention = m({
+      emphasis = '#9a6700',
+      muted = '#fff8c5',
+    }),
+    accent = m({
+      emphasis = '#0969da',
+      muted = '#ddf4ff',
+    }),
+    open = m({
+      emphasis = '#e16f24',
+      muted = '#fb8f4466',
+    }),
+    emphasis = '#24292f',
+    neutral = m({
+      emphasis = '#6e7781',
+      muted = '#afb8c133',
+    }),
+    default = '#ffffff',
+    transparent = '#ffffff00',
+    done = m({
+      emphasis = '#8250df',
+      muted = '#fbefff',
+    }),
+  }),
+  codeMirror = m({
+    activeline = m({
+      bgColor = '#afb8c133',
+    }),
+    fgColor = '#1f2328',
+    matchingBracket = m({
+      fgColor = '#1f2328',
+    }),
+    lineNumber = m({
+      fgColor = '#636c76',
+    }),
+    bgColor = '#ffffff',
+    gutters = m({
+      bgColor = '#ffffff',
+    }),
+    cursor = m({
+      fgColor = '#1f2328',
+    }),
+    gutterMarker = m({
       fgColor = m({
-        rest = '#24292f',
-      }),
-      shadow = m({
-        resting = '0px 1px 0px 0px #1f23280a',
+        default = '#ffffff',
+        muted = '#636c76',
       }),
     }),
-    primary = m({
+    syntax = m({
       fgColor = m({
-        rest = '#ffffff',
-        disabled = '#ffffffcc',
-      }),
-      shadow = m({
-        selected = 'inset 0px 1px 0px 0px #0021554d',
-      }),
-      bgColor = m({
-        rest = '#0f72e3',
-        disabled = '#92caff',
-        active = '#0b64ce',
-        hover = '#0d6bd8',
-      }),
-      borderColor = m({
-        rest = '#1f232826',
-        disabled = '#92caff',
-        active = '#1f232826',
-        hover = '#1f232826',
-      }),
-      iconColor = m({
-        rest = '#ffffffcc',
+        keyword = '#bc4c00',
+        constant = '#0550ae',
+        comment = '#24292f',
+        variable = '#953800',
+        entity = '#8250df',
+        storage = '#bc4c00',
+        support = '#0550ae',
+        string = '#0a3069',
       }),
     }),
-    inactive = m({
-      fgColor = '#57606a',
-      bgColor = '#eaeef2',
+    lines = m({
+      bgColor = '#ffffff',
     }),
-    star = m({
-      iconColor = '#eac54f',
+    selection = m({
+      bgColor = '#54aeff66',
     }),
-    outline = m({
-      bgColor = m({
-        rest = '#f6f8fa',
-        disabled = '#f6f8fa',
-        active = '#0757ba',
-        hover = '#0969da',
-      }),
-      borderColor = m({
-        hover = '#1f232826',
-        active = '#1f232826',
-      }),
-      fgColor = m({
-        rest = '#0969da',
-        disabled = '#0969da80',
-        active = '#ffffff',
-        hover = '#ffffff',
-      }),
-      shadow = m({
-        selected = 'inset 0px 1px 0px 0px #00215533',
-      }),
+  }),
+  underlineNav = m({
+    borderColor = m({
+      active = '#fd8c73',
+      hover = '#afb8c133',
+    }),
+    iconColor = m({
+      rest = '#636c76',
     }),
   }),
 })
diff --git a/lua/github-theme/palette/primitives/light_high_contrast.lua b/lua/github-theme/palette/primitives/light_high_contrast.lua
index 6ed9fbd..8ac798f 100644
--- a/lua/github-theme/palette/primitives/light_high_contrast.lua
+++ b/lua/github-theme/palette/primitives/light_high_contrast.lua
@@ -11,143 +11,81 @@ local function m(tbl)
   return setmetatable(tbl, mt)
 end
 local M = m({
-  bgColor = m({
-    transparent = '#ffffff00',
-    white = '#ffffff',
-    upsell = m({
-      muted = '#faf0fe',
-      emphasis = '#622cbc',
-    }),
-    success = m({
-      muted = '#d2fedb',
-      emphasis = '#055d20',
-    }),
-    sponsors = m({
-      muted = '#feeff7',
-      emphasis = '#971368',
-    }),
-    severe = m({
-      muted = '#fff2d5',
-      emphasis = '#873800',
-    }),
-    muted = '#e7ecf0',
-    inset = '#ffffff',
-    done = m({
-      muted = '#faf0fe',
-      emphasis = '#622cbc',
-    }),
-    disabled = '#ced5dcb3',
-    danger = m({
-      muted = '#fff0ee',
-      emphasis = '#a0111f',
-    }),
-    closed = m({
-      muted = '#fff0ee',
-      emphasis = '#a0111f',
-    }),
-    black = '#010409',
-    attention = m({
-      muted = '#fcf7be',
-      emphasis = '#744500',
-    }),
-    accent = m({
-      muted = '#dff7ff',
-      emphasis = '#0349b4',
-    }),
-    emphasis = '#0e1116',
-    open = m({
-      muted = '#d2fedb',
-      emphasis = '#055d20',
-    }),
-    default = '#ffffff',
-    inverse = '#0e1116',
-    neutral = m({
-      muted = '#e7ecf0',
-      emphasis = '#66707b',
+  avatarStack = m({
+    fade = m({
+      bgColor = m({
+        muted = '#ced5dc',
+        default = '#acb6c0',
+      }),
     }),
   }),
-  diffBlob = m({
-    expander = m({
-      iconColor = '#0e1116',
+  avatar = m({
+    borderColor = '#010409e6',
+    shadow = '0px 0px 0px 2px #ffffffcc',
+    bgColor = '#ffffff',
+  }),
+  codeMirror = m({
+    lines = m({
+      bgColor = '#ffffff',
     }),
-    deletion = m({
+    gutterMarker = m({
       fgColor = m({
-        num = '#010409',
-        text = '#ffffff',
-      }),
-      bgColor = m({
-        word = '#a0111f',
-        line = '#fff0ee',
-        num = '#ffc1bc',
-      }),
-    }),
-    hunk = m({
-      bgColor = m({
-        num = '#9cd7ff',
+        muted = '#0e1116',
+        default = '#ffffff',
       }),
     }),
-    addition = m({
+    syntax = m({
       fgColor = m({
-        num = '#010409',
-        text = '#ffffff',
-      }),
-      bgColor = m({
-        word = '#117f32',
-        line = '#d2fedb',
-        num = '#c2f9cd',
+        keyword = '#a0111f',
+        support = '#023b95',
+        string = '#032563',
+        variable = '#702c00',
+        comment = '#0e1116',
+        storage = '#a0111f',
+        constant = '#023b95',
+        entity = '#622cbc',
       }),
     }),
-  }),
-  sideNav = m({
-    bgColor = m({
-      selected = '#ffffff',
+    bgColor = '#ffffff',
+    selection = m({
+      bgColor = '#368cf9',
     }),
-  }),
-  shadow = m({
-    resting = m({
-      small = '0px 1px 0px 0px #0104090a',
-      xsmall = '0px 1px 0px 0px #0104091a',
-      medium = '0px 3px 6px 0px #343b431f',
+    activeline = m({
+      bgColor = '#e7ecf0',
     }),
-    floating = m({
-      large = '0px 0px 0px 1px #88929d, 0px 40px 80px 0px #343b433d',
-      small = '0px 0px 0px 1px #88929d80, 0px 6px 12px -3px #343b430a, 0px 6px 18px 0px #343b431f',
-      medium = '0px 0px 0px 1px #88929d, 0px 8px 16px -4px #343b4314, 0px 4px 32px -4px #343b4314, 0px 24px 48px -12px #343b4314, 0px 48px 96px -24px #343b4314',
-      xlarge = '0px 0px 0px 1px #88929d, 0px 56px 112px 0px #343b4352',
-      legacy = '0px 6px 12px -3px #343b430a, 0px 6px 18px 0px #343b431f',
+    cursor = m({
+      fgColor = '#010409',
+    }),
+    matchingBracket = m({
+      fgColor = '#010409',
+    }),
+    fgColor = '#010409',
+    gutters = m({
+      bgColor = '#ffffff',
+    }),
+    lineNumber = m({
+      fgColor = '#0e1116',
     }),
-    inset = 'inset 0px 1px 0px 0px #0104090a',
-  }),
-  selection = m({
-    bgColor = '#0349b433',
   }),
   selectMenu = m({
+    borderColor = '#ffffff00',
     bgColor = m({
       active = '#9cd7ff',
     }),
-    borderColor = '#ffffff00',
   }),
   reactionButton = m({
     selected = m({
-      fgColor = m({
-        rest = '#023b95',
-        hover = '#023b95',
-      }),
       bgColor = m({
-        rest = '#dff7ff',
         hover = '#c7e9ff',
+        rest = '#dff7ff',
+      }),
+      fgColor = m({
+        hover = '#023b95',
+        rest = '#023b95',
       }),
     }),
   }),
   fgColor = m({
-    white = '#ffffff',
-    upsell = '#622cbc',
-    success = '#055d20',
-    sponsors = '#971368',
-    severe = '#873800',
-    onEmphasis = '#ffffff',
-    muted = '#0e1116',
-    link = '#023b95',
     done = '#622cbc',
     disabled = '#66707b',
     danger = '#8a071e',
@@ -155,31 +93,24 @@ local M = m({
     black = '#010409',
     attention = '#744500',
     accent = '#023b95',
+    neutral = '#66707b',
     open = '#055d20',
+    sponsors = '#971368',
+    white = '#ffffff',
+    upsell = '#622cbc',
+    success = '#055d20',
     default = '#010409',
-    neutral = '#66707b',
-  }),
-  counter = m({
-    borderColor = '#20252c',
+    severe = '#873800',
+    onEmphasis = '#ffffff',
+    muted = '#0e1116',
+    link = '#023b95',
   }),
-  controlTrack = m({
-    bgColor = m({
-      rest = '#acb6c0',
-      disabled = '#66707b',
-      active = '#909aa4',
-      hover = '#9ea8b2',
-    }),
-    borderColor = m({
-      rest = '#ffffff00',
-      disabled = '#66707b',
-    }),
-    fgColor = m({
-      rest = '#010409',
-      disabled = '#ffffff',
+  page = m({
+    header = m({
+      bgColor = '#e7ecf0',
     }),
   }),
   header = m({
-    bgColor = '#0e1116',
     borderColor = m({
       divider = '#acb6c0',
     }),
@@ -187,431 +118,568 @@ local M = m({
       logo = '#ffffff',
       default = '#ffffffb3',
     }),
+    bgColor = '#0e1116',
   }),
   overlay = m({
-    bgColor = '#ffffff',
     borderColor = '#88929d',
     backdrop = m({
       bgColor = '#88929d33',
     }),
+    bgColor = '#ffffff',
   }),
-  color = m({
-    ansi = m({
-      black = m({
-        bright = '#4b535d',
-        default = '#0e1116',
+  focus = m({
+    outlineColor = '#0349b4',
+    outline = '#0349b4 solid 2px',
+  }),
+  menu = m({
+    bgColor = m({
+      active = '#ffffff00',
+    }),
+  }),
+  card = m({
+    bgColor = '#ffffff',
+  }),
+  buttonCounter = m({
+    danger = m({
+      bgColor = m({
+        disabled = '#a0111f0d',
+        rest = '#a0111f1a',
+        hover = '#ffffff33',
       }),
-      magenta = m({
-        bright = '#844ae7',
-        default = '#622cbc',
+      fgColor = m({
+        disabled = '#8a071e80',
+        rest = '#980e1e',
+        hover = '#ffffff',
       }),
-      yellow = m({
-        bright = '#4e2c00',
-        default = '#3f2200',
+    }),
+    default = m({
+      bgColor = m({
+        rest = '#66707b33',
       }),
-      white = m({
-        bright = '#88929d',
-        default = '#66707b',
+    }),
+    outline = m({
+      bgColor = m({
+        disabled = '#0349b40d',
+        rest = '#0349b41a',
+        hover = '#ffffff33',
       }),
-      blue = m({
-        bright = '#1168e3',
-        default = '#0349b4',
+      fgColor = m({
+        disabled = '#023b9580',
+        rest = '#023b95',
+        hover = '#ffffff',
       }),
-      green = m({
-        bright = '#055d20',
-        default = '#024c1a',
-      }),
-      red = m({
-        bright = '#86061d',
-        default = '#a0111f',
-      }),
-      gray = '#66707b',
-      cyan = m({
-        bright = '#3192aa',
-        default = '#1b7c83',
+    }),
+    primary = m({
+      bgColor = m({
+        rest = '#00230b33',
       }),
     }),
-    prettylights = m({
-      syntax = m({
-        variable = '#702c00',
-        entity = m({
-          default = '#512598',
-          tag = '#023b95',
-        }),
-        constant = m({
-          default = '#023b95',
-          other = m({
-            reference = m({
-              link = '#032563',
-            }),
-          }),
-        }),
-        sublimelinter = m({
-          gutter = m({
-            mark = '#88929d',
-          }),
-        }),
-        comment = '#4b535d',
-        string = m({
-          default = '#032563',
-          regexp = '#024c1a',
-        }),
-        carriage = m({
-          ['return'] = m({
-            bg = '#a0111f',
-            text = '#ffffff',
-          }),
-        }),
-        storage = m({
-          modifier = m({
-            import = '#0e1116',
-          }),
-        }),
-        markup = m({
-          deleted = m({
-            bg = '#fff0ee',
-            text = '#6e011a',
-          }),
-          italic = '#0e1116',
-          changed = m({
-            bg = '#ffc67b',
-            text = '#702c00',
-          }),
-          inserted = m({
-            bg = '#d2fedb',
-            text = '#024c1a',
-          }),
-          bold = '#0e1116',
-          heading = '#023b95',
-          ignored = m({
-            bg = '#023b95',
-            text = '#e7ecf0',
-          }),
-          list = '#2e1800',
-        }),
-        brackethighlighter = m({
-          angle = '#4b535d',
-          unmatched = '#6e011a',
-        }),
-        keyword = '#a0111f',
-        meta = m({
-          diff = m({
-            range = '#622cbc',
-          }),
-        }),
-        invalid = m({
-          illegal = m({
-            bg = '#6e011a',
-            text = '#ffffff',
-          }),
-        }),
+    invisible = m({
+      bgColor = m({
+        rest = '#66707b33',
       }),
     }),
   }),
-  controlKnob = m({
-    bgColor = m({
-      rest = '#ffffff',
-      disabled = '#ced5dcb3',
-      checked = '#ffffff',
-    }),
-    borderColor = m({
-      rest = '#20252c',
-      disabled = '#ced5dcb3',
-      checked = '#0349b4',
-    }),
-  }),
-  menu = m({
-    bgColor = m({
-      active = '#ffffff00',
+  highlight = m({
+    neutral = m({
+      bgColor = '#fcf7be',
     }),
   }),
-  label = m({
-    lemon = m({
+  button = m({
+    default = m({
+      borderColor = m({
+        active = '#20252c',
+        disabled = '#ced5dcb3',
+        rest = '#20252c',
+        hover = '#20252c',
+      }),
       fgColor = m({
-        rest = '#786002',
-        active = '#523f00',
-        hover = '#654f01',
+        rest = '#0e1116',
+      }),
+      shadow = m({
+        resting = '0px 1px 0px 0px #0104090a',
       }),
       bgColor = m({
-        rest = '#f7eea1',
-        active = '#d8bd0e',
-        hover = '#f0db3d',
+        disabled = '#ced5dcb3',
+        selected = '#cfd6dd',
+        rest = '#e7ecf0',
+        active = '#cfd6dd',
+        hover = '#dbe1e6',
       }),
     }),
-    yellow = m({
+    danger = m({
+      borderColor = m({
+        active = '#01040926',
+        rest = '#20252c',
+        hover = '#01040926',
+      }),
       fgColor = m({
-        rest = '#805900',
-        active = '#5c3d00',
-        hover = '#704d00',
+        active = '#ffffff',
+        disabled = '#8a071e80',
+        rest = '#8a071e',
+        hover = '#ffffff',
       }),
-      bgColor = m({
-        rest = '#ffec9e',
-        active = '#ebb400',
-        hover = '#ffd642',
+      iconColor = m({
+        hover = '#ffffff',
+        rest = '#8a071e',
       }),
-    }),
-    indigo = m({
-      fgColor = m({
-        rest = '#494edf',
-        active = '#2d2db4',
-        hover = '#393cd5',
+      shadow = m({
+        selected = 'inset 0px 1px 0px 0px #43001133',
       }),
       bgColor = m({
-        rest = '#e5e9ff',
-        active = '#b1b9fb',
-        hover = '#d2d7fe',
+        active = '#74041a',
+        disabled = '#ced5dcb3',
+        rest = '#e7ecf0',
+        hover = '#86061d',
       }),
     }),
-    teal = m({
+    primary = m({
+      borderColor = m({
+        active = '#013d14',
+        disabled = '#85cb97',
+        rest = '#013d14',
+        hover = '#013d14',
+      }),
       fgColor = m({
-        rest = '#106e75',
-        active = '#0a4852',
-        hover = '#0d5b63',
+        disabled = '#ffffffcc',
+        rest = '#ffffff',
       }),
-      bgColor = m({
-        rest = '#c7f5ef',
-        active = '#22d3c7',
-        hover = '#89ebe1',
+      iconColor = m({
+        rest = '#ffffffcc',
       }),
-    }),
-    green = m({
-      fgColor = m({
-        rest = '#2b6e3f',
-        active = '#254b34',
-        hover = '#285c3b',
+      shadow = m({
+        selected = 'inset 0px 1px 0px 0px #00230b4d',
       }),
       bgColor = m({
-        rest = '#caf7ca',
-        active = '#54d961',
-        hover = '#9ceda0',
+        active = '#03501b',
+        disabled = '#85cb97',
+        rest = '#055d20',
+        hover = '#04571e',
       }),
     }),
-    red = m({
+    inactive = m({
+      bgColor = '#e7ecf0',
+      fgColor = '#4b535d',
+    }),
+    star = m({
+      iconColor = '#d5a824',
+    }),
+    outline = m({
+      borderColor = m({
+        active = '#01040926',
+        hover = '#01040926',
+      }),
       fgColor = m({
-        rest = '#c50d28',
-        active = '#880c27',
-        hover = '#a60c29',
+        active = '#ffffff',
+        disabled = '#023b9580',
+        rest = '#023b95',
+        hover = '#ffffff',
+      }),
+      shadow = m({
+        selected = 'inset 0px 1px 0px 0px #021a4a33',
       }),
       bgColor = m({
-        rest = '#ffe2e0',
-        active = '#fda5a7',
-        hover = '#fecdcd',
+        active = '#033f9d',
+        disabled = '#ffffff',
+        rest = '#e7ecf0',
+        hover = '#0349b4',
       }),
     }),
-    gray = m({
+    invisible = m({
+      borderColor = m({
+        disabled = '#ced5dcb3',
+        rest = '#ffffff00',
+        hover = '#20252c',
+      }),
       fgColor = m({
-        rest = '#5c6570',
-        active = '#424448',
-        hover = '#4e535a',
+        disabled = '#66707b',
+        rest = '#023b95',
+        hover = '#67b3fd',
+      }),
+      iconColor = m({
+        disabled = '#66707b',
+        rest = '#0e1116',
+        hover = '#ffffff',
       }),
       bgColor = m({
-        rest = '#e8ecf2',
-        active = '#b4c0cf',
-        hover = '#d2dae4',
-      }),
-    }),
-    purple = m({
-      fgColor = m({
-        rest = '#783ae4',
-        active = '#4f21ab',
-        hover = '#6223d7',
-      }),
-      bgColor = m({
-        rest = '#f1e5ff',
-        active = '#d1b1fc',
-        hover = '#e6d2fe',
+        active = '#4b535d',
+        disabled = '#ced5dcb3',
+        rest = '#ffffff00',
+        hover = '#20252c',
       }),
     }),
+  }),
+  display = m({
     cyan = m({
-      fgColor = m({
-        rest = '#006a80',
-        active = '#004857',
-        hover = '#00596b',
+      borderColor = m({
+        muted = '#7ae9ff',
+        emphasis = '#007b94',
       }),
+      fgColor = '#006a80',
       bgColor = m({
-        rest = '#bdf4ff',
-        active = '#00d0fa',
-        hover = '#7ae9ff',
+        muted = '#bdf4ff',
+        emphasis = '#007b94',
       }),
     }),
-    plum = m({
-      fgColor = m({
-        rest = '#961edc',
-        active = '#651d96',
-        hover = '#7d1eb8',
+    purple = m({
+      borderColor = m({
+        muted = '#e6d2fe',
+        emphasis = '#894ceb',
       }),
+      fgColor = '#783ae4',
       bgColor = m({
-        rest = '#f8e5ff',
-        active = '#e2a7fb',
-        hover = '#f0cdfe',
+        muted = '#f1e5ff',
+        emphasis = '#894ceb',
       }),
     }),
     coral = m({
-      fgColor = m({
-        rest = '#ba2e12',
-        active = '#7e2011',
-        hover = '#9b2712',
+      borderColor = m({
+        muted = '#fecebe',
+        emphasis = '#d43511',
       }),
+      fgColor = '#ba2e12',
       bgColor = m({
-        rest = '#ffe5db',
-        active = '#fcab92',
-        hover = '#fecebe',
+        muted = '#ffe5db',
+        emphasis = '#d43511',
       }),
     }),
-    pink = m({
-      fgColor = m({
-        rest = '#b12f79',
-        active = '#6e2b53',
-        hover = '#8e2e66',
+    plum = m({
+      borderColor = m({
+        muted = '#f0cdfe',
+        emphasis = '#a830e8',
       }),
+      fgColor = '#961edc',
       bgColor = m({
-        rest = '#ffe5f1',
-        active = '#f8a5cf',
-        hover = '#fdc9e2',
+        muted = '#f8e5ff',
+        emphasis = '#a830e8',
       }),
     }),
     brown = m({
-      fgColor = m({
-        rest = '#755f43',
-        active = '#51412f',
-        hover = '#64513a',
+      borderColor = m({
+        muted = '#dfd7c8',
+        emphasis = '#856d4c',
       }),
+      fgColor = '#755f43',
       bgColor = m({
-        rest = '#eeeae2',
-        active = '#cbbda4',
-        hover = '#dfd7c8',
+        muted = '#eeeae2',
+        emphasis = '#856d4c',
       }),
     }),
-    pine = m({
-      fgColor = m({
-        rest = '#156f4b',
-        active = '#114b36',
-        hover = '#135d41',
+    pink = m({
+      borderColor = m({
+        muted = '#fdc9e2',
+        emphasis = '#ce2c85',
       }),
+      fgColor = '#b12f79',
       bgColor = m({
-        rest = '#bff8db',
-        active = '#1dd781',
-        hover = '#80efb9',
+        muted = '#ffe5f1',
+        emphasis = '#ce2c85',
       }),
     }),
     blue = m({
-      fgColor = m({
-        rest = '#005fcc',
-        active = '#003d99',
-        hover = '#004db3',
+      borderColor = m({
+        muted = '#ade1ff',
+        emphasis = '#006edb',
       }),
+      fgColor = '#005fcc',
       bgColor = m({
-        rest = '#d1f0ff',
-        active = '#75c8ff',
-        hover = '#ade1ff',
+        muted = '#d1f0ff',
+        emphasis = '#006edb',
       }),
     }),
     orange = m({
-      fgColor = m({
-        rest = '#a24610',
-        active = '#70300f',
-        hover = '#8d3c11',
+      borderColor = m({
+        muted = '#fecfaa',
+        emphasis = '#b8500f',
       }),
+      fgColor = '#a24610',
       bgColor = m({
-        rest = '#ffe7d1',
-        active = '#fbaf74',
-        hover = '#fecfaa',
+        muted = '#ffe7d1',
+        emphasis = '#b8500f',
       }),
     }),
     auburn = m({
-      fgColor = m({
-        rest = '#8a5551',
-        active = '#5d3937',
-        hover = '#744744',
+      borderColor = m({
+        muted = '#e6d6d5',
+        emphasis = '#9d615c',
       }),
+      fgColor = '#8a5551',
       bgColor = m({
-        rest = '#f2e9e9',
-        active = '#d4b7b5',
-        hover = '#e6d6d5',
+        muted = '#f2e9e9',
+        emphasis = '#9d615c',
       }),
     }),
     olive = m({
-      fgColor = m({
-        rest = '#56682c',
-        active = '#3b4927',
-        hover = '#495a2b',
+      borderColor = m({
+        muted = '#dbe170',
+        emphasis = '#64762d',
       }),
+      fgColor = '#56682c',
       bgColor = m({
-        rest = '#f0f0ad',
-        active = '#b9c832',
-        hover = '#dbe170',
+        muted = '#f0f0ad',
+        emphasis = '#64762d',
       }),
     }),
     lime = m({
-      fgColor = m({
-        rest = '#476c28',
-        active = '#2f4a21',
-        hover = '#3a5b25',
+      borderColor = m({
+        muted = '#c7e580',
+        emphasis = '#527a29',
       }),
+      fgColor = '#476c28',
       bgColor = m({
-        rest = '#e3f2b5',
-        active = '#9bd039',
-        hover = '#c7e580',
+        muted = '#e3f2b5',
+        emphasis = '#527a29',
       }),
     }),
-  }),
-  codeMirror = m({
-    cursor = m({
-      fgColor = '#010409',
-    }),
-    selection = m({
-      bgColor = '#368cf9',
-    }),
-    syntax = m({
-      fgColor = m({
-        variable = '#702c00',
-        string = '#032563',
-        storage = '#a0111f',
-        constant = '#023b95',
-        support = '#023b95',
-        keyword = '#a0111f',
-        entity = '#622cbc',
-        comment = '#0e1116',
+    lemon = m({
+      borderColor = m({
+        muted = '#f0db3d',
+        emphasis = '#866e04',
+      }),
+      fgColor = '#786002',
+      bgColor = m({
+        muted = '#f7eea1',
+        emphasis = '#866e04',
       }),
     }),
-    fgColor = '#010409',
-    matchingBracket = m({
-      fgColor = '#010409',
-    }),
-    lineNumber = m({
-      fgColor = '#0e1116',
+    indigo = m({
+      borderColor = m({
+        muted = '#d2d7fe',
+        emphasis = '#5a61e7',
+      }),
+      fgColor = '#494edf',
+      bgColor = m({
+        muted = '#e5e9ff',
+        emphasis = '#5a61e7',
+      }),
     }),
-    activeline = m({
-      bgColor = '#e7ecf0',
+    yellow = m({
+      borderColor = m({
+        muted = '#ffd642',
+        emphasis = '#946a00',
+      }),
+      fgColor = '#805900',
+      bgColor = m({
+        muted = '#ffec9e',
+        emphasis = '#946a00',
+      }),
     }),
-    gutters = m({
-      bgColor = '#ffffff',
+    green = m({
+      borderColor = m({
+        muted = '#9ceda0',
+        emphasis = '#2c8141',
+      }),
+      fgColor = '#2b6e3f',
+      bgColor = m({
+        muted = '#caf7ca',
+        emphasis = '#2c8141',
+      }),
     }),
-    bgColor = '#ffffff',
-    gutterMarker = m({
-      fgColor = m({
-        muted = '#0e1116',
-        default = '#ffffff',
+    teal = m({
+      borderColor = m({
+        muted = '#89ebe1',
+        emphasis = '#127e81',
+      }),
+      fgColor = '#106e75',
+      bgColor = m({
+        muted = '#c7f5ef',
+        emphasis = '#127e81',
       }),
     }),
-    lines = m({
-      bgColor = '#ffffff',
+    gray = m({
+      borderColor = m({
+        muted = '#d2dae4',
+        emphasis = '#647182',
+      }),
+      fgColor = '#5c6570',
+      bgColor = m({
+        muted = '#e8ecf2',
+        emphasis = '#647182',
+      }),
     }),
-  }),
-  scale = m({
-    black = '#010409',
-    pink = m({
-      [1] = '#feeff7',
-      [2] = '#ffbde0',
-      [3] = '#fc87ca',
-      [4] = '#ed4baf',
-      [5] = '#c9248e',
-      [6] = '#971368',
-      [7] = '#7d0c57',
-      [8] = '#660847',
-      [9] = '#53043a',
-      [10] = '#3e022b',
+    pine = m({
+      borderColor = m({
+        muted = '#80efb9',
+        emphasis = '#167e53',
+      }),
+      fgColor = '#156f4b',
+      bgColor = m({
+        muted = '#bff8db',
+        emphasis = '#167e53',
+      }),
+    }),
+    red = m({
+      borderColor = m({
+        muted = '#fecdcd',
+        emphasis = '#df0c24',
+      }),
+      fgColor = '#c50d28',
+      bgColor = m({
+        muted = '#ffe2e0',
+        emphasis = '#df0c24',
+      }),
+    }),
+  }),
+  counter = m({
+    borderColor = '#20252c',
+  }),
+  color = m({
+    prettylights = m({
+      syntax = m({
+        keyword = '#a0111f',
+        brackethighlighter = m({
+          unmatched = '#6e011a',
+          angle = '#4b535d',
+        }),
+        invalid = m({
+          illegal = m({
+            bg = '#6e011a',
+            text = '#ffffff',
+          }),
+        }),
+        variable = '#702c00',
+        entity = m({
+          tag = '#023b95',
+          default = '#512598',
+        }),
+        sublimelinter = m({
+          gutter = m({
+            mark = '#88929d',
+          }),
+        }),
+        constant = m({
+          other = m({
+            reference = m({
+              link = '#032563',
+            }),
+          }),
+          default = '#023b95',
+        }),
+        markup = m({
+          heading = '#023b95',
+          ignored = m({
+            bg = '#023b95',
+            text = '#e7ecf0',
+          }),
+          list = '#2e1800',
+          changed = m({
+            bg = '#ffc67b',
+            text = '#702c00',
+          }),
+          italic = '#0e1116',
+          deleted = m({
+            bg = '#fff0ee',
+            text = '#6e011a',
+          }),
+          inserted = m({
+            bg = '#d2fedb',
+            text = '#024c1a',
+          }),
+          bold = '#0e1116',
+        }),
+        meta = m({
+          diff = m({
+            range = '#622cbc',
+          }),
+        }),
+        comment = '#4b535d',
+        storage = m({
+          modifier = m({
+            import = '#0e1116',
+          }),
+        }),
+        carriage = m({
+          ['return'] = m({
+            bg = '#a0111f',
+            text = '#ffffff',
+          }),
+        }),
+        string = m({
+          regexp = '#024c1a',
+          default = '#032563',
+        }),
+      }),
+    }),
+    ansi = m({
+      cyan = m({
+        default = '#1b7c83',
+        bright = '#3192aa',
+      }),
+      black = m({
+        default = '#0e1116',
+        bright = '#4b535d',
+      }),
+      magenta = m({
+        default = '#622cbc',
+        bright = '#844ae7',
+      }),
+      white = m({
+        default = '#66707b',
+        bright = '#88929d',
+      }),
+      yellow = m({
+        default = '#3f2200',
+        bright = '#4e2c00',
+      }),
+      green = m({
+        default = '#024c1a',
+        bright = '#055d20',
+      }),
+      gray = '#66707b',
+      blue = m({
+        default = '#0349b4',
+        bright = '#1168e3',
+      }),
+      red = m({
+        default = '#a0111f',
+        bright = '#86061d',
+      }),
+    }),
+  }),
+  controlTrack = m({
+    borderColor = m({
+      disabled = '#66707b',
+      rest = '#ffffff00',
+    }),
+    fgColor = m({
+      disabled = '#ffffff',
+      rest = '#010409',
+    }),
+    bgColor = m({
+      active = '#909aa4',
+      disabled = '#66707b',
+      rest = '#acb6c0',
+      hover = '#9ea8b2',
+    }),
+  }),
+  scale = m({
+    purple = m({
+      [1] = '#faf0fe',
+      [2] = '#e0c5ff',
+      [3] = '#c49bff',
+      [4] = '#a371f7',
+      [5] = '#844ae7',
+      [6] = '#622cbc',
+      [7] = '#512598',
+      [8] = '#411d7b',
+      [9] = '#341763',
+      [10] = '#260f49',
+    }),
+    coral = m({
+      [1] = '#fff0ed',
+      [2] = '#ffc2b6',
+      [3] = '#ff8f7e',
+      [4] = '#cd3425',
+      [5] = '#ef5b48',
+      [6] = '#9f1710',
+      [7] = '#870706',
+      [8] = '#6f0107',
+      [9] = '#5b0002',
+      [10] = '#430200',
     }),
+    black = '#010409',
+    transparent = '#ffffff00',
+    white = '#ffffff',
     yellow = m({
       [1] = '#fcf7be',
       [2] = '#f0ce53',
@@ -624,19 +692,6 @@ local M = m({
       [9] = '#3f2200',
       [10] = '#2e1800',
     }),
-    white = '#ffffff',
-    blue = m({
-      [1] = '#dff7ff',
-      [2] = '#9cd7ff',
-      [3] = '#67b3fd',
-      [4] = '#368cf9',
-      [5] = '#1168e3',
-      [6] = '#0349b4',
-      [7] = '#023b95',
-      [8] = '#022f7a',
-      [9] = '#032563',
-      [10] = '#021a4a',
-    }),
     green = m({
       [1] = '#d2fedb',
       [2] = '#82e596',
@@ -661,30 +716,6 @@ local M = m({
       [9] = '#491b00',
       [10] = '#361200',
     }),
-    red = m({
-      [1] = '#fff0ee',
-      [2] = '#ffc1bc',
-      [3] = '#ff8e8a',
-      [4] = '#ee5a5d',
-      [5] = '#d5232c',
-      [6] = '#a0111f',
-      [7] = '#86061d',
-      [8] = '#6e011a',
-      [9] = '#5a0016',
-      [10] = '#430011',
-    }),
-    purple = m({
-      [1] = '#faf0fe',
-      [2] = '#e0c5ff',
-      [3] = '#c49bff',
-      [4] = '#a371f7',
-      [5] = '#844ae7',
-      [6] = '#622cbc',
-      [7] = '#512598',
-      [8] = '#411d7b',
-      [9] = '#341763',
-      [10] = '#260f49',
-    }),
     neutral = m({
       [1] = '#ffffff',
       [2] = '#e7ecf0',
@@ -697,133 +728,46 @@ local M = m({
       [9] = '#20252c',
       [10] = '#0e1116',
     }),
-    transparent = '#ffffff00',
-    coral = m({
-      [1] = '#fff0ed',
-      [2] = '#ffc2b6',
-      [3] = '#ff8f7e',
-      [4] = '#cd3425',
-      [5] = '#ef5b48',
-      [6] = '#9f1710',
-      [7] = '#870706',
-      [8] = '#6f0107',
-      [9] = '#5b0002',
-      [10] = '#430200',
+    pink = m({
+      [1] = '#feeff7',
+      [2] = '#ffbde0',
+      [3] = '#fc87ca',
+      [4] = '#ed4baf',
+      [5] = '#c9248e',
+      [6] = '#971368',
+      [7] = '#7d0c57',
+      [8] = '#660847',
+      [9] = '#53043a',
+      [10] = '#3e022b',
     }),
-  }),
-  avatar = m({
-    bgColor = '#ffffff',
-    borderColor = '#010409e6',
-    shadow = '0px 0px 0px 2px #ffffffcc',
-  }),
-  avatarStack = m({
-    fade = m({
-      bgColor = m({
-        muted = '#ced5dc',
-        default = '#acb6c0',
-      }),
+    blue = m({
+      [1] = '#dff7ff',
+      [2] = '#9cd7ff',
+      [3] = '#67b3fd',
+      [4] = '#368cf9',
+      [5] = '#1168e3',
+      [6] = '#0349b4',
+      [7] = '#023b95',
+      [8] = '#022f7a',
+      [9] = '#032563',
+      [10] = '#021a4a',
+    }),
+    red = m({
+      [1] = '#fff0ee',
+      [2] = '#ffc1bc',
+      [3] = '#ff8e8a',
+      [4] = '#ee5a5d',
+      [5] = '#d5232c',
+      [6] = '#a0111f',
+      [7] = '#86061d',
+      [8] = '#6e011a',
+      [9] = '#5a0016',
+      [10] = '#430011',
     }),
   }),
   base = m({
     display = m({
       color = m({
-        lemon = m({
-          [0] = '#f7eea1',
-          [1] = '#f0db3d',
-          [2] = '#d8bd0e',
-          [3] = '#c2a60a',
-          [4] = '#a68c07',
-          [5] = '#866e04',
-          [6] = '#786002',
-          [7] = '#654f01',
-          [8] = '#523f00',
-          [9] = '#3d2e00',
-        }),
-        yellow = m({
-          [0] = '#ffec9e',
-          [1] = '#ffd642',
-          [2] = '#ebb400',
-          [3] = '#d19d00',
-          [4] = '#b88700',
-          [5] = '#946a00',
-          [6] = '#805900',
-          [7] = '#704d00',
-          [8] = '#5c3d00',
-          [9] = '#422b00',
-        }),
-        indigo = m({
-          [0] = '#e5e9ff',
-          [1] = '#d2d7fe',
-          [2] = '#b1b9fb',
-          [3] = '#979ff7',
-          [4] = '#7a82f0',
-          [5] = '#5a61e7',
-          [6] = '#494edf',
-          [7] = '#393cd5',
-          [8] = '#2d2db4',
-          [9] = '#25247b',
-        }),
-        white = '#ffffff',
-        teal = m({
-          [0] = '#c7f5ef',
-          [1] = '#89ebe1',
-          [2] = '#22d3c7',
-          [3] = '#1db9b4',
-          [4] = '#179b9b',
-          [5] = '#127e81',
-          [6] = '#106e75',
-          [7] = '#0d5b63',
-          [8] = '#0a4852',
-          [9] = '#073740',
-        }),
-        green = m({
-          [0] = '#caf7ca',
-          [1] = '#9ceda0',
-          [2] = '#54d961',
-          [3] = '#31bf46',
-          [4] = '#30a147',
-          [5] = '#2c8141',
-          [6] = '#2b6e3f',
-          [7] = '#285c3b',
-          [8] = '#254b34',
-          [9] = '#1d3528',
-        }),
-        red = m({
-          [0] = '#ffe2e0',
-          [1] = '#fecdcd',
-          [2] = '#fda5a7',
-          [3] = '#fb8389',
-          [4] = '#f85461',
-          [5] = '#df0c24',
-          [6] = '#c50d28',
-          [7] = '#a60c29',
-          [8] = '#880c27',
-          [9] = '#610a20',
-        }),
-        gray = m({
-          [0] = '#e8ecf2',
-          [1] = '#d2dae4',
-          [2] = '#b4c0cf',
-          [3] = '#9ba9bb',
-          [4] = '#808fa3',
-          [5] = '#647182',
-          [6] = '#5c6570',
-          [7] = '#4e535a',
-          [8] = '#424448',
-          [9] = '#303031',
-        }),
-        purple = m({
-          [0] = '#f1e5ff',
-          [1] = '#e6d2fe',
-          [2] = '#d1b1fc',
-          [3] = '#bc91f8',
-          [4] = '#a672f3',
-          [5] = '#894ceb',
-          [6] = '#783ae4',
-          [7] = '#6223d7',
-          [8] = '#4f21ab',
-          [9] = '#391b79',
-        }),
         cyan = m({
           [0] = '#bdf4ff',
           [1] = '#7ae9ff',
@@ -836,17 +780,17 @@ local M = m({
           [8] = '#004857',
           [9] = '#003742',
         }),
-        plum = m({
-          [0] = '#f8e5ff',
-          [1] = '#f0cdfe',
-          [2] = '#e2a7fb',
-          [3] = '#d487f7',
-          [4] = '#c264f2',
-          [5] = '#a830e8',
-          [6] = '#961edc',
-          [7] = '#7d1eb8',
-          [8] = '#651d96',
-          [9] = '#471769',
+        purple = m({
+          [0] = '#f1e5ff',
+          [1] = '#e6d2fe',
+          [2] = '#d1b1fc',
+          [3] = '#bc91f8',
+          [4] = '#a672f3',
+          [5] = '#894ceb',
+          [6] = '#783ae4',
+          [7] = '#6223d7',
+          [8] = '#4f21ab',
+          [9] = '#391b79',
         }),
         coral = m({
           [0] = '#ffe5db',
@@ -861,17 +805,17 @@ local M = m({
           [9] = '#5d180e',
         }),
         black = '#0d1117',
-        pink = m({
-          [0] = '#ffe5f1',
-          [1] = '#fdc9e2',
-          [2] = '#f8a5cf',
-          [3] = '#f184bc',
-          [4] = '#e55da5',
-          [5] = '#ce2c85',
-          [6] = '#b12f79',
-          [7] = '#8e2e66',
-          [8] = '#6e2b53',
-          [9] = '#4d233d',
+        plum = m({
+          [0] = '#f8e5ff',
+          [1] = '#f0cdfe',
+          [2] = '#e2a7fb',
+          [3] = '#d487f7',
+          [4] = '#c264f2',
+          [5] = '#a830e8',
+          [6] = '#961edc',
+          [7] = '#7d1eb8',
+          [8] = '#651d96',
+          [9] = '#471769',
         }),
         brown = m({
           [0] = '#eeeae2',
@@ -885,17 +829,17 @@ local M = m({
           [8] = '#51412f',
           [9] = '#3a2e22',
         }),
-        pine = m({
-          [0] = '#bff8db',
-          [1] = '#80efb9',
-          [2] = '#1dd781',
-          [3] = '#1dbf76',
-          [4] = '#1aa267',
-          [5] = '#167e53',
-          [6] = '#156f4b',
-          [7] = '#135d41',
-          [8] = '#114b36',
-          [9] = '#0d3627',
+        pink = m({
+          [0] = '#ffe5f1',
+          [1] = '#fdc9e2',
+          [2] = '#f8a5cf',
+          [3] = '#f184bc',
+          [4] = '#e55da5',
+          [5] = '#ce2c85',
+          [6] = '#b12f79',
+          [7] = '#8e2e66',
+          [8] = '#6e2b53',
+          [9] = '#4d233d',
         }),
         blue = m({
           [0] = '#d1f0ff',
@@ -957,71 +901,181 @@ local M = m({
           [8] = '#2f4a21',
           [9] = '#213319',
         }),
-      }),
-    }),
-    color = m({
-      black = '#010409',
-      pink = m({
-        [0] = '#feeff7',
-        [1] = '#ffbde0',
-        [2] = '#fc87ca',
-        [3] = '#ed4baf',
-        [4] = '#c9248e',
-        [5] = '#971368',
-        [6] = '#7d0c57',
-        [7] = '#660847',
-        [8] = '#53043a',
-        [9] = '#3e022b',
-      }),
-      yellow = m({
-        [0] = '#fcf7be',
-        [1] = '#f0ce53',
-        [2] = '#d5a824',
-        [3] = '#b58407',
-        [4] = '#956400',
-        [5] = '#744500',
-        [6] = '#603700',
-        [7] = '#4e2c00',
-        [8] = '#3f2200',
-        [9] = '#2e1800',
-      }),
-      white = '#ffffff',
-      blue = m({
-        [0] = '#dff7ff',
-        [1] = '#9cd7ff',
-        [2] = '#67b3fd',
-        [3] = '#368cf9',
-        [4] = '#1168e3',
-        [5] = '#0349b4',
-        [6] = '#023b95',
-        [7] = '#022f7a',
-        [8] = '#032563',
-        [9] = '#021a4a',
-      }),
-      green = m({
-        [0] = '#d2fedb',
-        [1] = '#82e596',
-        [2] = '#43c663',
-        [3] = '#26a148',
-        [4] = '#117f32',
-        [5] = '#055d20',
-        [6] = '#024c1a',
-        [7] = '#013d14',
-        [8] = '#003110',
-        [9] = '#00230b',
-      }),
-      orange = m({
-        [0] = '#fff2d5',
-        [1] = '#ffc67b',
-        [2] = '#f99636',
-        [3] = '#dc6d1a',
-        [4] = '#b45105',
-        [5] = '#873800',
-        [6] = '#702c00',
-        [7] = '#5b2300',
+        lemon = m({
+          [0] = '#f7eea1',
+          [1] = '#f0db3d',
+          [2] = '#d8bd0e',
+          [3] = '#c2a60a',
+          [4] = '#a68c07',
+          [5] = '#866e04',
+          [6] = '#786002',
+          [7] = '#654f01',
+          [8] = '#523f00',
+          [9] = '#3d2e00',
+        }),
+        indigo = m({
+          [0] = '#e5e9ff',
+          [1] = '#d2d7fe',
+          [2] = '#b1b9fb',
+          [3] = '#979ff7',
+          [4] = '#7a82f0',
+          [5] = '#5a61e7',
+          [6] = '#494edf',
+          [7] = '#393cd5',
+          [8] = '#2d2db4',
+          [9] = '#25247b',
+        }),
+        white = '#ffffff',
+        yellow = m({
+          [0] = '#ffec9e',
+          [1] = '#ffd642',
+          [2] = '#ebb400',
+          [3] = '#d19d00',
+          [4] = '#b88700',
+          [5] = '#946a00',
+          [6] = '#805900',
+          [7] = '#704d00',
+          [8] = '#5c3d00',
+          [9] = '#422b00',
+        }),
+        green = m({
+          [0] = '#caf7ca',
+          [1] = '#9ceda0',
+          [2] = '#54d961',
+          [3] = '#31bf46',
+          [4] = '#30a147',
+          [5] = '#2c8141',
+          [6] = '#2b6e3f',
+          [7] = '#285c3b',
+          [8] = '#254b34',
+          [9] = '#1d3528',
+        }),
+        teal = m({
+          [0] = '#c7f5ef',
+          [1] = '#89ebe1',
+          [2] = '#22d3c7',
+          [3] = '#1db9b4',
+          [4] = '#179b9b',
+          [5] = '#127e81',
+          [6] = '#106e75',
+          [7] = '#0d5b63',
+          [8] = '#0a4852',
+          [9] = '#073740',
+        }),
+        gray = m({
+          [0] = '#e8ecf2',
+          [1] = '#d2dae4',
+          [2] = '#b4c0cf',
+          [3] = '#9ba9bb',
+          [4] = '#808fa3',
+          [5] = '#647182',
+          [6] = '#5c6570',
+          [7] = '#4e535a',
+          [8] = '#424448',
+          [9] = '#303031',
+        }),
+        pine = m({
+          [0] = '#bff8db',
+          [1] = '#80efb9',
+          [2] = '#1dd781',
+          [3] = '#1dbf76',
+          [4] = '#1aa267',
+          [5] = '#167e53',
+          [6] = '#156f4b',
+          [7] = '#135d41',
+          [8] = '#114b36',
+          [9] = '#0d3627',
+        }),
+        red = m({
+          [0] = '#ffe2e0',
+          [1] = '#fecdcd',
+          [2] = '#fda5a7',
+          [3] = '#fb8389',
+          [4] = '#f85461',
+          [5] = '#df0c24',
+          [6] = '#c50d28',
+          [7] = '#a60c29',
+          [8] = '#880c27',
+          [9] = '#610a20',
+        }),
+      }),
+    }),
+    color = m({
+      purple = m({
+        [0] = '#faf0fe',
+        [1] = '#e0c5ff',
+        [2] = '#c49bff',
+        [3] = '#a371f7',
+        [4] = '#844ae7',
+        [5] = '#622cbc',
+        [6] = '#512598',
+        [7] = '#411d7b',
+        [8] = '#341763',
+        [9] = '#260f49',
+      }),
+      coral = m({
+        [0] = '#fff0ed',
+        [1] = '#ffc2b6',
+        [2] = '#ff8f7e',
+        [3] = '#cd3425',
+        [4] = '#ef5b48',
+        [5] = '#9f1710',
+        [6] = '#870706',
+        [7] = '#6f0107',
+        [8] = '#5b0002',
+        [9] = '#430200',
+      }),
+      black = '#010409',
+      transparent = '#ffffff00',
+      white = '#ffffff',
+      yellow = m({
+        [0] = '#fcf7be',
+        [1] = '#f0ce53',
+        [2] = '#d5a824',
+        [3] = '#b58407',
+        [4] = '#956400',
+        [5] = '#744500',
+        [6] = '#603700',
+        [7] = '#4e2c00',
+        [8] = '#3f2200',
+        [9] = '#2e1800',
+      }),
+      green = m({
+        [0] = '#d2fedb',
+        [1] = '#82e596',
+        [2] = '#43c663',
+        [3] = '#26a148',
+        [4] = '#117f32',
+        [5] = '#055d20',
+        [6] = '#024c1a',
+        [7] = '#013d14',
+        [8] = '#003110',
+        [9] = '#00230b',
+      }),
+      orange = m({
+        [0] = '#fff2d5',
+        [1] = '#ffc67b',
+        [2] = '#f99636',
+        [3] = '#dc6d1a',
+        [4] = '#b45105',
+        [5] = '#873800',
+        [6] = '#702c00',
+        [7] = '#5b2300',
         [8] = '#491b00',
         [9] = '#361200',
       }),
+      blue = m({
+        [0] = '#dff7ff',
+        [1] = '#9cd7ff',
+        [2] = '#67b3fd',
+        [3] = '#368cf9',
+        [4] = '#1168e3',
+        [5] = '#0349b4',
+        [6] = '#023b95',
+        [7] = '#022f7a',
+        [8] = '#032563',
+        [9] = '#021a4a',
+      }),
       red = m({
         [0] = '#fff0ee',
         [1] = '#ffc1bc',
@@ -1034,17 +1088,17 @@ local M = m({
         [8] = '#5a0016',
         [9] = '#430011',
       }),
-      purple = m({
-        [0] = '#faf0fe',
-        [1] = '#e0c5ff',
-        [2] = '#c49bff',
-        [3] = '#a371f7',
-        [4] = '#844ae7',
-        [5] = '#622cbc',
-        [6] = '#512598',
-        [7] = '#411d7b',
-        [8] = '#341763',
-        [9] = '#260f49',
+      pink = m({
+        [0] = '#feeff7',
+        [1] = '#ffbde0',
+        [2] = '#fc87ca',
+        [3] = '#ed4baf',
+        [4] = '#c9248e',
+        [5] = '#971368',
+        [6] = '#7d0c57',
+        [7] = '#660847',
+        [8] = '#53043a',
+        [9] = '#3e022b',
       }),
       neutral = m({
         [0] = '#ffffff',
@@ -1058,623 +1112,569 @@ local M = m({
         [8] = '#20252c',
         [9] = '#0e1116',
       }),
-      transparent = '#ffffff00',
-      coral = m({
-        [0] = '#fff0ed',
-        [1] = '#ffc2b6',
-        [2] = '#ff8f7e',
-        [3] = '#cd3425',
-        [4] = '#ef5b48',
-        [5] = '#9f1710',
-        [6] = '#870706',
-        [7] = '#6f0107',
-        [8] = '#5b0002',
-        [9] = '#430200',
-      }),
     }),
   }),
-  focus = m({
-    outlineColor = '#0349b4',
-    outline = '#0349b4 solid 2px',
-  }),
-  headerSearch = m({
-    bgColor = '#0e1116',
-    borderColor = '#4b535d',
-  }),
-  highlight = m({
-    neutral = m({
-      bgColor = '#fcf7be',
+  borderColor = m({
+    done = m({
+      muted = '#a371f7',
+      emphasis = '#622cbc',
     }),
-  }),
-  card = m({
-    bgColor = '#ffffff',
-  }),
-  display = m({
-    lemon = m({
-      bgColor = m({
-        muted = '#f7eea1',
-        emphasis = '#866e04',
-      }),
-      borderColor = m({
-        muted = '#f0db3d',
-        emphasis = '#866e04',
-      }),
-      fgColor = '#786002',
+    disabled = '#ced5dcb3',
+    danger = m({
+      muted = '#ee5a5d',
+      emphasis = '#a0111f',
     }),
-    yellow = m({
-      bgColor = m({
-        muted = '#ffec9e',
-        emphasis = '#946a00',
-      }),
-      borderColor = m({
-        muted = '#ffd642',
-        emphasis = '#946a00',
-      }),
-      fgColor = '#805900',
+    closed = m({
+      muted = '#ee5a5d66',
+      emphasis = '#a0111f',
     }),
-    indigo = m({
-      bgColor = m({
-        muted = '#e5e9ff',
-        emphasis = '#5a61e7',
+    attention = m({
+      muted = '#b58407',
+      emphasis = '#744500',
+    }),
+    accent = m({
+      muted = '#368cf9',
+      emphasis = '#0349b4',
+    }),
+    emphasis = '#66707b',
+    neutral = m({
+      muted = '#88929d',
+      emphasis = '#66707b',
+    }),
+    open = m({
+      muted = '#26a148',
+      emphasis = '#055d20',
+    }),
+    transparent = '#ffffff00',
+    upsell = m({
+      muted = '#a371f766',
+      emphasis = '#622cbc',
+    }),
+    success = m({
+      muted = '#26a148',
+      emphasis = '#055d20',
+    }),
+    default = '#20252c',
+    severe = m({
+      muted = '#dc6d1a',
+      emphasis = '#873800',
+    }),
+    sponsors = m({
+      muted = '#ed4baf',
+      emphasis = '#971368',
+    }),
+    muted = '#88929d',
+    translucent = '#20252c',
+  }),
+  controlKnob = m({
+    borderColor = m({
+      disabled = '#ced5dcb3',
+      checked = '#0349b4',
+      rest = '#20252c',
+    }),
+    bgColor = m({
+      disabled = '#ced5dcb3',
+      checked = '#ffffff',
+      rest = '#ffffff',
+    }),
+  }),
+  headerSearch = m({
+    borderColor = '#4b535d',
+    bgColor = '#0e1116',
+  }),
+  data = m({
+    purple = m({
+      color = m({
+        muted = '#f1e5ff',
+        default = '#894ceb',
       }),
-      borderColor = m({
-        muted = '#d2d7fe',
-        emphasis = '#5a61e7',
+    }),
+    auburn = m({
+      color = m({
+        muted = '#f2e9e9',
+        default = '#9d615c',
       }),
-      fgColor = '#494edf',
     }),
-    teal = m({
-      bgColor = m({
-        muted = '#c7f5ef',
-        emphasis = '#127e81',
+    pink = m({
+      color = m({
+        muted = '#ffe5f1',
+        default = '#ce2c85',
       }),
-      borderColor = m({
-        muted = '#89ebe1',
-        emphasis = '#127e81',
+    }),
+    yellow = m({
+      color = m({
+        muted = '#ffec9e',
+        default = '#b88700',
       }),
-      fgColor = '#106e75',
     }),
     green = m({
-      bgColor = m({
+      color = m({
         muted = '#caf7ca',
-        emphasis = '#2c8141',
-      }),
-      borderColor = m({
-        muted = '#9ceda0',
-        emphasis = '#2c8141',
+        default = '#30a147',
       }),
-      fgColor = '#2b6e3f',
     }),
-    red = m({
-      bgColor = m({
-        muted = '#ffe2e0',
-        emphasis = '#df0c24',
+    orange = m({
+      color = m({
+        muted = '#ffe7d1',
+        default = '#eb670f',
       }),
-      borderColor = m({
-        muted = '#fecdcd',
-        emphasis = '#df0c24',
+    }),
+    teal = m({
+      color = m({
+        muted = '#c7f5ef',
+        default = '#179b9b',
       }),
-      fgColor = '#c50d28',
     }),
     gray = m({
-      bgColor = m({
+      color = m({
         muted = '#e8ecf2',
-        emphasis = '#647182',
-      }),
-      borderColor = m({
-        muted = '#d2dae4',
-        emphasis = '#647182',
+        default = '#808fa3',
       }),
-      fgColor = '#5c6570',
     }),
-    purple = m({
-      bgColor = m({
-        muted = '#f1e5ff',
-        emphasis = '#894ceb',
-      }),
-      borderColor = m({
-        muted = '#e6d2fe',
-        emphasis = '#894ceb',
+    blue = m({
+      color = m({
+        muted = '#d1f0ff',
+        default = '#006edb',
       }),
-      fgColor = '#783ae4',
     }),
-    cyan = m({
-      bgColor = m({
-        muted = '#bdf4ff',
-        emphasis = '#007b94',
-      }),
-      borderColor = m({
-        muted = '#7ae9ff',
-        emphasis = '#007b94',
+    red = m({
+      color = m({
+        muted = '#ffe2e0',
+        default = '#df0c24',
       }),
-      fgColor = '#006a80',
     }),
-    plum = m({
-      bgColor = m({
-        muted = '#f8e5ff',
-        emphasis = '#a830e8',
-      }),
-      borderColor = m({
-        muted = '#f0cdfe',
-        emphasis = '#a830e8',
-      }),
-      fgColor = '#961edc',
+  }),
+  control = m({
+    borderColor = m({
+      warning = '#744500',
+      disabled = '#ced5dcb3',
+      selected = '#ffffff',
+      rest = '#20252c',
+      danger = '#a0111f',
+      emphasis = '#20252c',
+      success = '#055d20',
     }),
-    coral = m({
-      bgColor = m({
-        muted = '#ffe5db',
-        emphasis = '#d43511',
-      }),
+    checked = m({
       borderColor = m({
-        muted = '#fecebe',
-        emphasis = '#d43511',
-      }),
-      fgColor = '#ba2e12',
-    }),
-    pink = m({
-      bgColor = m({
-        muted = '#ffe5f1',
-        emphasis = '#ce2c85',
+        active = '#033f9d',
+        disabled = '#66707b',
+        rest = '#0349b4',
+        hover = '#0344a8',
       }),
-      borderColor = m({
-        muted = '#fdc9e2',
-        emphasis = '#ce2c85',
+      fgColor = m({
+        disabled = '#ffffff',
+        rest = '#ffffff',
       }),
-      fgColor = '#b12f79',
-    }),
-    brown = m({
       bgColor = m({
-        muted = '#eeeae2',
-        emphasis = '#856d4c',
-      }),
-      borderColor = m({
-        muted = '#dfd7c8',
-        emphasis = '#856d4c',
+        active = '#033f9d',
+        disabled = '#66707b',
+        rest = '#0349b4',
+        hover = '#0344a8',
       }),
-      fgColor = '#755f43',
     }),
-    pine = m({
+    danger = m({
       bgColor = m({
-        muted = '#bff8db',
-        emphasis = '#167e53',
+        active = '#8c0b1d',
+        hover = '#a0111f',
       }),
-      borderColor = m({
-        muted = '#80efb9',
-        emphasis = '#167e53',
+      fgColor = m({
+        hover = '#ffffff',
+        rest = '#8a071e',
       }),
-      fgColor = '#156f4b',
     }),
-    blue = m({
-      bgColor = m({
-        muted = '#d1f0ff',
-        emphasis = '#006edb',
-      }),
-      borderColor = m({
-        muted = '#ade1ff',
-        emphasis = '#006edb',
-      }),
-      fgColor = '#005fcc',
+    iconColor = m({
+      rest = '#0e1116',
     }),
-    orange = m({
-      bgColor = m({
-        muted = '#ffe7d1',
-        emphasis = '#b8500f',
-      }),
-      borderColor = m({
-        muted = '#fecfaa',
-        emphasis = '#b8500f',
-      }),
-      fgColor = '#a24610',
+    fgColor = m({
+      placeholder = '#616a75',
+      disabled = '#66707b',
+      rest = '#0e1116',
     }),
-    auburn = m({
-      bgColor = m({
-        muted = '#f2e9e9',
-        emphasis = '#9d615c',
-      }),
+    transparent = m({
       borderColor = m({
-        muted = '#e6d6d5',
-        emphasis = '#9d615c',
+        active = '#ffffff00',
+        rest = '#ffffff00',
+        hover = '#20252c',
       }),
-      fgColor = '#8a5551',
-    }),
-    olive = m({
       bgColor = m({
-        muted = '#f0f0ad',
-        emphasis = '#64762d',
-      }),
-      borderColor = m({
-        muted = '#dbe170',
-        emphasis = '#64762d',
+        disabled = '#ced5dcb3',
+        selected = '#ced5dc33',
+        rest = '#ffffff00',
+        active = '#ced5dc',
+        hover = '#e7ecf0',
       }),
-      fgColor = '#56682c',
     }),
-    lime = m({
-      bgColor = m({
-        muted = '#e3f2b5',
-        emphasis = '#527a29',
-      }),
-      borderColor = m({
-        muted = '#c7e580',
-        emphasis = '#527a29',
-      }),
-      fgColor = '#476c28',
+    bgColor = m({
+      disabled = '#ced5dcb3',
+      selected = '#acb6c0',
+      rest = '#e7ecf0',
+      active = '#cfd6dd',
+      hover = '#dbe1e6',
+    }),
+  }),
+  topicTag = m({
+    borderColor = '#0349b4',
+  }),
+  timelineBadge = m({
+    bgColor = '#e7ecf0',
+  }),
+  bgColor = m({
+    done = m({
+      muted = '#faf0fe',
+      emphasis = '#622cbc',
+    }),
+    disabled = '#ced5dcb3',
+    inset = '#ffffff',
+    closed = m({
+      muted = '#fff0ee',
+      emphasis = '#a0111f',
+    }),
+    black = '#010409',
+    attention = m({
+      muted = '#fcf7be',
+      emphasis = '#744500',
+    }),
+    accent = m({
+      muted = '#dff7ff',
+      emphasis = '#0349b4',
+    }),
+    emphasis = '#0e1116',
+    neutral = m({
+      muted = '#e7ecf0',
+      emphasis = '#66707b',
+    }),
+    inverse = '#0e1116',
+    open = m({
+      muted = '#d2fedb',
+      emphasis = '#055d20',
+    }),
+    transparent = '#ffffff00',
+    white = '#ffffff',
+    upsell = m({
+      muted = '#faf0fe',
+      emphasis = '#622cbc',
+    }),
+    success = m({
+      muted = '#d2fedb',
+      emphasis = '#055d20',
+    }),
+    default = '#ffffff',
+    severe = m({
+      muted = '#fff2d5',
+      emphasis = '#873800',
+    }),
+    sponsors = m({
+      muted = '#feeff7',
+      emphasis = '#971368',
+    }),
+    muted = '#e7ecf0',
+    danger = m({
+      muted = '#fff0ee',
+      emphasis = '#a0111f',
+    }),
+  }),
+  skeletonLoader = m({
+    bgColor = '#e7ecf0',
+  }),
+  underlineNav = m({
+    borderColor = m({
+      active = '#cd3425',
+      hover = '#88929d',
+    }),
+    iconColor = m({
+      rest = '#0e1116',
     }),
   }),
-  buttonCounter = m({
-    invisible = m({
+  label = m({
+    cyan = m({
       bgColor = m({
-        rest = '#66707b33',
+        active = '#00d0fa',
+        rest = '#bdf4ff',
+        hover = '#7ae9ff',
+      }),
+      fgColor = m({
+        active = '#004857',
+        rest = '#006a80',
+        hover = '#00596b',
       }),
     }),
-    default = m({
+    purple = m({
       bgColor = m({
-        rest = '#66707b33',
+        active = '#d1b1fc',
+        rest = '#f1e5ff',
+        hover = '#e6d2fe',
       }),
-    }),
-    danger = m({
       fgColor = m({
-        rest = '#980e1e',
-        disabled = '#8a071e80',
-        hover = '#ffffff',
+        active = '#4f21ab',
+        rest = '#783ae4',
+        hover = '#6223d7',
       }),
+    }),
+    coral = m({
       bgColor = m({
-        rest = '#a0111f1a',
-        disabled = '#a0111f0d',
-        hover = '#ffffff33',
+        active = '#fcab92',
+        rest = '#ffe5db',
+        hover = '#fecebe',
+      }),
+      fgColor = m({
+        active = '#7e2011',
+        rest = '#ba2e12',
+        hover = '#9b2712',
       }),
     }),
-    primary = m({
+    plum = m({
       bgColor = m({
-        rest = '#00230b33',
+        active = '#e2a7fb',
+        rest = '#f8e5ff',
+        hover = '#f0cdfe',
       }),
-    }),
-    outline = m({
       fgColor = m({
-        rest = '#023b95',
-        disabled = '#023b9580',
-        hover = '#ffffff',
+        active = '#651d96',
+        rest = '#961edc',
+        hover = '#7d1eb8',
       }),
+    }),
+    brown = m({
       bgColor = m({
-        rest = '#0349b41a',
-        disabled = '#0349b40d',
-        hover = '#ffffff33',
+        active = '#cbbda4',
+        rest = '#eeeae2',
+        hover = '#dfd7c8',
+      }),
+      fgColor = m({
+        active = '#51412f',
+        rest = '#755f43',
+        hover = '#64513a',
       }),
     }),
-  }),
-  data = m({
     pink = m({
-      color = m({
-        muted = '#ffe5f1',
-        default = '#ce2c85',
+      bgColor = m({
+        active = '#f8a5cf',
+        rest = '#ffe5f1',
+        hover = '#fdc9e2',
       }),
-    }),
-    yellow = m({
-      color = m({
-        muted = '#ffec9e',
-        default = '#b88700',
+      fgColor = m({
+        active = '#6e2b53',
+        rest = '#b12f79',
+        hover = '#8e2e66',
       }),
     }),
-    teal = m({
-      color = m({
-        muted = '#c7f5ef',
-        default = '#179b9b',
+    blue = m({
+      bgColor = m({
+        active = '#75c8ff',
+        rest = '#d1f0ff',
+        hover = '#ade1ff',
       }),
-    }),
-    green = m({
-      color = m({
-        muted = '#caf7ca',
-        default = '#30a147',
+      fgColor = m({
+        active = '#003d99',
+        rest = '#005fcc',
+        hover = '#004db3',
       }),
     }),
     orange = m({
-      color = m({
-        muted = '#ffe7d1',
-        default = '#eb670f',
-      }),
-    }),
-    red = m({
-      color = m({
-        muted = '#ffe2e0',
-        default = '#df0c24',
-      }),
-    }),
-    gray = m({
-      color = m({
-        muted = '#e8ecf2',
-        default = '#808fa3',
+      bgColor = m({
+        active = '#fbaf74',
+        rest = '#ffe7d1',
+        hover = '#fecfaa',
       }),
-    }),
-    purple = m({
-      color = m({
-        muted = '#f1e5ff',
-        default = '#894ceb',
+      fgColor = m({
+        active = '#70300f',
+        rest = '#a24610',
+        hover = '#8d3c11',
       }),
     }),
     auburn = m({
-      color = m({
-        muted = '#f2e9e9',
-        default = '#9d615c',
+      bgColor = m({
+        active = '#d4b7b5',
+        rest = '#f2e9e9',
+        hover = '#e6d6d5',
       }),
-    }),
-    blue = m({
-      color = m({
-        muted = '#d1f0ff',
-        default = '#006edb',
+      fgColor = m({
+        active = '#5d3937',
+        rest = '#8a5551',
+        hover = '#744744',
       }),
     }),
-  }),
-  page = m({
-    header = m({
-      bgColor = '#e7ecf0',
-    }),
-  }),
-  skeletonLoader = m({
-    bgColor = '#e7ecf0',
-  }),
-  borderColor = m({
-    transparent = '#ffffff00',
-    upsell = m({
-      muted = '#a371f766',
-      emphasis = '#622cbc',
-    }),
-    success = m({
-      muted = '#26a148',
-      emphasis = '#055d20',
-    }),
-    sponsors = m({
-      muted = '#ed4baf',
-      emphasis = '#971368',
-    }),
-    severe = m({
-      muted = '#dc6d1a',
-      emphasis = '#873800',
-    }),
-    muted = '#88929d',
-    done = m({
-      muted = '#a371f7',
-      emphasis = '#622cbc',
-    }),
-    disabled = '#ced5dcb3',
-    danger = m({
-      muted = '#ee5a5d',
-      emphasis = '#a0111f',
-    }),
-    closed = m({
-      muted = '#ee5a5d66',
-      emphasis = '#a0111f',
-    }),
-    attention = m({
-      muted = '#b58407',
-      emphasis = '#744500',
-    }),
-    accent = m({
-      muted = '#368cf9',
-      emphasis = '#0349b4',
-    }),
-    emphasis = '#66707b',
-    open = m({
-      muted = '#26a148',
-      emphasis = '#055d20',
-    }),
-    translucent = '#20252c',
-    default = '#20252c',
-    neutral = m({
-      muted = '#88929d',
-      emphasis = '#66707b',
-    }),
-  }),
-  underlineNav = m({
-    iconColor = m({
-      rest = '#0e1116',
-    }),
-    borderColor = m({
-      hover = '#88929d',
-      active = '#cd3425',
-    }),
-  }),
-  timelineBadge = m({
-    bgColor = '#e7ecf0',
-  }),
-  treeViewItem = m({
-    leadingVisual = m({
-      iconColor = m({
-        rest = '#368cf9',
+    olive = m({
+      bgColor = m({
+        active = '#b9c832',
+        rest = '#f0f0ad',
+        hover = '#dbe170',
+      }),
+      fgColor = m({
+        active = '#3b4927',
+        rest = '#56682c',
+        hover = '#495a2b',
       }),
     }),
-  }),
-  control = m({
-    bgColor = m({
-      hover = '#dbe1e6',
-      active = '#cfd6dd',
-      selected = '#acb6c0',
-      rest = '#e7ecf0',
-      disabled = '#ced5dcb3',
-    }),
-    borderColor = m({
-      danger = '#a0111f',
-      disabled = '#ced5dcb3',
-      selected = '#ffffff',
-      rest = '#20252c',
-      warning = '#744500',
-      success = '#055d20',
-      emphasis = '#20252c',
-    }),
-    transparent = m({
+    lime = m({
       bgColor = m({
-        hover = '#e7ecf0',
-        active = '#ced5dc',
-        selected = '#ced5dc33',
-        rest = '#ffffff00',
-        disabled = '#ced5dcb3',
+        active = '#9bd039',
+        rest = '#e3f2b5',
+        hover = '#c7e580',
       }),
-      borderColor = m({
-        rest = '#ffffff00',
-        active = '#ffffff00',
-        hover = '#20252c',
+      fgColor = m({
+        active = '#2f4a21',
+        rest = '#476c28',
+        hover = '#3a5b25',
       }),
     }),
-    checked = m({
+    lemon = m({
       bgColor = m({
-        rest = '#0349b4',
-        disabled = '#66707b',
-        active = '#033f9d',
-        hover = '#0344a8',
-      }),
-      borderColor = m({
-        rest = '#0349b4',
-        disabled = '#66707b',
-        active = '#033f9d',
-        hover = '#0344a8',
+        active = '#d8bd0e',
+        rest = '#f7eea1',
+        hover = '#f0db3d',
       }),
       fgColor = m({
-        rest = '#ffffff',
-        disabled = '#ffffff',
+        active = '#523f00',
+        rest = '#786002',
+        hover = '#654f01',
       }),
     }),
-    iconColor = m({
-      rest = '#0e1116',
-    }),
-    danger = m({
+    indigo = m({
+      bgColor = m({
+        active = '#b1b9fb',
+        rest = '#e5e9ff',
+        hover = '#d2d7fe',
+      }),
       fgColor = m({
-        rest = '#8a071e',
-        hover = '#ffffff',
+        active = '#2d2db4',
+        rest = '#494edf',
+        hover = '#393cd5',
       }),
+    }),
+    yellow = m({
       bgColor = m({
-        hover = '#a0111f',
-        active = '#8c0b1d',
+        active = '#ebb400',
+        rest = '#ffec9e',
+        hover = '#ffd642',
+      }),
+      fgColor = m({
+        active = '#5c3d00',
+        rest = '#805900',
+        hover = '#704d00',
       }),
     }),
-    fgColor = m({
-      rest = '#0e1116',
-      disabled = '#66707b',
-      placeholder = '#616a75',
-    }),
-  }),
-  topicTag = m({
-    borderColor = '#0349b4',
-  }),
-  button = m({
-    star = m({
-      iconColor = '#d5a824',
-    }),
-    invisible = m({
+    green = m({
       bgColor = m({
-        rest = '#ffffff00',
-        disabled = '#ced5dcb3',
-        active = '#4b535d',
-        hover = '#20252c',
+        active = '#54d961',
+        rest = '#caf7ca',
+        hover = '#9ceda0',
       }),
-      borderColor = m({
-        rest = '#ffffff00',
-        disabled = '#ced5dcb3',
-        hover = '#20252c',
+      fgColor = m({
+        active = '#254b34',
+        rest = '#2b6e3f',
+        hover = '#285c3b',
       }),
-      iconColor = m({
-        rest = '#0e1116',
-        disabled = '#66707b',
-        hover = '#ffffff',
+    }),
+    teal = m({
+      bgColor = m({
+        active = '#22d3c7',
+        rest = '#c7f5ef',
+        hover = '#89ebe1',
       }),
       fgColor = m({
-        rest = '#023b95',
-        disabled = '#66707b',
-        hover = '#67b3fd',
+        active = '#0a4852',
+        rest = '#106e75',
+        hover = '#0d5b63',
       }),
     }),
-    outline = m({
+    gray = m({
       bgColor = m({
-        rest = '#e7ecf0',
-        disabled = '#ffffff',
-        active = '#033f9d',
-        hover = '#0349b4',
-      }),
-      borderColor = m({
-        hover = '#01040926',
-        active = '#01040926',
+        active = '#b4c0cf',
+        rest = '#e8ecf2',
+        hover = '#d2dae4',
       }),
       fgColor = m({
-        rest = '#023b95',
-        disabled = '#023b9580',
-        active = '#ffffff',
-        hover = '#ffffff',
-      }),
-      shadow = m({
-        selected = 'inset 0px 1px 0px 0px #021a4a33',
+        active = '#424448',
+        rest = '#5c6570',
+        hover = '#4e535a',
       }),
     }),
-    danger = m({
+    pine = m({
       bgColor = m({
-        rest = '#e7ecf0',
-        disabled = '#ced5dcb3',
-        active = '#74041a',
-        hover = '#86061d',
+        active = '#1dd781',
+        rest = '#bff8db',
+        hover = '#80efb9',
       }),
-      borderColor = m({
-        rest = '#20252c',
-        active = '#01040926',
-        hover = '#01040926',
+      fgColor = m({
+        active = '#114b36',
+        rest = '#156f4b',
+        hover = '#135d41',
       }),
-      iconColor = m({
-        rest = '#8a071e',
-        hover = '#ffffff',
+    }),
+    red = m({
+      bgColor = m({
+        active = '#fda5a7',
+        rest = '#ffe2e0',
+        hover = '#fecdcd',
       }),
       fgColor = m({
-        rest = '#8a071e',
-        disabled = '#8a071e80',
-        active = '#ffffff',
-        hover = '#ffffff',
+        active = '#880c27',
+        rest = '#c50d28',
+        hover = '#a60c29',
       }),
-      shadow = m({
-        selected = 'inset 0px 1px 0px 0px #43001133',
+    }),
+  }),
+  sideNav = m({
+    bgColor = m({
+      selected = '#ffffff',
+    }),
+  }),
+  treeViewItem = m({
+    leadingVisual = m({
+      iconColor = m({
+        rest = '#368cf9',
       }),
     }),
-    default = m({
+  }),
+  selection = m({
+    bgColor = '#0349b433',
+  }),
+  shadow = m({
+    floating = m({
+      small = '0px 0px 0px 1px #88929d80, 0px 6px 12px -3px #343b430a, 0px 6px 18px 0px #343b431f',
+      medium = '0px 0px 0px 1px #88929d, 0px 8px 16px -4px #343b4314, 0px 4px 32px -4px #343b4314, 0px 24px 48px -12px #343b4314, 0px 48px 96px -24px #343b4314',
+      xlarge = '0px 0px 0px 1px #88929d, 0px 56px 112px 0px #343b4352',
+      legacy = '0px 6px 12px -3px #343b430a, 0px 6px 18px 0px #343b431f',
+      large = '0px 0px 0px 1px #88929d, 0px 40px 80px 0px #343b433d',
+    }),
+    inset = 'inset 0px 1px 0px 0px #0104090a',
+    resting = m({
+      small = '0px 1px 0px 0px #0104090a',
+      xsmall = '0px 1px 0px 0px #0104091a',
+      medium = '0px 3px 6px 0px #343b431f',
+    }),
+  }),
+  diffBlob = m({
+    deletion = m({
       bgColor = m({
-        hover = '#dbe1e6',
-        active = '#cfd6dd',
-        selected = '#cfd6dd',
-        rest = '#e7ecf0',
-        disabled = '#ced5dcb3',
-      }),
-      borderColor = m({
-        rest = '#20252c',
-        disabled = '#ced5dcb3',
-        active = '#20252c',
-        hover = '#20252c',
+        line = '#fff0ee',
+        word = '#a0111f',
+        num = '#ffc1bc',
       }),
       fgColor = m({
-        rest = '#0e1116',
-      }),
-      shadow = m({
-        resting = '0px 1px 0px 0px #0104090a',
+        num = '#010409',
+        text = '#ffffff',
       }),
     }),
-    primary = m({
+    hunk = m({
       bgColor = m({
-        rest = '#055d20',
-        disabled = '#85cb97',
-        active = '#03501b',
-        hover = '#04571e',
-      }),
-      borderColor = m({
-        rest = '#013d14',
-        disabled = '#85cb97',
-        active = '#013d14',
-        hover = '#013d14',
+        num = '#9cd7ff',
       }),
-      iconColor = m({
-        rest = '#ffffffcc',
+    }),
+    addition = m({
+      bgColor = m({
+        line = '#d2fedb',
+        word = '#117f32',
+        num = '#c2f9cd',
       }),
       fgColor = m({
-        rest = '#ffffff',
-        disabled = '#ffffffcc',
-      }),
-      shadow = m({
-        selected = 'inset 0px 1px 0px 0px #00230b4d',
+        num = '#010409',
+        text = '#ffffff',
       }),
     }),
-    inactive = m({
-      fgColor = '#4b535d',
-      bgColor = '#e7ecf0',
+    expander = m({
+      iconColor = '#0e1116',
     }),
   }),
 })
diff --git a/lua/github-theme/palette/primitives/light_tritanopia.lua b/lua/github-theme/palette/primitives/light_tritanopia.lua
index 0ecafcd..4d7e10e 100644
--- a/lua/github-theme/palette/primitives/light_tritanopia.lua
+++ b/lua/github-theme/palette/primitives/light_tritanopia.lua
@@ -18,12 +18,8 @@ local M = m({
     bgColor = '#eaeef2',
   }),
   bgColor = m({
-    attention = m({
-      emphasis = '#9a6700',
-      muted = '#fff8c5',
-    }),
     white = '#ffffff',
-    inset = '#f6f8fa',
+    default = '#ffffff',
     success = m({
       emphasis = '#0f72e3',
       muted = '#ddf4ff',
@@ -36,9 +32,8 @@ local M = m({
       emphasis = '#cf222e',
       muted = '#ffebe9',
     }),
-    default = '#ffffff',
     muted = '#f6f8fa',
-    inverse = '#24292f',
+    inset = '#f6f8fa',
     done = m({
       emphasis = '#8250df',
       muted = '#fbefff',
@@ -48,162 +43,48 @@ local M = m({
       emphasis = '#cf222e',
       muted = '#ffebe9',
     }),
-    open = m({
-      emphasis = '#cf222e',
-      muted = '#ffebe9',
-    }),
-    transparent = '#ffffff00',
-    neutral = m({
+    closed = m({
       emphasis = '#6e7781',
-      muted = '#afb8c133',
+      muted = '#f6f8fa',
     }),
+    black = '#1f2328',
+    transparent = '#ffffff00',
     accent = m({
       emphasis = '#0969da',
       muted = '#ddf4ff',
     }),
-    black = '#1f2328',
-    closed = m({
+    open = m({
+      emphasis = '#cf222e',
+      muted = '#ffebe9',
+    }),
+    attention = m({
+      emphasis = '#9a6700',
+      muted = '#fff8c5',
+    }),
+    neutral = m({
       emphasis = '#6e7781',
-      muted = '#f6f8fa',
+      muted = '#afb8c133',
     }),
     upsell = m({
       emphasis = '#8250df',
       muted = '#fbefff',
     }),
+    inverse = '#24292f',
     emphasis = '#24292f',
   }),
   skeletonLoader = m({
     bgColor = '#f6f8fa',
   }),
+  highlight = m({
+    neutral = m({
+      bgColor = '#fff8c5',
+    }),
+  }),
   sideNav = m({
     bgColor = m({
       selected = '#ffffff',
     }),
   }),
-  button = m({
-    inactive = m({
-      bgColor = '#eaeef2',
-      fgColor = '#57606a',
-    }),
-    star = m({
-      iconColor = '#eac54f',
-    }),
-    default = m({
-      borderColor = m({
-        rest = '#d0d7de',
-        active = '#d0d7de',
-        disabled = '#eaeef2b3',
-        hover = '#d0d7de',
-      }),
-      fgColor = m({
-        rest = '#24292f',
-      }),
-      shadow = m({
-        resting = '0px 1px 0px 0px #1f23280a',
-      }),
-      bgColor = m({
-        hover = '#eef1f4',
-        selected = '#e7ebef',
-        active = '#e7ebef',
-        disabled = '#eaeef2b3',
-        rest = '#f6f8fa',
-      }),
-    }),
-    invisible = m({
-      borderColor = m({
-        rest = '#ffffff00',
-        disabled = '#eaeef2b3',
-        hover = '#ffffff00',
-      }),
-      fgColor = m({
-        rest = '#0969da',
-        disabled = '#8c959f',
-        hover = '#0969da',
-      }),
-      iconColor = m({
-        rest = '#636c76',
-        disabled = '#8c959f',
-        hover = '#636c76',
-      }),
-      bgColor = m({
-        rest = '#ffffff00',
-        active = '#d0d7de66',
-        disabled = '#eaeef2b3',
-        hover = '#d0d7de33',
-      }),
-    }),
-    outline = m({
-      borderColor = m({
-        active = '#1f232826',
-        hover = '#1f232826',
-      }),
-      fgColor = m({
-        rest = '#0969da',
-        active = '#ffffff',
-        disabled = '#0969da80',
-        hover = '#ffffff',
-      }),
-      shadow = m({
-        selected = 'inset 0px 1px 0px 0px #00215533',
-      }),
-      bgColor = m({
-        rest = '#f6f8fa',
-        active = '#0757ba',
-        disabled = '#f6f8fa',
-        hover = '#0969da',
-      }),
-    }),
-    danger = m({
-      iconColor = m({
-        hover = '#ffffff',
-        rest = '#d1242f',
-      }),
-      shadow = m({
-        selected = 'inset 0px 1px 0px 0px #4c001433',
-      }),
-      bgColor = m({
-        rest = '#f6f8fa',
-        active = '#8b0820',
-        disabled = '#eaeef2b3',
-        hover = '#a40e26',
-      }),
-      borderColor = m({
-        active = '#1f232826',
-        rest = '#d0d7de',
-        hover = '#1f232826',
-      }),
-      fgColor = m({
-        rest = '#d1242f',
-        active = '#ffffff',
-        disabled = '#d1242f80',
-        hover = '#ffffff',
-      }),
-    }),
-    primary = m({
-      iconColor = m({
-        rest = '#ffffffcc',
-      }),
-      shadow = m({
-        selected = 'inset 0px 1px 0px 0px #0021554d',
-      }),
-      bgColor = m({
-        rest = '#0f72e3',
-        active = '#0b64ce',
-        disabled = '#92caff',
-        hover = '#0d6bd8',
-      }),
-      borderColor = m({
-        rest = '#1f232826',
-        active = '#1f232826',
-        disabled = '#92caff',
-        hover = '#1f232826',
-      }),
-      fgColor = m({
-        disabled = '#ffffffcc',
-        rest = '#ffffff',
-      }),
-    }),
-  }),
   shadow = m({
     floating = m({
       xlarge = '0px 0px 0px 1px #d0d7de, 0px 56px 112px 0px #424a5352',
@@ -219,18 +100,20 @@ local M = m({
       medium = '0px 3px 6px 0px #424a531f',
     }),
   }),
-  diffBlob = m({
-    deletion = m({
+  avatarStack = m({
+    fade = m({
       bgColor = m({
-        line = '#ffebe9',
-        word = '#ff818266',
-        num = '#ffcecb',
-      }),
-      fgColor = m({
-        num = '#1f2328',
-        text = '#1f2328',
+        default = '#afb8c1',
+        muted = '#d0d7de',
       }),
     }),
+  }),
+  avatar = m({
+    borderColor = '#1f232826',
+    shadow = '0px 0px 0px 2px #ffffffcc',
+    bgColor = '#ffffff',
+  }),
+  diffBlob = m({
     hunk = m({
       bgColor = m({
         num = '#54aeff66',
@@ -238,136 +121,204 @@ local M = m({
     }),
     addition = m({
       bgColor = m({
-        line = '#ddf4ff',
-        word = '#b6e3ff',
         num = '#d5f1ff',
+        word = '#b6e3ff',
+        line = '#ddf4ff',
       }),
       fgColor = m({
-        num = '#1f2328',
         text = '#1f2328',
+        num = '#1f2328',
       }),
     }),
     expander = m({
       iconColor = '#636c76',
     }),
-  }),
-  selectMenu = m({
-    borderColor = '#ffffff00',
-    bgColor = m({
-      active = '#b6e3ff',
-    }),
-  }),
-  avatar = m({
-    borderColor = '#1f232826',
-    shadow = '0px 0px 0px 2px #ffffffcc',
-    bgColor = '#ffffff',
-  }),
-  reactionButton = m({
-    selected = m({
+    deletion = m({
       bgColor = m({
-        hover = '#caecff',
-        rest = '#ddf4ff',
+        num = '#ffcecb',
+        word = '#ff818266',
+        line = '#ffebe9',
       }),
       fgColor = m({
-        hover = '#0550ae',
-        rest = '#0969da',
+        text = '#1f2328',
+        num = '#1f2328',
       }),
     }),
   }),
-  fgColor = m({
-    white = '#ffffff',
-    upsell = '#8250df',
-    success = '#0969da',
-    sponsors = '#bf3989',
-    severe = '#cf222e',
-    onEmphasis = '#ffffff',
-    muted = '#636c76',
-    link = '#0969da',
-    done = '#8250df',
-    disabled = '#8c959f',
-    danger = '#d1242f',
-    open = '#cf222e',
-    black = '#1f2328',
-    neutral = '#6e7781',
-    accent = '#0969da',
-    attention = '#9a6700',
-    default = '#1f2328',
-    closed = '#6e7781',
-  }),
-  headerSearch = m({
-    borderColor = '#57606a',
-    bgColor = '#24292f',
-  }),
-  page = m({
-    header = m({
-      bgColor = '#f6f8fa',
+  data = m({
+    pink = m({
+      color = m({
+        default = '#ce2c85',
+        muted = '#ffe5f1',
+      }),
     }),
-  }),
-  header = m({
-    borderColor = m({
-      divider = '#57606a',
+    yellow = m({
+      color = m({
+        default = '#b88700',
+        muted = '#ffec9e',
+      }),
     }),
-    fgColor = m({
-      default = '#ffffffb3',
-      logo = '#ffffff',
+    teal = m({
+      color = m({
+        default = '#179b9b',
+        muted = '#c7f5ef',
+      }),
     }),
-    bgColor = '#24292f',
-  }),
-  overlay = m({
-    borderColor = '#d0d7de80',
-    backdrop = m({
-      bgColor = '#8c959f33',
+    green = m({
+      color = m({
+        default = '#30a147',
+        muted = '#caf7ca',
+      }),
     }),
-    bgColor = '#ffffff',
-  }),
-  focus = m({
-    outline = '#0969da solid 2px',
-    outlineColor = '#0969da',
-  }),
-  codeMirror = m({
-    matchingBracket = m({
-      fgColor = '#1f2328',
+    orange = m({
+      color = m({
+        default = '#eb670f',
+        muted = '#ffe7d1',
+      }),
     }),
-    lineNumber = m({
-      fgColor = '#636c76',
+    red = m({
+      color = m({
+        default = '#df0c24',
+        muted = '#ffe2e0',
+      }),
     }),
-    selection = m({
-      bgColor = '#54aeff66',
+    gray = m({
+      color = m({
+        default = '#808fa3',
+        muted = '#e8ecf2',
+      }),
     }),
-    gutters = m({
-      bgColor = '#ffffff',
+    auburn = m({
+      color = m({
+        default = '#9d615c',
+        muted = '#f2e9e9',
+      }),
     }),
-    lines = m({
-      bgColor = '#ffffff',
+    purple = m({
+      color = m({
+        default = '#894ceb',
+        muted = '#f1e5ff',
+      }),
+    }),
+    blue = m({
+      color = m({
+        default = '#006edb',
+        muted = '#d1f0ff',
+      }),
+    }),
+  }),
+  selectMenu = m({
+    borderColor = '#ffffff00',
+    bgColor = m({
+      active = '#b6e3ff',
     }),
+  }),
+  codeMirror = m({
     gutterMarker = m({
       fgColor = m({
         default = '#ffffff',
         muted = '#636c76',
       }),
     }),
-    fgColor = '#1f2328',
+    cursor = m({
+      fgColor = '#1f2328',
+    }),
     syntax = m({
       fgColor = m({
+        keyword = '#cf222e',
         comment = '#24292f',
         variable = '#a40e26',
         constant = '#0550ae',
         storage = '#cf222e',
         entity = '#8250df',
         support = '#0550ae',
-        keyword = '#cf222e',
         string = '#0a3069',
       }),
     }),
     activeline = m({
       bgColor = '#afb8c133',
     }),
-    bgColor = '#ffffff',
-    cursor = m({
+    lines = m({
+      bgColor = '#ffffff',
+    }),
+    fgColor = '#1f2328',
+    matchingBracket = m({
       fgColor = '#1f2328',
     }),
+    bgColor = '#ffffff',
+    lineNumber = m({
+      fgColor = '#636c76',
+    }),
+    selection = m({
+      bgColor = '#54aeff66',
+    }),
+    gutters = m({
+      bgColor = '#ffffff',
+    }),
   }),
   scale = m({
+    coral = m({
+      [1] = '#fff0eb',
+      [2] = '#ffd6cc',
+      [3] = '#ffb4a1',
+      [4] = '#fd8c73',
+      [5] = '#ec6547',
+      [6] = '#c4432b',
+      [7] = '#9e2f1c',
+      [8] = '#801f0f',
+      [9] = '#691105',
+      [10] = '#510901',
+    }),
+    black = '#1f2328',
+    pink = m({
+      [1] = '#ffeff7',
+      [2] = '#ffd3eb',
+      [3] = '#ffadda',
+      [4] = '#ff80c8',
+      [5] = '#e85aad',
+      [6] = '#bf3989',
+      [7] = '#99286e',
+      [8] = '#772057',
+      [9] = '#611347',
+      [10] = '#4d0336',
+    }),
+    yellow = m({
+      [1] = '#fff8c5',
+      [2] = '#fae17d',
+      [3] = '#eac54f',
+      [4] = '#d4a72c',
+      [5] = '#bf8700',
+      [6] = '#9a6700',
+      [7] = '#7d4e00',
+      [8] = '#633c01',
+      [9] = '#4d2d00',
+      [10] = '#3b2300',
+    }),
+    white = '#ffffff',
+    blue = m({
+      [1] = '#ddf4ff',
+      [2] = '#b6e3ff',
+      [3] = '#80ccff',
+      [4] = '#54aeff',
+      [5] = '#218bff',
+      [6] = '#0969da',
+      [7] = '#0550ae',
+      [8] = '#033d8b',
+      [9] = '#0a3069',
+      [10] = '#002155',
+    }),
+    green = m({
+      [1] = '#dafbe1',
+      [2] = '#aceebb',
+      [3] = '#6fdd8b',
+      [4] = '#4ac26b',
+      [5] = '#2da44e',
+      [6] = '#1a7f37',
+      [7] = '#116329',
+      [8] = '#044f1e',
+      [9] = '#003d16',
+      [10] = '#002d11',
+    }),
     orange = m({
       [1] = '#fff1e5',
       [2] = '#ffd8b5',
@@ -393,18 +344,6 @@ local M = m({
       [10] = '#4c0014',
     }),
     transparent = '#ffffff00',
-    pink = m({
-      [1] = '#ffeff7',
-      [2] = '#ffd3eb',
-      [3] = '#ffadda',
-      [4] = '#ff80c8',
-      [5] = '#e85aad',
-      [6] = '#bf3989',
-      [7] = '#99286e',
-      [8] = '#772057',
-      [9] = '#611347',
-      [10] = '#4d0336',
-    }),
     purple = m({
       [1] = '#fbefff',
       [2] = '#ecd8ff',
@@ -417,7 +356,6 @@ local M = m({
       [9] = '#3e1f79',
       [10] = '#2e1461',
     }),
-    black = '#1f2328',
     neutral = m({
       [1] = '#f6f8fa',
       [2] = '#eaeef2',
@@ -430,578 +368,314 @@ local M = m({
       [9] = '#32383f',
       [10] = '#24292f',
     }),
-    blue = m({
-      [1] = '#ddf4ff',
-      [2] = '#b6e3ff',
-      [3] = '#80ccff',
-      [4] = '#54aeff',
-      [5] = '#218bff',
-      [6] = '#0969da',
-      [7] = '#0550ae',
-      [8] = '#033d8b',
-      [9] = '#0a3069',
-      [10] = '#002155',
-    }),
-    green = m({
-      [1] = '#dafbe1',
-      [2] = '#aceebb',
-      [3] = '#6fdd8b',
-      [4] = '#4ac26b',
-      [5] = '#2da44e',
-      [6] = '#1a7f37',
-      [7] = '#116329',
-      [8] = '#044f1e',
-      [9] = '#003d16',
-      [10] = '#002d11',
-    }),
-    white = '#ffffff',
-    coral = m({
-      [1] = '#fff0eb',
-      [2] = '#ffd6cc',
-      [3] = '#ffb4a1',
-      [4] = '#fd8c73',
-      [5] = '#ec6547',
-      [6] = '#c4432b',
-      [7] = '#9e2f1c',
-      [8] = '#801f0f',
-      [9] = '#691105',
-      [10] = '#510901',
-    }),
-    yellow = m({
-      [1] = '#fff8c5',
-      [2] = '#fae17d',
-      [3] = '#eac54f',
-      [4] = '#d4a72c',
-      [5] = '#bf8700',
-      [6] = '#9a6700',
-      [7] = '#7d4e00',
-      [8] = '#633c01',
-      [9] = '#4d2d00',
-      [10] = '#3b2300',
-    }),
-  }),
-  counter = m({
-    borderColor = '#ffffff00',
   }),
-  avatarStack = m({
-    fade = m({
-      bgColor = m({
-        default = '#afb8c1',
-        muted = '#d0d7de',
+  color = m({
+    ansi = m({
+      black = m({
+        default = '#24292f',
+        bright = '#57606a',
       }),
-    }),
-  }),
-  controlTrack = m({
-    borderColor = m({
-      disabled = '#8c959f',
-      rest = '#ffffff00',
-    }),
-    fgColor = m({
-      disabled = '#ffffff',
-      rest = '#636c76',
-    }),
-    bgColor = m({
-      rest = '#eaeef2',
-      active = '#d2d8de',
-      disabled = '#8c959f',
-      hover = '#dee3e8',
-    }),
-  }),
-  base = m({
-    color = m({
-      orange = m({
-        [0] = '#fff1e5',
-        [1] = '#ffd8b5',
-        [2] = '#ffb77c',
-        [3] = '#fb8f44',
-        [4] = '#e16f24',
-        [5] = '#bc4c00',
-        [6] = '#953800',
-        [7] = '#762c00',
-        [8] = '#5c2200',
-        [9] = '#471700',
-      }),
-      red = m({
-        [0] = '#ffebe9',
-        [1] = '#ffcecb',
-        [2] = '#ffaba8',
-        [3] = '#ff8182',
-        [4] = '#fa4549',
-        [5] = '#cf222e',
-        [6] = '#a40e26',
-        [7] = '#82071e',
-        [8] = '#660018',
-        [9] = '#4c0014',
-      }),
-      black = '#1f2328',
-      blue = m({
-        [0] = '#ddf4ff',
-        [1] = '#b6e3ff',
-        [2] = '#80ccff',
-        [3] = '#54aeff',
-        [4] = '#218bff',
-        [5] = '#0969da',
-        [6] = '#0550ae',
-        [7] = '#033d8b',
-        [8] = '#0a3069',
-        [9] = '#002155',
+      magenta = m({
+        default = '#8250df',
+        bright = '#a475f9',
       }),
-      purple = m({
-        [0] = '#fbefff',
-        [1] = '#ecd8ff',
-        [2] = '#d8b9ff',
-        [3] = '#c297ff',
-        [4] = '#a475f9',
-        [5] = '#8250df',
-        [6] = '#6639ba',
-        [7] = '#512a97',
-        [8] = '#3e1f79',
-        [9] = '#2e1461',
+      yellow = m({
+        default = '#4d2d00',
+        bright = '#633c01',
       }),
-      transparent = '#ffffff00',
-      neutral = m({
-        [0] = '#f6f8fa',
-        [1] = '#eaeef2',
-        [2] = '#d0d7de',
-        [3] = '#afb8c1',
-        [4] = '#8c959f',
-        [5] = '#6e7781',
-        [6] = '#57606a',
-        [7] = '#424a53',
-        [8] = '#32383f',
-        [9] = '#24292f',
+      white = m({
+        default = '#6e7781',
+        bright = '#8c959f',
       }),
-      coral = m({
-        [0] = '#fff0eb',
-        [1] = '#ffd6cc',
-        [2] = '#ffb4a1',
-        [3] = '#fd8c73',
-        [4] = '#ec6547',
-        [5] = '#c4432b',
-        [6] = '#9e2f1c',
-        [7] = '#801f0f',
-        [8] = '#691105',
-        [9] = '#510901',
+      blue = m({
+        default = '#0969da',
+        bright = '#218bff',
       }),
       green = m({
-        [0] = '#dafbe1',
-        [1] = '#aceebb',
-        [2] = '#6fdd8b',
-        [3] = '#4ac26b',
-        [4] = '#2da44e',
-        [5] = '#1a7f37',
-        [6] = '#116329',
-        [7] = '#044f1e',
-        [8] = '#003d16',
-        [9] = '#002d11',
+        default = '#0550ae',
+        bright = '#0969da',
       }),
-      white = '#ffffff',
-      pink = m({
-        [0] = '#ffeff7',
-        [1] = '#ffd3eb',
-        [2] = '#ffadda',
-        [3] = '#ff80c8',
-        [4] = '#e85aad',
-        [5] = '#bf3989',
-        [6] = '#99286e',
-        [7] = '#772057',
-        [8] = '#611347',
-        [9] = '#4d0336',
+      red = m({
+        default = '#cf222e',
+        bright = '#a40e26',
       }),
-      yellow = m({
-        [0] = '#fff8c5',
-        [1] = '#fae17d',
-        [2] = '#eac54f',
-        [3] = '#d4a72c',
-        [4] = '#bf8700',
-        [5] = '#9a6700',
-        [6] = '#7d4e00',
-        [7] = '#633c01',
-        [8] = '#4d2d00',
-        [9] = '#3b2300',
+      gray = '#6e7781',
+      cyan = m({
+        default = '#1b7c83',
+        bright = '#3192aa',
       }),
     }),
-    display = m({
-      color = m({
-        teal = m({
-          [0] = '#c7f5ef',
-          [1] = '#89ebe1',
-          [2] = '#22d3c7',
-          [3] = '#1db9b4',
-          [4] = '#179b9b',
-          [5] = '#127e81',
-          [6] = '#106e75',
-          [7] = '#0d5b63',
-          [8] = '#0a4852',
-          [9] = '#073740',
+    prettylights = m({
+      syntax = m({
+        keyword = '#cf222e',
+        invalid = m({
+          illegal = m({
+            text = '#f6f8fa',
+            bg = '#82071e',
+          }),
         }),
-        red = m({
-          [0] = '#ffe2e0',
-          [1] = '#fecdcd',
-          [2] = '#fda5a7',
-          [3] = '#fb8389',
-          [4] = '#f85461',
-          [5] = '#df0c24',
-          [6] = '#c50d28',
-          [7] = '#a60c29',
-          [8] = '#880c27',
-          [9] = '#610a20',
+        entity = m({
+          tag = '#0550ae',
+          default = '#6639ba',
         }),
-        gray = m({
-          [0] = '#e8ecf2',
-          [1] = '#d2dae4',
-          [2] = '#b4c0cf',
-          [3] = '#9ba9bb',
-          [4] = '#808fa3',
-          [5] = '#647182',
-          [6] = '#5c6570',
-          [7] = '#4e535a',
-          [8] = '#424448',
-          [9] = '#303031',
+        brackethighlighter = m({
+          unmatched = '#82071e',
+          angle = '#57606a',
         }),
-        cyan = m({
-          [0] = '#bdf4ff',
-          [1] = '#7ae9ff',
-          [2] = '#00d0fa',
-          [3] = '#00b7db',
-          [4] = '#0099b8',
-          [5] = '#007b94',
-          [6] = '#006a80',
-          [7] = '#00596b',
-          [8] = '#004857',
-          [9] = '#003742',
+        sublimelinter = m({
+          gutter = m({
+            mark = '#8c959f',
+          }),
         }),
-        white = '#ffffff',
-        pink = m({
-          [0] = '#ffe5f1',
-          [1] = '#fdc9e2',
-          [2] = '#f8a5cf',
-          [3] = '#f184bc',
-          [4] = '#e55da5',
-          [5] = '#ce2c85',
-          [6] = '#b12f79',
-          [7] = '#8e2e66',
-          [8] = '#6e2b53',
-          [9] = '#4d233d',
+        carriage = m({
+          ['return'] = m({
+            text = '#f6f8fa',
+            bg = '#cf222e',
+          }),
         }),
-        pine = m({
-          [0] = '#bff8db',
-          [1] = '#80efb9',
-          [2] = '#1dd781',
-          [3] = '#1dbf76',
-          [4] = '#1aa267',
-          [5] = '#167e53',
-          [6] = '#156f4b',
-          [7] = '#135d41',
-          [8] = '#114b36',
-          [9] = '#0d3627',
+        constant = m({
+          other = m({
+            reference = m({
+              link = '#0a3069',
+            }),
+          }),
+          default = '#0550ae',
         }),
-        auburn = m({
-          [0] = '#f2e9e9',
-          [1] = '#e6d6d5',
-          [2] = '#d4b7b5',
-          [3] = '#c59e9b',
-          [4] = '#b4827e',
-          [5] = '#9d615c',
-          [6] = '#8a5551',
-          [7] = '#744744',
-          [8] = '#5d3937',
-          [9] = '#432928',
+        comment = '#57606a',
+        string = m({
+          default = '#0a3069',
+          regexp = '#0550ae',
         }),
-        yellow = m({
-          [0] = '#ffec9e',
-          [1] = '#ffd642',
-          [2] = '#ebb400',
-          [3] = '#d19d00',
-          [4] = '#b88700',
-          [5] = '#946a00',
-          [6] = '#805900',
-          [7] = '#704d00',
-          [8] = '#5c3d00',
-          [9] = '#422b00',
+        storage = m({
+          modifier = m({
+            import = '#24292f',
+          }),
         }),
-        orange = m({
-          [0] = '#ffe7d1',
-          [1] = '#fecfaa',
-          [2] = '#fbaf74',
-          [3] = '#f68c41',
-          [4] = '#eb670f',
-          [5] = '#b8500f',
-          [6] = '#a24610',
-          [7] = '#8d3c11',
-          [8] = '#70300f',
-          [9] = '#54230d',
-        }),
-        blue = m({
-          [0] = '#d1f0ff',
-          [1] = '#ade1ff',
-          [2] = '#75c8ff',
-          [3] = '#47afff',
-          [4] = '#0f8fff',
-          [5] = '#006edb',
-          [6] = '#005fcc',
-          [7] = '#004db3',
-          [8] = '#003d99',
-          [9] = '#002b75',
-        }),
-        brown = m({
-          [0] = '#eeeae2',
-          [1] = '#dfd7c8',
-          [2] = '#cbbda4',
-          [3] = '#b8a484',
-          [4] = '#a68b64',
-          [5] = '#856d4c',
-          [6] = '#755f43',
-          [7] = '#64513a',
-          [8] = '#51412f',
-          [9] = '#3a2e22',
-        }),
-        olive = m({
-          [0] = '#f0f0ad',
-          [1] = '#dbe170',
-          [2] = '#b9c832',
-          [3] = '#9bae32',
-          [4] = '#819532',
-          [5] = '#64762d',
-          [6] = '#56682c',
-          [7] = '#495a2b',
-          [8] = '#3b4927',
-          [9] = '#2a331f',
-        }),
-        coral = m({
-          [0] = '#ffe5db',
-          [1] = '#fecebe',
-          [2] = '#fcab92',
-          [3] = '#f88768',
-          [4] = '#f25f3a',
-          [5] = '#d43511',
-          [6] = '#ba2e12',
-          [7] = '#9b2712',
-          [8] = '#7e2011',
-          [9] = '#5d180e',
-        }),
-        black = '#0d1117',
-        lime = m({
-          [0] = '#e3f2b5',
-          [1] = '#c7e580',
-          [2] = '#9bd039',
-          [3] = '#80b530',
-          [4] = '#6c9d2f',
-          [5] = '#527a29',
-          [6] = '#476c28',
-          [7] = '#3a5b25',
-          [8] = '#2f4a21',
-          [9] = '#213319',
-        }),
-        green = m({
-          [0] = '#caf7ca',
-          [1] = '#9ceda0',
-          [2] = '#54d961',
-          [3] = '#31bf46',
-          [4] = '#30a147',
-          [5] = '#2c8141',
-          [6] = '#2b6e3f',
-          [7] = '#285c3b',
-          [8] = '#254b34',
-          [9] = '#1d3528',
-        }),
-        plum = m({
-          [0] = '#f8e5ff',
-          [1] = '#f0cdfe',
-          [2] = '#e2a7fb',
-          [3] = '#d487f7',
-          [4] = '#c264f2',
-          [5] = '#a830e8',
-          [6] = '#961edc',
-          [7] = '#7d1eb8',
-          [8] = '#651d96',
-          [9] = '#471769',
-        }),
-        indigo = m({
-          [0] = '#e5e9ff',
-          [1] = '#d2d7fe',
-          [2] = '#b1b9fb',
-          [3] = '#979ff7',
-          [4] = '#7a82f0',
-          [5] = '#5a61e7',
-          [6] = '#494edf',
-          [7] = '#393cd5',
-          [8] = '#2d2db4',
-          [9] = '#25247b',
-        }),
-        purple = m({
-          [0] = '#f1e5ff',
-          [1] = '#e6d2fe',
-          [2] = '#d1b1fc',
-          [3] = '#bc91f8',
-          [4] = '#a672f3',
-          [5] = '#894ceb',
-          [6] = '#783ae4',
-          [7] = '#6223d7',
-          [8] = '#4f21ab',
-          [9] = '#391b79',
+        variable = '#a40e26',
+        markup = m({
+          list = '#3b2300',
+          ignored = m({
+            text = '#eaeef2',
+            bg = '#0550ae',
+          }),
+          heading = '#0550ae',
+          italic = '#24292f',
+          deleted = m({
+            text = '#82071e',
+            bg = '#ffebe9',
+          }),
+          inserted = m({
+            text = '#0550ae',
+            bg = '#ddf4ff',
+          }),
+          changed = m({
+            text = '#a40e26',
+            bg = '#ffcecb',
+          }),
+          bold = '#24292f',
         }),
-        lemon = m({
-          [0] = '#f7eea1',
-          [1] = '#f0db3d',
-          [2] = '#d8bd0e',
-          [3] = '#c2a60a',
-          [4] = '#a68c07',
-          [5] = '#866e04',
-          [6] = '#786002',
-          [7] = '#654f01',
-          [8] = '#523f00',
-          [9] = '#3d2e00',
+        meta = m({
+          diff = m({
+            range = '#8250df',
+          }),
         }),
       }),
     }),
   }),
-  card = m({
+  fgColor = m({
+    white = '#ffffff',
+    default = '#1f2328',
+    success = '#0969da',
+    sponsors = '#bf3989',
+    severe = '#cf222e',
+    onEmphasis = '#ffffff',
+    muted = '#636c76',
+    link = '#0969da',
+    done = '#8250df',
+    disabled = '#8c959f',
+    danger = '#d1242f',
+    closed = '#6e7781',
+    black = '#1f2328',
+    attention = '#9a6700',
+    accent = '#0969da',
+    open = '#cf222e',
+    neutral = '#6e7781',
+    upsell = '#8250df',
+  }),
+  page = m({
+    header = m({
+      bgColor = '#f6f8fa',
+    }),
+  }),
+  header = m({
+    borderColor = m({
+      divider = '#57606a',
+    }),
+    fgColor = m({
+      default = '#ffffffb3',
+      logo = '#ffffff',
+    }),
+    bgColor = '#24292f',
+  }),
+  overlay = m({
+    borderColor = '#d0d7de80',
+    backdrop = m({
+      bgColor = '#8c959f33',
+    }),
     bgColor = '#ffffff',
   }),
+  headerSearch = m({
+    borderColor = '#57606a',
+    bgColor = '#24292f',
+  }),
+  menu = m({
+    bgColor = m({
+      active = '#ffffff00',
+    }),
+  }),
   label = m({
-    teal = m({
+    lime = m({
       bgColor = m({
-        active = '#22d3c7',
-        rest = '#c7f5ef',
-        hover = '#89ebe1',
+        active = '#9bd039',
+        rest = '#e3f2b5',
+        hover = '#c7e580',
       }),
       fgColor = m({
-        active = '#0a4852',
-        rest = '#106e75',
-        hover = '#0d5b63',
+        active = '#2f4a21',
+        rest = '#476c28',
+        hover = '#3a5b25',
       }),
     }),
-    red = m({
+    lemon = m({
       bgColor = m({
-        active = '#fda5a7',
-        rest = '#ffe2e0',
-        hover = '#fecdcd',
+        active = '#d8bd0e',
+        rest = '#f7eea1',
+        hover = '#f0db3d',
       }),
       fgColor = m({
-        active = '#880c27',
-        rest = '#c50d28',
-        hover = '#a60c29',
+        active = '#523f00',
+        rest = '#786002',
+        hover = '#654f01',
       }),
     }),
-    gray = m({
+    yellow = m({
       bgColor = m({
-        active = '#b4c0cf',
-        rest = '#e8ecf2',
-        hover = '#d2dae4',
+        active = '#ebb400',
+        rest = '#ffec9e',
+        hover = '#ffd642',
       }),
       fgColor = m({
-        active = '#424448',
-        rest = '#5c6570',
-        hover = '#4e535a',
+        active = '#5c3d00',
+        rest = '#805900',
+        hover = '#704d00',
       }),
     }),
-    cyan = m({
+    indigo = m({
       bgColor = m({
-        active = '#00d0fa',
-        rest = '#bdf4ff',
-        hover = '#7ae9ff',
+        active = '#b1b9fb',
+        rest = '#e5e9ff',
+        hover = '#d2d7fe',
       }),
       fgColor = m({
-        active = '#004857',
-        rest = '#006a80',
-        hover = '#00596b',
-      }),
+        active = '#2d2db4',
+        rest = '#494edf',
+        hover = '#393cd5',
+      }),
     }),
-    coral = m({
+    teal = m({
       bgColor = m({
-        active = '#fcab92',
-        rest = '#ffe5db',
-        hover = '#fecebe',
+        active = '#22d3c7',
+        rest = '#c7f5ef',
+        hover = '#89ebe1',
       }),
       fgColor = m({
-        active = '#7e2011',
-        rest = '#ba2e12',
-        hover = '#9b2712',
+        active = '#0a4852',
+        rest = '#106e75',
+        hover = '#0d5b63',
       }),
     }),
-    pine = m({
+    green = m({
       bgColor = m({
-        active = '#1dd781',
-        rest = '#bff8db',
-        hover = '#80efb9',
+        active = '#54d961',
+        rest = '#caf7ca',
+        hover = '#9ceda0',
       }),
       fgColor = m({
-        active = '#114b36',
-        rest = '#156f4b',
-        hover = '#135d41',
+        active = '#254b34',
+        rest = '#2b6e3f',
+        hover = '#285c3b',
       }),
     }),
-    auburn = m({
+    red = m({
       bgColor = m({
-        active = '#d4b7b5',
-        rest = '#f2e9e9',
-        hover = '#e6d6d5',
+        active = '#fda5a7',
+        rest = '#ffe2e0',
+        hover = '#fecdcd',
       }),
       fgColor = m({
-        active = '#5d3937',
-        rest = '#8a5551',
-        hover = '#744744',
+        active = '#880c27',
+        rest = '#c50d28',
+        hover = '#a60c29',
       }),
     }),
-    orange = m({
+    gray = m({
       bgColor = m({
-        active = '#fbaf74',
-        rest = '#ffe7d1',
-        hover = '#fecfaa',
+        active = '#b4c0cf',
+        rest = '#e8ecf2',
+        hover = '#d2dae4',
       }),
       fgColor = m({
-        active = '#70300f',
-        rest = '#a24610',
-        hover = '#8d3c11',
+        active = '#424448',
+        rest = '#5c6570',
+        hover = '#4e535a',
       }),
     }),
-    blue = m({
+    purple = m({
       bgColor = m({
-        active = '#75c8ff',
-        rest = '#d1f0ff',
-        hover = '#ade1ff',
+        active = '#d1b1fc',
+        rest = '#f1e5ff',
+        hover = '#e6d2fe',
       }),
       fgColor = m({
-        active = '#003d99',
-        rest = '#005fcc',
-        hover = '#004db3',
+        active = '#4f21ab',
+        rest = '#783ae4',
+        hover = '#6223d7',
       }),
     }),
-    brown = m({
+    cyan = m({
       bgColor = m({
-        active = '#cbbda4',
-        rest = '#eeeae2',
-        hover = '#dfd7c8',
+        active = '#00d0fa',
+        rest = '#bdf4ff',
+        hover = '#7ae9ff',
       }),
       fgColor = m({
-        active = '#51412f',
-        rest = '#755f43',
-        hover = '#64513a',
+        active = '#004857',
+        rest = '#006a80',
+        hover = '#00596b',
       }),
     }),
-    olive = m({
+    plum = m({
       bgColor = m({
-        active = '#b9c832',
-        rest = '#f0f0ad',
-        hover = '#dbe170',
+        active = '#e2a7fb',
+        rest = '#f8e5ff',
+        hover = '#f0cdfe',
       }),
       fgColor = m({
-        active = '#3b4927',
-        rest = '#56682c',
-        hover = '#495a2b',
+        active = '#651d96',
+        rest = '#961edc',
+        hover = '#7d1eb8',
       }),
     }),
-    yellow = m({
+    coral = m({
       bgColor = m({
-        active = '#ebb400',
-        rest = '#ffec9e',
-        hover = '#ffd642',
+        active = '#fcab92',
+        rest = '#ffe5db',
+        hover = '#fecebe',
       }),
       fgColor = m({
-        active = '#5c3d00',
-        rest = '#805900',
-        hover = '#704d00',
+        active = '#7e2011',
+        rest = '#ba2e12',
+        hover = '#9b2712',
       }),
     }),
     pink = m({
@@ -1016,149 +690,284 @@ local M = m({
         hover = '#8e2e66',
       }),
     }),
-    lime = m({
+    brown = m({
       bgColor = m({
-        active = '#9bd039',
-        rest = '#e3f2b5',
-        hover = '#c7e580',
+        active = '#cbbda4',
+        rest = '#eeeae2',
+        hover = '#dfd7c8',
       }),
       fgColor = m({
-        active = '#2f4a21',
-        rest = '#476c28',
-        hover = '#3a5b25',
+        active = '#51412f',
+        rest = '#755f43',
+        hover = '#64513a',
       }),
     }),
-    purple = m({
+    pine = m({
       bgColor = m({
-        active = '#d1b1fc',
-        rest = '#f1e5ff',
-        hover = '#e6d2fe',
+        active = '#1dd781',
+        rest = '#bff8db',
+        hover = '#80efb9',
       }),
       fgColor = m({
-        active = '#4f21ab',
-        rest = '#783ae4',
-        hover = '#6223d7',
+        active = '#114b36',
+        rest = '#156f4b',
+        hover = '#135d41',
       }),
     }),
-    indigo = m({
+    blue = m({
       bgColor = m({
-        active = '#b1b9fb',
-        rest = '#e5e9ff',
-        hover = '#d2d7fe',
+        active = '#75c8ff',
+        rest = '#d1f0ff',
+        hover = '#ade1ff',
       }),
       fgColor = m({
-        active = '#2d2db4',
-        rest = '#494edf',
-        hover = '#393cd5',
+        active = '#003d99',
+        rest = '#005fcc',
+        hover = '#004db3',
       }),
     }),
-    plum = m({
+    orange = m({
       bgColor = m({
-        active = '#e2a7fb',
-        rest = '#f8e5ff',
-        hover = '#f0cdfe',
+        active = '#fbaf74',
+        rest = '#ffe7d1',
+        hover = '#fecfaa',
       }),
       fgColor = m({
-        active = '#651d96',
-        rest = '#961edc',
-        hover = '#7d1eb8',
+        active = '#70300f',
+        rest = '#a24610',
+        hover = '#8d3c11',
       }),
     }),
-    green = m({
+    auburn = m({
       bgColor = m({
-        active = '#54d961',
-        rest = '#caf7ca',
-        hover = '#9ceda0',
+        active = '#d4b7b5',
+        rest = '#f2e9e9',
+        hover = '#e6d6d5',
       }),
       fgColor = m({
-        active = '#254b34',
-        rest = '#2b6e3f',
-        hover = '#285c3b',
+        active = '#5d3937',
+        rest = '#8a5551',
+        hover = '#744744',
       }),
     }),
-    lemon = m({
+    olive = m({
       bgColor = m({
-        active = '#d8bd0e',
-        rest = '#f7eea1',
-        hover = '#f0db3d',
+        active = '#b9c832',
+        rest = '#f0f0ad',
+        hover = '#dbe170',
       }),
       fgColor = m({
-        active = '#523f00',
-        rest = '#786002',
-        hover = '#654f01',
+        active = '#3b4927',
+        rest = '#56682c',
+        hover = '#495a2b',
       }),
     }),
   }),
-  controlKnob = m({
-    borderColor = m({
-      checked = '#0969da',
-      disabled = '#eaeef2b3',
-      rest = '#868f99',
-    }),
-    bgColor = m({
-      checked = '#ffffff',
-      disabled = '#eaeef2b3',
-      rest = '#ffffff',
-    }),
-  }),
-  highlight = m({
-    neutral = m({
-      bgColor = '#fff8c5',
-    }),
-  }),
-  underlineNav = m({
-    borderColor = m({
-      active = '#fd8c73',
-      hover = '#afb8c133',
-    }),
-    iconColor = m({
-      rest = '#636c76',
-    }),
-  }),
-  menu = m({
-    bgColor = m({
-      active = '#ffffff00',
-    }),
+  card = m({
+    bgColor = '#ffffff',
   }),
-  control = m({
-    transparent = m({
-      borderColor = m({
-        active = '#ffffff00',
-        rest = '#ffffff00',
-        hover = '#ffffff00',
+  buttonCounter = m({
+    default = m({
+      bgColor = m({
+        rest = '#afb8c133',
       }),
+    }),
+    primary = m({
       bgColor = m({
-        hover = '#d0d7de33',
-        selected = '#d0d7de33',
-        active = '#d0d7de66',
-        disabled = '#eaeef2b3',
-        rest = '#ffffff00',
+        rest = '#002d1133',
       }),
     }),
-    iconColor = m({
-      rest = '#636c76',
+    invisible = m({
+      bgColor = m({
+        rest = '#afb8c133',
+      }),
+    }),
+    outline = m({
+      bgColor = m({
+        disabled = '#0969da0d',
+        rest = '#0969da1a',
+        hover = '#ffffff33',
+      }),
+      fgColor = m({
+        disabled = '#0969da80',
+        rest = '#0550ae',
+        hover = '#ffffff',
+      }),
+    }),
+    danger = m({
+      bgColor = m({
+        disabled = '#cf222e0d',
+        rest = '#cf222e1a',
+        hover = '#ffffff33',
+      }),
+      fgColor = m({
+        disabled = '#d1242f80',
+        rest = '#c21c2c',
+        hover = '#ffffff',
+      }),
+    }),
+  }),
+  counter = m({
+    borderColor = '#ffffff00',
+  }),
+  controlTrack = m({
+    borderColor = m({
+      disabled = '#8c959f',
+      rest = '#ffffff00',
+    }),
+    fgColor = m({
+      disabled = '#ffffff',
+      rest = '#636c76',
     }),
     bgColor = m({
-      hover = '#eef1f4',
-      selected = '#f6f8fa',
-      active = '#e7ebef',
-      disabled = '#eaeef2b3',
-      rest = '#f6f8fa',
+      disabled = '#8c959f',
+      active = '#d2d8de',
+      rest = '#eaeef2',
+      hover = '#dee3e8',
     }),
+  }),
+  controlKnob = m({
     borderColor = m({
-      danger = '#cf222e',
       disabled = '#eaeef2b3',
-      emphasis = '#868f99',
-      success = '#218bff',
-      warning = '#bf8700',
-      selected = '#f6f8fa',
-      rest = '#d0d7de',
+      checked = '#0969da',
+      rest = '#868f99',
     }),
-    checked = m({
+    bgColor = m({
+      disabled = '#eaeef2b3',
+      checked = '#ffffff',
+      rest = '#ffffff',
+    }),
+  }),
+  button = m({
+    default = m({
+      borderColor = m({
+        disabled = '#eaeef2b3',
+        active = '#d0d7de',
+        rest = '#d0d7de',
+        hover = '#d0d7de',
+      }),
+      fgColor = m({
+        rest = '#24292f',
+      }),
+      shadow = m({
+        resting = '0px 1px 0px 0px #1f23280a',
+      }),
+      bgColor = m({
+        disabled = '#eaeef2b3',
+        hover = '#eef1f4',
+        active = '#e7ebef',
+        selected = '#e7ebef',
+        rest = '#f6f8fa',
+      }),
+    }),
+    primary = m({
+      iconColor = m({
+        rest = '#ffffffcc',
+      }),
+      shadow = m({
+        selected = 'inset 0px 1px 0px 0px #0021554d',
+      }),
+      bgColor = m({
+        disabled = '#92caff',
+        active = '#0b64ce',
+        rest = '#0f72e3',
+        hover = '#0d6bd8',
+      }),
+      borderColor = m({
+        disabled = '#92caff',
+        active = '#1f232826',
+        rest = '#1f232826',
+        hover = '#1f232826',
+      }),
+      fgColor = m({
+        disabled = '#ffffffcc',
+        rest = '#ffffff',
+      }),
+    }),
+    inactive = m({
+      bgColor = '#eaeef2',
+      fgColor = '#57606a',
+    }),
+    star = m({
+      iconColor = '#eac54f',
+    }),
+    invisible = m({
+      borderColor = m({
+        disabled = '#eaeef2b3',
+        rest = '#ffffff00',
+        hover = '#ffffff00',
+      }),
+      fgColor = m({
+        disabled = '#8c959f',
+        rest = '#0969da',
+        hover = '#0969da',
+      }),
+      iconColor = m({
+        disabled = '#8c959f',
+        rest = '#636c76',
+        hover = '#636c76',
+      }),
+      bgColor = m({
+        disabled = '#eaeef2b3',
+        active = '#d0d7de66',
+        rest = '#ffffff00',
+        hover = '#d0d7de33',
+      }),
+    }),
+    outline = m({
       borderColor = m({
+        active = '#1f232826',
+        hover = '#1f232826',
+      }),
+      fgColor = m({
+        disabled = '#0969da80',
+        active = '#ffffff',
         rest = '#0969da',
+        hover = '#ffffff',
+      }),
+      shadow = m({
+        selected = 'inset 0px 1px 0px 0px #00215533',
+      }),
+      bgColor = m({
+        disabled = '#f6f8fa',
         active = '#0757ba',
+        rest = '#f6f8fa',
+        hover = '#0969da',
+      }),
+    }),
+    danger = m({
+      iconColor = m({
+        hover = '#ffffff',
+        rest = '#d1242f',
+      }),
+      shadow = m({
+        selected = 'inset 0px 1px 0px 0px #4c001433',
+      }),
+      bgColor = m({
+        disabled = '#eaeef2b3',
+        active = '#8b0820',
+        rest = '#f6f8fa',
+        hover = '#a40e26',
+      }),
+      borderColor = m({
+        active = '#1f232826',
+        rest = '#d0d7de',
+        hover = '#1f232826',
+      }),
+      fgColor = m({
+        disabled = '#d1242f80',
+        active = '#ffffff',
+        rest = '#d1242f',
+        hover = '#ffffff',
+      }),
+    }),
+  }),
+  control = m({
+    checked = m({
+      borderColor = m({
         disabled = '#8c959f',
+        active = '#0757ba',
+        rest = '#0969da',
         hover = '#0860ca',
       }),
       fgColor = m({
@@ -1166,12 +975,45 @@ local M = m({
         rest = '#ffffff',
       }),
       bgColor = m({
-        rest = '#0969da',
-        active = '#0757ba',
         disabled = '#8c959f',
+        active = '#0757ba',
+        rest = '#0969da',
         hover = '#0860ca',
       }),
     }),
+    iconColor = m({
+      rest = '#636c76',
+    }),
+    bgColor = m({
+      disabled = '#eaeef2b3',
+      hover = '#eef1f4',
+      active = '#e7ebef',
+      selected = '#f6f8fa',
+      rest = '#f6f8fa',
+    }),
+    transparent = m({
+      borderColor = m({
+        active = '#ffffff00',
+        rest = '#ffffff00',
+        hover = '#ffffff00',
+      }),
+      bgColor = m({
+        disabled = '#eaeef2b3',
+        hover = '#d0d7de33',
+        active = '#d0d7de66',
+        selected = '#d0d7de33',
+        rest = '#ffffff00',
+      }),
+    }),
+    borderColor = m({
+      disabled = '#eaeef2b3',
+      success = '#218bff',
+      danger = '#cf222e',
+      emphasis = '#868f99',
+      warning = '#bf8700',
+      selected = '#f6f8fa',
+      rest = '#d0d7de',
+    }),
     fgColor = m({
       placeholder = '#69727c',
       disabled = '#8c959f',
@@ -1188,237 +1030,51 @@ local M = m({
       }),
     }),
   }),
-  selection = m({
-    bgColor = '#0969da33',
-  }),
-  data = m({
-    teal = m({
-      color = m({
-        default = '#179b9b',
-        muted = '#c7f5ef',
+  display = m({
+    lime = m({
+      borderColor = m({
+        emphasis = '#527a29',
+        muted = '#c7e580',
       }),
-    }),
-    orange = m({
-      color = m({
-        default = '#eb670f',
-        muted = '#ffe7d1',
+      fgColor = '#476c28',
+      bgColor = m({
+        emphasis = '#527a29',
+        muted = '#e3f2b5',
       }),
     }),
-    green = m({
-      color = m({
-        default = '#30a147',
-        muted = '#caf7ca',
+    lemon = m({
+      borderColor = m({
+        emphasis = '#866e04',
+        muted = '#f0db3d',
       }),
-    }),
-    auburn = m({
-      color = m({
-        default = '#9d615c',
-        muted = '#f2e9e9',
-      }),
-    }),
-    purple = m({
-      color = m({
-        default = '#894ceb',
-        muted = '#f1e5ff',
-      }),
-    }),
-    blue = m({
-      color = m({
-        default = '#006edb',
-        muted = '#d1f0ff',
-      }),
-    }),
-    gray = m({
-      color = m({
-        default = '#808fa3',
-        muted = '#e8ecf2',
-      }),
-    }),
-    red = m({
-      color = m({
-        default = '#df0c24',
-        muted = '#ffe2e0',
-      }),
-    }),
-    pink = m({
-      color = m({
-        default = '#ce2c85',
-        muted = '#ffe5f1',
+      fgColor = '#786002',
+      bgColor = m({
+        emphasis = '#866e04',
+        muted = '#f7eea1',
       }),
     }),
     yellow = m({
-      color = m({
-        default = '#b88700',
-        muted = '#ffec9e',
+      borderColor = m({
+        emphasis = '#946a00',
+        muted = '#ffd642',
       }),
-    }),
-  }),
-  color = m({
-    prettylights = m({
-      syntax = m({
-        comment = '#57606a',
-        carriage = m({
-          ['return'] = m({
-            bg = '#cf222e',
-            text = '#f6f8fa',
-          }),
-        }),
-        storage = m({
-          modifier = m({
-            import = '#24292f',
-          }),
-        }),
-        brackethighlighter = m({
-          unmatched = '#82071e',
-          angle = '#57606a',
-        }),
-        keyword = '#cf222e',
-        string = m({
-          regexp = '#0550ae',
-          default = '#0a3069',
-        }),
-        invalid = m({
-          illegal = m({
-            bg = '#82071e',
-            text = '#f6f8fa',
-          }),
-        }),
-        variable = '#a40e26',
-        entity = m({
-          tag = '#0550ae',
-          default = '#6639ba',
-        }),
-        meta = m({
-          diff = m({
-            range = '#8250df',
-          }),
-        }),
-        constant = m({
-          other = m({
-            reference = m({
-              link = '#0a3069',
-            }),
-          }),
-          default = '#0550ae',
-        }),
-        sublimelinter = m({
-          gutter = m({
-            mark = '#8c959f',
-          }),
-        }),
-        markup = m({
-          list = '#3b2300',
-          deleted = m({
-            bg = '#ffebe9',
-            text = '#82071e',
-          }),
-          italic = '#24292f',
-          changed = m({
-            bg = '#ffcecb',
-            text = '#a40e26',
-          }),
-          inserted = m({
-            bg = '#ddf4ff',
-            text = '#0550ae',
-          }),
-          bold = '#24292f',
-          heading = '#0550ae',
-          ignored = m({
-            bg = '#0550ae',
-            text = '#eaeef2',
-          }),
-        }),
+      fgColor = '#805900',
+      bgColor = m({
+        emphasis = '#946a00',
+        muted = '#ffec9e',
       }),
     }),
-    ansi = m({
-      blue = m({
-        default = '#0969da',
-        bright = '#218bff',
-      }),
-      green = m({
-        default = '#0550ae',
-        bright = '#0969da',
-      }),
-      gray = '#6e7781',
-      black = m({
-        default = '#24292f',
-        bright = '#57606a',
-      }),
-      magenta = m({
-        default = '#8250df',
-        bright = '#a475f9',
-      }),
-      cyan = m({
-        default = '#1b7c83',
-        bright = '#3192aa',
-      }),
-      white = m({
-        default = '#6e7781',
-        bright = '#8c959f',
-      }),
-      red = m({
-        default = '#cf222e',
-        bright = '#a40e26',
+    indigo = m({
+      borderColor = m({
+        emphasis = '#5a61e7',
+        muted = '#d2d7fe',
       }),
-      yellow = m({
-        default = '#4d2d00',
-        bright = '#633c01',
+      fgColor = '#494edf',
+      bgColor = m({
+        emphasis = '#5a61e7',
+        muted = '#e5e9ff',
       }),
     }),
-  }),
-  borderColor = m({
-    translucent = '#1f232826',
-    upsell = m({
-      emphasis = '#8250df',
-      muted = '#c297ff66',
-    }),
-    success = m({
-      emphasis = '#218bff',
-      muted = '#54aeff66',
-    }),
-    sponsors = m({
-      emphasis = '#bf3989',
-      muted = '#ff80c866',
-    }),
-    severe = m({
-      emphasis = '#cf222e',
-      muted = '#ff818266',
-    }),
-    default = '#d0d7de',
-    muted = '#d0d7deb3',
-    done = m({
-      emphasis = '#8250df',
-      muted = '#c297ff66',
-    }),
-    disabled = '#eaeef2b3',
-    danger = m({
-      emphasis = '#cf222e',
-      muted = '#ff818266',
-    }),
-    open = m({
-      emphasis = '#cf222e',
-      muted = '#ff818266',
-    }),
-    transparent = '#ffffff00',
-    attention = m({
-      emphasis = '#bf8700',
-      muted = '#d4a72c66',
-    }),
-    accent = m({
-      emphasis = '#0969da',
-      muted = '#54aeff66',
-    }),
-    neutral = m({
-      emphasis = '#6e7781',
-      muted = '#afb8c133',
-    }),
-    closed = m({
-      emphasis = '#6e7781',
-      muted = '#afb8c166',
-    }),
-    emphasis = '#6e7781',
-  }),
-  display = m({
     teal = m({
       borderColor = m({
         emphasis = '#127e81',
@@ -1430,6 +1086,17 @@ local M = m({
         muted = '#c7f5ef',
       }),
     }),
+    green = m({
+      borderColor = m({
+        emphasis = '#2c8141',
+        muted = '#9ceda0',
+      }),
+      fgColor = '#2b6e3f',
+      bgColor = m({
+        emphasis = '#2c8141',
+        muted = '#caf7ca',
+      }),
+    }),
     red = m({
       borderColor = m({
         emphasis = '#df0c24',
@@ -1452,6 +1119,17 @@ local M = m({
         muted = '#e8ecf2',
       }),
     }),
+    purple = m({
+      borderColor = m({
+        emphasis = '#894ceb',
+        muted = '#e6d2fe',
+      }),
+      fgColor = '#783ae4',
+      bgColor = m({
+        emphasis = '#894ceb',
+        muted = '#f1e5ff',
+      }),
+    }),
     cyan = m({
       borderColor = m({
         emphasis = '#007b94',
@@ -1463,6 +1141,17 @@ local M = m({
         muted = '#bdf4ff',
       }),
     }),
+    plum = m({
+      borderColor = m({
+        emphasis = '#a830e8',
+        muted = '#f0cdfe',
+      }),
+      fgColor = '#961edc',
+      bgColor = m({
+        emphasis = '#a830e8',
+        muted = '#f8e5ff',
+      }),
+    }),
     coral = m({
       borderColor = m({
         emphasis = '#d43511',
@@ -1474,9 +1163,31 @@ local M = m({
         muted = '#ffe5db',
       }),
     }),
-    pine = m({
+    pink = m({
       borderColor = m({
-        emphasis = '#167e53',
+        emphasis = '#ce2c85',
+        muted = '#fdc9e2',
+      }),
+      fgColor = '#b12f79',
+      bgColor = m({
+        emphasis = '#ce2c85',
+        muted = '#ffe5f1',
+      }),
+    }),
+    brown = m({
+      borderColor = m({
+        emphasis = '#856d4c',
+        muted = '#dfd7c8',
+      }),
+      fgColor = '#755f43',
+      bgColor = m({
+        emphasis = '#856d4c',
+        muted = '#eeeae2',
+      }),
+    }),
+    pine = m({
+      borderColor = m({
+        emphasis = '#167e53',
         muted = '#80efb9',
       }),
       fgColor = '#156f4b',
@@ -1485,190 +1196,479 @@ local M = m({
         muted = '#bff8db',
       }),
     }),
-    auburn = m({
-      borderColor = m({
-        emphasis = '#9d615c',
-        muted = '#e6d6d5',
-      }),
-      fgColor = '#8a5551',
+    blue = m({
+      borderColor = m({
+        emphasis = '#006edb',
+        muted = '#ade1ff',
+      }),
+      fgColor = '#005fcc',
+      bgColor = m({
+        emphasis = '#006edb',
+        muted = '#d1f0ff',
+      }),
+    }),
+    orange = m({
+      borderColor = m({
+        emphasis = '#b8500f',
+        muted = '#fecfaa',
+      }),
+      fgColor = '#a24610',
+      bgColor = m({
+        emphasis = '#b8500f',
+        muted = '#ffe7d1',
+      }),
+    }),
+    auburn = m({
+      borderColor = m({
+        emphasis = '#9d615c',
+        muted = '#e6d6d5',
+      }),
+      fgColor = '#8a5551',
+      bgColor = m({
+        emphasis = '#9d615c',
+        muted = '#f2e9e9',
+      }),
+    }),
+    olive = m({
+      borderColor = m({
+        emphasis = '#64762d',
+        muted = '#dbe170',
+      }),
+      fgColor = '#56682c',
+      bgColor = m({
+        emphasis = '#64762d',
+        muted = '#f0f0ad',
+      }),
+    }),
+  }),
+  underlineNav = m({
+    borderColor = m({
+      active = '#fd8c73',
+      hover = '#afb8c133',
+    }),
+    iconColor = m({
+      rest = '#636c76',
+    }),
+  }),
+  base = m({
+    color = m({
+      coral = m({
+        [0] = '#fff0eb',
+        [1] = '#ffd6cc',
+        [2] = '#ffb4a1',
+        [3] = '#fd8c73',
+        [4] = '#ec6547',
+        [5] = '#c4432b',
+        [6] = '#9e2f1c',
+        [7] = '#801f0f',
+        [8] = '#691105',
+        [9] = '#510901',
+      }),
+      black = '#1f2328',
+      pink = m({
+        [0] = '#ffeff7',
+        [1] = '#ffd3eb',
+        [2] = '#ffadda',
+        [3] = '#ff80c8',
+        [4] = '#e85aad',
+        [5] = '#bf3989',
+        [6] = '#99286e',
+        [7] = '#772057',
+        [8] = '#611347',
+        [9] = '#4d0336',
+      }),
+      yellow = m({
+        [0] = '#fff8c5',
+        [1] = '#fae17d',
+        [2] = '#eac54f',
+        [3] = '#d4a72c',
+        [4] = '#bf8700',
+        [5] = '#9a6700',
+        [6] = '#7d4e00',
+        [7] = '#633c01',
+        [8] = '#4d2d00',
+        [9] = '#3b2300',
+      }),
+      white = '#ffffff',
+      blue = m({
+        [0] = '#ddf4ff',
+        [1] = '#b6e3ff',
+        [2] = '#80ccff',
+        [3] = '#54aeff',
+        [4] = '#218bff',
+        [5] = '#0969da',
+        [6] = '#0550ae',
+        [7] = '#033d8b',
+        [8] = '#0a3069',
+        [9] = '#002155',
+      }),
+      green = m({
+        [0] = '#dafbe1',
+        [1] = '#aceebb',
+        [2] = '#6fdd8b',
+        [3] = '#4ac26b',
+        [4] = '#2da44e',
+        [5] = '#1a7f37',
+        [6] = '#116329',
+        [7] = '#044f1e',
+        [8] = '#003d16',
+        [9] = '#002d11',
+      }),
+      orange = m({
+        [0] = '#fff1e5',
+        [1] = '#ffd8b5',
+        [2] = '#ffb77c',
+        [3] = '#fb8f44',
+        [4] = '#e16f24',
+        [5] = '#bc4c00',
+        [6] = '#953800',
+        [7] = '#762c00',
+        [8] = '#5c2200',
+        [9] = '#471700',
+      }),
+      red = m({
+        [0] = '#ffebe9',
+        [1] = '#ffcecb',
+        [2] = '#ffaba8',
+        [3] = '#ff8182',
+        [4] = '#fa4549',
+        [5] = '#cf222e',
+        [6] = '#a40e26',
+        [7] = '#82071e',
+        [8] = '#660018',
+        [9] = '#4c0014',
+      }),
+      purple = m({
+        [0] = '#fbefff',
+        [1] = '#ecd8ff',
+        [2] = '#d8b9ff',
+        [3] = '#c297ff',
+        [4] = '#a475f9',
+        [5] = '#8250df',
+        [6] = '#6639ba',
+        [7] = '#512a97',
+        [8] = '#3e1f79',
+        [9] = '#2e1461',
+      }),
+      neutral = m({
+        [0] = '#f6f8fa',
+        [1] = '#eaeef2',
+        [2] = '#d0d7de',
+        [3] = '#afb8c1',
+        [4] = '#8c959f',
+        [5] = '#6e7781',
+        [6] = '#57606a',
+        [7] = '#424a53',
+        [8] = '#32383f',
+        [9] = '#24292f',
+      }),
+      transparent = '#ffffff00',
+    }),
+    display = m({
+      color = m({
+        lime = m({
+          [0] = '#e3f2b5',
+          [1] = '#c7e580',
+          [2] = '#9bd039',
+          [3] = '#80b530',
+          [4] = '#6c9d2f',
+          [5] = '#527a29',
+          [6] = '#476c28',
+          [7] = '#3a5b25',
+          [8] = '#2f4a21',
+          [9] = '#213319',
+        }),
+        lemon = m({
+          [0] = '#f7eea1',
+          [1] = '#f0db3d',
+          [2] = '#d8bd0e',
+          [3] = '#c2a60a',
+          [4] = '#a68c07',
+          [5] = '#866e04',
+          [6] = '#786002',
+          [7] = '#654f01',
+          [8] = '#523f00',
+          [9] = '#3d2e00',
+        }),
+        yellow = m({
+          [0] = '#ffec9e',
+          [1] = '#ffd642',
+          [2] = '#ebb400',
+          [3] = '#d19d00',
+          [4] = '#b88700',
+          [5] = '#946a00',
+          [6] = '#805900',
+          [7] = '#704d00',
+          [8] = '#5c3d00',
+          [9] = '#422b00',
+        }),
+        indigo = m({
+          [0] = '#e5e9ff',
+          [1] = '#d2d7fe',
+          [2] = '#b1b9fb',
+          [3] = '#979ff7',
+          [4] = '#7a82f0',
+          [5] = '#5a61e7',
+          [6] = '#494edf',
+          [7] = '#393cd5',
+          [8] = '#2d2db4',
+          [9] = '#25247b',
+        }),
+        white = '#ffffff',
+        teal = m({
+          [0] = '#c7f5ef',
+          [1] = '#89ebe1',
+          [2] = '#22d3c7',
+          [3] = '#1db9b4',
+          [4] = '#179b9b',
+          [5] = '#127e81',
+          [6] = '#106e75',
+          [7] = '#0d5b63',
+          [8] = '#0a4852',
+          [9] = '#073740',
+        }),
+        green = m({
+          [0] = '#caf7ca',
+          [1] = '#9ceda0',
+          [2] = '#54d961',
+          [3] = '#31bf46',
+          [4] = '#30a147',
+          [5] = '#2c8141',
+          [6] = '#2b6e3f',
+          [7] = '#285c3b',
+          [8] = '#254b34',
+          [9] = '#1d3528',
+        }),
+        red = m({
+          [0] = '#ffe2e0',
+          [1] = '#fecdcd',
+          [2] = '#fda5a7',
+          [3] = '#fb8389',
+          [4] = '#f85461',
+          [5] = '#df0c24',
+          [6] = '#c50d28',
+          [7] = '#a60c29',
+          [8] = '#880c27',
+          [9] = '#610a20',
+        }),
+        gray = m({
+          [0] = '#e8ecf2',
+          [1] = '#d2dae4',
+          [2] = '#b4c0cf',
+          [3] = '#9ba9bb',
+          [4] = '#808fa3',
+          [5] = '#647182',
+          [6] = '#5c6570',
+          [7] = '#4e535a',
+          [8] = '#424448',
+          [9] = '#303031',
+        }),
+        purple = m({
+          [0] = '#f1e5ff',
+          [1] = '#e6d2fe',
+          [2] = '#d1b1fc',
+          [3] = '#bc91f8',
+          [4] = '#a672f3',
+          [5] = '#894ceb',
+          [6] = '#783ae4',
+          [7] = '#6223d7',
+          [8] = '#4f21ab',
+          [9] = '#391b79',
+        }),
+        cyan = m({
+          [0] = '#bdf4ff',
+          [1] = '#7ae9ff',
+          [2] = '#00d0fa',
+          [3] = '#00b7db',
+          [4] = '#0099b8',
+          [5] = '#007b94',
+          [6] = '#006a80',
+          [7] = '#00596b',
+          [8] = '#004857',
+          [9] = '#003742',
+        }),
+        plum = m({
+          [0] = '#f8e5ff',
+          [1] = '#f0cdfe',
+          [2] = '#e2a7fb',
+          [3] = '#d487f7',
+          [4] = '#c264f2',
+          [5] = '#a830e8',
+          [6] = '#961edc',
+          [7] = '#7d1eb8',
+          [8] = '#651d96',
+          [9] = '#471769',
+        }),
+        coral = m({
+          [0] = '#ffe5db',
+          [1] = '#fecebe',
+          [2] = '#fcab92',
+          [3] = '#f88768',
+          [4] = '#f25f3a',
+          [5] = '#d43511',
+          [6] = '#ba2e12',
+          [7] = '#9b2712',
+          [8] = '#7e2011',
+          [9] = '#5d180e',
+        }),
+        black = '#0d1117',
+        pink = m({
+          [0] = '#ffe5f1',
+          [1] = '#fdc9e2',
+          [2] = '#f8a5cf',
+          [3] = '#f184bc',
+          [4] = '#e55da5',
+          [5] = '#ce2c85',
+          [6] = '#b12f79',
+          [7] = '#8e2e66',
+          [8] = '#6e2b53',
+          [9] = '#4d233d',
+        }),
+        brown = m({
+          [0] = '#eeeae2',
+          [1] = '#dfd7c8',
+          [2] = '#cbbda4',
+          [3] = '#b8a484',
+          [4] = '#a68b64',
+          [5] = '#856d4c',
+          [6] = '#755f43',
+          [7] = '#64513a',
+          [8] = '#51412f',
+          [9] = '#3a2e22',
+        }),
+        pine = m({
+          [0] = '#bff8db',
+          [1] = '#80efb9',
+          [2] = '#1dd781',
+          [3] = '#1dbf76',
+          [4] = '#1aa267',
+          [5] = '#167e53',
+          [6] = '#156f4b',
+          [7] = '#135d41',
+          [8] = '#114b36',
+          [9] = '#0d3627',
+        }),
+        blue = m({
+          [0] = '#d1f0ff',
+          [1] = '#ade1ff',
+          [2] = '#75c8ff',
+          [3] = '#47afff',
+          [4] = '#0f8fff',
+          [5] = '#006edb',
+          [6] = '#005fcc',
+          [7] = '#004db3',
+          [8] = '#003d99',
+          [9] = '#002b75',
+        }),
+        orange = m({
+          [0] = '#ffe7d1',
+          [1] = '#fecfaa',
+          [2] = '#fbaf74',
+          [3] = '#f68c41',
+          [4] = '#eb670f',
+          [5] = '#b8500f',
+          [6] = '#a24610',
+          [7] = '#8d3c11',
+          [8] = '#70300f',
+          [9] = '#54230d',
+        }),
+        auburn = m({
+          [0] = '#f2e9e9',
+          [1] = '#e6d6d5',
+          [2] = '#d4b7b5',
+          [3] = '#c59e9b',
+          [4] = '#b4827e',
+          [5] = '#9d615c',
+          [6] = '#8a5551',
+          [7] = '#744744',
+          [8] = '#5d3937',
+          [9] = '#432928',
+        }),
+        olive = m({
+          [0] = '#f0f0ad',
+          [1] = '#dbe170',
+          [2] = '#b9c832',
+          [3] = '#9bae32',
+          [4] = '#819532',
+          [5] = '#64762d',
+          [6] = '#56682c',
+          [7] = '#495a2b',
+          [8] = '#3b4927',
+          [9] = '#2a331f',
+        }),
+      }),
+    }),
+  }),
+  reactionButton = m({
+    selected = m({
       bgColor = m({
-        emphasis = '#9d615c',
-        muted = '#f2e9e9',
-      }),
-    }),
-    orange = m({
-      borderColor = m({
-        emphasis = '#b8500f',
-        muted = '#fecfaa',
+        hover = '#caecff',
+        rest = '#ddf4ff',
       }),
-      fgColor = '#a24610',
-      bgColor = m({
-        emphasis = '#b8500f',
-        muted = '#ffe7d1',
+      fgColor = m({
+        hover = '#0550ae',
+        rest = '#0969da',
       }),
     }),
-    blue = m({
-      borderColor = m({
-        emphasis = '#006edb',
-        muted = '#ade1ff',
-      }),
-      fgColor = '#005fcc',
-      bgColor = m({
-        emphasis = '#006edb',
-        muted = '#d1f0ff',
-      }),
+  }),
+  borderColor = m({
+    default = '#d0d7de',
+    success = m({
+      emphasis = '#218bff',
+      muted = '#54aeff66',
     }),
-    brown = m({
-      borderColor = m({
-        emphasis = '#856d4c',
-        muted = '#dfd7c8',
-      }),
-      fgColor = '#755f43',
-      bgColor = m({
-        emphasis = '#856d4c',
-        muted = '#eeeae2',
-      }),
+    sponsors = m({
+      emphasis = '#bf3989',
+      muted = '#ff80c866',
     }),
-    olive = m({
-      borderColor = m({
-        emphasis = '#64762d',
-        muted = '#dbe170',
-      }),
-      fgColor = '#56682c',
-      bgColor = m({
-        emphasis = '#64762d',
-        muted = '#f0f0ad',
-      }),
+    severe = m({
+      emphasis = '#cf222e',
+      muted = '#ff818266',
     }),
-    yellow = m({
-      borderColor = m({
-        emphasis = '#946a00',
-        muted = '#ffd642',
-      }),
-      fgColor = '#805900',
-      bgColor = m({
-        emphasis = '#946a00',
-        muted = '#ffec9e',
-      }),
+    muted = '#d0d7deb3',
+    done = m({
+      emphasis = '#8250df',
+      muted = '#c297ff66',
     }),
-    pink = m({
-      borderColor = m({
-        emphasis = '#ce2c85',
-        muted = '#fdc9e2',
-      }),
-      fgColor = '#b12f79',
-      bgColor = m({
-        emphasis = '#ce2c85',
-        muted = '#ffe5f1',
-      }),
+    disabled = '#eaeef2b3',
+    danger = m({
+      emphasis = '#cf222e',
+      muted = '#ff818266',
     }),
-    lime = m({
-      borderColor = m({
-        emphasis = '#527a29',
-        muted = '#c7e580',
-      }),
-      fgColor = '#476c28',
-      bgColor = m({
-        emphasis = '#527a29',
-        muted = '#e3f2b5',
-      }),
+    closed = m({
+      emphasis = '#6e7781',
+      muted = '#afb8c166',
     }),
-    purple = m({
-      borderColor = m({
-        emphasis = '#894ceb',
-        muted = '#e6d2fe',
-      }),
-      fgColor = '#783ae4',
-      bgColor = m({
-        emphasis = '#894ceb',
-        muted = '#f1e5ff',
-      }),
+    attention = m({
+      emphasis = '#bf8700',
+      muted = '#d4a72c66',
     }),
-    indigo = m({
-      borderColor = m({
-        emphasis = '#5a61e7',
-        muted = '#d2d7fe',
-      }),
-      fgColor = '#494edf',
-      bgColor = m({
-        emphasis = '#5a61e7',
-        muted = '#e5e9ff',
-      }),
+    accent = m({
+      emphasis = '#0969da',
+      muted = '#54aeff66',
     }),
-    plum = m({
-      borderColor = m({
-        emphasis = '#a830e8',
-        muted = '#f0cdfe',
-      }),
-      fgColor = '#961edc',
-      bgColor = m({
-        emphasis = '#a830e8',
-        muted = '#f8e5ff',
-      }),
+    open = m({
+      emphasis = '#cf222e',
+      muted = '#ff818266',
     }),
-    green = m({
-      borderColor = m({
-        emphasis = '#2c8141',
-        muted = '#9ceda0',
-      }),
-      fgColor = '#2b6e3f',
-      bgColor = m({
-        emphasis = '#2c8141',
-        muted = '#caf7ca',
-      }),
+    emphasis = '#6e7781',
+    translucent = '#1f232826',
+    upsell = m({
+      emphasis = '#8250df',
+      muted = '#c297ff66',
     }),
-    lemon = m({
-      borderColor = m({
-        emphasis = '#866e04',
-        muted = '#f0db3d',
-      }),
-      fgColor = '#786002',
-      bgColor = m({
-        emphasis = '#866e04',
-        muted = '#f7eea1',
-      }),
+    neutral = m({
+      emphasis = '#6e7781',
+      muted = '#afb8c133',
     }),
+    transparent = '#ffffff00',
   }),
-  buttonCounter = m({
-    default = m({
-      bgColor = m({
-        rest = '#afb8c133',
-      }),
-    }),
-    invisible = m({
-      bgColor = m({
-        rest = '#afb8c133',
-      }),
-    }),
-    outline = m({
-      bgColor = m({
-        rest = '#0969da1a',
-        disabled = '#0969da0d',
-        hover = '#ffffff33',
-      }),
-      fgColor = m({
-        rest = '#0550ae',
-        disabled = '#0969da80',
-        hover = '#ffffff',
-      }),
-    }),
-    danger = m({
-      bgColor = m({
-        rest = '#cf222e1a',
-        disabled = '#cf222e0d',
-        hover = '#ffffff33',
-      }),
-      fgColor = m({
-        rest = '#c21c2c',
-        disabled = '#d1242f80',
-        hover = '#ffffff',
-      }),
-    }),
-    primary = m({
-      bgColor = m({
-        rest = '#002d1133',
-      }),
-    }),
+  selection = m({
+    bgColor = '#0969da33',
+  }),
+  focus = m({
+    outline = '#0969da solid 2px',
+    outlineColor = '#0969da',
   }),
   treeViewItem = m({
     leadingVisual = m({