diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index e94d62c..b7bd9ad 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -1,112 +1,92 @@
-# Font
 font:
   normal:
     family: Fira Code
     style: Regular
   size: 14
 
-# Colors
-# dark
-colors:
-  primary:
-    background: "#282c34"
-    foreground: "#abb2bf"
-  cursor:
-    text: CellBackground
-    cursor: CellForeground
-  vi_mode_cursor:
-    text: CellBackground
-    cursor: CellForeground
-  search:
-    matches:
-      foreground: CellBackground
-      background: CellForeground
-    focused_match:
-      foreground: "#282c34"
-      background: "#abb2bf"
-    bar:
-      background: "#abb2bf"
-      foreground: "#282c34"
-  hints:
-    start:
-      foreground: "#1d1f21"
-      background: "#e9ff5e"
-    end:
-      foreground: "#e9ff5e"
-      background: "#1d1f21"
-  line_indicator:
-    foreground: None
-    background: None
-  selection:
-    text: CellBackground
-    background: CellForeground
-  normal:
-    black: "#282c34"
-    red: "#be5046"
-    green: "#98c379"
-    yellow: "#d19a66"
-    blue: "#61afef"
-    magenta: "#c678dd"
-    cyan: "#56b6c2"
-    white: "#abb2bf"
-  bright:
-    black: "#5c6370"
-    red: "#e06c75"
-    green: "#98c379"
-    yellow: "#e5c07b"
-    blue: "#61afef"
-    magenta: "#c678dd"
-    cyan: "#56b6c2"
-    white: "#3e4451"
-# light
-# colors:
-#   primary:
-#     background: "#fafafa"
-#     foreground: "#383a42"
-#   cursor:
-#     text: CellBackground
-#     cursor: CellForeground
-#   vi_mode_cursor:
-#     text: CellBackground
-#     cursor: CellForeground
-#   search:
-#     matches:
-#       foreground: CellBackground
-#       background: CellForeground
-#     focused_match:
-#       foreground: "#fafafa"
-#       background: "#383a42"
-#     bar:
-#       background: "#383a42"
-#       foreground: "#fafafa"
-#   hints:
-#     start:
-#       foreground: "#1d1f21"
-#       background: "#e9ff5e"
-#     end:
-#       foreground: "#e9ff5e"
-#       background: "#1d1f21"
-#   line_indicator:
-#     foreground: None
-#     background: None
-#   selection:
-#     text: CellBackground
-#     background: CellForeground
-#   normal:
-#     black: "#fafafa"
-#     red: "#ca1261"
-#     green: "#50a14f"
-#     yellow: "#986801"
-#     blue: "#4078f2"
-#     magenta: "#a626a4"
-#     cyan: "#0184bc"
-#     white: "#383a42"
-#   bright:
-#     black: "#a0a1a7"
-#     red: "#e45649"
-#     green: "#50a14f"
-#     yellow: "#c18401"
-#     blue: "#4078f2"
-#     magenta: "#a626a4"
-#     cyan: "#0184bc"
-#     white: "#e5e5e6"
+color-schemes:
+  one-dark: &one-dark
+    primary:
+      background: "#282c34" # syntax-bg
+      foreground: "#abb2bf" # syntax-fg
+    cursor:
+      text: CellBackground
+      cursor: CellForeground
+    vi_mode_cursor:
+      text: CellBackground
+      cursor: CellForeground
+    search:
+      matches:
+        foreground: CellForeground
+        background: "#314365" # (manually extracted via color picker)
+      focused_match:
+        foreground: CellForeground
+        background: "#3E4451" # (manually extracted via color picker)
+      bar:
+        background: "#1B1D23" # (manually extracted via color picker)
+        foreground: "#abb2bf" # syntax-fg
+    selection:
+      text: CellForeground
+      background: "#3e4451" # syntax-selection-color
+    normal:
+      black: "#282c34"   # syntax-bg
+      red: "#e06c75"     # red 1
+      green: "#98c379"   # green
+      yellow: "#e5c07b"  # orange 2
+      blue: "#61afef"    # blue
+      magenta: "#c678dd" # purple
+      cyan: "#56b6c2"    # cyan
+      white: "#abb2bf"   # syntax-fg
+    bright:
+      black: "#5c6370"   # mono-3
+      red: "#be5046"     # red 2
+      green: "#98c379"   # green
+      yellow: "#d19a66"  # orange 1
+      blue: "#61afef"    # blue
+      magenta: "#c678dd" # purple
+      cyan: "#56b6c2"    # cyan
+      white: "#636d83"   # syntax-gutter-text-color
+
+  one-light: &one-light
+    primary:
+      background: "#fafafa" # syntax-bg
+      foreground: "#383a42" # syntax-fg
+    cursor:
+      text: CellBackground
+      cursor: CellForeground
+    vi_mode_cursor:
+      text: CellBackground
+      cursor: CellForeground
+    search:
+      matches:
+        foreground: CellForeground
+        background: "#d8defb" # (manually extracted via color picker)
+      focused_match:
+        foreground: CellForeground
+        background: "#e5e5e6" # (manually extracted via color picker)
+      bar:
+        background: "#ffffff" # (manually extracted via color picker)
+        foreground: "#383a42" # syntax-fg
+    selection:
+      text: CellForeground
+      background: "#e5e5e6" # syntax-selection-color
+    normal:
+      black: "#383a42"   # syntax-fg
+      red: "#ca1243"     # red 2
+      green: "#50a14f"   # green
+      yellow: "#b76b01"  # orange 1
+      blue: "#4078f2"    # blue
+      magenta: "#a626a4" # purple
+      cyan: "#0184bc"    # cyan
+      white: "#fafafa"   # syntax-bg
+    bright:
+      black: "#696c77"   # mono-2
+      red: "#e45649"     # red 1
+      green: "#50a14f"   # green
+      yellow: "#cb7701"  # orange 2
+      blue: "#4078f2"    # blue
+      magenta: "#a626a4" # purple
+      cyan: "#0184bc"    # cyan
+      white: "#9d9d9f"   # syntax-gutter-text-color
+
+colors: *one-dark