diff --git a/templates/iterm2/templates/default-256.mustache b/templates/iterm2/templates/base16-256.mustache
similarity index 98%
rename from templates/iterm2/templates/default-256.mustache
rename to templates/iterm2/templates/base16-256.mustache
index b315896..a07bd6a 100644
--- a/templates/iterm2/templates/default-256.mustache
+++ b/templates/iterm2/templates/base16-256.mustache
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Base16 {{scheme-name}}-256
+    {{scheme-system}} {{scheme-name}}-256
     Scheme author: {{scheme-author}}
     Template author: Tinted Theming (https://github.com/tinted-theming)
-    semanticClass: theme.base16.{{scheme-slug}}
+    semanticClass: theme.{{scheme-system}}.{{scheme-slug}}-256
 -->
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
diff --git a/templates/iterm2/templates/default.mustache b/templates/iterm2/templates/base16.mustache
similarity index 98%
rename from templates/iterm2/templates/default.mustache
rename to templates/iterm2/templates/base16.mustache
index 7c1361d..06e8544 100644
--- a/templates/iterm2/templates/default.mustache
+++ b/templates/iterm2/templates/base16.mustache
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Base16 {{scheme-name}}
+    {{scheme-system}} {{scheme-name}}
     Scheme author: {{scheme-author}}
     Template author: Tinted Theming (https://github.com/tinted-theming)
-    semanticClass: theme.base16.{{scheme-slug}}
+    semanticClass: theme.{{scheme-system}}.{{scheme-slug}}
 -->
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
diff --git a/templates/iterm2/templates/base24-256.mustache b/templates/iterm2/templates/base24-256.mustache
new file mode 100644
index 0000000..990138c
--- /dev/null
+++ b/templates/iterm2/templates/base24-256.mustache
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    {{scheme-system}} {{scheme-name}}-256
+    Scheme author: {{scheme-author}}
+    Template author: Tinted Theming (https://github.com/tinted-theming)
+    semanticClass: theme.{{scheme-system}}.{{scheme-slug}}-256
+-->
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Ansi 0 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base00-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base00-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base00-dec-r}}</real>
+	</dict>
+	<key>Ansi 1 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base08-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base08-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base08-dec-r}}</real>
+	</dict>
+	<key>Ansi 2 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base0B-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base0B-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base0B-dec-r}}</real>
+	</dict>
+	<key>Ansi 3 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base0A-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base0A-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base0A-dec-r}}</real>
+	</dict>
+	<key>Ansi 4 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base0D-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base0D-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base0D-dec-r}}</real>
+	</dict>
+	<key>Ansi 5 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base0E-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base0E-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base0E-dec-r}}</real>
+	</dict>
+	<key>Ansi 6 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base0C-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base0C-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base0C-dec-r}}</real>
+	</dict>
+	<key>Ansi 7 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base06-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base06-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base06-dec-r}}</real>
+	</dict>
+	<key>Ansi 8 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base02-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base02-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base02-dec-r}}</real>
+	</dict>
+	<key>Ansi 9 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base12-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base12-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base12-dec-r}}</real>
+	</dict>
+	<key>Ansi 10 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base14-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base14-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base14-dec-r}}</real>
+	</dict>
+	<key>Ansi 11 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base13-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base13-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base13-dec-r}}</real>
+	</dict>
+	<key>Ansi 12 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base16-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base16-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base16-dec-r}}</real>
+	</dict>
+	<key>Ansi 13 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base17-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base17-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base17-dec-r}}</real>
+	</dict>
+	<key>Ansi 14 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base15-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base15-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base15-dec-r}}</real>
+	</dict>
+	<key>Ansi 15 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base07-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base07-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base07-dec-r}}</real>
+	</dict>
+	<key>Background Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base00-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base00-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base00-dec-r}}</real>
+	</dict>
+	<key>Bold Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base05-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base05-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base05-dec-r}}</real>
+	</dict>
+	<key>Cursor Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base05-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base05-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base05-dec-r}}</real>
+	</dict>
+	<key>Cursor Text Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base00-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base00-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base00-dec-r}}</real>
+	</dict>
+	<key>Foreground Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base05-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base05-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base05-dec-r}}</real>
+	</dict>
+	<key>Selected Text Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base05-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base05-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base05-dec-r}}</real>
+	</dict>
+	<key>Selection Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base02-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base02-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base02-dec-r}}</real>
+	</dict>
+</dict>
+</plist>
diff --git a/templates/iterm2/templates/base24.mustache b/templates/iterm2/templates/base24.mustache
new file mode 100644
index 0000000..968a3cd
--- /dev/null
+++ b/templates/iterm2/templates/base24.mustache
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    {{scheme-system}} {{scheme-name}}
+    Scheme author: {{scheme-author}}
+    Template author: Tinted Theming (https://github.com/tinted-theming)
+    semanticClass: theme.{{scheme-system}}.{{scheme-slug}}
+-->
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Ansi 0 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base00-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base00-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base00-dec-r}}</real>
+	</dict>
+	<key>Ansi 1 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base08-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base08-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base08-dec-r}}</real>
+	</dict>
+	<key>Ansi 2 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base0B-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base0B-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base0B-dec-r}}</real>
+	</dict>
+	<key>Ansi 3 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base0A-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base0A-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base0A-dec-r}}</real>
+	</dict>
+	<key>Ansi 4 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base0D-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base0D-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base0D-dec-r}}</real>
+	</dict>
+	<key>Ansi 5 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base0E-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base0E-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base0E-dec-r}}</real>
+	</dict>
+	<key>Ansi 6 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base0C-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base0C-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base0C-dec-r}}</real>
+	</dict>
+	<key>Ansi 7 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base06-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base06-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base06-dec-r}}</real>
+	</dict>
+	<key>Ansi 8 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base02-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base02-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base02-dec-r}}</real>
+	</dict>
+	<key>Ansi 9 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base12-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base12-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base12-dec-r}}</real>
+	</dict>
+	<key>Ansi 10 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base14-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base14-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base14-dec-r}}</real>
+	</dict>
+	<key>Ansi 11 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base13-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base13-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base13-dec-r}}</real>
+	</dict>
+	<key>Ansi 12 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base16-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base16-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base16-dec-r}}</real>
+	</dict>
+	<key>Ansi 13 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base17-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base17-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base17-dec-r}}</real>
+	</dict>
+	<key>Ansi 14 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base15-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base15-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base15-dec-r}}</real>
+	</dict>
+	<key>Ansi 15 Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base07-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base07-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base07-dec-r}}</real>
+	</dict>
+	<key>Background Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base00-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base00-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base00-dec-r}}</real>
+	</dict>
+	<key>Bold Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base05-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base05-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base05-dec-r}}</real>
+	</dict>
+	<key>Cursor Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base05-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base05-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base05-dec-r}}</real>
+	</dict>
+	<key>Cursor Text Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base00-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base00-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base00-dec-r}}</real>
+	</dict>
+	<key>Foreground Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base05-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base05-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base05-dec-r}}</real>
+	</dict>
+	<key>Selected Text Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base05-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base05-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base05-dec-r}}</real>
+	</dict>
+	<key>Selection Color</key>
+	<dict>
+		<key>Color Space</key>
+		<string>sRGB</string>
+		<key>Blue Component</key>
+		<real>{{base02-dec-b}}</real>
+		<key>Green Component</key>
+		<real>{{base02-dec-g}}</real>
+		<key>Red Component</key>
+		<real>{{base02-dec-r}}</real>
+	</dict>
+</dict>
+</plist>
diff --git a/templates/iterm2/templates/config.yaml b/templates/iterm2/templates/config.yaml
index 0c22348..a1fc9bd 100644
--- a/templates/iterm2/templates/config.yaml
+++ b/templates/iterm2/templates/config.yaml
@@ -1,11 +1,24 @@
-default:
+base16:
   extension: .itermcolors
   output: itermcolors
+  supported-systems: [base16]
 
-legacy-256:
-  extension: -256.itermcolors
+base24:
+  extension: .itermcolors
   output: itermcolors
+  supported-systems: [base24]
+
+base16-256:
+  extension: .itermcolors
+  output: itermcolors-256
+  supported-systems: [base16]
 
-default-256:
+base24-256:
   extension: .itermcolors
   output: itermcolors-256
+  supported-systems: [base24]
+
+legacy-256:
+  extension: -256.itermcolors
+  output: itermcolors
+  supported-systems: [base16]
diff --git a/templates/iterm2/templates/legacy-256.mustache b/templates/iterm2/templates/legacy-256.mustache
index b315896..a07bd6a 100644
--- a/templates/iterm2/templates/legacy-256.mustache
+++ b/templates/iterm2/templates/legacy-256.mustache
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Base16 {{scheme-name}}-256
+    {{scheme-system}} {{scheme-name}}-256
     Scheme author: {{scheme-author}}
     Template author: Tinted Theming (https://github.com/tinted-theming)
-    semanticClass: theme.base16.{{scheme-slug}}
+    semanticClass: theme.{{scheme-system}}.{{scheme-slug}}-256
 -->
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
diff --git a/templates/kitty/templates/default-256.mustache b/templates/kitty/templates/default-256.mustache
index 6f449ad..a356fe0 100644
--- a/templates/kitty/templates/default-256.mustache
+++ b/templates/kitty/templates/default-256.mustache
@@ -6,6 +6,7 @@ selection_background #{{base05-hex}}
 selection_foreground #{{base00-hex}}
 url_color #{{base04-hex}}
 cursor #{{base05-hex}}
+cursor_text_color #{{base00-hex}}
 active_border_color #{{base03-hex}}
 inactive_border_color #{{base01-hex}}
 active_tab_background #{{base00-hex}}
diff --git a/templates/kitty/templates/default.mustache b/templates/kitty/templates/default.mustache
index b2259fe..38c1ddf 100644
--- a/templates/kitty/templates/default.mustache
+++ b/templates/kitty/templates/default.mustache
@@ -6,6 +6,7 @@ selection_background #{{base05-hex}}
 selection_foreground #{{base00-hex}}
 url_color #{{base04-hex}}
 cursor #{{base05-hex}}
+cursor_text_color #{{base00-hex}}
 active_border_color #{{base03-hex}}
 inactive_border_color #{{base01-hex}}
 active_tab_background #{{base00-hex}}