Swapping in real template vars

.gulp/paths.js

@@ -3,9 +3,9 @@ import infos from '../package.json';
 const today = new Date()
   , paths = {
     'icons': './icons',
-    'themes': './themes',
+    'themes': './src/themes',
     'src': './src',
     'dist': './dist'
   };
 
-export default paths;
+export default paths;

.gulp/tasks/icons.js

@@ -53,4 +53,4 @@ Gulp.task('build:templateicons', () => {
       extname: ".tmp"
     }))
     .pipe(Gulp.dest('./'));
-});
+});

.gulp/tasks/themes.js

@@ -1,33 +1,35 @@
 import fs from 'fs';
 import gulp from 'gulp';
+import gutil from 'gulp-util';
 import Mustache from 'mustache';
 import YAML from 'yamljs';
 
+import Paths from '../paths';
+
 const themeCommons = require('../../src/themes/settings/commons.json');
 const themeVariants = [];
 const themeTemplateFile = fs.readFileSync(
-  './src/themes/theme-template.yml',
+  `${Paths.themes}/theme-template.yml`,
   'utf-8'
 );
 
-const files = fs.readdirSync('./src/themes/settings/specific');
+const files = fs.readdirSync(`${Paths.themes}/settings/specific`);
 
 // build theme variants for later use in templating
 files.forEach(file => {
   const name = file.split('.')[0];
-  const filepath = './src/themes/settings/specific/' + file;
+  const filepath = `${Paths.themes}/settings/specific/${file}`;
   const contents = fs.readFileSync(filepath, 'utf-8');
 
   try {
     themeVariants.push(JSON.parse(contents));
   } catch (err) {
-    console.log('Error when parsing json for theme variants', err);
+    gutil.log('Error when parsing json for theme variants', err);
   }
 });
 
 gulp.task('build:themes', cb => {
   themeVariants.forEach(variant => {
-    console.log('Building ', variant.name);
     const templateData = {
       commons: themeCommons,
       variant,
@@ -37,10 +39,14 @@ gulp.task('build:themes', cb => {
       Mustache.render(themeTemplateFile, templateData)
     );
 
+    const path = `${Paths.themes}/${variant.name}.json`;
+
     fs.writeFileSync(
-      `./src/themes/${variant.name}.json`,
+      path,
       JSON.stringify(templateJson, null, 2),
       'utf-8'
     );
+
+    gutil.log('Generated', gutil.colors.green(path));
   });
 });

package.json

@@ -28,6 +28,7 @@
     "remove-icons": "rimraf icons && rimraf material-theme-icons.json",
     "remove-icons-tmp": "rimraf .material-theme-icons.tmp",
     "buildicons": "gulp build:icons",
+    "build-themes": "gulp build:themes",
     "release": "npm run bump && npm run changelog",
     "changelog": "gulp changelog",
     "bump": "gulp bump"
@@ -75,6 +76,7 @@
     "gulp-rename": "^1.2.2",
     "gulp-stats": "^0.0.4",
     "gulp-template": "^4.0.0",
+    "gulp-util": "^3.0.8",
     "gulp-watch": "^4.3.8",
     "json-minify": "^1.0.0",
     "mustache": "^2.3.0",

src/themes/Material-Theme-Darker.json

@@ -4,7 +4,7 @@
     {
       "settings": {
         "background": "#252526",
-        "foreground": "#FFFFFF"
+        "foreground": "#ffffff"
       }
     },
     {
@@ -25,7 +25,7 @@
         "string constant.other.placeholder"
       ],
       "settings": {
-        "foreground": "#EEFFFFFF"
+        "foreground": "#eeffffff"
       }
     },
     {
@@ -34,7 +34,7 @@
         "constant.other.color"
       ],
       "settings": {
-        "foreground": "#FFFFFF"
+        "foreground": "#ffffff"
       }
     },
     {
@@ -46,7 +46,7 @@
       ],
       "settings": {
         "background": "#FF5370",
-        "foreground": "#FFFFFF"
+        "foreground": "#ffffff"
       }
     },
     {
@@ -56,7 +56,7 @@
       ],
       "settings": {
         "background": "#C3E88D",
-        "foreground": "#FFFFFF"
+        "foreground": "#ffffff"
       }
     },
     {
@@ -66,7 +66,7 @@
       ],
       "settings": {
         "background": "#C792EA",
-        "foreground": "#FFFFFF"
+        "foreground": "#ffffff"
       }
     },
     {
@@ -118,7 +118,7 @@
         "markup.deleted.git_gutter"
       ],
       "settings": {
-        "foreground": "#F07178"
+        "foreground": "#f07178"
       }
     },
     {
@@ -142,7 +142,7 @@
         "string.other.link"
       ],
       "settings": {
-        "foreground": "#F07178"
+        "foreground": "#f07178"
       }
     },
     {
@@ -447,7 +447,7 @@
         "punctuation.definition.list_item.markdown"
       ],
       "settings": {
-        "foreground": "#EEFFFFFF"
+        "foreground": "#eeffffff"
       }
     },
     {
@@ -495,7 +495,7 @@
       ],
       "settings": {
         "fontStyle": "italic",
-        "foreground": "#F07178"
+        "foreground": "#f07178"
       }
     },
     {
@@ -506,7 +506,7 @@
       ],
       "settings": {
         "fontStyle": "bold",
-        "foreground": "#F07178"
+        "foreground": "#f07178"
       }
     },
     {
@@ -521,7 +521,7 @@
       ],
       "settings": {
         "fontStyle": "bold",
-        "foreground": "#F07178"
+        "foreground": "#f07178"
       }
     },
     {
@@ -567,7 +567,7 @@
   ],
   "colors": {
     "editorBackground": "#252526",
-    "editorForeground": "#FFFFFF",
+    "editorForeground": "#ffffff",
     "statusBarBackground": "#252526"
   }
 }

src/themes/Material-Theme-Default.json

@@ -4,7 +4,7 @@
     {
       "settings": {
         "background": "#252526",
-        "foreground": "#FFFFFF"
+        "foreground": "#ffffff"
       }
     },
     {
@@ -25,7 +25,7 @@
         "string constant.other.placeholder"
       ],
       "settings": {
-        "foreground": "#EEFFFFFF"
+        "foreground": "#eeffff"
       }
     },
     {
@@ -34,7 +34,7 @@
         "constant.other.color"
       ],
       "settings": {
-        "foreground": "#FFFFFF"
+        "foreground": "#ffffff"
       }
     },
     {
@@ -46,7 +46,7 @@
       ],
       "settings": {
         "background": "#FF5370",
-        "foreground": "#FFFFFF"
+        "foreground": "#ffffff"
       }
     },
     {
@@ -56,7 +56,7 @@
       ],
       "settings": {
         "background": "#C3E88D",
-        "foreground": "#FFFFFF"
+        "foreground": "#ffffff"
       }
     },
     {
@@ -66,7 +66,7 @@
       ],
       "settings": {
         "background": "#C792EA",
-        "foreground": "#FFFFFF"
+        "foreground": "#ffffff"
       }
     },
     {
@@ -118,7 +118,7 @@
         "markup.deleted.git_gutter"
       ],
       "settings": {
-        "foreground": "#F07178"
+        "foreground": "#f07178"
       }
     },
     {
@@ -142,7 +142,7 @@
         "string.other.link"
       ],
       "settings": {
-        "foreground": "#F07178"
+        "foreground": "#f07178"
       }
     },
     {
@@ -447,7 +447,7 @@
         "punctuation.definition.list_item.markdown"
       ],
       "settings": {
-        "foreground": "#EEFFFFFF"
+        "foreground": "#eeffff"
       }
     },
     {
@@ -495,7 +495,7 @@
       ],
       "settings": {
         "fontStyle": "italic",
-        "foreground": "#F07178"
+        "foreground": "#f07178"
       }
     },
     {
@@ -506,7 +506,7 @@
       ],
       "settings": {
         "fontStyle": "bold",
-        "foreground": "#F07178"
+        "foreground": "#f07178"
       }
     },
     {
@@ -521,7 +521,7 @@
       ],
       "settings": {
         "fontStyle": "bold",
-        "foreground": "#F07178"
+        "foreground": "#f07178"
       }
     },
     {
@@ -567,7 +567,7 @@
   ],
   "colors": {
     "editorBackground": "#252526",
-    "editorForeground": "#FFFFFF",
+    "editorForeground": "#ffffff",
     "statusBarBackground": "#252526"
   }
 }

src/themes/Material-Theme-Lighter.json

@@ -4,7 +4,7 @@
     {
       "settings": {
         "background": "#252526",
-        "foreground": "#FFFFFF"
+        "foreground": "#ffffff"
       }
     },
     {
@@ -25,7 +25,7 @@
         "string constant.other.placeholder"
       ],
       "settings": {
-        "foreground": "#EEFFFFFF"
+        "foreground": "#80CBC4"
       }
     },
     {
@@ -34,7 +34,7 @@
         "constant.other.color"
       ],
       "settings": {
-        "foreground": "#FFFFFF"
+        "foreground": "#ffffff"
       }
     },
     {
@@ -45,8 +45,8 @@
         "invalid.broken"
       ],
       "settings": {
-        "background": "#FF5370",
-        "foreground": "#FFFFFF"
+        "background": "#E53935",
+        "foreground": "#ffffff"
       }
     },
     {
@@ -55,8 +55,8 @@
         "invalid.unimplemented"
       ],
       "settings": {
-        "background": "#C3E88D",
-        "foreground": "#FFFFFF"
+        "background": "#91B859",
+        "foreground": "#ffffff"
       }
     },
     {
@@ -65,8 +65,8 @@
         "invalid.deprecated"
       ],
       "settings": {
-        "background": "#C792EA",
-        "foreground": "#FFFFFF"
+        "background": "#7C4DFF",
+        "foreground": "#ffffff"
       }
     },
     {
@@ -77,7 +77,7 @@
         "storage.modifier"
       ],
       "settings": {
-        "foreground": "#C792EA"
+        "foreground": "#7C4DFF"
       }
     },
     {
@@ -107,7 +107,7 @@
         "keyword.other.substitution"
       ],
       "settings": {
-        "foreground": "#89DDFF"
+        "foreground": "#39ADB5"
       }
     },
     {
@@ -118,7 +118,7 @@
         "markup.deleted.git_gutter"
       ],
       "settings": {
-        "foreground": "#F07178"
+        "foreground": "#FF5370"
       }
     },
     {
@@ -132,7 +132,7 @@
         "meta.block-level"
       ],
       "settings": {
-        "foreground": "#82AAFF"
+        "foreground": "#6182B8"
       }
     },
     {
@@ -142,7 +142,7 @@
         "string.other.link"
       ],
       "settings": {
-        "foreground": "#F07178"
+        "foreground": "#FF5370"
       }
     },
     {
@@ -156,7 +156,7 @@
         "keyword.other.unit"
       ],
       "settings": {
-        "foreground": "#F78C6C"
+        "foreground": "#F76D47"
       }
     },
     {
@@ -172,7 +172,7 @@
       ],
       "settings": {
         "fontStyle": "normal",
-        "foreground": "#C3E88D"
+        "foreground": "#91B859"
       }
     },
     {
@@ -189,7 +189,7 @@
         "support.type.sys-types"
       ],
       "settings": {
-        "foreground": "#FFCB6B"
+        "foreground": "#FFB62C"
       }
     },
     {
@@ -202,7 +202,7 @@
         "source.stylus support.type"
       ],
       "settings": {
-        "foreground": "#B2CCD6"
+        "foreground": "#8796B0"
       }
     },
     {
@@ -213,7 +213,7 @@
         "variable.other.class.js"
       ],
       "settings": {
-        "foreground": "#FF5370"
+        "foreground": "#E53935"
       }
     },
     {
@@ -223,7 +223,7 @@
       ],
       "settings": {
         "fontStyle": "italic",
-        "foreground": "#FF5370"
+        "foreground": "#E53935"
       }
     },
     {
@@ -233,7 +233,7 @@
       ],
       "settings": {
         "fontStyle": "italic",
-        "foreground": "#82AAFF"
+        "foreground": "#6182B8"
       }
     },
     {
@@ -243,7 +243,7 @@
         "variable.function.constructor"
       ],
       "settings": {
-        "foreground": "#82AAFF"
+        "foreground": "#6182B8"
       }
     },
     {
@@ -252,7 +252,7 @@
         "entity.other.attribute-name"
       ],
       "settings": {
-        "foreground": "#C792EA"
+        "foreground": "#7C4DFF"
       }
     },
     {
@@ -263,7 +263,7 @@
       ],
       "settings": {
         "fontStyle": "italic",
-        "foreground": "#FFCB6B"
+        "foreground": "#FFB62C"
       }
     },
     {
@@ -272,7 +272,7 @@
         "entity.other.attribute-name.class"
       ],
       "settings": {
-        "foreground": "#FFCB6B"
+        "foreground": "#FFB62C"
       }
     },
     {
@@ -281,7 +281,7 @@
         "source.sass keyword.control"
       ],
       "settings": {
-        "foreground": "#82AAFF"
+        "foreground": "#6182B8"
       }
     },
     {
@@ -290,7 +290,7 @@
         "markup.inserted"
       ],
       "settings": {
-        "foreground": "#C3E88D"
+        "foreground": "#91B859"
       }
     },
     {
@@ -299,7 +299,7 @@
         "markup.deleted"
       ],
       "settings": {
-        "foreground": "#FF5370"
+        "foreground": "#E53935"
       }
     },
     {
@@ -308,7 +308,7 @@
         "markup.changed"
       ],
       "settings": {
-        "foreground": "#C792EA"
+        "foreground": "#7C4DFF"
       }
     },
     {
@@ -317,7 +317,7 @@
         "string.regexp"
       ],
       "settings": {
-        "foreground": "#89DDFF"
+        "foreground": "#39ADB5"
       }
     },
     {
@@ -326,7 +326,7 @@
         "constant.character.escape"
       ],
       "settings": {
-        "foreground": "#89DDFF"
+        "foreground": "#39ADB5"
       }
     },
     {
@@ -346,7 +346,7 @@
       ],
       "settings": {
         "fontStyle": "italic",
-        "foreground": "#82AAFF"
+        "foreground": "#6182B8"
       }
     },
     {
@@ -356,7 +356,7 @@
       ],
       "settings": {
         "fontStyle": "italic",
-        "foreground": "#FF5370"
+        "foreground": "#E53935"
       }
     },
     {
@@ -365,7 +365,7 @@
         "source.json meta.structure.dictionary.json support.type.property-name.json"
       ],
       "settings": {
-        "foreground": "#C792EA"
+        "foreground": "#7C4DFF"
       }
     },
     {
@@ -374,7 +374,7 @@
         "source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json"
       ],
       "settings": {
-        "foreground": "#FFCB6B"
+        "foreground": "#FFB62C"
       }
     },
     {
@@ -383,7 +383,7 @@
         "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": "#FFCB6B"
+        "foreground": "#FFB62C"
       }
     },
     {
@@ -392,7 +392,7 @@
         "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": "#FF5370"
+        "foreground": "#E53935"
       }
     },
     {
@@ -410,7 +410,7 @@
         "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": "#82AAFF"
+        "foreground": "#6182B8"
       }
     },
     {
@@ -419,7 +419,7 @@
         "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": "#f07178"
+        "foreground": "#FF5370"
       }
     },
     {
@@ -428,7 +428,7 @@
         "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": "#C792EA"
+        "foreground": "#7C4DFF"
       }
     },
     {
@@ -437,7 +437,7 @@
         "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": "#C3E88D"
+        "foreground": "#91B859"
       }
     },
     {
@@ -447,7 +447,7 @@
         "punctuation.definition.list_item.markdown"
       ],
       "settings": {
-        "foreground": "#EEFFFFFF"
+        "foreground": "#80CBC4"
       }
     },
     {
@@ -456,7 +456,7 @@
         "text.html.markdown markup.inline.raw.markdown"
       ],
       "settings": {
-        "foreground": "#C792EA"
+        "foreground": "#7C4DFF"
       }
     },
     {
@@ -465,7 +465,7 @@
         "text.html.markdown markup.inline.raw.markdown punctuation.definition.raw.markdown"
       ],
       "settings": {
-        "foreground": "#65737e"
+        "foreground": "#E7EAEC"
       }
     },
     {
@@ -485,7 +485,7 @@
         "markup.heading.markdown punctuation.definition.heading.markdown"
       ],
       "settings": {
-        "foreground": "#C3E88D"
+        "foreground": "#91B859"
       }
     },
     {
@@ -495,7 +495,7 @@
       ],
       "settings": {
         "fontStyle": "italic",
-        "foreground": "#F07178"
+        "foreground": "#FF5370"
       }
     },
     {
@@ -506,7 +506,7 @@
       ],
       "settings": {
         "fontStyle": "bold",
-        "foreground": "#F07178"
+        "foreground": "#FF5370"
       }
     },
     {
@@ -521,7 +521,7 @@
       ],
       "settings": {
         "fontStyle": "bold",
-        "foreground": "#F07178"
+        "foreground": "#FF5370"
       }
     },
     {
@@ -531,7 +531,7 @@
       ],
       "settings": {
         "fontStyle": "underline",
-        "foreground": "#F78C6C"
+        "foreground": "#F76D47"
       }
     },
     {
@@ -550,8 +550,8 @@
         "markup.quote punctuation.definition.blockquote.markdown"
       ],
       "settings": {
-        "background": "#65737e",
-        "foreground": "#65737e"
+        "background": "#E7EAEC",
+        "foreground": "#E7EAEC"
       }
     },
     {
@@ -567,7 +567,7 @@
   ],
   "colors": {
     "editorBackground": "#252526",
-    "editorForeground": "#FFFFFF",
+    "editorForeground": "#ffffff",
     "statusBarBackground": "#252526"
   }
 }

src/themes/Material-Theme-Palenight.json

@@ -4,7 +4,7 @@
     {
       "settings": {
         "background": "#252526",
-        "foreground": "#FFFFFF"
+        "foreground": "#ffffff"
       }
     },
     {
@@ -25,7 +25,7 @@
         "string constant.other.placeholder"
       ],
       "settings": {
-        "foreground": "#EEFFFFFF"
+        "foreground": "#959DCB"
       }
     },
     {
@@ -34,7 +34,7 @@
         "constant.other.color"
       ],
       "settings": {
-        "foreground": "#FFFFFF"
+        "foreground": "#ffffff"
       }
     },
     {
@@ -46,7 +46,7 @@
       ],
       "settings": {
         "background": "#FF5370",
-        "foreground": "#FFFFFF"
+        "foreground": "#ffffff"
       }
     },
     {
@@ -56,7 +56,7 @@
       ],
       "settings": {
         "background": "#C3E88D",
-        "foreground": "#FFFFFF"
+        "foreground": "#ffffff"
       }
     },
     {
@@ -66,7 +66,7 @@
       ],
       "settings": {
         "background": "#C792EA",
-        "foreground": "#FFFFFF"
+        "foreground": "#ffffff"
       }
     },
     {
@@ -118,7 +118,7 @@
         "markup.deleted.git_gutter"
       ],
       "settings": {
-        "foreground": "#F07178"
+        "foreground": "#f07178"
       }
     },
     {
@@ -142,7 +142,7 @@
         "string.other.link"
       ],
       "settings": {
-        "foreground": "#F07178"
+        "foreground": "#f07178"
       }
     },
     {
@@ -447,7 +447,7 @@
         "punctuation.definition.list_item.markdown"
       ],
       "settings": {
-        "foreground": "#EEFFFFFF"
+        "foreground": "#959DCB"
       }
     },
     {
@@ -465,7 +465,7 @@
         "text.html.markdown markup.inline.raw.markdown punctuation.definition.raw.markdown"
       ],
       "settings": {
-        "foreground": "#65737e"
+        "foreground": "#4E5579"
       }
     },
     {
@@ -495,7 +495,7 @@
       ],
       "settings": {
         "fontStyle": "italic",
-        "foreground": "#F07178"
+        "foreground": "#f07178"
       }
     },
     {
@@ -506,7 +506,7 @@
       ],
       "settings": {
         "fontStyle": "bold",
-        "foreground": "#F07178"
+        "foreground": "#f07178"
       }
     },
     {
@@ -521,7 +521,7 @@
       ],
       "settings": {
         "fontStyle": "bold",
-        "foreground": "#F07178"
+        "foreground": "#f07178"
       }
     },
     {
@@ -550,8 +550,8 @@
         "markup.quote punctuation.definition.blockquote.markdown"
       ],
       "settings": {
-        "background": "#65737e",
-        "foreground": "#65737e"
+        "background": "#4E5579",
+        "foreground": "#4E5579"
       }
     },
     {
@@ -567,7 +567,7 @@
   ],
   "colors": {
     "editorBackground": "#252526",
-    "editorForeground": "#FFFFFF",
+    "editorForeground": "#ffffff",
     "statusBarBackground": "#252526"
   }
 }

src/themes/Material-Theme.json

@@ -15,7 +15,7 @@
       ],
       "settings": {
         "fontStyle": "italic",
-        "foreground": "#4A4A4A"
+        "foreground": "#546E7A"
       }
     },
     {

src/themes/settings/specific/darker.json

@@ -35,4 +35,4 @@
       "violet": "#bb80b3"
     }
   }
-}
+}

src/themes/settings/specific/default.json

@@ -1,6 +1,6 @@
 {
   "id": "material.theme.default",
-  "name": "Material-Theme",
+  "name": "Material-Theme-Default",
   "scheme": {
     "background": "#263238",
     "comments": "#546E7A",

src/themes/theme-template.yml

@@ -2,7 +2,7 @@ name: Material Theme Darker
 tokenColors:
   - settings:
       background: '#252526'
-      foreground: '#FFFFFF'
+      foreground: '{{variant.scheme.base.white}}'
   - name: Comment
     scope:
       - comment
@@ -15,39 +15,39 @@ tokenColors:
       - variable
       - string constant.other.placeholder
     settings:
-      foreground: '#EEFFFFFF'
+      foreground: '{{variant.scheme.foreground}}'
   - name: Colors
     scope:
       - constant.other.color
     settings:
-      foreground: '#FFFFFF'
+      foreground: '{{variant.scheme.base.white}}'
   - name: Invalid
     scope:
       - invalid
       - invalid.illegal
       - invalid.broken
     settings:
-      background: '#FF5370'
-      foreground: '#FFFFFF'
+      background: '{{variant.scheme.base.red}}'
+      foreground: '{{variant.scheme.base.white}}'
   - name: Invalid unimplemented
     scope:
       - invalid.unimplemented
     settings:
-      background: '#C3E88D'
-      foreground: '#FFFFFF'
+      background: '{{variant.scheme.base.green}}'
+      foreground: '{{variant.scheme.base.white}}'
   - name: Invalid deprecated
     scope:
       - invalid.deprecated
     settings:
-      background: '#C792EA'
-      foreground: '#FFFFFF'
+      background: '{{variant.scheme.base.purple}}'
+      foreground: '{{variant.scheme.base.white}}'
   - name: 'Keyword, Storage'
     scope:
       - keyword
       - storage.type
       - storage.modifier
     settings:
-      foreground: '#C792EA'
+      foreground: '{{variant.scheme.base.purple}}'
   - name: 'Keyword, Storage'
     scope:
       - Keyword
@@ -69,14 +69,14 @@ tokenColors:
       - keyword.other.template
       - keyword.other.substitution
     settings:
-      foreground: '#89DDFF'
+      foreground: '{{variant.scheme.base.cyan}}'
   - name: Tag
     scope:
       - entity.name.tag
       - meta.tag.sgml
       - markup.deleted.git_gutter
     settings:
-      foreground: '#F07178'
+      foreground: '{{variant.scheme.base.pink}}'
   - name: 'Function, Special Method, Block Level'
     scope:
       - entity.name.function
@@ -86,13 +86,13 @@ tokenColors:
       - keyword.other.special-method
       - meta.block-level
     settings:
-      foreground: '#82AAFF'
+      foreground: '{{variant.scheme.base.blue}}'
   - name: 'Other Variable, String Link'
     scope:
       - support.other.variable
       - string.other.link
     settings:
-      foreground: '#F07178'
+      foreground: '{{variant.scheme.base.pink}}'
   - name: 'Number, Constant, Function Argument, Tag Attribute, Embedded'
     scope:
       - constant.numeric
@@ -102,7 +102,7 @@ tokenColors:
       - variable.parameter
       - keyword.other.unit
     settings:
-      foreground: '#F78C6C'
+      foreground: '{{variant.scheme.base.orange}}'
   - name: 'String, Symbols, Inherited Class, Markup Heading'
     scope:
       - string
@@ -114,7 +114,7 @@ tokenColors:
       - meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js
     settings:
       fontStyle: normal
-      foreground: '#C3E88D'
+      foreground: '{{variant.scheme.base.green}}'
   - name: 'Class, Support'
     scope:
       - entity.name.class
@@ -127,7 +127,7 @@ tokenColors:
       - markup.changed.git_gutter
       - support.type.sys-types
     settings:
-      foreground: '#FFCB6B'
+      foreground: '{{variant.scheme.base.yellow}}'
   - name: CSS Class and Support
     scope:
       - source.css support.type
@@ -136,79 +136,79 @@ tokenColors:
       - source.less support.type
       - source.stylus support.type
     settings:
-      foreground: '#B2CCD6'
+      foreground: '{{variant.scheme.base.paleblue}}'
   - name: Sub-methods
     scope:
       - entity.name.module.js
       - variable.import.parameter.js
       - variable.other.class.js
     settings:
-      foreground: '#FF5370'
+      foreground: '{{variant.scheme.base.red}}'
   - name: Language methods
     scope:
       - variable.language
     settings:
       fontStyle: italic
-      foreground: '#FF5370'
+      foreground: '{{variant.scheme.base.red}}'
   - name: entity.name.method.js
     scope:
       - entity.name.method.js
     settings:
       fontStyle: italic
-      foreground: '#82AAFF'
+      foreground: '{{variant.scheme.base.blue}}'
   - name: meta.method.js
     scope:
       - meta.class-method.js entity.name.function.js
       - variable.function.constructor
     settings:
-      foreground: '#82AAFF'
+      foreground: '{{variant.scheme.base.blue}}'
   - name: Attributes
     scope:
       - entity.other.attribute-name
     settings:
-      foreground: '#C792EA'
+      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: '#FFCB6B'
+      foreground: '{{variant.scheme.base.yellow}}'
   - name: CSS Classes
     scope:
       - entity.other.attribute-name.class
     settings:
-      foreground: '#FFCB6B'
+      foreground: '{{variant.scheme.base.yellow}}'
   - name: "CSS ID's"
     scope:
       - source.sass keyword.control
     settings:
-      foreground: '#82AAFF'
+      foreground: '{{variant.scheme.base.blue}}'
   - name: Inserted
     scope:
       - markup.inserted
     settings:
-      foreground: '#C3E88D'
+      foreground: '{{variant.scheme.base.green}}'
   - name: Deleted
     scope:
       - markup.deleted
     settings:
-      foreground: '#FF5370'
+      foreground: '{{variant.scheme.base.red}}'
   - name: Changed
     scope:
       - markup.changed
     settings:
-      foreground: '#C792EA'
+      foreground: '{{variant.scheme.base.purple}}'
   - name: Regular Expressions
     scope:
       - string.regexp
     settings:
-      foreground: '#89DDFF'
+      foreground: '{{variant.scheme.base.cyan}}'
   - name: Escape Characters
     scope:
       - constant.character.escape
     settings:
-      foreground: '#89DDFF'
+      foreground: '{{variant.scheme.base.cyan}}'
   - name: URL
     scope:
       - '*url*, *link*, *uri*'
@@ -220,74 +220,74 @@ tokenColors:
       - tag.decorator.js punctuation.definition.tag.js
     settings:
       fontStyle: italic
-      foreground: '#82AAFF'
+      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: '#FF5370'
+      foreground: '{{variant.scheme.base.red}}'
   - name: JSON Key - Level 0
     scope:
       - source.json meta.structure.dictionary.json support.type.property-name.json
     settings:
-      foreground: '#C792EA'
+      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: '#FFCB6B'
+      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: '#FFCB6B'
+      foreground: '{{variant.scheme.base.yellow}}'
   - 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: '#FF5370'
+      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: '#C17E70'
+      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: '#82AAFF'
+      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: '#f07178'
+      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: '#C792EA'
+      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: '#C3E88D'
+      foreground: '{{variant.scheme.base.green}}'
   - name: Markdown - Plain
     scope:
       - text.html.markdown
       - punctuation.definition.list_item.markdown
     settings:
-      foreground: '#EEFFFFFF'
+      foreground: '{{variant.scheme.foreground}}'
   - name: Markdown - Markup Raw Inline
     scope:
       - text.html.markdown markup.inline.raw.markdown
     settings:
-      foreground: '#C792EA'
+      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: '#65737e'
+      foreground: '{{variant.scheme.invisibles}}'
   - name: Markdown - Line Break
     scope:
       - text.html.markdown meta.dummy.line-break
@@ -299,20 +299,20 @@ tokenColors:
       - 'markup.heading | markup.heading entity.name'
       - markup.heading.markdown punctuation.definition.heading.markdown
     settings:
-      foreground: '#C3E88D'
+      foreground: '{{variant.scheme.base.green}}'
   - name: Markup - Italic
     scope:
       - markup.italic
     settings:
       fontStyle: italic
-      foreground: '#F07178'
+      foreground: '{{variant.scheme.base.pink}}'
   - name: Markup - Bold
     scope:
       - markup.bold
       - markup.bold string
     settings:
       fontStyle: bold
-      foreground: '#F07178'
+      foreground: '{{variant.scheme.base.pink}}'
   - name: Markup - Bold-Italic
     scope:
       - 'markup.bold markup.italic,'
@@ -323,13 +323,13 @@ tokenColors:
       - markup.quote markup.bold string
     settings:
       fontStyle: bold
-      foreground: '#F07178'
+      foreground: '{{variant.scheme.base.pink}}'
   - name: Markup - Underline
     scope:
       - markup.underline
     settings:
       fontStyle: underline
-      foreground: '#F78C6C'
+      foreground: '{{variant.scheme.base.orange}}'
   - name: Markup - Strike
     scope:
       - markup.strike
@@ -340,8 +340,8 @@ tokenColors:
     scope:
       - markup.quote punctuation.definition.blockquote.markdown
     settings:
-      background: '#65737e'
-      foreground: '#65737e'
+      background: '{{variant.scheme.invisibles}}'
+      foreground: '{{variant.scheme.invisibles}}'
   - name: Markup - Quote
     scope:
       - markup.quote
@@ -350,5 +350,5 @@ tokenColors:
       foreground: ''
 colors:
   editorBackground: '#252526'
-  editorForeground: '#FFFFFF'
+  editorForeground: '{{variant.scheme.base.white}}'
   statusBarBackground: '#252526'

yarn.lock

@@ -1854,7 +1854,7 @@ gulp-template@^4.0.0:
     lodash "^4.8.2"
     through2 "^2.0.0"
 
-gulp-util@*, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7:
+gulp-util@*, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7, gulp-util@^3.0.8:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
   dependencies: