diff --git a/extension.json b/extension.json
index 916fb64..f6c4a78 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
 {
     "name": "Rosé Pine",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "authors": [
         "Kainoa Kanter <kainoa@t1c.dev>"
     ],
diff --git a/src/rose-pine-dawn.scss b/src/rose-pine-dawn.scss
index f28ce11..444bfd8 100644
--- a/src/rose-pine-dawn.scss
+++ b/src/rose-pine-dawn.scss
@@ -1,6 +1,6 @@
 :root {
   --schema: "https://zed.dev/schema/themes/v0.1.0.json";
-  --name: "Rosé Pine Dawn";
+  --name: "Rosé Pine";
   --author: "Kainoa Kanter <kainoa@t1c.dev>";
 }
 
@@ -8,6 +8,7 @@ themes {
   light {
     --appearance: "light";
     --name: "Rosé Pine Dawn";
+
     $foreground-accent: #d7827e;
     $foreground-higher-contrast: #575279;
     $foreground-high-contrast: #797593;
@@ -51,14 +52,14 @@ themes {
     $white: #575279;
 
     // Syntax highlighting
-    $syntax1: #286983;
+    $syntax1: #ea9d34;
     $syntax2: #b4637a;
     $syntax3: #d7827e;
-    $syntax4: #56949f;
+    $syntax4: #575279;
     $syntax5: #907aa9;
-    $syntax6: #286983;
-    $syntax7: #ea9d34;
-    $syntax8: #56949f;
+    $syntax6: #d7827e;
+    $syntax7: #56949f;
+    $syntax8: #286983;
 
     style {
       /* Editor */
diff --git a/src/rose-pine-moon.scss b/src/rose-pine-moon.scss
index 83a200f..0a79007 100644
--- a/src/rose-pine-moon.scss
+++ b/src/rose-pine-moon.scss
@@ -1,6 +1,6 @@
 :root {
   --schema: "https://zed.dev/schema/themes/v0.1.0.json";
-  --name: "Rosé Pine Moon";
+  --name: "Rosé Pine";
   --author: "Kainoa Kanter <kainoa@t1c.dev>";
 }
 
@@ -8,6 +8,7 @@ themes {
   dark {
     --appearance: "dark";
     --name: "Rosé Pine Moon";
+
     $foreground-accent: #ea9a97;
     $foreground-higher-contrast: #e0def4;
     $foreground-high-contrast: #908caa;
@@ -51,14 +52,14 @@ themes {
     $white: #e0def4;
 
     // Syntax highlighting
-    $syntax1: #3e8fb0;
+    $syntax1: #f6c177;
     $syntax2: #eb6f92;
     $syntax3: #ea9a97;
-    $syntax4: #9ccfd8;
+    $syntax4: #e0def4;
     $syntax5: #c4a7e7;
-    $syntax6: #3e8fb0;
-    $syntax7: #f6c177;
-    $syntax8: #9ccfd8;
+    $syntax6: #ea9a97;
+    $syntax7: #9ccfd8;
+    $syntax8: #3e8fb0;
 
     style {
       /* Editor */
diff --git a/src/rose-pine.scss b/src/rose-pine.scss
index eee717f..572ea92 100644
--- a/src/rose-pine.scss
+++ b/src/rose-pine.scss
@@ -8,6 +8,7 @@ themes {
   dark {
     --appearance: "dark";
     --name: "Rosé Pine";
+
     $foreground-accent: #ebbcba;
     $foreground-higher-contrast: #e0def4;
     $foreground-high-contrast: #908caa;
@@ -51,14 +52,14 @@ themes {
     $white: #e0def4;
 
     // Syntax highlighting
-    $syntax1: #31748f;
+    $syntax1: #f6c177;
     $syntax2: #eb6f92;
     $syntax3: #ebbcba;
-    $syntax4: #9ccfd8;
+    $syntax4: #e0def4;
     $syntax5: #c4a7e7;
-    $syntax6: #31748f;
-    $syntax7: #f6c177;
-    $syntax8: #9ccfd8;
+    $syntax6: #ebbcba;
+    $syntax7: #9ccfd8;
+    $syntax8: #31748f;
 
     style {
       /* Editor */
diff --git a/src/template.scss b/src/template.scss
new file mode 100644
index 0000000..86f07d9
--- /dev/null
+++ b/src/template.scss
@@ -0,0 +1,354 @@
+:root {
+  --schema: "https://zed.dev/schema/themes/v0.1.0.json";
+  --name: "Rosé Pine";
+  --author: "Kainoa Kanter <kainoa@t1c.dev>";
+}
+
+themes {
+  dark {
+    --appearance: "dark";
+    --name: "Rosé Pine";
+
+    $foreground-accent: $rose;
+    $foreground-higher-contrast: $text;
+    $foreground-high-contrast: $subtle;
+    $foreground: $muted;
+    $foreground-low-contrast: $highlightHigh;
+    $foreground-lower-contrast: $highlightMed;
+
+    $background-lowest-contrast: $overlay;
+    $background-lower-contrast: $overlay;
+    $background-low-contrast: $surface;
+    $background: $base;
+    $background-high-contrast: $base;
+    $background-higher-contrast: $base;
+
+    // UI
+    $predictive: $subtle;
+    $modified: $gold;
+    $ignored: $muted;
+
+    $info: $pine;
+
+    $hint: $subtle;
+    $hint-background: mix($background-low-contrast, $info, 80%);
+
+    $error: $love;
+    $error-background: mix($background-low-contrast, $error, 80%);
+    $error-border: $error;
+
+    $deleted: $love;
+    $created: $foam;
+    $warning: $gold;
+
+    // Terminal
+    $black: $highlightMed;
+    $red: $love;
+    $green: $pine;
+    $yellow: $gold;
+    $blue: $foam;
+    $magenta: $iris;
+    $cyan: $rose;
+    $white: $text;
+
+    // Syntax highlighting
+    $syntax1: $gold;
+    $syntax2: $love;
+    $syntax3: $rose;
+    $syntax4: $text;
+    $syntax5: $iris;
+    $syntax6: $rose;
+    $syntax7: $foam;
+    $syntax8: $pine;
+
+    style {
+      /* Editor */
+      --editor-foreground: #{$foreground};
+      --editor-background: #{$background};
+      --editor-gutter-background: #{$background};
+      --editor-active_line-background: #{$background-low-contrast};
+      --editor-line_number: #{$foreground-lower-contrast};
+      --editor-active_line_number: #{$foreground};
+      --editor-invisible: #{$foreground-lower-contrast};
+      --editor-wrap_guide: #{$foreground-lower-contrast};
+      --editor-active_wrap_guide: #{$foreground-lower-contrast};
+
+      /* Borders */
+      --border: #{$background-high-contrast};
+      --border-variant: #{$background-high-contrast};
+      --border-focused: #{$background-high-contrast};
+      --border-selected: #{$background-high-contrast};
+      --border-transparent: #{$background-high-contrast};
+      --border-disabled: #{$background-high-contrast};
+
+      /* Text */
+      --text: #{$foreground-high-contrast};
+      --text-muted: #{$foreground};
+      --text-placeholder: #{$foreground-lower-contrast};
+      --text-disabled: #{$foreground-lower-contrast};
+      --text-accent: #{$foreground-accent};
+
+      /* Layout */
+      --surface-background: #{$background-lower-contrast};
+      --elevated_surface-background: #{$background-lower-contrast};
+      --panel-background: #{$background};
+      --panel-focused_border: null;
+      --background: #{$background};
+      --status_bar-background: #{$background};
+      --title_bar-background: #{$background};
+      --toolbar-background: #{$background};
+
+      /* Tabs */
+      --tab_bar-background: #{$background-high-contrast};
+      --tab-inactive_background: #{$background-high-contrast};
+      --tab-active_background: #{$background};
+
+      /* Buttons */
+      --element-background: #{$background-lower-contrast};
+      --element-hover: #{$background-lowest-contrast};
+      --element-active: #{$background-lowest-contrast};
+      --element-selected: #{$background-lowest-contrast};
+      --element-disabled: #{$background-lowest-contrast};
+
+      --predictive: #{$predictive};
+      --modified: #{$modified};
+      --ignored: #{$ignored};
+      --deleted: #{$deleted};
+      --created: #{$created};
+      --warning: #{$warning};
+
+      --hint: #{$hint};
+      --hint-background: #{$hint-background};
+
+      --error: #{$error};
+      --error-background: #{$error-background};
+      --error-border: #{$error-border};
+
+      --info: #{$info};
+      // --info-background: #{$info-background};
+
+      /* Scrollbar */
+      --scrollbar-thumb-background: #{$foreground}44;
+      // --scrollbar-thumb-hover--background: #abb2bf;
+      --scrollbar-thumb-border: transparent;
+      --scrollbar-track-background: transparent;
+
+      /* Terminal */
+      --terminal-background: #{$background};
+      --terminal-ansi-black: #{$black};
+      --terminal-ansi-red: #{$red};
+      --terminal-ansi-green: #{$green};
+      --terminal-ansi-yellow: #{$yellow};
+      --terminal-ansi-blue: #{$blue};
+      --terminal-ansi-magenta: #{$magenta};
+      --terminal-ansi-cyan: #{$cyan};
+      --terminal-ansi-white: #{$white};
+
+      /* Players */
+      players {
+        p1 {
+          --cursor: #{$white};
+          --background: #{$white};
+          --selection: #{$white}22;
+        }
+        p2 {
+          --cursor: #{$blue};
+          --background: #{$blue};
+          --selection: #{$blue}44;
+        }
+        p3 {
+          --cursor: #{$magenta};
+          --background: #{$magenta};
+          --selection: #{$magenta}44;
+        }
+        p4 {
+          --cursor: #{$green};
+          --background: #{$green};
+          --selection: #{$green}44;
+        }
+        p5 {
+          --cursor: #{$red};
+          --background: #{$red};
+          --selection: #{$red}44;
+        }
+      }
+
+      /* Syntax highlighting */
+      syntax {
+        attribute {
+          color: #{$syntax3};
+        }
+        boolean {
+          color: #{$syntax3};
+        }
+        comment {
+          color: #{$foreground-low-contrast};
+          font-style: italic;
+        }
+        comment.doc {
+          color: #{$syntax4};
+        }
+        constant {
+          color: #{$syntax3};
+        }
+        constructor {
+          color: #{$syntax2};
+        }
+        embedded {
+          color: #{$syntax4};
+        }
+        emphasis {
+          color: #{$syntax5};
+          font-style: italic;
+          &.strong {
+            color: #{$syntax7};
+            font-weight: 700;
+          }
+        }
+        enum {
+          color: #{$syntax8};
+        }
+        function {
+          color: #{$syntax6};
+        }
+        hint {
+          color: #{$syntax4};
+        }
+        keyword {
+          color: #{$syntax5};
+        }
+        label {
+          color: #{$syntax6};
+        }
+        link_text {
+          color: #{$syntax6};
+        }
+        link_uri {
+          color: #{$syntax5};
+        }
+        number {
+          color: #{$syntax7};
+        }
+        operator {
+          color: #{$syntax8};
+        }
+        predictive {
+          color: #{$syntax4};
+        }
+        preproc {
+          color: #{$syntax1};
+        }
+        primary {
+          color: #{$syntax5};
+        } // <--
+        property {
+          color: #{$syntax2};
+        }
+        punctuation {
+          color: #{$syntax7};
+        }
+        punctuation.bracket {
+          color: #{$syntax3};
+        }
+        punctuation.delimiter {
+          color: #{$syntax7};
+        }
+        punctuation.list_marker {
+          color: #{$syntax7};
+          font-weight: 700;
+        }
+        punctuation.special {
+          color: #{$syntax5};
+        } // <--
+        string {
+          color: #{$syntax1};
+          &.escape {
+            color: #{$syntax1};
+          }
+          &.regex {
+            color: #{$syntax1};
+          }
+          &.special {
+            color: #{$syntax8};
+          }
+          &.special.symbol {
+            color: #{$syntax8};
+          }
+        }
+        tag {
+          color: #{$syntax5};
+        }
+        text.literal {
+          color: #{$syntax1};
+        }
+        title {
+          color: #{$syntax2};
+          font-weight: 700;
+        }
+        type {
+          color: #{$syntax7};
+        }
+        variable {
+          color: #{$syntax4};
+        }
+        variable.special {
+          color: #{$syntax7};
+        }
+        variant {
+          color: #{$syntax6};
+        }
+      }
+
+      // TODO
+      // --editor-subheader-background: null;
+      // --editor-highlighted_line-background: null;
+      // --editor-document_highlight-read_background: null;
+      // --editor-document_highlight-write_background: null;
+      // --scrollbar-thumb-hover_background: null;
+      // --scrollbar-track-border: null;
+      // --link_text-hover: null;
+      // --conflict: null;
+      // --conflict-background: null;
+      // --conflict-border: null;
+      // --created: null;
+      // --created-background: null;
+      // --created-border: null;
+      // --deleted: null;
+      // --deleted-background: null;
+      // --deleted-border: null;
+      // --error: null;
+      // --error-background: null;
+      // --error-border: null;
+      // --hidden: #f00;
+      // --hidden-background: #f00;
+      // --hidden-border: #f00;
+      // --hint: null;
+      // --hint-background: null;
+      // --hint-border: null;
+      // --ignored: null;
+      // --ignored-background: null;
+      // --ignored-border: null;
+      // --info: #f00;
+      // --info-background: #f00;
+      // --info-border: #f00;
+      // --modified: null;
+      // --modified-background: null;
+      // --modified-border: null;
+      // --predictive: null;
+      // --predictive-background: null;
+      // --predictive-border: null;
+      // --renamed: null;
+      // --renamed-background: null;
+      // --renamed-border: null;
+      // --success: null;
+      // --success-background: null;
+      // --success-border: null;
+      // --unreachable: #f00;
+      // --unreachable-background: #f00;
+      // --unreachable-border: #f00;
+      // --warning: null;
+      // --warning-background: null;
+      // --warning-border: null;
+    }
+  }
+}
diff --git a/themes/rose-pine-dawn.json b/themes/rose-pine-dawn.json
index 714b713..a37139c 100644
--- a/themes/rose-pine-dawn.json
+++ b/themes/rose-pine-dawn.json
@@ -3,7 +3,7 @@
     "\"UTF.8\"": true
   },
   "$schema": "https://zed.dev/schema/themes/v0.1.0.json",
-  "name": "Rosé Pine Dawn",
+  "name": "Rosé Pine",
   "author": "Kainoa Kanter <kainoa@t1c.dev>",
   "themes": [
     {
@@ -109,7 +109,7 @@
             "font_style": "italic"
           },
           "comment.doc": {
-            "color": "#56949f"
+            "color": "#575279"
           },
           "constant": {
             "color": "#d7827e"
@@ -118,48 +118,48 @@
             "color": "#b4637a"
           },
           "embedded": {
-            "color": "#56949f"
+            "color": "#575279"
           },
           "emphasis": {
             "color": "#907aa9",
             "font_style": "italic"
           },
           "emphasis.strong": {
-            "color": "#ea9d34",
+            "color": "#56949f",
             "font_weight": 700
           },
           "enum": {
-            "color": "#56949f"
+            "color": "#286983"
           },
           "function": {
-            "color": "#286983"
+            "color": "#d7827e"
           },
           "hint": {
-            "color": "#56949f"
+            "color": "#575279"
           },
           "keyword": {
             "color": "#907aa9"
           },
           "label": {
-            "color": "#286983"
+            "color": "#d7827e"
           },
           "link_text": {
-            "color": "#286983"
+            "color": "#d7827e"
           },
           "link_uri": {
             "color": "#907aa9"
           },
           "number": {
-            "color": "#ea9d34"
+            "color": "#56949f"
           },
           "operator": {
-            "color": "#56949f"
+            "color": "#286983"
           },
           "predictive": {
-            "color": "#56949f"
+            "color": "#575279"
           },
           "preproc": {
-            "color": "#286983"
+            "color": "#ea9d34"
           },
           "primary": {
             "color": "#907aa9"
@@ -168,57 +168,57 @@
             "color": "#b4637a"
           },
           "punctuation": {
-            "color": "#ea9d34"
+            "color": "#56949f"
           },
           "punctuation.bracket": {
             "color": "#d7827e"
           },
           "punctuation.delimiter": {
-            "color": "#ea9d34"
+            "color": "#56949f"
           },
           "punctuation.list_marker": {
-            "color": "#ea9d34",
+            "color": "#56949f",
             "font_weight": 700
           },
           "punctuation.special": {
             "color": "#907aa9"
           },
           "string": {
-            "color": "#286983"
+            "color": "#ea9d34"
           },
           "string.escape": {
-            "color": "#286983"
+            "color": "#ea9d34"
           },
           "string.regex": {
-            "color": "#286983"
+            "color": "#ea9d34"
           },
           "string.special": {
-            "color": "#56949f"
+            "color": "#286983"
           },
           "string.special.symbol": {
-            "color": "#56949f"
+            "color": "#286983"
           },
           "tag": {
             "color": "#907aa9"
           },
           "text.literal": {
-            "color": "#286983"
+            "color": "#ea9d34"
           },
           "title": {
             "color": "#b4637a",
             "font_weight": 700
           },
           "type": {
-            "color": "#ea9d34"
+            "color": "#56949f"
           },
           "variable": {
-            "color": "#56949f"
+            "color": "#575279"
           },
           "variable.special": {
-            "color": "#ea9d34"
+            "color": "#56949f"
           },
           "variant": {
-            "color": "#286983"
+            "color": "#d7827e"
           }
         }
       }
diff --git a/themes/rose-pine-moon.json b/themes/rose-pine-moon.json
index dd179ad..737f0fc 100644
--- a/themes/rose-pine-moon.json
+++ b/themes/rose-pine-moon.json
@@ -3,7 +3,7 @@
     "\"UTF.8\"": true
   },
   "$schema": "https://zed.dev/schema/themes/v0.1.0.json",
-  "name": "Rosé Pine Moon",
+  "name": "Rosé Pine",
   "author": "Kainoa Kanter <kainoa@t1c.dev>",
   "themes": [
     {
@@ -109,7 +109,7 @@
             "font_style": "italic"
           },
           "comment.doc": {
-            "color": "#9ccfd8"
+            "color": "#e0def4"
           },
           "constant": {
             "color": "#ea9a97"
@@ -118,48 +118,48 @@
             "color": "#eb6f92"
           },
           "embedded": {
-            "color": "#9ccfd8"
+            "color": "#e0def4"
           },
           "emphasis": {
             "color": "#c4a7e7",
             "font_style": "italic"
           },
           "emphasis.strong": {
-            "color": "#f6c177",
+            "color": "#9ccfd8",
             "font_weight": 700
           },
           "enum": {
-            "color": "#9ccfd8"
+            "color": "#3e8fb0"
           },
           "function": {
-            "color": "#3e8fb0"
+            "color": "#ea9a97"
           },
           "hint": {
-            "color": "#9ccfd8"
+            "color": "#e0def4"
           },
           "keyword": {
             "color": "#c4a7e7"
           },
           "label": {
-            "color": "#3e8fb0"
+            "color": "#ea9a97"
           },
           "link_text": {
-            "color": "#3e8fb0"
+            "color": "#ea9a97"
           },
           "link_uri": {
             "color": "#c4a7e7"
           },
           "number": {
-            "color": "#f6c177"
+            "color": "#9ccfd8"
           },
           "operator": {
-            "color": "#9ccfd8"
+            "color": "#3e8fb0"
           },
           "predictive": {
-            "color": "#9ccfd8"
+            "color": "#e0def4"
           },
           "preproc": {
-            "color": "#3e8fb0"
+            "color": "#f6c177"
           },
           "primary": {
             "color": "#c4a7e7"
@@ -168,57 +168,57 @@
             "color": "#eb6f92"
           },
           "punctuation": {
-            "color": "#f6c177"
+            "color": "#9ccfd8"
           },
           "punctuation.bracket": {
             "color": "#ea9a97"
           },
           "punctuation.delimiter": {
-            "color": "#f6c177"
+            "color": "#9ccfd8"
           },
           "punctuation.list_marker": {
-            "color": "#f6c177",
+            "color": "#9ccfd8",
             "font_weight": 700
           },
           "punctuation.special": {
             "color": "#c4a7e7"
           },
           "string": {
-            "color": "#3e8fb0"
+            "color": "#f6c177"
           },
           "string.escape": {
-            "color": "#3e8fb0"
+            "color": "#f6c177"
           },
           "string.regex": {
-            "color": "#3e8fb0"
+            "color": "#f6c177"
           },
           "string.special": {
-            "color": "#9ccfd8"
+            "color": "#3e8fb0"
           },
           "string.special.symbol": {
-            "color": "#9ccfd8"
+            "color": "#3e8fb0"
           },
           "tag": {
             "color": "#c4a7e7"
           },
           "text.literal": {
-            "color": "#3e8fb0"
+            "color": "#f6c177"
           },
           "title": {
             "color": "#eb6f92",
             "font_weight": 700
           },
           "type": {
-            "color": "#f6c177"
+            "color": "#9ccfd8"
           },
           "variable": {
-            "color": "#9ccfd8"
+            "color": "#e0def4"
           },
           "variable.special": {
-            "color": "#f6c177"
+            "color": "#9ccfd8"
           },
           "variant": {
-            "color": "#3e8fb0"
+            "color": "#ea9a97"
           }
         }
       }
diff --git a/themes/rose-pine.json b/themes/rose-pine.json
index e4cb09c..6911d3d 100644
--- a/themes/rose-pine.json
+++ b/themes/rose-pine.json
@@ -109,7 +109,7 @@
             "font_style": "italic"
           },
           "comment.doc": {
-            "color": "#9ccfd8"
+            "color": "#e0def4"
           },
           "constant": {
             "color": "#ebbcba"
@@ -118,48 +118,48 @@
             "color": "#eb6f92"
           },
           "embedded": {
-            "color": "#9ccfd8"
+            "color": "#e0def4"
           },
           "emphasis": {
             "color": "#c4a7e7",
             "font_style": "italic"
           },
           "emphasis.strong": {
-            "color": "#f6c177",
+            "color": "#9ccfd8",
             "font_weight": 700
           },
           "enum": {
-            "color": "#9ccfd8"
+            "color": "#31748f"
           },
           "function": {
-            "color": "#31748f"
+            "color": "#ebbcba"
           },
           "hint": {
-            "color": "#9ccfd8"
+            "color": "#e0def4"
           },
           "keyword": {
             "color": "#c4a7e7"
           },
           "label": {
-            "color": "#31748f"
+            "color": "#ebbcba"
           },
           "link_text": {
-            "color": "#31748f"
+            "color": "#ebbcba"
           },
           "link_uri": {
             "color": "#c4a7e7"
           },
           "number": {
-            "color": "#f6c177"
+            "color": "#9ccfd8"
           },
           "operator": {
-            "color": "#9ccfd8"
+            "color": "#31748f"
           },
           "predictive": {
-            "color": "#9ccfd8"
+            "color": "#e0def4"
           },
           "preproc": {
-            "color": "#31748f"
+            "color": "#f6c177"
           },
           "primary": {
             "color": "#c4a7e7"
@@ -168,57 +168,57 @@
             "color": "#eb6f92"
           },
           "punctuation": {
-            "color": "#f6c177"
+            "color": "#9ccfd8"
           },
           "punctuation.bracket": {
             "color": "#ebbcba"
           },
           "punctuation.delimiter": {
-            "color": "#f6c177"
+            "color": "#9ccfd8"
           },
           "punctuation.list_marker": {
-            "color": "#f6c177",
+            "color": "#9ccfd8",
             "font_weight": 700
           },
           "punctuation.special": {
             "color": "#c4a7e7"
           },
           "string": {
-            "color": "#31748f"
+            "color": "#f6c177"
           },
           "string.escape": {
-            "color": "#31748f"
+            "color": "#f6c177"
           },
           "string.regex": {
-            "color": "#31748f"
+            "color": "#f6c177"
           },
           "string.special": {
-            "color": "#9ccfd8"
+            "color": "#31748f"
           },
           "string.special.symbol": {
-            "color": "#9ccfd8"
+            "color": "#31748f"
           },
           "tag": {
             "color": "#c4a7e7"
           },
           "text.literal": {
-            "color": "#31748f"
+            "color": "#f6c177"
           },
           "title": {
             "color": "#eb6f92",
             "font_weight": 700
           },
           "type": {
-            "color": "#f6c177"
+            "color": "#9ccfd8"
           },
           "variable": {
-            "color": "#9ccfd8"
+            "color": "#e0def4"
           },
           "variable.special": {
-            "color": "#f6c177"
+            "color": "#9ccfd8"
           },
           "variant": {
-            "color": "#31748f"
+            "color": "#ebbcba"
           }
         }
       }