diff --git a/.gulp/paths.js b/.gulp/paths.js
index fa42e54..06df29c 100644
--- a/.gulp/paths.js
+++ b/.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;
\ No newline at end of file
+export default paths;
diff --git a/.gulp/tasks/icons.js b/.gulp/tasks/icons.js
index d98a620..ae850de 100644
--- a/.gulp/tasks/icons.js
+++ b/.gulp/tasks/icons.js
@@ -53,4 +53,4 @@ Gulp.task('build:templateicons', () => {
       extname: ".tmp"
     }))
     .pipe(Gulp.dest('./'));
-});
\ No newline at end of file
+});
diff --git a/.gulp/tasks/themes.js b/.gulp/tasks/themes.js
index d1cf6d3..21ae56b 100644
--- a/.gulp/tasks/themes.js
+++ b/.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));
   });
 });
diff --git a/.material-theme-icons.tmp b/.material-theme-icons.tmp
new file mode 100644
index 0000000..7bbcb6d
--- /dev/null
+++ b/.material-theme-icons.tmp
@@ -0,0 +1,2024 @@
+{
+  "iconDefinitions": {
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_actionscript": {
+      "iconPath": "./icons/actionscript.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_ai": {
+      "iconPath": "./icons/ai.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_android": {
+      "iconPath": "./icons/android.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_angular": {
+      "iconPath": "./icons/angular.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_arduino": {
+      "iconPath": "./icons/arduino.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_assembly": {
+      "iconPath": "./icons/assembly.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_autohotkey": {
+      "iconPath": "./icons/autohotkey.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_bower": {
+      "iconPath": "./icons/bower.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_c-lang": {
+      "iconPath": "./icons/c-lang.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_certificate": {
+      "iconPath": "./icons/certificate.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_changelog": {
+      "iconPath": "./icons/changelog.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_clojure": {
+      "iconPath": "./icons/clojure.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_cmake": {
+      "iconPath": "./icons/cmake.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_cmd": {
+      "iconPath": "./icons/cmd.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_coffee": {
+      "iconPath": "./icons/coffee.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_console": {
+      "iconPath": "./icons/console.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_contributing": {
+      "iconPath": "./icons/contributing.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_cpp": {
+      "iconPath": "./icons/cpp.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_credits": {
+      "iconPath": "./icons/credits.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_csharp": {
+      "iconPath": "./icons/csharp.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_css-map": {
+      "iconPath": "./icons/css-map.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_css": {
+      "iconPath": "./icons/css.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_dart": {
+      "iconPath": "./icons/dart.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_database": {
+      "iconPath": "./icons/database.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_dlang": {
+      "iconPath": "./icons/dlang.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_docker": {
+      "iconPath": "./icons/docker.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_document": {
+      "iconPath": "./icons/document.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_email": {
+      "iconPath": "./icons/email.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_exe": {
+      "iconPath": "./icons/exe.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_favicon": {
+      "iconPath": "./icons/favicon.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_file": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_flash": {
+      "iconPath": "./icons/flash.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_flow": {
+      "iconPath": "./icons/flow.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_folder-light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_folder-outline": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_folder": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_font": {
+      "iconPath": "./icons/font.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_fsharp": {
+      "iconPath": "./icons/fsharp.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_git": {
+      "iconPath": "./icons/git.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_github": {
+      "iconPath": "./icons/github.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_gopher": {
+      "iconPath": "./icons/gopher.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_gradle": {
+      "iconPath": "./icons/gradle.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_groovy": {
+      "iconPath": "./icons/groovy.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_grunt": {
+      "iconPath": "./icons/grunt.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_gulp": {
+      "iconPath": "./icons/gulp.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_haskell": {
+      "iconPath": "./icons/haskell.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_html": {
+      "iconPath": "./icons/html.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_image": {
+      "iconPath": "./icons/image.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_ionic": {
+      "iconPath": "./icons/ionic.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_java": {
+      "iconPath": "./icons/java.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_javascript-map": {
+      "iconPath": "./icons/javascript-map.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_js": {
+      "iconPath": "./icons/js.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_json": {
+      "iconPath": "./icons/json.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_key": {
+      "iconPath": "./icons/key.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_kotlin": {
+      "iconPath": "./icons/kotlin.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_less": {
+      "iconPath": "./icons/less.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_lib": {
+      "iconPath": "./icons/lib.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_license": {
+      "iconPath": "./icons/license.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_lua": {
+      "iconPath": "./icons/lua.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_markdown": {
+      "iconPath": "./icons/markdown.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_markup": {
+      "iconPath": "./icons/markup.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_movie": {
+      "iconPath": "./icons/movie.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_music": {
+      "iconPath": "./icons/music.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_mustache": {
+      "iconPath": "./icons/mustache.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_mxml": {
+      "iconPath": "./icons/mxml.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_nodejs": {
+      "iconPath": "./icons/nodejs.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_npm": {
+      "iconPath": "./icons/npm.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_ocaml": {
+      "iconPath": "./icons/ocaml.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_pdf": {
+      "iconPath": "./icons/pdf.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_php": {
+      "iconPath": "./icons/php.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_polymer": {
+      "iconPath": "./icons/polymer.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_postcss": {
+      "iconPath": "./icons/postcss.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_powerpoint": {
+      "iconPath": "./icons/powerpoint.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_procfile": {
+      "iconPath": "./icons/procfile.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_pug": {
+      "iconPath": "./icons/pug.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_python": {
+      "iconPath": "./icons/python.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_r": {
+      "iconPath": "./icons/r.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_rails": {
+      "iconPath": "./icons/rails.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_raml": {
+      "iconPath": "./icons/raml.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_react": {
+      "iconPath": "./icons/react.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_readme": {
+      "iconPath": "./icons/readme.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_ruby": {
+      "iconPath": "./icons/ruby.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_rust": {
+      "iconPath": "./icons/rust.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_sass": {
+      "iconPath": "./icons/sass.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_settings": {
+      "iconPath": "./icons/settings.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_sketch": {
+      "iconPath": "./icons/sketch.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_star": {
+      "iconPath": "./icons/star.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_stylus": {
+      "iconPath": "./icons/stylus.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_sublime": {
+      "iconPath": "./icons/sublime.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_svg": {
+      "iconPath": "./icons/svg.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_swc": {
+      "iconPath": "./icons/swc.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_swift": {
+      "iconPath": "./icons/swift.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_swig": {
+      "iconPath": "./icons/swig.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_table": {
+      "iconPath": "./icons/table.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_tex": {
+      "iconPath": "./icons/tex.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_todo": {
+      "iconPath": "./icons/todo.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_tune": {
+      "iconPath": "./icons/tune.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_twig": {
+      "iconPath": "./icons/twig.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_typescript": {
+      "iconPath": "./icons/typescript.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_typescript_def": {
+      "iconPath": "./icons/typescript_def.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_url": {
+      "iconPath": "./icons/url.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_virtual": {
+      "iconPath": "./icons/virtual.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_visualstudio": {
+      "iconPath": "./icons/visualstudio.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_vue": {
+      "iconPath": "./icons/vue.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_webpack": {
+      "iconPath": "./icons/webpack.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_word": {
+      "iconPath": "./icons/word.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_xaml": {
+      "iconPath": "./icons/xaml.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_xml": {
+      "iconPath": "./icons/xml.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_yaml": {
+      "iconPath": "./icons/yaml.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_yarn": {
+      "iconPath": "./icons/yarn.svg"
+    },
+    "_folder_dark": {
+      "iconPath": "./icons/folder.svg"
+    },
+    "_folder_light": {
+      "iconPath": "./icons/folder-light.svg"
+    },
+    "_folder_open": {
+      "iconPath": "./icons/folder-outline.svg"
+    },
+    "_file_dark": {
+      "iconPath": "./icons/file.svg"
+    },
+    "_file_zip": {
+      "iconPath": "./icons/zip.svg"
+    }
+  },
+  "fileExtensions": {
+    "cmd": "_file_cmd",
+    "mustache": "_file_mustache",
+    "rails": "_file_rails",
+    "styl": "_file_stylus",
+    "twig": "_file_twig",
+    "swig": "_file_swig",
+    "sketch": "_file_sketch",
+    "do": "_file_todo",
+    "sublime-settings": "_file_sublime",
+    "sublime-theme": "_file_sublime",
+    "sublime-commands": "_file_sublime",
+    "sublime-menu": "_file_sublime",
+    "html": "_file_html",
+    "jade": "_file_pug",
+    "pug": "_file_pug",
+    "md": "_file_markdown",
+    "md.rendered": "_file_markdown",
+    "markdown": "_file_markdown",
+    "markdown.rendered": "_file_markdown",
+    "css": "_file_css",
+    "postcss": "_file_postcss",
+    "scss": "_file_sass",
+    "sass": "_file_sass",
+    "less": "_file_less",
+    "json": "_file_json",
+    "yaml": "_file_yaml",
+    "YAML-tmLanguage": "_file_yaml",
+    "yml": "_file_yaml",
+    "xml": "_file_xml",
+    "plist": "_file_xml",
+    "xsd": "_file_xml",
+    "dtd": "_file_xml",
+    "xsl": "_file_xml",
+    "xslt": "_file_xml",
+    "resx": "_file_xml",
+    "iml": "_file_xml",
+    "xquery": "_file_xml",
+    "tmLanguage": "_file_xml",
+    "png": "_file_image",
+    "jpeg": "_file_image",
+    "jpg": "_file_image",
+    "gif": "_file_image",
+    "svg": "_file_svg",
+    "eps": "_file_svg",
+    "ai": "_file_ai",
+    "ico": "_file_image",
+    "tif": "_file_image",
+    "tiff": "_file_image",
+    "psd": "_file_image",
+    "psb": "_file_image",
+    "ami": "_file_image",
+    "apx": "_file_image",
+    "bmp": "_file_image",
+    "bpg": "_file_image",
+    "brk": "_file_image",
+    "cur": "_file_image",
+    "dds": "_file_image",
+    "dng": "_file_image",
+    "exr": "_file_image",
+    "fpx": "_file_image",
+    "gbr": "_file_image",
+    "img": "_file_image",
+    "jbig2": "_file_image",
+    "jb2": "_file_image",
+    "jng": "_file_image",
+    "jxr": "_file_image",
+    "pbm": "_file_image",
+    "pgf": "_file_image",
+    "pic": "_file_image",
+    "raw": "_file_image",
+    "webp": "_file_image",
+    "php": "_file_php",
+    "js": "_file_js",
+    "ejs": "_file_js",
+    "jsx": "_file_react",
+    "ini": "_file_settings",
+    "dlc": "_file_settings",
+    "dll": "_file_settings",
+    "config": "_file_settings",
+    "conf": "_file_settings",
+    "esx": "_file_js",
+    "ts": "_file_typescript",
+    "tsx": "_file_react",
+    "d.ts": "_file_typescript_def",
+    "pdf": "_file_pdf",
+    "xlsx": "_file_table",
+    "xls": "_file_table",
+    "csv": "_file_table",
+    "vscodeignore": "_file_vs",
+    "vsixmanifest": "_file_vs",
+    "suo": "_file_vs",
+    "sln": "_file_vs",
+    "pdb": "_file_database",
+    "cs": "_file_csharp",
+    "csproj": "_file_vs",
+    "zip": "_file_zip",
+    "tar": "_file_zip",
+    "gz": "_file_zip",
+    "xz": "_file_zip",
+    "bzip2": "_file_zip",
+    "gzip": "_file_zip",
+    "7z": "_file_zip",
+    "7zip": "_file_zip",
+    "pzip": "_file_zip",
+    "wim": "_file_zip",
+    "rar": "_file_zip",
+    "tgz": "_file_zip",
+    "exe": "_file_exe",
+    "msi": "_file_exe",
+    "java": "_file_java",
+    "jar": "_file_java",
+    "jsp": "_file_java",
+    "c": "_file_c",
+    "h": "_file_c",
+    "m": "_file_c",
+    "cc": "_file_c++",
+    "cpp": "_file_c++",
+    "hpp": "_file_c++",
+    "mm": "_file_c++",
+    "cxx": "_file_c++",
+    "go": "_file_go",
+    "py": "_file_python",
+    "url": "_file_url",
+    "sh": "_file_console",
+    "bat": "_file_console",
+    "ps1": "_file_console",
+    "fish": "_file_console",
+    "bash": "_file_console",
+    "gradle": "_file_gradle",
+    "doc": "_file_word",
+    "docx": "_file_word",
+    "rtf": "_file_word",
+    "properties": "_file_settings",
+    "prop": "_file_settings",
+    "settings": "_file_settings",
+    "sql": "_file_database",
+    "accdb": "_file_database",
+    "mdb": "_file_database",
+    "cer": "_file_certificate",
+    "cert": "_file_certificate",
+    "crt": "_file_certificate",
+    "pub": "_file_key",
+    "key": "_file_key",
+    "pem": "_file_key",
+    "asc": "_file_key",
+    "woff": "_file_font",
+    "woff2": "_file_font",
+    "ttf": "_file_font",
+    "eot": "_file_font",
+    "suit": "_file_font",
+    "otf": "_file_font",
+    "bmap": "_file_font",
+    "fnt": "_file_font",
+    "odttf": "_file_font",
+    "ttc": "_file_font",
+    "font": "_file_font",
+    "fonts": "_file_font",
+    "sui": "_file_font",
+    "ntf": "_file_font",
+    "mrf": "_file_font",
+    "lib": "_file_lib",
+    "rb": "_file_ruby",
+    "erb": "_file_ruby",
+    "fs": "_file_fsharp",
+    "fsx": "_file_fsharp",
+    "fsi": "_file_fsharp",
+    "fsproj": "_file_fsharp",
+    "manifest": "_file_xml",
+    "swift": "_file_swift",
+    "ino": "_file_arduino",
+    "dockerignore": "_file_docker",
+    "tex": "_file_tex",
+    "bib": "_file_lib",
+    "pptx": "_file_powerpoint",
+    "ppt": "_file_powerpoint",
+    "pptm": "_file_powerpoint",
+    "potx": "_file_powerpoint",
+    "pot": "_file_powerpoint",
+    "potm": "_file_powerpoint",
+    "ppsx": "_file_powerpoint",
+    "ppsm": "_file_powerpoint",
+    "pps": "_file_powerpoint",
+    "ppam": "_file_powerpoint",
+    "ppa": "_file_powerpoint",
+    "webm": "_file_movie",
+    "mkv": "_file_movie",
+    "flv": "_file_movie",
+    "vob": "_file_movie",
+    "ogv": "_file_movie",
+    "ogg": "_file_movie",
+    "gifv": "_file_movie",
+    "avi": "_file_movie",
+    "mov": "_file_movie",
+    "qt": "_file_movie",
+    "wmv": "_file_movie",
+    "yuv": "_file_movie",
+    "rm": "_file_movie",
+    "rmvb": "_file_movie",
+    "mp4": "_file_movie",
+    "m4v": "_file_movie",
+    "mpg": "_file_movie",
+    "mp2": "_file_movie",
+    "mpeg": "_file_movie",
+    "mpe": "_file_movie",
+    "mpv": "_file_movie",
+    "m2v": "_file_movie",
+    "vdi": "_file_virtual",
+    "vbox": "_file_virtual",
+    "vbox-prev": "_file_virtual",
+    "ics": "_file_email",
+    "mp3": "_file_music",
+    "flac": "_file_music",
+    "m4a": "_file_music",
+    "wma": "_file_music",
+    "aiff": "_file_music",
+    "coffee": "_file_coffee",
+    "txt": "_file_document",
+    "sqlite": "_file_database",
+    "graphql": "_file_json",
+    "props": "_file_settings",
+    "toml": "_file_settings",
+    "rs": "_file_rust",
+    "raml": "_file_raml",
+    "xaml": "_file_xaml",
+    "prefs": "_file_settings",
+    "hs": "_file_haskell",
+    "kt": "_file_kotlin",
+    "project": "_file_xml",
+    "patch": "_file_git",
+    "dockerfile": "_file_docker",
+    "vb": "_file_vs",
+    "lua": "_file_lua",
+    "clj": "_file_clojure",
+    "groovy": "_file_groovy",
+    "r": "_file_r",
+    "rst": "_file_markdown",
+    "dart": "_file_dart",
+    "as": "_file_actionscript",
+    "mxml": "_file_mxml",
+    "ahk": "_file_autohotkey",
+    "swf": "_file_flash",
+    "swc": "_file_swc",
+    "cmake": "_file_cmake",
+    "asm": "_file_assembly",
+    "a51": "_file_assembly",
+    "inc": "_file_assembly",
+    "nasm": "_file_assembly",
+    "s": "_file_assembly",
+    "ms": "_file_assembly",
+    "agc": "_file_assembly",
+    "ags": "_file_assembly",
+    "aea": "_file_assembly",
+    "argus": "_file_assembly",
+    "mitigus": "_file_assembly",
+    "binsource": "_file_assembly",
+    "vue": "_file_vue",
+    "ml": "_file_ocaml",
+    "mli": "_file_ocaml",
+    "cmx": "_file_ocaml",
+    "js.map": "_file_jsmap",
+    "css.map": "_file_cssmap",
+    "tmTheme": "_file_markup"
+  },
+  "fileNames": {
+    "gruntfile.js": "_file_grunt",
+    "bower.json": "_file_bower",
+    ".bowerrc": "_file_bower",
+    "webpack.js": "_file_webpack",
+    "webpack.config.js": "_file_webpack",
+    "webpack.dev.js": "_file_webpack",
+    "webpack.prod.js": "_file_webpack",
+    "webpack.common.js": "_file_webpack",
+    "webpackfile.js": "_file_webpack",
+    "ionic.config.json": "_file_ionic",
+    ".io-config.json": "_file_ionic",
+    "gulpfile.js": "_file_gulp",
+    "gulpfile.babel.js": "_file_gulp",
+    "package.json": "_file_npm",
+    "gradle.properties": "_file_gradle",
+    "gradlew": "_file_gradle",
+    ".jscsrc": "_file_json",
+    ".jshintrc": "_file_json",
+    ".jshintignore": "_file_settings",
+    ".npmignore": "_file_npm",
+    "tsconfig.json": "_file_json",
+    "tslint.json": "_file_json",
+    "androidmanifest.xml": "_file_android",
+    "gradle-wrapper.properties": "_file_gradle",
+    ".editorconfig": "_file_settings",
+    "procfile": "_file_procfile",
+    ".env": "_file_tune",
+    "dockerfile": "_file_docker",
+    "license": "_file_license",
+    "license.md": "_file_license",
+    "license.md.rendered": "_file_license",
+    "license.txt": "_file_license",
+    ".babelrc": "_file_json",
+    ".eslintrc": "_file_yaml",
+    ".buildignore": "_file_settings",
+    ".htaccess": "_file_xml",
+    "composer.lock": "_file_json",
+    ".gitignore": "_file_git",
+    ".gitconfig": "_file_git",
+    ".gitattributes": "_file_git",
+    ".gitmodules": "_file_git",
+    ".gitkeep": "_file_git",
+    "yarn.lock": "_file_yarn",
+    ".yarnclean": "_file_yarn",
+    ".yarn-integrity": "_file_yarn",
+    "yarn-error.log": "_file_yarn",
+    "contributing.md": "_file_contributing",
+    "contributing.md.rendered": "_file_contributing",
+    "readme.md": "_file_readme",
+    "readme.md.rendered": "_file_readme",
+    ".mailmap": "_file_email",
+    "makefile": "_file_settings",
+    "changelog": "_file_changelog",
+    "changelog.md": "_file_changelog",
+    "changelog.md.rendered": "_file_changelog",
+    "CREDITS": "_file_credits",
+    "credits.txt": "_file_credits",
+    "credits.md": "_file_credits",
+    "credits.md.rendered": "_file_credits",
+    ".flowconfig": "_file_flow",
+    ".jsbeautifyrc": "_file_json",
+    "git-history": "_file_git",
+    "angular-cli.json": "_file_angular",
+    "app.module.ts": "_file_angular",
+    "favicon.ico": "_file_favicon"
+  },
+  "file": "_file_dark",
+  "folder": "_folder_dark",
+  "folderExpanded": "_folder_open",
+  "folderNames": {
+    "node_modules": "_file_nodejs",
+    ".git": "_file_git",
+    ".github": "_file_github",
+    ".gulp": "_file_gulp",
+    "bower_components": "_file_bower"
+  },
+  "folderNamesExpanded": {
+    "node_modules": "_file_nodejs",
+    ".git": "_file_git",
+    ".github": "_file_github",
+    ".gulp": "_file_gulp",
+    "bower_components": "_file_bower"
+  },
+  "light": {
+    "folderExpanded": "_folder_open",
+    "folder": "_folder_light"
+  },
+  "languageIds": {
+    "git": "_file_git"
+  }
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 3932e45..2b0d3d8 100644
--- a/package.json
+++ b/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",
diff --git a/src/themes/Material-Theme-Darker.json b/src/themes/Material-Theme-Darker.json
index 527980f..17c4397 100644
--- a/src/themes/Material-Theme-Darker.json
+++ b/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"
   }
 }
\ No newline at end of file
diff --git a/src/themes/Material-Theme-Default.json b/src/themes/Material-Theme-Default.json
index 3d6f166..2d39db3 100644
--- a/src/themes/Material-Theme-Default.json
+++ b/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"
   }
 }
\ No newline at end of file
diff --git a/src/themes/Material-Theme-Lighter.json b/src/themes/Material-Theme-Lighter.json
index 09233d1..9e50b53 100644
--- a/src/themes/Material-Theme-Lighter.json
+++ b/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"
   }
 }
\ No newline at end of file
diff --git a/src/themes/Material-Theme-Palenight.json b/src/themes/Material-Theme-Palenight.json
index 8862927..24ad645 100644
--- a/src/themes/Material-Theme-Palenight.json
+++ b/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"
   }
 }
\ No newline at end of file
diff --git a/src/themes/Material-Theme.json b/src/themes/Material-Theme.json
index 527980f..3d6f166 100644
--- a/src/themes/Material-Theme.json
+++ b/src/themes/Material-Theme.json
@@ -15,7 +15,7 @@
       ],
       "settings": {
         "fontStyle": "italic",
-        "foreground": "#4A4A4A"
+        "foreground": "#546E7A"
       }
     },
     {
diff --git a/src/themes/settings/specific/darker.json b/src/themes/settings/specific/darker.json
index b91c23b..c44ce98 100644
--- a/src/themes/settings/specific/darker.json
+++ b/src/themes/settings/specific/darker.json
@@ -35,4 +35,4 @@
       "violet": "#bb80b3"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/themes/settings/specific/default.json b/src/themes/settings/specific/default.json
index 383ab61..9ff0e7a 100644
--- a/src/themes/settings/specific/default.json
+++ b/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",
diff --git a/src/themes/theme-template.yml b/src/themes/theme-template.yml
index 0cc3f07..823f1db 100644
--- a/src/themes/theme-template.yml
+++ b/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'
diff --git a/yarn.lock b/yarn.lock
index 8e64646..d7301c7 100644
--- a/yarn.lock
+++ b/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: