diff --git a/.gulp/tasks/themes.js b/.gulp/tasks/themes.js
index d4b2394..90224a5 100644
--- a/.gulp/tasks/themes.js
+++ b/.gulp/tasks/themes.js
@@ -13,7 +13,7 @@ import Paths from '../paths';
 const themeCommons = require('../../src/themes/settings/commons.json');
 const themeVariants = [];
 const themeTemplateFile = fs.readFileSync(
-  `${Paths.src}/themes/theme-template.yml`,
+  `${Paths.src}/themes/theme-template.json`,
   'utf-8'
 );
 
@@ -39,7 +39,7 @@ gulp.task('build:themes', cb => {
       variant,
     };
 
-    const templateJson = YAML.parse(
+    const templateJson = JSON.parse(
       Mustache.render(themeTemplateFile, templateData)
     );
 
diff --git a/src/themes/theme-template-color-theme.json b/src/themes/theme-template-color-theme.json
new file mode 100644
index 0000000..8a662f1
--- /dev/null
+++ b/src/themes/theme-template-color-theme.json
@@ -0,0 +1,741 @@
+{
+  "name": "{{variant.name}}",
+  "tokenColors": [
+    {
+      "settings": {
+        "background": "{{variant.scheme.background}}",
+        "foreground": "{{variant.scheme.base.white}}"
+      }
+    },
+    {
+      "name": "Comment",
+      "scope": [
+        "comment",
+        "punctuation.definition.comment"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "{{variant.scheme.comments}}"
+      }
+    },
+    {
+      "name": "Variables",
+      "scope": [
+        "variable",
+        "string constant.other.placeholder"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.foreground}}"
+      }
+    },
+    {
+      "name": "Colors",
+      "scope": [
+        "constant.other.color"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.white}}"
+      }
+    },
+    {
+      "name": "Invalid",
+      "scope": [
+        "invalid",
+        "invalid.illegal",
+        "invalid.broken"
+      ],
+      "settings": {
+        "background": "{{variant.scheme.base.red}}",
+        "foreground": "{{variant.scheme.base.white}}"
+      }
+    },
+    {
+      "name": "Invalid unimplemented",
+      "scope": [
+        "invalid.unimplemented"
+      ],
+      "settings": {
+        "background": "{{variant.scheme.base.green}}",
+        "foreground": "{{variant.scheme.base.white}}"
+      }
+    },
+    {
+      "name": "Invalid deprecated",
+      "scope": [
+        "invalid.deprecated"
+      ],
+      "settings": {
+        "background": "{{variant.scheme.base.purple}}",
+        "foreground": "{{variant.scheme.base.white}}"
+      }
+    },
+    {
+      "name": "Keyword, Storage",
+      "scope": [
+        "keyword",
+        "storage.type",
+        "storage.modifier"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.purple}}"
+      }
+    },
+    {
+      "name": "Keyword, Storage",
+      "scope": [
+        "Keyword",
+        "Storage"
+      ],
+      "settings": {
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "name": "Operator, Misc",
+      "scope": [
+        "keyword.control",
+        "constant.other.color",
+        "punctuation",
+        "meta.tag",
+        "punctuation.definition.tag",
+        "punctuation.separator.inheritance.php",
+        "punctuation.definition.tag.html",
+        "punctuation.definition.tag.begin.html",
+        "punctuation.definition.tag.end.html",
+        "punctuation.section.embedded",
+        "keyword.other.template",
+        "keyword.other.substitution"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.cyan}}"
+      }
+    },
+    {
+      "name": "Tag",
+      "scope": [
+        "entity.name.tag",
+        "meta.tag.sgml",
+        "markup.deleted.git_gutter"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.pink}}"
+      }
+    },
+    {
+      "name": "Function, Special Method, Block Level",
+      "scope": [
+        "entity.name.function",
+        "meta.function-call",
+        "variable.function",
+        "support.function",
+        "keyword.other.special-method",
+        "meta.block-level"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.blue}}"
+      }
+    },
+    {
+      "name": "Other Variable, String Link",
+      "scope": [
+        "support.other.variable",
+        "string.other.link"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.pink}}"
+      }
+    },
+    {
+      "name": "Number, Constant, Function Argument, Tag Attribute, Embedded",
+      "scope": [
+        "constant.numeric",
+        "constant.language",
+        "support.constant",
+        "constant.character",
+        "variable.parameter",
+        "keyword.other.unit"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.orange}}"
+      }
+    },
+    {
+      "name": "String, Symbols, Inherited Class, Markup Heading",
+      "scope": [
+        "string",
+        "constant.other.symbol",
+        "constant.other.key",
+        "entity.other.inherited-class",
+        "markup.heading",
+        "markup.inserted.git_gutter",
+        "meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js"
+      ],
+      "settings": {
+        "fontStyle": "normal",
+        "foreground": "{{variant.scheme.base.green}}"
+      }
+    },
+    {
+      "name": "Class, Support",
+      "scope": [
+        "entity.name.class",
+        "entity.name.type.class",
+        "support.type",
+        "support.class",
+        "support.orther.namespace.use.php",
+        "meta.use.php",
+        "support.other.namespace.php",
+        "markup.changed.git_gutter",
+        "support.type.sys-types"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.yellow}}"
+      }
+    },
+    {
+      "name": "CSS Class and Support",
+      "scope": [
+        "source.css support.type.property-name",
+        "source.sass support.type.property-name",
+        "source.scss support.type.property-name",
+        "source.less support.type.property-name",
+        "source.stylus support.type.property-name",
+        "source.postcss support.type.property-name"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.paleblue}}"
+      }
+    },
+    {
+      "name": "Sub-methods",
+      "scope": [
+        "entity.name.module.js",
+        "variable.import.parameter.js",
+        "variable.other.class.js"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.red}}"
+      }
+    },
+    {
+      "name": "Language methods",
+      "scope": [
+        "variable.language"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "{{variant.scheme.base.red}}"
+      }
+    },
+    {
+      "name": "entity.name.method.js",
+      "scope": [
+        "entity.name.method.js"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "{{variant.scheme.base.blue}}"
+      }
+    },
+    {
+      "name": "meta.method.js",
+      "scope": [
+        "meta.class-method.js entity.name.function.js",
+        "variable.function.constructor"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.blue}}"
+      }
+    },
+    {
+      "name": "Attributes",
+      "scope": [
+        "entity.other.attribute-name"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.purple}}"
+      }
+    },
+    {
+      "name": "HTML Attributes",
+      "scope": [
+        "text.html.basic entity.other.attribute-name.html",
+        "text.html.basic entity.other.attribute-name"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "{{variant.scheme.base.yellow}}"
+      }
+    },
+    {
+      "name": "CSS Classes",
+      "scope": [
+        "entity.other.attribute-name.class"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.yellow}}"
+      }
+    },
+    {
+      "name": "CSS ID's",
+      "scope": [
+        "source.sass keyword.control"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.blue}}"
+      }
+    },
+    {
+      "name": "Inserted",
+      "scope": [
+        "markup.inserted"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.green}}"
+      }
+    },
+    {
+      "name": "Deleted",
+      "scope": [
+        "markup.deleted"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.red}}"
+      }
+    },
+    {
+      "name": "Changed",
+      "scope": [
+        "markup.changed"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.purple}}"
+      }
+    },
+    {
+      "name": "Regular Expressions",
+      "scope": [
+        "string.regexp"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.cyan}}"
+      }
+    },
+    {
+      "name": "Escape Characters",
+      "scope": [
+        "constant.character.escape"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.cyan}}"
+      }
+    },
+    {
+      "name": "URL",
+      "scope": [
+        "*url*",
+        "*link*",
+        "*uri*"
+      ],
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    {
+      "name": "Decorators",
+      "scope": [
+        "tag.decorator.js entity.name.tag.js",
+        "tag.decorator.js punctuation.definition.tag.js"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "{{variant.scheme.base.blue}}"
+      }
+    },
+    {
+      "name": "ES7 Bind Operator",
+      "scope": [
+        "source.js constant.other.object.key.js string.unquoted.label.js"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "{{variant.scheme.base.red}}"
+      }
+    },
+    {
+      "name": "JSON Key - Level 0",
+      "scope": [
+        "source.json meta.structure.dictionary.json support.type.property-name.json"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.purple}}"
+      }
+    },
+    {
+      "name": "JSON Key - Level 1",
+      "scope": [
+        "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.yellow}}"
+      }
+    },
+    {
+      "name": "JSON Key - Level 2",
+      "scope": [
+        "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.orange}}"
+      }
+    },
+    {
+      "name": "JSON Key - Level 3",
+      "scope": [
+        "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.red}}"
+      }
+    },
+    {
+      "name": "JSON Key - Level 4",
+      "scope": [
+        "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.brown}}"
+      }
+    },
+    {
+      "name": "JSON Key - Level 5",
+      "scope": [
+        "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.blue}}"
+      }
+    },
+    {
+      "name": "JSON Key - Level 6",
+      "scope": [
+        "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.pink}}"
+      }
+    },
+    {
+      "name": "JSON Key - Level 7",
+      "scope": [
+        "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.purple}}"
+      }
+    },
+    {
+      "name": "JSON Key - Level 8",
+      "scope": [
+        "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.green}}"
+      }
+    },
+    {
+      "name": "Markdown - Plain",
+      "scope": [
+        "text.html.markdown",
+        "punctuation.definition.list_item.markdown"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.foreground}}"
+      }
+    },
+    {
+      "name": "Markdown - Markup Raw Inline",
+      "scope": [
+        "text.html.markdown markup.inline.raw.markdown"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.purple}}"
+      }
+    },
+    {
+      "name": "Markdown - Markup Raw Inline Punctuation",
+      "scope": [
+        "text.html.markdown markup.inline.raw.markdown punctuation.definition.raw.markdown"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.invisibles}}"
+      }
+    },
+    {
+      "name": "Markdown - Line Break",
+      "scope": [
+        "text.html.markdown meta.dummy.line-break"
+      ],
+      "settings": {
+        "foreground": ""
+      }
+    },
+    {
+      "name": "Markdown - Heading",
+      "scope": [
+        "markdown.heading",
+        "markup.heading | markup.heading entity.name",
+        "markup.heading.markdown punctuation.definition.heading.markdown"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.green}}"
+      }
+    },
+    {
+      "name": "Markup - Italic",
+      "scope": [
+        "markup.italic"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "{{variant.scheme.base.pink}}"
+      }
+    },
+    {
+      "name": "Markup - Bold",
+      "scope": [
+        "markup.bold",
+        "markup.bold string"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "{{variant.scheme.base.pink}}"
+      }
+    },
+    {
+      "name": "Markup - Bold-Italic",
+      "scope": [
+        "markup.bold markup.italic",
+        "markup.italic markup.bold",
+        "markup.quote markup.bold",
+        "markup.bold markup.italic string",
+        "markup.italic markup.bold string",
+        "markup.quote markup.bold string"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "{{variant.scheme.base.pink}}"
+      }
+    },
+    {
+      "name": "Markup - Underline",
+      "scope": [
+        "markup.underline"
+      ],
+      "settings": {
+        "fontStyle": "underline",
+        "foreground": "{{variant.scheme.base.orange}}"
+      }
+    },
+    {
+      "name": "Markup - Strike",
+      "scope": [
+        "markup.strike"
+      ],
+      "settings": {
+        "fontStyle": "strike",
+        "foreground": ""
+      }
+    },
+    {
+      "name": "Markdown - Blockquote",
+      "scope": [
+        "markup.quote punctuation.definition.blockquote.markdown"
+      ],
+      "settings": {
+        "background": "{{variant.scheme.invisibles}}",
+        "foreground": "{{variant.scheme.invisibles}}"
+      }
+    },
+    {
+      "name": "Markup - Quote",
+      "scope": [
+        "markup.quote"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": ""
+      }
+    },
+    {
+      "name": "Markdown - Link",
+      "scope": [
+        "string.other.link.title.markdown"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.blue}}"
+      }
+    },
+    {
+      "name": "Markdown - Link Description",
+      "scope": [
+        "string.other.link.description.title.markdown"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.purple}}"
+      }
+    },
+    {
+      "name": "Markdown - Link Anchor",
+      "scope": [
+        "constant.other.reference.link.markdown"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.yellow}}"
+      }
+    },
+    {
+      "name": "Markup - Raw Block",
+      "scope": [
+        "markup.raw.block"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.base.purple}}"
+      }
+    },
+    {
+      "name": "Markdown - Raw Block Fenced",
+      "scope": [
+        "markup.raw.block.fenced.markdown"
+      ],
+      "settings": {
+        "foreground": "#00000050"
+      }
+    },
+    {
+      "name": "Markdown - Fenced Bode Block",
+      "scope": [
+        "punctuation.definition.fenced.markdown"
+      ],
+      "settings": {
+        "foreground": "#00000050"
+      }
+    },
+    {
+      "name": "Markdown - Fenced Bode Block Variable",
+      "scope": [
+        "markup.raw.block.fenced.markdown",
+        "variable.language.fenced.markdown",
+        "punctuation.section.class.end"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.foreground}}"
+      }
+    },
+    {
+      "name": "Markdown - Fenced Language",
+      "scope": [
+        "variable.language.fenced.markdown"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.invisibles}}"
+      }
+    },
+    {
+      "name": "Markdown - Separator",
+      "scope": [
+        "meta.separator"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "background": "#00000050",
+        "foreground": "{{variant.scheme.invisibles}}"
+      }
+    },
+    {
+      "name": "Markup - Table",
+      "scope": [
+        "markup.table"
+      ],
+      "settings": {
+        "foreground": "{{variant.scheme.foreground}}"
+      }
+    }
+  ],
+  "colors": {
+    "focusBorder": "{{variant.scheme.focusBorder}}",
+    "editorCursor.foreground": "{{variant.scheme.caret}}",
+    "scrollbar.shadow": "{{variant.scheme.shadow}}",
+    "editor.background": "{{variant.scheme.background}}",
+    "editor.foreground": "{{variant.scheme.foreground}}",
+    "editorLineNumber.foreground": "{{variant.scheme.lineNumbers}}",
+    "editor.lineHighlightBackground": "{{variant.scheme.lineHighlight}}50",
+    "editor.selectionBackground": "{{variant.scheme.selection}}",
+    "editorHoverWidget.background": "{{variant.scheme.background}}",
+    "editorIndentGuide.background": "{{variant.scheme.guides}}",
+    "editorGroupHeader.tabsBackground": "{{variant.scheme.background}}",
+    "editorGroup.border": "{{variant.scheme.shadow}}",
+    "tab.inactiveBackground": "{{variant.scheme.background}}",
+    "tab.inactiveForeground": "{{variant.scheme.comments}}",
+    "tab.border": "{{variant.scheme.background}}",
+    "statusBar.background": "{{variant.scheme.background}}",
+    "statusBar.foreground": "{{variant.scheme.comments}}",
+    "activityBar.background": "{{variant.scheme.background}}",
+    "activityBar.foreground": "{{variant.scheme.foreground}}",
+    "titleBar.activeBackground": "{{variant.scheme.background}}",
+    "titleBar.activeForeground": "{{variant.scheme.comments}}",
+    "titleBar.inactiveBackground": "{{variant.scheme.background}}",
+    "titleBar.inactiveForeground": "{{variant.scheme.comments}}",
+    "sideBar.background": "{{variant.scheme.background}}",
+    "sideBarTitle.foreground": "{{variant.scheme.foreground}}",
+    "sideBarSectionHeader.background": "{{variant.scheme.background}}",
+    "input.background": "{{variant.scheme.inputBackground}}",
+    "input.foreground": "{{variant.scheme.inputForeground}}",
+    "input.border": "{{variant.scheme.inputBorder}}",
+    "inputValidation.errorBorder": "{{variant.scheme.base.red}}",
+    "inputValidation.infoBorder": "{{variant.scheme.base.blue}}",
+    "inputValidation.warningBorder": "{{variant.scheme.base.yellow}}",
+    "dropdown.background": "{{variant.scheme.background}}",
+    "dropdown.border": "{{variant.scheme.inputBorder}}",
+    "list.hoverBackground": "{{variant.scheme.background}}",
+    "list.activeSelectionBackground": "{{variant.scheme.lineHighlight}}50",
+    "list.activeSelectionForeground": "{{variant.scheme.accents.teal}}",
+    "list.inactiveSelectionBackground": "{{variant.scheme.lineHighlight}}50",
+    "list.highlightForeground": "{{variant.scheme.accents.teal}}",
+    "list.focusBackground": "{{variant.scheme.lineNumbers}}",
+    "terminal.ansiWhite": "{{variant.scheme.base.white}}",
+    "terminal.ansiBlack": "{{variant.scheme.comments}}",
+    "terminal.ansiBlue": "{{variant.scheme.base.blue}}",
+    "terminal.ansiCyan": "{{variant.scheme.base.cyan}}",
+    "terminal.ansiGreen": "{{variant.scheme.base.green}}",
+    "terminal.ansiMagenta": "{{variant.scheme.base.purple}}",
+    "terminal.ansiRed": "{{variant.scheme.base.red}}",
+    "terminal.ansiYellow": "{{variant.scheme.base.yellow}}",
+    "terminal.ansiBrightWhite": "{{variant.scheme.base.white}}",
+    "terminal.ansiBrightBlack": "{{variant.scheme.comments}}",
+    "terminal.ansiBrightBlue": "{{variant.scheme.base.blue}}",
+    "terminal.ansiBrightCyan": "{{variant.scheme.base.cyan}}",
+    "terminal.ansiBrightGreen": "{{variant.scheme.base.green}}",
+    "terminal.ansiBrightMagenta": "{{variant.scheme.base.purple}}",
+    "terminal.ansiBrightRed": "{{variant.scheme.base.red}}",
+    "terminal.ansiBrightYellow": "{{variant.scheme.base.yellow}}",
+    "scrollbarSlider.background": "{{variant.scheme.scrollbars}}",
+    "scrollbarSlider.hoverBackground": "{{variant.scheme.scrollbarsHover}}",
+    "scrollbarSlider.activeBackground": "{{variant.scheme.accents.teal}}",
+    "editorSuggestWidget.background": "{{variant.scheme.background}}",
+    "editorSuggestWidget.foreground": "{{variant.scheme.foreground}}",
+    "editorSuggestWidget.highlightForeground": "{{variant.scheme.accents.teal}}",
+    "editorSuggestWidget.selectedBackground": "{{variant.scheme.lineHighlight}}50",
+    "editorSuggestWidget.border": "{{variant.scheme.inputBorder}}",
+    "widget.shadow": "{{variant.scheme.shadow}}",
+    "editorWidget.background": "{{variant.scheme.background}}",
+    "activityBarBadge.background": "{{variant.scheme.accents.teal}}",
+    "activityBarBadge.foreground": "{{variant.scheme.base.black}}",
+    "panel.border": "{{variant.scheme.background}}",
+    "panelTitle.activeForeground": "{{variant.scheme.foreground}}",
+    "diffEditor.insertedTextBackground": "{{variant.scheme.base.green}}15",
+    "diffEditor.removedTextBackground": "{{variant.scheme.base.red}}20",
+    "notification.background": "{{variant.scheme.background}}",
+    "notification.foreground": "{{variant.scheme.base.white}}"
+  }
+}
\ No newline at end of file
diff --git a/src/themes/theme-template.yml b/src/themes/theme-template.yml
deleted file mode 100644
index f30d2f0..0000000
--- a/src/themes/theme-template.yml
+++ /dev/null
@@ -1,526 +0,0 @@
-name: '{{variant.name}}'
-tokenColors:
-  - settings:
-      background: '{{variant.scheme.background}}'
-      foreground: '{{variant.scheme.base.white}}'
-  - name: Comment
-    scope:
-      - comment
-      - punctuation.definition.comment
-    settings:
-      fontStyle: italic
-      foreground: '{{variant.scheme.comments}}'
-  - name: Variables
-    scope:
-      - variable
-      - string constant.other.placeholder
-    settings:
-      foreground: '{{variant.scheme.foreground}}'
-  - name: Colors
-    scope:
-      - constant.other.color
-    settings:
-      foreground: '{{variant.scheme.base.white}}'
-  - name: Invalid
-    scope:
-      - invalid
-      - invalid.illegal
-      - invalid.broken
-    settings:
-      background: '{{variant.scheme.base.red}}'
-      foreground: '{{variant.scheme.base.white}}'
-  - name: Invalid unimplemented
-    scope:
-      - invalid.unimplemented
-    settings:
-      background: '{{variant.scheme.base.green}}'
-      foreground: '{{variant.scheme.base.white}}'
-  - name: Invalid deprecated
-    scope:
-      - invalid.deprecated
-    settings:
-      background: '{{variant.scheme.base.purple}}'
-      foreground: '{{variant.scheme.base.white}}'
-  - name: 'Keyword, Storage'
-    scope:
-      - keyword
-      - storage.type
-      - storage.modifier
-    settings:
-      foreground: '{{variant.scheme.base.purple}}'
-  - name: 'Keyword, Storage'
-    scope:
-      - Keyword
-      - Storage
-    settings:
-      fontStyle: italic
-  - name: 'Operator, Misc'
-    scope:
-      - keyword.control
-      - constant.other.color
-      - punctuation
-      - meta.tag
-      - punctuation.definition.tag
-      - punctuation.separator.inheritance.php
-      - punctuation.definition.tag.html
-      - punctuation.definition.tag.begin.html
-      - punctuation.definition.tag.end.html
-      - punctuation.section.embedded
-      - keyword.other.template
-      - keyword.other.substitution
-    settings:
-      foreground: '{{variant.scheme.base.cyan}}'
-  - name: Tag
-    scope:
-      - entity.name.tag
-      - meta.tag.sgml
-      - markup.deleted.git_gutter
-    settings:
-      foreground: '{{variant.scheme.base.pink}}'
-  - name: 'Function, Special Method, Block Level'
-    scope:
-      - entity.name.function
-      - meta.function-call
-      - variable.function
-      - support.function
-      - keyword.other.special-method
-      - meta.block-level
-    settings:
-      foreground: '{{variant.scheme.base.blue}}'
-  - name: 'Other Variable, String Link'
-    scope:
-      - support.other.variable
-      - string.other.link
-    settings:
-      foreground: '{{variant.scheme.base.pink}}'
-  - name: 'Number, Constant, Function Argument, Tag Attribute, Embedded'
-    scope:
-      - constant.numeric
-      - constant.language
-      - support.constant
-      - constant.character
-      - variable.parameter
-      - keyword.other.unit
-    settings:
-      foreground: '{{variant.scheme.base.orange}}'
-  - name: 'String, Symbols, Inherited Class, Markup Heading'
-    scope:
-      - string
-      - constant.other.symbol
-      - constant.other.key
-      - entity.other.inherited-class
-      - markup.heading
-      - markup.inserted.git_gutter
-      - meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js
-    settings:
-      fontStyle: normal
-      foreground: '{{variant.scheme.base.green}}'
-  - name: 'Class, Support'
-    scope:
-      - entity.name.class
-      - entity.name.type.class
-      - support.type
-      - support.class
-      - support.orther.namespace.use.php
-      - meta.use.php
-      - support.other.namespace.php
-      - markup.changed.git_gutter
-      - support.type.sys-types
-    settings:
-      foreground: '{{variant.scheme.base.yellow}}'
-  - name: CSS Class and Support
-    scope:
-      - source.css support.type.property-name
-      - source.sass support.type.property-name
-      - source.scss support.type.property-name
-      - source.less support.type.property-name
-      - source.stylus support.type.property-name
-      - source.postcss support.type.property-name
-    settings:
-      foreground: '{{variant.scheme.base.paleblue}}'
-  - name: 'Sub-methods'
-    scope:
-      - entity.name.module.js
-      - variable.import.parameter.js
-      - variable.other.class.js
-    settings:
-      foreground: '{{variant.scheme.base.red}}'
-  - name: Language methods
-    scope:
-      - variable.language
-    settings:
-      fontStyle: italic
-      foreground: '{{variant.scheme.base.red}}'
-  - name: entity.name.method.js
-    scope:
-      - entity.name.method.js
-    settings:
-      fontStyle: italic
-      foreground: '{{variant.scheme.base.blue}}'
-  - name: meta.method.js
-    scope:
-      - meta.class-method.js entity.name.function.js
-      - variable.function.constructor
-    settings:
-      foreground: '{{variant.scheme.base.blue}}'
-  - name: Attributes
-    scope:
-      - entity.other.attribute-name
-    settings:
-      foreground: '{{variant.scheme.base.purple}}'
-  - name: HTML Attributes
-    scope:
-      - text.html.basic entity.other.attribute-name.html
-      - text.html.basic entity.other.attribute-name
-    settings:
-      fontStyle: italic
-      foreground: '{{variant.scheme.base.yellow}}'
-  - name: CSS Classes
-    scope:
-      - entity.other.attribute-name.class
-    settings:
-      foreground: '{{variant.scheme.base.yellow}}'
-  - name: "CSS ID's"
-    scope:
-      - source.sass keyword.control
-    settings:
-      foreground: '{{variant.scheme.base.blue}}'
-  - name: Inserted
-    scope:
-      - markup.inserted
-    settings:
-      foreground: '{{variant.scheme.base.green}}'
-  - name: Deleted
-    scope:
-      - markup.deleted
-    settings:
-      foreground: '{{variant.scheme.base.red}}'
-  - name: Changed
-    scope:
-      - markup.changed
-    settings:
-      foreground: '{{variant.scheme.base.purple}}'
-  - name: Regular Expressions
-    scope:
-      - string.regexp
-    settings:
-      foreground: '{{variant.scheme.base.cyan}}'
-  - name: Escape Characters
-    scope:
-      - constant.character.escape
-    settings:
-      foreground: '{{variant.scheme.base.cyan}}'
-  - name: URL
-    scope:
-      - '*url*'
-      - '*link*'
-      - '*uri*'
-    settings:
-      fontStyle: underline
-  - name: Decorators
-    scope:
-      - tag.decorator.js entity.name.tag.js
-      - tag.decorator.js punctuation.definition.tag.js
-    settings:
-      fontStyle: italic
-      foreground: '{{variant.scheme.base.blue}}'
-  - name: ES7 Bind Operator
-    scope:
-      - source.js constant.other.object.key.js string.unquoted.label.js
-    settings:
-      fontStyle: italic
-      foreground: '{{variant.scheme.base.red}}'
-  - name: 'JSON Key - Level 0'
-    scope:
-      - source.json meta.structure.dictionary.json support.type.property-name.json
-    settings:
-      foreground: '{{variant.scheme.base.purple}}'
-  - name: 'JSON Key - Level 1'
-    scope:
-      - source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json
-    settings:
-      foreground: '{{variant.scheme.base.yellow}}'
-  - name: 'JSON Key - Level 2'
-    scope:
-      - source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json
-    settings:
-      foreground: '{{variant.scheme.base.orange}}'
-  - name: 'JSON Key - Level 3'
-    scope:
-      - source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json
-    settings:
-      foreground: '{{variant.scheme.base.red}}'
-  - name: 'JSON Key - Level 4'
-    scope:
-      - source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json
-    settings:
-      foreground: '{{variant.scheme.base.brown}}'
-  - name: 'JSON Key - Level 5'
-    scope:
-      - source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json
-    settings:
-      foreground: '{{variant.scheme.base.blue}}'
-  - name: 'JSON Key - Level 6'
-    scope:
-      - source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json
-    settings:
-      foreground: '{{variant.scheme.base.pink}}'
-  - name: 'JSON Key - Level 7'
-    scope:
-      - source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json
-    settings:
-      foreground: '{{variant.scheme.base.purple}}'
-  - name: 'JSON Key - Level 8'
-    scope:
-      - source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json
-    settings:
-      foreground: '{{variant.scheme.base.green}}'
-  - name: 'Markdown - Plain'
-    scope:
-      - text.html.markdown
-      - punctuation.definition.list_item.markdown
-    settings:
-      foreground: '{{variant.scheme.foreground}}'
-  - name: 'Markdown - Markup Raw Inline'
-    scope:
-      - text.html.markdown markup.inline.raw.markdown
-    settings:
-      foreground: '{{variant.scheme.base.purple}}'
-  - name: 'Markdown - Markup Raw Inline Punctuation'
-    scope:
-      - text.html.markdown markup.inline.raw.markdown punctuation.definition.raw.markdown
-    settings:
-      foreground: '{{variant.scheme.invisibles}}'
-  - name: 'Markdown - Line Break'
-    scope:
-      - text.html.markdown meta.dummy.line-break
-    settings:
-      foreground: ''
-  - name: 'Markdown - Heading'
-    scope:
-      - markdown.heading
-      - 'markup.heading | markup.heading entity.name'
-      - markup.heading.markdown punctuation.definition.heading.markdown
-    settings:
-      foreground: '{{variant.scheme.base.green}}'
-  - name: 'Markup - Italic'
-    scope:
-      - markup.italic
-    settings:
-      fontStyle: italic
-      foreground: '{{variant.scheme.base.pink}}'
-  - name: 'Markup - Bold'
-    scope:
-      - markup.bold
-      - markup.bold string
-    settings:
-      fontStyle: bold
-      foreground: '{{variant.scheme.base.pink}}'
-  - name: 'Markup - Bold-Italic'
-    scope:
-      - markup.bold markup.italic
-      - markup.italic markup.bold
-      - markup.quote markup.bold
-      - markup.bold markup.italic string
-      - markup.italic markup.bold string
-      - markup.quote markup.bold string
-    settings:
-      fontStyle: bold
-      foreground: '{{variant.scheme.base.pink}}'
-  - name: 'Markup - Underline'
-    scope:
-      - markup.underline
-    settings:
-      fontStyle: underline
-      foreground: '{{variant.scheme.base.orange}}'
-  - name: 'Markup - Strike'
-    scope:
-      - markup.strike
-    settings:
-      fontStyle: strike
-      foreground: ''
-  - name: 'Markdown - Blockquote'
-    scope:
-      - markup.quote punctuation.definition.blockquote.markdown
-    settings:
-      background: '{{variant.scheme.invisibles}}'
-      foreground: '{{variant.scheme.invisibles}}'
-  - name: 'Markup - Quote'
-    scope:
-      - markup.quote
-    settings:
-      fontStyle: italic
-      foreground: ''
-  - name: 'Markdown - Link'
-    scope:
-      - string.other.link.title.markdown
-    settings:
-      foreground: '{{variant.scheme.base.blue}}'
-  - name: 'Markdown - Link Description'
-    scope:
-      - string.other.link.description.title.markdown
-    settings:
-      foreground: '{{variant.scheme.base.purple}}'
-  - name: 'Markdown - Link Anchor'
-    scope:
-      - constant.other.reference.link.markdown
-    settings:
-      foreground: '{{variant.scheme.base.yellow}}'
-  - name: 'Markup - Raw Block'
-    scope:
-      - markup.raw.block
-    settings:
-      foreground: '{{variant.scheme.base.purple}}'
-  - name: 'Markdown - Raw Block Fenced'
-    scope:
-      - markup.raw.block.fenced.markdown
-    settings:
-      foreground: '#00000050'
-  - name: 'Markdown - Fenced Bode Block'
-    scope:
-      - punctuation.definition.fenced.markdown
-    settings:
-      foreground: '#00000050'
-  - name: 'Markdown - Fenced Bode Block Variable'
-    scope:
-      - markup.raw.block.fenced.markdown
-      - variable.language.fenced.markdown
-      - punctuation.section.class.end
-    settings:
-      foreground: '{{variant.scheme.foreground}}'
-  - name: 'Markdown - Fenced Language'
-    scope:
-      - variable.language.fenced.markdown
-    settings:
-      foreground: '{{variant.scheme.invisibles}}'
-  - name: 'Markdown - Separator'
-    scope:
-      - meta.separator
-    settings:
-      fontStyle: bold
-      background: '#00000050'
-      foreground: '{{variant.scheme.invisibles}}'
-  - name: 'Markup - Table'
-    scope:
-      - markup.table
-    settings:
-      foreground: '{{variant.scheme.foreground}}'
-colors:
-  # Abstract
-  focusBorder: '{{variant.scheme.focusBorder}}'
-  editorCursor.foreground: '{{variant.scheme.caret}}'
-  scrollbar.shadow: '{{variant.scheme.shadow}}'
-
-  # Editor
-  editor.background: '{{variant.scheme.background}}'
-  editor.foreground: '{{variant.scheme.foreground}}'
-  editorLineNumber.foreground: '{{variant.scheme.lineNumbers}}'
-  editor.lineHighlightBackground: '{{variant.scheme.lineHighlight}}50'
-  editor.selectionBackground: '{{variant.scheme.selection}}'
-  editorHoverWidget.background: '{{variant.scheme.background}}'
-
-  # Editor Indents
-  editorIndentGuide.background: '{{variant.scheme.guides}}'
-
-  # Editor Group and GroupHeader
-  editorGroupHeader.tabsBackground: '{{variant.scheme.background}}'
-  editorGroup.border: '{{variant.scheme.shadow}}'
-
-  # Tabs
-  tab.inactiveBackground: '{{variant.scheme.background}}'
-  tab.inactiveForeground: '{{variant.scheme.comments}}'
-  tab.border: '{{variant.scheme.background}}'
-
-  # Status bar
-  statusBar.background: '{{variant.scheme.background}}'
-  statusBar.foreground: '{{variant.scheme.comments}}'
-
-  # Activity bar
-  activityBar.background: '{{variant.scheme.background}}'
-  activityBar.foreground: '{{variant.scheme.foreground}}'
-
-  # Title bar
-  titleBar.activeBackground: '{{variant.scheme.background}}'
-  titleBar.activeForeground: '{{variant.scheme.comments}}'
-  titleBar.inactiveBackground: '{{variant.scheme.background}}'
-  titleBar.inactiveForeground: '{{variant.scheme.comments}}'
-
-  # Sidebar
-  sideBar.background: '{{variant.scheme.background}}'
-  sideBarTitle.foreground: '{{variant.scheme.foreground}}'
-  sideBarSectionHeader.background: '{{variant.scheme.background}}'
-
-  # Inputs and triggers
-  input.background: '{{variant.scheme.inputBackground}}'
-  input.foreground: '{{variant.scheme.inputForeground}}'
-  input.border: '{{variant.scheme.inputBorder}}'
-  inputValidation.errorBorder: '{{variant.scheme.base.red}}'
-  inputValidation.infoBorder: '{{variant.scheme.base.blue}}'
-  inputValidation.warningBorder: '{{variant.scheme.base.yellow}}'
-
-  # Dropdown
-  dropdown.background: '{{variant.scheme.background}}'
-  dropdown.border: '{{variant.scheme.inputBorder}}'
-
-  # Lists
-  list.hoverBackground: '{{variant.scheme.background}}'
-  list.activeSelectionBackground: '{{variant.scheme.lineHighlight}}50'
-  list.activeSelectionForeground: '{{variant.scheme.accents.teal}}'
-  list.inactiveSelectionBackground: '{{variant.scheme.lineHighlight}}50'
-  list.highlightForeground: '{{variant.scheme.accents.teal}}'
-  list.focusBackground: '{{variant.scheme.lineNumbers}}'
-
-  # Terminal colors
-  terminal.ansiWhite: '{{variant.scheme.base.white}}'
-  terminal.ansiBlack: '{{variant.scheme.comments}}'
-  terminal.ansiBlue: '{{variant.scheme.base.blue}}'
-  terminal.ansiCyan: '{{variant.scheme.base.cyan}}'
-  terminal.ansiGreen: '{{variant.scheme.base.green}}'
-  terminal.ansiMagenta: '{{variant.scheme.base.purple}}'
-  terminal.ansiRed: '{{variant.scheme.base.red}}'
-  terminal.ansiYellow: '{{variant.scheme.base.yellow}}'
-  terminal.ansiBrightWhite: '{{variant.scheme.base.white}}'
-  terminal.ansiBrightBlack: '{{variant.scheme.comments}}'
-  terminal.ansiBrightBlue: '{{variant.scheme.base.blue}}'
-  terminal.ansiBrightCyan: '{{variant.scheme.base.cyan}}'
-  terminal.ansiBrightGreen: '{{variant.scheme.base.green}}'
-  terminal.ansiBrightMagenta: '{{variant.scheme.base.purple}}'
-  terminal.ansiBrightRed: '{{variant.scheme.base.red}}'
-  terminal.ansiBrightYellow: '{{variant.scheme.base.yellow}}'
-
-  # Scrollbars
-  scrollbarSlider.background: '{{variant.scheme.scrollbars}}'
-  scrollbarSlider.hoverBackground: '{{variant.scheme.scrollbarsHover}}'
-  scrollbarSlider.activeBackground: '{{variant.scheme.accents.teal}}'
-
-  # Autocomplete / Suggest
-  editorSuggestWidget.background: '{{variant.scheme.background}}'
-  editorSuggestWidget.foreground: '{{variant.scheme.foreground}}'
-  editorSuggestWidget.highlightForeground: '{{variant.scheme.accents.teal}}'
-  editorSuggestWidget.selectedBackground: '{{variant.scheme.lineHighlight}}50'
-  editorSuggestWidget.border: '{{variant.scheme.inputBorder}}'
-
-  # Find & Replace Widgets
-  widget.shadow: '{{variant.scheme.shadow}}'
-  editorWidget.background: '{{variant.scheme.background}}'
-
-  # Badge
-  activityBarBadge.background: '{{variant.scheme.accents.teal}}'
-  activityBarBadge.foreground: '{{variant.scheme.base.black}}'
-
-  # Panels
-  panel.border: '{{variant.scheme.background}}'
-  panelTitle.activeForeground: '{{variant.scheme.foreground}}'
-
-  # Diff tool
-  diffEditor.insertedTextBackground: '{{variant.scheme.base.green}}15'
-  diffEditor.removedTextBackground: '{{variant.scheme.base.red}}20'
-
-  # Notification bar
-  notification.background: '{{variant.scheme.background}}'
-  notification.foreground: '{{variant.scheme.base.white}}'
-
-  # Buttons
-  #button.background: '{{variant.scheme.accents.teal}}'
-  #button.hoverBackground: '{{variant.scheme.accents.teal}}'
-  #button.foreground: '{{variant.scheme.base.black}}'
\ No newline at end of file