diff --git a/.gulp/index.js b/.gulp/index.js
index b25efc7..117146c 100644
--- a/.gulp/index.js
+++ b/.gulp/index.js
@@ -3,6 +3,7 @@ import './tasks/changelog';
 import './tasks/bump';
 import './tasks/icons';
 import './tasks/themes';
+import './tasks/watcher';
 
 // export default script
-export default ['build'];
+export default ['build:themes'];
diff --git a/.gulp/tasks/bump.js b/.gulp/tasks/bump.js
index b688813..0ad3a55 100644
--- a/.gulp/tasks/bump.js
+++ b/.gulp/tasks/bump.js
@@ -4,16 +4,16 @@
  * > Bump
  */
 
-import gulp from 'gulp';
+import Gulp from 'gulp';
 import runSequence from 'run-sequence';
 import gutil from 'gulp-util';
 import yrgv from 'yargs';
 import bump from 'gulp-bump';
-import gulpif from 'gulp-if';
+import Gulpif from 'gulp-if';
 
 var argv = yrgv.argv;
 
-gulp.task('bump', (cb) => {
+Gulp.task('bump', (cb) => {
   runSequence(
     'bump-pkg-version',
     (error) => {
@@ -27,11 +27,11 @@ gulp.task('bump', (cb) => {
   );
 });
 
-gulp.task('bump-pkg-version', () => {
-  return gulp.src(['./package.json'])
+Gulp.task('bump-pkg-version', () => {
+  return Gulp.src(['./package.json'])
     .pipe(gulpif((Object.keys(argv).length === 2), bump()))
     .pipe(gulpif(argv.patch, bump()))
     .pipe(gulpif(argv.minor, bump({ type: 'minor' })))
     .pipe(gulpif(argv.major, bump({ type: 'major' })))
-    .pipe(gulp.dest('./'));
+    .pipe(Gulp.dest('./'));
 });
\ No newline at end of file
diff --git a/.gulp/tasks/changelog.js b/.gulp/tasks/changelog.js
index f667b7e..bc8c075 100644
--- a/.gulp/tasks/changelog.js
+++ b/.gulp/tasks/changelog.js
@@ -4,15 +4,15 @@
  * > Changelog
  */
 
-import gulp from 'gulp';
+import Gulp from 'gulp';
 import conventionalChangelog from 'gulp-conventional-changelog';
 
 
-gulp.task('changelog', () => {
-  return gulp.src('CHANGELOG.md')
+Gulp.task('changelog', () => {
+  return Gulp.src('CHANGELOG.md')
     .pipe(conventionalChangelog({
       preset: 'angular',
       releaseCount: 0
     }))
-    .pipe(gulp.dest('./'));
+    .pipe(Gulp.dest('./'));
 });
\ No newline at end of file
diff --git a/.gulp/tasks/icons.js b/.gulp/tasks/icons.js
index 6836db6..58ffda0 100644
--- a/.gulp/tasks/icons.js
+++ b/.gulp/tasks/icons.js
@@ -1,14 +1,16 @@
+'use strict';
+
 /*
  * > Build Icons
  */
 
 import fs from 'fs';
-import gulp from 'gulp';
+import Gulp from 'gulp';
 import Mustache from 'mustache';
 import gutil from 'gulp-util';
 import Paths from '../paths';
 
-gulp.task('build:icons', cb => {
+Gulp.task('build:icons', cb => {
   const partials = fs.readdirSync(`${Paths.src}/icons/partials`);
   const partialData = {};
   const files = fs.readdirSync(`${Paths.src}/icons/svgs`);
diff --git a/.gulp/tasks/themes.js b/.gulp/tasks/themes.js
index 77f1715..92d89e9 100644
--- a/.gulp/tasks/themes.js
+++ b/.gulp/tasks/themes.js
@@ -1,9 +1,11 @@
+'use strict';
+
 /*
  * > Build Themes
  */
 
 import fs from 'fs';
-import gulp from 'gulp';
+import Gulp from 'gulp';
 import gutil from 'gulp-util';
 import Mustache from 'mustache';
 import YAML from 'yamljs';
@@ -32,10 +34,7 @@ files.forEach(file => {
   }
 });
 
-gulp.task('build:themes', cb => {
-    gutil.log()
-})
-gulp.task('build:themes', cb => {
+Gulp.task('build:themes', cb => {
   gutil.log(
     gutil.colors.gray('\n████████████████████████████████████████████████████████\n')
   );
diff --git a/.gulp/tasks/watcher.js b/.gulp/tasks/watcher.js
new file mode 100644
index 0000000..d08fbad
--- /dev/null
+++ b/.gulp/tasks/watcher.js
@@ -0,0 +1,12 @@
+'use strict';
+
+/*
+ * > Watcher
+ */
+
+import Gulp from 'gulp';
+import Paths from '../paths';
+
+Gulp.task('watch', () => {
+  Gulp.watch(`${Paths.src}/themes/**/*.json`, ['build:themes']);
+});
\ No newline at end of file
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 2670f16..2869b44 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -1,9 +1,9 @@
-import gulp from 'gulp';
-import gulpStats from 'gulp-stats';
+import Gulp from 'gulp';
+import GulpStats from 'gulp-stats';
 import tasks from './.gulp';
 
 // Use gulp-stats
-gulpStats(gulp);
+GulpStats(Gulp);
 
 // set default task
-gulp.task('default', tasks);
\ No newline at end of file
+Gulp.task('default', tasks);
\ No newline at end of file
diff --git a/material-theme-icons.json b/material-theme-icons.json
index b2d4319..d7af20b 100644
--- a/material-theme-icons.json
+++ b/material-theme-icons.json
@@ -1 +1 @@
-{"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_":{"iconPath":"./icons/.svg"},"_file_actionscript":{"iconPath":"./icons/actionscript.svg"},"_file_ai":{"iconPath":"./icons/ai.svg"},"_file_android":{"iconPath":"./icons/android.svg"},"_file_angular":{"iconPath":"./icons/angular.svg"},"_file_arduino":{"iconPath":"./icons/arduino.svg"},"_file_assembly":{"iconPath":"./icons/assembly.svg"},"_file_autohotkey":{"iconPath":"./icons/autohotkey.svg"},"_file_bower":{"iconPath":"./icons/bower.svg"},"_file_c-lang":{"iconPath":"./icons/c-lang.svg"},"_file_certificate":{"iconPath":"./icons/certificate.svg"},"_file_changelog":{"iconPath":"./icons/changelog.svg"},"_file_clojure":{"iconPath":"./icons/clojure.svg"},"_file_cmake":{"iconPath":"./icons/cmake.svg"},"_file_cmd":{"iconPath":"./icons/cmd.svg"},"_file_coffee":{"iconPath":"./icons/coffee.svg"},"_file_console":{"iconPath":"./icons/console.svg"},"_file_contributing":{"iconPath":"./icons/contributing.svg"},"_file_cpp":{"iconPath":"./icons/cpp.svg"},"_file_credits":{"iconPath":"./icons/credits.svg"},"_file_csharp":{"iconPath":"./icons/csharp.svg"},"_file_css-map":{"iconPath":"./icons/css-map.svg"},"_file_css":{"iconPath":"./icons/css.svg"},"_file_dart":{"iconPath":"./icons/dart.svg"},"_file_database":{"iconPath":"./icons/database.svg"},"_file_dlang":{"iconPath":"./icons/dlang.svg"},"_file_docker":{"iconPath":"./icons/docker.svg"},"_file_document":{"iconPath":"./icons/document.svg"},"_file_email":{"iconPath":"./icons/email.svg"},"_file_exe":{"iconPath":"./icons/exe.svg"},"_file_favicon":{"iconPath":"./icons/favicon.svg"},"_file_file":{"iconPath":"./icons/file.svg"},"_file_flash":{"iconPath":"./icons/flash.svg"},"_file_flow":{"iconPath":"./icons/flow.svg"},"_file_folder-light":{"iconPath":"./icons/folder-light.svg"},"_file_folder-outline":{"iconPath":"./icons/folder-outline.svg"},"_file_folder":{"iconPath":"./icons/folder.svg"},"_file_font":{"iconPath":"./icons/font.svg"},"_file_fsharp":{"iconPath":"./icons/fsharp.svg"},"_file_git":{"iconPath":"./icons/git.svg"},"_file_github":{"iconPath":"./icons/github.svg"},"_file_gopher":{"iconPath":"./icons/gopher.svg"},"_file_gradle":{"iconPath":"./icons/gradle.svg"},"_file_groovy":{"iconPath":"./icons/groovy.svg"},"_file_grunt":{"iconPath":"./icons/grunt.svg"},"_file_gulp":{"iconPath":"./icons/gulp.svg"},"_file_haskell":{"iconPath":"./icons/haskell.svg"},"_file_html":{"iconPath":"./icons/html.svg"},"_file_image":{"iconPath":"./icons/image.svg"},"_file_ionic":{"iconPath":"./icons/ionic.svg"},"_file_java":{"iconPath":"./icons/java.svg"},"_file_javascript-map":{"iconPath":"./icons/javascript-map.svg"},"_file_js":{"iconPath":"./icons/js.svg"},"_file_json":{"iconPath":"./icons/json.svg"},"_file_key":{"iconPath":"./icons/key.svg"},"_file_kotlin":{"iconPath":"./icons/kotlin.svg"},"_file_less":{"iconPath":"./icons/less.svg"},"_file_lib":{"iconPath":"./icons/lib.svg"},"_file_license":{"iconPath":"./icons/license.svg"},"_file_lua":{"iconPath":"./icons/lua.svg"},"_file_markdown":{"iconPath":"./icons/markdown.svg"},"_file_markup":{"iconPath":"./icons/markup.svg"},"_file_movie":{"iconPath":"./icons/movie.svg"},"_file_music":{"iconPath":"./icons/music.svg"},"_file_mustache":{"iconPath":"./icons/mustache.svg"},"_file_mxml":{"iconPath":"./icons/mxml.svg"},"_file_nodejs":{"iconPath":"./icons/nodejs.svg"},"_file_npm":{"iconPath":"./icons/npm.svg"},"_file_ocaml":{"iconPath":"./icons/ocaml.svg"},"_file_pdf":{"iconPath":"./icons/pdf.svg"},"_file_php":{"iconPath":"./icons/php.svg"},"_file_polymer":{"iconPath":"./icons/polymer.svg"},"_file_postcss":{"iconPath":"./icons/postcss.svg"},"_file_powerpoint":{"iconPath":"./icons/powerpoint.svg"},"_file_procfile":{"iconPath":"./icons/procfile.svg"},"_file_pug":{"iconPath":"./icons/pug.svg"},"_file_python":{"iconPath":"./icons/python.svg"},"_file_r":{"iconPath":"./icons/r.svg"},"_file_rails":{"iconPath":"./icons/rails.svg"},"_file_raml":{"iconPath":"./icons/raml.svg"},"_file_react":{"iconPath":"./icons/react.svg"},"_file_readme":{"iconPath":"./icons/readme.svg"},"_file_ruby":{"iconPath":"./icons/ruby.svg"},"_file_rust":{"iconPath":"./icons/rust.svg"},"_file_sass":{"iconPath":"./icons/sass.svg"},"_file_settings":{"iconPath":"./icons/settings.svg"},"_file_sketch":{"iconPath":"./icons/sketch.svg"},"_file_star":{"iconPath":"./icons/star.svg"},"_file_stylus":{"iconPath":"./icons/stylus.svg"},"_file_sublime":{"iconPath":"./icons/sublime.svg"},"_file_svg":{"iconPath":"./icons/svg.svg"},"_file_swc":{"iconPath":"./icons/swc.svg"},"_file_swift":{"iconPath":"./icons/swift.svg"},"_file_swig":{"iconPath":"./icons/swig.svg"},"_file_table":{"iconPath":"./icons/table.svg"},"_file_tex":{"iconPath":"./icons/tex.svg"},"_file_todo":{"iconPath":"./icons/todo.svg"},"_file_tune":{"iconPath":"./icons/tune.svg"},"_file_twig":{"iconPath":"./icons/twig.svg"},"_file_typescript":{"iconPath":"./icons/typescript.svg"},"_file_typescript_def":{"iconPath":"./icons/typescript_def.svg"},"_file_url":{"iconPath":"./icons/url.svg"},"_file_virtual":{"iconPath":"./icons/virtual.svg"},"_file_visualstudio":{"iconPath":"./icons/visualstudio.svg"},"_file_vue":{"iconPath":"./icons/vue.svg"},"_file_webpack":{"iconPath":"./icons/webpack.svg"},"_file_word":{"iconPath":"./icons/word.svg"},"_file_xaml":{"iconPath":"./icons/xaml.svg"},"_file_xml":{"iconPath":"./icons/xml.svg"},"_file_yaml":{"iconPath":"./icons/yaml.svg"},"_file_yarn":{"iconPath":"./icons/yarn.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"}}
+{"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_":{"iconPath":"./icons/.svg"},"_file_actionscript":{"iconPath":"./icons/actionscript.svg"},"_file_ai":{"iconPath":"./icons/ai.svg"},"_file_android":{"iconPath":"./icons/android.svg"},"_file_angular":{"iconPath":"./icons/angular.svg"},"_file_arduino":{"iconPath":"./icons/arduino.svg"},"_file_assembly":{"iconPath":"./icons/assembly.svg"},"_file_autohotkey":{"iconPath":"./icons/autohotkey.svg"},"_file_bower":{"iconPath":"./icons/bower.svg"},"_file_c-lang":{"iconPath":"./icons/c-lang.svg"},"_file_certificate":{"iconPath":"./icons/certificate.svg"},"_file_changelog":{"iconPath":"./icons/changelog.svg"},"_file_clojure":{"iconPath":"./icons/clojure.svg"},"_file_cmake":{"iconPath":"./icons/cmake.svg"},"_file_cmd":{"iconPath":"./icons/cmd.svg"},"_file_coffee":{"iconPath":"./icons/coffee.svg"},"_file_console":{"iconPath":"./icons/console.svg"},"_file_contributing":{"iconPath":"./icons/contributing.svg"},"_file_cpp":{"iconPath":"./icons/cpp.svg"},"_file_credits":{"iconPath":"./icons/credits.svg"},"_file_csharp":{"iconPath":"./icons/csharp.svg"},"_file_css-map":{"iconPath":"./icons/css-map.svg"},"_file_css":{"iconPath":"./icons/css.svg"},"_file_dart":{"iconPath":"./icons/dart.svg"},"_file_database":{"iconPath":"./icons/database.svg"},"_file_dlang":{"iconPath":"./icons/dlang.svg"},"_file_docker":{"iconPath":"./icons/docker.svg"},"_file_document":{"iconPath":"./icons/document.svg"},"_file_email":{"iconPath":"./icons/email.svg"},"_file_exe":{"iconPath":"./icons/exe.svg"},"_file_favicon":{"iconPath":"./icons/favicon.svg"},"_file_file":{"iconPath":"./icons/file.svg"},"_file_flash":{"iconPath":"./icons/flash.svg"},"_file_flow":{"iconPath":"./icons/flow.svg"},"_file_folder-light":{"iconPath":"./icons/folder-light.svg"},"_file_folder-outline":{"iconPath":"./icons/folder-outline.svg"},"_file_folder":{"iconPath":"./icons/folder.svg"},"_file_font":{"iconPath":"./icons/font.svg"},"_file_fsharp":{"iconPath":"./icons/fsharp.svg"},"_file_git":{"iconPath":"./icons/git.svg"},"_file_github":{"iconPath":"./icons/github.svg"},"_file_gopher":{"iconPath":"./icons/gopher.svg"},"_file_gradle":{"iconPath":"./icons/gradle.svg"},"_file_groovy":{"iconPath":"./icons/groovy.svg"},"_file_grunt":{"iconPath":"./icons/grunt.svg"},"_file_gulp":{"iconPath":"./icons/Gulp.svg"},"_file_haskell":{"iconPath":"./icons/haskell.svg"},"_file_html":{"iconPath":"./icons/html.svg"},"_file_image":{"iconPath":"./icons/image.svg"},"_file_ionic":{"iconPath":"./icons/ionic.svg"},"_file_java":{"iconPath":"./icons/java.svg"},"_file_javascript-map":{"iconPath":"./icons/javascript-map.svg"},"_file_js":{"iconPath":"./icons/js.svg"},"_file_json":{"iconPath":"./icons/json.svg"},"_file_key":{"iconPath":"./icons/key.svg"},"_file_kotlin":{"iconPath":"./icons/kotlin.svg"},"_file_less":{"iconPath":"./icons/less.svg"},"_file_lib":{"iconPath":"./icons/lib.svg"},"_file_license":{"iconPath":"./icons/license.svg"},"_file_lua":{"iconPath":"./icons/lua.svg"},"_file_markdown":{"iconPath":"./icons/markdown.svg"},"_file_markup":{"iconPath":"./icons/markup.svg"},"_file_movie":{"iconPath":"./icons/movie.svg"},"_file_music":{"iconPath":"./icons/music.svg"},"_file_mustache":{"iconPath":"./icons/mustache.svg"},"_file_mxml":{"iconPath":"./icons/mxml.svg"},"_file_nodejs":{"iconPath":"./icons/nodejs.svg"},"_file_npm":{"iconPath":"./icons/npm.svg"},"_file_ocaml":{"iconPath":"./icons/ocaml.svg"},"_file_pdf":{"iconPath":"./icons/pdf.svg"},"_file_php":{"iconPath":"./icons/php.svg"},"_file_polymer":{"iconPath":"./icons/polymer.svg"},"_file_postcss":{"iconPath":"./icons/postcss.svg"},"_file_powerpoint":{"iconPath":"./icons/powerpoint.svg"},"_file_procfile":{"iconPath":"./icons/procfile.svg"},"_file_pug":{"iconPath":"./icons/pug.svg"},"_file_python":{"iconPath":"./icons/python.svg"},"_file_r":{"iconPath":"./icons/r.svg"},"_file_rails":{"iconPath":"./icons/rails.svg"},"_file_raml":{"iconPath":"./icons/raml.svg"},"_file_react":{"iconPath":"./icons/react.svg"},"_file_readme":{"iconPath":"./icons/readme.svg"},"_file_ruby":{"iconPath":"./icons/ruby.svg"},"_file_rust":{"iconPath":"./icons/rust.svg"},"_file_sass":{"iconPath":"./icons/sass.svg"},"_file_settings":{"iconPath":"./icons/settings.svg"},"_file_sketch":{"iconPath":"./icons/sketch.svg"},"_file_star":{"iconPath":"./icons/star.svg"},"_file_stylus":{"iconPath":"./icons/stylus.svg"},"_file_sublime":{"iconPath":"./icons/sublime.svg"},"_file_svg":{"iconPath":"./icons/svg.svg"},"_file_swc":{"iconPath":"./icons/swc.svg"},"_file_swift":{"iconPath":"./icons/swift.svg"},"_file_swig":{"iconPath":"./icons/swig.svg"},"_file_table":{"iconPath":"./icons/table.svg"},"_file_tex":{"iconPath":"./icons/tex.svg"},"_file_todo":{"iconPath":"./icons/todo.svg"},"_file_tune":{"iconPath":"./icons/tune.svg"},"_file_twig":{"iconPath":"./icons/twig.svg"},"_file_typescript":{"iconPath":"./icons/typescript.svg"},"_file_typescript_def":{"iconPath":"./icons/typescript_def.svg"},"_file_url":{"iconPath":"./icons/url.svg"},"_file_virtual":{"iconPath":"./icons/virtual.svg"},"_file_visualstudio":{"iconPath":"./icons/visualstudio.svg"},"_file_vue":{"iconPath":"./icons/vue.svg"},"_file_webpack":{"iconPath":"./icons/webpack.svg"},"_file_word":{"iconPath":"./icons/word.svg"},"_file_xaml":{"iconPath":"./icons/xaml.svg"},"_file_xml":{"iconPath":"./icons/xml.svg"},"_file_yaml":{"iconPath":"./icons/yaml.svg"},"_file_yarn":{"iconPath":"./icons/yarn.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"}}
diff --git a/package.json b/package.json
index 789218c..3d9c6ab 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,6 @@
     "gulp-if": "^2.0.2",
     "gulp-stats": "^0.0.4",
     "gulp-util": "^3.0.8",
-    "gulp-watch": "^4.3.8",
     "json-minify": "^1.0.0",
     "mustache": "^2.3.0",
     "rimraf": "^2.6.1",
diff --git a/src/themes/theme-template-color-theme.json b/src/themes/theme-template-color-theme.json
index 7412880..43e7411 100644
--- a/src/themes/theme-template-color-theme.json
+++ b/src/themes/theme-template-color-theme.json
@@ -683,6 +683,8 @@
     "statusBar.foreground": "{{variant.scheme.comments}}",
     "activityBar.background": "{{variant.scheme.background}}",
     "activityBar.foreground": "{{variant.scheme.foreground}}",
+    "activityBarBadge.background": "{{commons.accents.teal}}",
+    "activityBarBadge.foreground": "{{variant.scheme.base.black}}",
     "titleBar.activeBackground": "{{variant.scheme.background}}",
     "titleBar.activeForeground": "{{variant.scheme.comments}}",
     "titleBar.inactiveBackground": "{{variant.scheme.background}}",
@@ -731,8 +733,6 @@
     "editorSuggestWidget.border": "{{variant.scheme.inputBorder}}",
     "widget.shadow": "{{variant.scheme.shadow}}",
     "editorWidget.background": "{{variant.scheme.background}}",
-    "activityBarBadge.background": "{{commons.accents.teal}}",
-    "activityBarBadge.foreground": "{{variant.scheme.base.black}}",
     "panel.border": "{{variant.scheme.background}}",
     "panelTitle.activeForeground": "{{variant.scheme.foreground}}",
     "diffEditor.insertedTextBackground": "{{variant.scheme.base.green}}15",
diff --git a/themes/.material-theme-icons.tmp b/themes/.material-theme-icons.tmp
new file mode 100644
index 0000000..f1ffcef
--- /dev/null
+++ b/themes/.material-theme-icons.tmp
@@ -0,0 +1,755 @@
+{
+  "iconDefinitions": {
+    "_folder_dark": {
+      "iconPath": "../icons/folder.svg"
+    },
+    "_folder_dark_build": {
+      "iconPath": "../icons/folder-build.svg"
+    },
+    "_folder_light": {
+      "iconPath": "../icons/folder-light.svg"
+    },
+    "_folder_light_build": {
+      "iconPath": "../icons/folder-light-build.svg"
+    },
+    "_folder_open": {
+      "iconPath": "../icons/folder-outline.svg"
+    },
+    "_folder_open_build": {
+      "iconPath": "../icons/folder-outline-build.svg"
+    },
+    "_file_dark": {
+      "iconPath": "../icons/file.svg"
+    },
+    "_file_": {
+      "iconPath": "../icons/.svg"
+    },
+    "_file_actionscript": {
+      "iconPath": "../icons/actionscript.svg"
+    },
+    "_file_ai": {
+      "iconPath": "../icons/ai.svg"
+    },
+    "_file_android": {
+      "iconPath": "../icons/android.svg"
+    },
+    "_file_angular": {
+      "iconPath": "../icons/angular.svg"
+    },
+    "_file_arduino": {
+      "iconPath": "../icons/arduino.svg"
+    },
+    "_file_assembly": {
+      "iconPath": "../icons/assembly.svg"
+    },
+    "_file_autohotkey": {
+      "iconPath": "../icons/autohotkey.svg"
+    },
+    "_file_bower": {
+      "iconPath": "../icons/bower.svg"
+    },
+    "_file_c-lang": {
+      "iconPath": "../icons/c-lang.svg"
+    },
+    "_file_c": {
+      "iconPath": "../icons/c.svg"
+    },
+    "_file_certificate": {
+      "iconPath": "../icons/certificate.svg"
+    },
+    "_file_changelog": {
+      "iconPath": "../icons/changelog.svg"
+    },
+    "_file_clojure": {
+      "iconPath": "../icons/clojure.svg"
+    },
+    "_file_cmake": {
+      "iconPath": "../icons/cmake.svg"
+    },
+    "_file_cmd": {
+      "iconPath": "../icons/cmd.svg"
+    },
+    "_file_coffee": {
+      "iconPath": "../icons/coffee.svg"
+    },
+    "_file_console": {
+      "iconPath": "../icons/console.svg"
+    },
+    "_file_contributing": {
+      "iconPath": "../icons/contributing.svg"
+    },
+    "_file_cpp": {
+      "iconPath": "../icons/cpp.svg"
+    },
+    "_file_credits": {
+      "iconPath": "../icons/credits.svg"
+    },
+    "_file_csharp": {
+      "iconPath": "../icons/csharp.svg"
+    },
+    "_file_css-map": {
+      "iconPath": "../icons/css-map.svg"
+    },
+    "_file_css": {
+      "iconPath": "../icons/css.svg"
+    },
+    "_file_dart": {
+      "iconPath": "../icons/dart.svg"
+    },
+    "_file_database": {
+      "iconPath": "../icons/database.svg"
+    },
+    "_file_dlang": {
+      "iconPath": "../icons/dlang.svg"
+    },
+    "_file_docker": {
+      "iconPath": "../icons/docker.svg"
+    },
+    "_file_document": {
+      "iconPath": "../icons/document.svg"
+    },
+    "_file_email": {
+      "iconPath": "../icons/email.svg"
+    },
+    "_file_exe": {
+      "iconPath": "../icons/exe.svg"
+    },
+    "_file_favicon": {
+      "iconPath": "../icons/favicon.svg"
+    },
+    "_file_file": {
+      "iconPath": "../icons/file.svg"
+    },
+    "_file_flash": {
+      "iconPath": "../icons/flash.svg"
+    },
+    "_file_flow": {
+      "iconPath": "../icons/flow.svg"
+    },
+    "_file_folder-build": {
+      "iconPath": "../icons/folder-build.svg"
+    },
+    "_file_folder-light-build": {
+      "iconPath": "../icons/folder-light-build.svg"
+    },
+    "_file_folder-light": {
+      "iconPath": "../icons/folder-light.svg"
+    },
+    "_file_folder-outline-build": {
+      "iconPath": "../icons/folder-outline-build.svg"
+    },
+    "_file_folder-outline": {
+      "iconPath": "../icons/folder-outline.svg"
+    },
+    "_file_folder": {
+      "iconPath": "../icons/folder.svg"
+    },
+    "_file_font": {
+      "iconPath": "../icons/font.svg"
+    },
+    "_file_fsharp": {
+      "iconPath": "../icons/fsharp.svg"
+    },
+    "_file_git": {
+      "iconPath": "../icons/git.svg"
+    },
+    "_file_github": {
+      "iconPath": "../icons/github.svg"
+    },
+    "_file_gopher": {
+      "iconPath": "../icons/gopher.svg"
+    },
+    "_file_gradle": {
+      "iconPath": "../icons/gradle.svg"
+    },
+    "_file_graphql": {
+      "iconPath": "../icons/graphql.svg"
+    },
+    "_file_groovy": {
+      "iconPath": "../icons/groovy.svg"
+    },
+    "_file_grunt": {
+      "iconPath": "../icons/grunt.svg"
+    },
+    "_file_gulp": {
+      "iconPath": "../icons/gulp.svg"
+    },
+    "_file_haskell": {
+      "iconPath": "../icons/haskell.svg"
+    },
+    "_file_html": {
+      "iconPath": "../icons/html.svg"
+    },
+    "_file_image": {
+      "iconPath": "../icons/image.svg"
+    },
+    "_file_ionic": {
+      "iconPath": "../icons/ionic.svg"
+    },
+    "_file_java": {
+      "iconPath": "../icons/java.svg"
+    },
+    "_file_javascript-map": {
+      "iconPath": "../icons/javascript-map.svg"
+    },
+    "_file_js": {
+      "iconPath": "../icons/js.svg"
+    },
+    "_file_json": {
+      "iconPath": "../icons/json.svg"
+    },
+    "_file_key": {
+      "iconPath": "../icons/key.svg"
+    },
+    "_file_kotlin": {
+      "iconPath": "../icons/kotlin.svg"
+    },
+    "_file_less": {
+      "iconPath": "../icons/less.svg"
+    },
+    "_file_lib": {
+      "iconPath": "../icons/lib.svg"
+    },
+    "_file_license": {
+      "iconPath": "../icons/license.svg"
+    },
+    "_file_lua": {
+      "iconPath": "../icons/lua.svg"
+    },
+    "_file_markdown": {
+      "iconPath": "../icons/markdown.svg"
+    },
+    "_file_markup": {
+      "iconPath": "../icons/markup.svg"
+    },
+    "_file_movie": {
+      "iconPath": "../icons/movie.svg"
+    },
+    "_file_music": {
+      "iconPath": "../icons/music.svg"
+    },
+    "_file_mustache": {
+      "iconPath": "../icons/mustache.svg"
+    },
+    "_file_mxml": {
+      "iconPath": "../icons/mxml.svg"
+    },
+    "_file_nodejs": {
+      "iconPath": "../icons/nodejs.svg"
+    },
+    "_file_npm": {
+      "iconPath": "../icons/npm.svg"
+    },
+    "_file_ocaml": {
+      "iconPath": "../icons/ocaml.svg"
+    },
+    "_file_pdf": {
+      "iconPath": "../icons/pdf.svg"
+    },
+    "_file_php": {
+      "iconPath": "../icons/php.svg"
+    },
+    "_file_polymer": {
+      "iconPath": "../icons/polymer.svg"
+    },
+    "_file_postcss": {
+      "iconPath": "../icons/postcss.svg"
+    },
+    "_file_powerpoint": {
+      "iconPath": "../icons/powerpoint.svg"
+    },
+    "_file_procfile": {
+      "iconPath": "../icons/procfile.svg"
+    },
+    "_file_pug": {
+      "iconPath": "../icons/pug.svg"
+    },
+    "_file_python": {
+      "iconPath": "../icons/python.svg"
+    },
+    "_file_r": {
+      "iconPath": "../icons/r.svg"
+    },
+    "_file_rails": {
+      "iconPath": "../icons/rails.svg"
+    },
+    "_file_raml": {
+      "iconPath": "../icons/raml.svg"
+    },
+    "_file_react": {
+      "iconPath": "../icons/react.svg"
+    },
+    "_file_readme": {
+      "iconPath": "../icons/readme.svg"
+    },
+    "_file_ruby": {
+      "iconPath": "../icons/ruby.svg"
+    },
+    "_file_rust": {
+      "iconPath": "../icons/rust.svg"
+    },
+    "_file_sass": {
+      "iconPath": "../icons/sass.svg"
+    },
+    "_file_settings": {
+      "iconPath": "../icons/settings.svg"
+    },
+    "_file_sketch": {
+      "iconPath": "../icons/sketch.svg"
+    },
+    "_file_star": {
+      "iconPath": "../icons/star.svg"
+    },
+    "_file_stylus": {
+      "iconPath": "../icons/stylus.svg"
+    },
+    "_file_sublime": {
+      "iconPath": "../icons/sublime.svg"
+    },
+    "_file_svg": {
+      "iconPath": "../icons/svg.svg"
+    },
+    "_file_swc": {
+      "iconPath": "../icons/swc.svg"
+    },
+    "_file_swift": {
+      "iconPath": "../icons/swift.svg"
+    },
+    "_file_swig": {
+      "iconPath": "../icons/swig.svg"
+    },
+    "_file_table": {
+      "iconPath": "../icons/table.svg"
+    },
+    "_file_tex": {
+      "iconPath": "../icons/tex.svg"
+    },
+    "_file_todo": {
+      "iconPath": "../icons/todo.svg"
+    },
+    "_file_tune": {
+      "iconPath": "../icons/tune.svg"
+    },
+    "_file_twig": {
+      "iconPath": "../icons/twig.svg"
+    },
+    "_file_typescript": {
+      "iconPath": "../icons/typescript.svg"
+    },
+    "_file_typescript_def": {
+      "iconPath": "../icons/typescript_def.svg"
+    },
+    "_file_url": {
+      "iconPath": "../icons/url.svg"
+    },
+    "_file_virtual": {
+      "iconPath": "../icons/virtual.svg"
+    },
+    "_file_visualstudio": {
+      "iconPath": "../icons/visualstudio.svg"
+    },
+    "_file_vue": {
+      "iconPath": "../icons/vue.svg"
+    },
+    "_file_webpack": {
+      "iconPath": "../icons/webpack.svg"
+    },
+    "_file_word": {
+      "iconPath": "../icons/word.svg"
+    },
+    "_file_xaml": {
+      "iconPath": "../icons/xaml.svg"
+    },
+    "_file_xml": {
+      "iconPath": "../icons/xml.svg"
+    },
+    "_file_yaml": {
+      "iconPath": "../icons/yaml.svg"
+    },
+    "_file_yarn": {
+      "iconPath": "../icons/yarn.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_cpp",
+    "h": "_file_c",
+    "m": "_file_c",
+    "cc": "_file_cpp",
+    "cpp": "_file_cpp",
+    "c++": "_file_cpp",
+    "hpp": "_file_cpp",
+    "mm": "_file_cpp",
+    "cxx": "_file_cpp",
+    "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_graphql",
+    "gql": "_file_graphql",
+    "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",
+  "languageIds": {
+    "git": "_file_git"
+  },
+  "light": {
+    "folderExpanded": "_folder_open",
+    "folder": "_folder_light",
+    "folderNames": {
+      "node_modules": "_file_nodejs",
+      ".git": "_file_git",
+      ".github": "_file_github",
+      ".gulp": "_file_gulp",
+      "bower_components": "_file_bower",
+      "build": "_folder_light_build",
+      "dist": "_folder_light_build"
+    },
+    "folderNamesExpanded": {
+      "node_modules": "_file_nodejs",
+      ".git": "_file_git",
+      ".github": "_file_github",
+      ".gulp": "_file_gulp",
+      "bower_components": "_file_bower",
+      "build": "_folder_light_build",
+      "dist": "_folder_light_build"
+    }
+  },
+  "folderNames": {
+    "node_modules": "_file_nodejs",
+    ".git": "_file_git",
+    ".github": "_file_github",
+    ".gulp": "_file_gulp",
+    "bower_components": "_file_bower",
+    "build": "_folder_dark_build",
+    "dist": "_folder_dark_build"
+  },
+  "folderNamesExpanded": {
+    "node_modules": "_file_nodejs",
+    ".git": "_file_git",
+    ".github": "_file_github",
+    ".gulp": "_file_gulp",
+    "bower_components": "_file_bower",
+    "build": "_folder_open_build",
+    "dist": "_folder_open_build"
+  }
+}
\ No newline at end of file
diff --git a/themes/Material-Theme-Darker.json b/themes/Material-Theme-Darker.json
index 3c19261..a7c04fb 100644
--- a/themes/Material-Theme-Darker.json
+++ b/themes/Material-Theme-Darker.json
@@ -3,8 +3,7 @@
   "tokenColors": [
     {
       "settings": {
-        "background": "#212121",
-        "foreground": "#ffffff"
+        "background": "#212121"
       }
     },
     {
@@ -683,6 +682,8 @@
     "statusBar.foreground": "#4A4A4A",
     "activityBar.background": "#212121",
     "activityBar.foreground": "#EEFFFF",
+    "activityBarBadge.background": "#80CBC4",
+    "activityBarBadge.foreground": "#000000",
     "titleBar.activeBackground": "#212121",
     "titleBar.activeForeground": "#4A4A4A",
     "titleBar.inactiveBackground": "#212121",
@@ -731,8 +732,6 @@
     "editorSuggestWidget.border": "#FFFFFF10",
     "widget.shadow": "#00000030",
     "editorWidget.background": "#212121",
-    "activityBarBadge.background": "#80CBC4",
-    "activityBarBadge.foreground": "#000000",
     "panel.border": "#212121",
     "panelTitle.activeForeground": "#EEFFFF",
     "diffEditor.insertedTextBackground": "#C3E88D15",
diff --git a/themes/Material-Theme-Default.json b/themes/Material-Theme-Default.json
index b67cda4..0960ff9 100644
--- a/themes/Material-Theme-Default.json
+++ b/themes/Material-Theme-Default.json
@@ -3,8 +3,7 @@
   "tokenColors": [
     {
       "settings": {
-        "background": "#263238",
-        "foreground": "#ffffff"
+        "background": "#263238"
       }
     },
     {
@@ -683,6 +682,8 @@
     "statusBar.foreground": "#546E7A",
     "activityBar.background": "#263238",
     "activityBar.foreground": "#EEFFFF",
+    "activityBarBadge.background": "#80CBC4",
+    "activityBarBadge.foreground": "#000000",
     "titleBar.activeBackground": "#263238",
     "titleBar.activeForeground": "#546E7A",
     "titleBar.inactiveBackground": "#263238",
@@ -731,8 +732,6 @@
     "editorSuggestWidget.border": "#FFFFFF10",
     "widget.shadow": "#00000030",
     "editorWidget.background": "#263238",
-    "activityBarBadge.background": "#80CBC4",
-    "activityBarBadge.foreground": "#000000",
     "panel.border": "#263238",
     "panelTitle.activeForeground": "#EEFFFF",
     "diffEditor.insertedTextBackground": "#C3E88D15",
diff --git a/themes/Material-Theme-Lighter.json b/themes/Material-Theme-Lighter.json
index e6189d4..012362a 100644
--- a/themes/Material-Theme-Lighter.json
+++ b/themes/Material-Theme-Lighter.json
@@ -3,8 +3,7 @@
   "tokenColors": [
     {
       "settings": {
-        "background": "#FAFAFA",
-        "foreground": "#FFFFFF"
+        "background": "#FAFAFA"
       }
     },
     {
@@ -683,6 +682,8 @@
     "statusBar.foreground": "#CCD7DA",
     "activityBar.background": "#FAFAFA",
     "activityBar.foreground": "#90A4AE",
+    "activityBarBadge.background": "#80CBC4",
+    "activityBarBadge.foreground": "#000000",
     "titleBar.activeBackground": "#FAFAFA",
     "titleBar.activeForeground": "#CCD7DA",
     "titleBar.inactiveBackground": "#FAFAFA",
@@ -731,8 +732,6 @@
     "editorSuggestWidget.border": "#00000010",
     "widget.shadow": "#00000030",
     "editorWidget.background": "#FAFAFA",
-    "activityBarBadge.background": "#80CBC4",
-    "activityBarBadge.foreground": "#000000",
     "panel.border": "#FAFAFA",
     "panelTitle.activeForeground": "#90A4AE",
     "diffEditor.insertedTextBackground": "#91B85915",
diff --git a/themes/Material-Theme-Palenight.json b/themes/Material-Theme-Palenight.json
index 5a56257..0eb8594 100644
--- a/themes/Material-Theme-Palenight.json
+++ b/themes/Material-Theme-Palenight.json
@@ -3,8 +3,7 @@
   "tokenColors": [
     {
       "settings": {
-        "background": "#292D3E",
-        "foreground": "#ffffff"
+        "background": "#292D3E"
       }
     },
     {
@@ -683,6 +682,8 @@
     "statusBar.foreground": "#676E95",
     "activityBar.background": "#292D3E",
     "activityBar.foreground": "#A6ACCD",
+    "activityBarBadge.background": "#80CBC4",
+    "activityBarBadge.foreground": "#000000",
     "titleBar.activeBackground": "#292D3E",
     "titleBar.activeForeground": "#676E95",
     "titleBar.inactiveBackground": "#292D3E",
@@ -731,8 +732,6 @@
     "editorSuggestWidget.border": "#FFFFFF10",
     "widget.shadow": "#00000030",
     "editorWidget.background": "#292D3E",
-    "activityBarBadge.background": "#80CBC4",
-    "activityBarBadge.foreground": "#000000",
     "panel.border": "#292D3E",
     "panelTitle.activeForeground": "#A6ACCD",
     "diffEditor.insertedTextBackground": "#C3E88D15",
diff --git a/yarn.lock b/yarn.lock
index ebf4d3e..91158a6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -741,7 +741,7 @@ chalk@^0.5.1:
     strip-ansi "^0.3.0"
     supports-color "^0.2.0"
 
-chokidar@^1.6.0, chokidar@^1.6.1:
+chokidar@^1.6.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -1436,12 +1436,6 @@ first-chunk-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
 
-first-chunk-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz#1bdecdb8e083c0664b91945581577a43a9f31d70"
-  dependencies:
-    readable-stream "^2.0.2"
-
 flagged-respawn@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5"
@@ -1613,13 +1607,6 @@ glob-parent@^2.0.0:
   dependencies:
     is-glob "^2.0.0"
 
-glob-parent@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
 glob-stream@^3.1.5:
   version "3.1.18"
   resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b"
@@ -1773,7 +1760,7 @@ gulp-stats@^0.0.4:
     pretty-hrtime "^1.0.0"
     text-table "^0.2.0"
 
-gulp-util@*, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7, gulp-util@^3.0.8:
+gulp-util@*, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.8:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
   dependencies:
@@ -1796,21 +1783,6 @@ gulp-util@*, gulp-util@^3.0.0, gulp-util@^3.0.6, gulp-util@^3.0.7, gulp-util@^3.
     through2 "^2.0.0"
     vinyl "^0.5.0"
 
-gulp-watch@^4.3.8:
-  version "4.3.11"
-  resolved "https://registry.yarnpkg.com/gulp-watch/-/gulp-watch-4.3.11.tgz#162fc563de9fc770e91f9a7ce3955513a9a118c0"
-  dependencies:
-    anymatch "^1.3.0"
-    chokidar "^1.6.1"
-    glob-parent "^3.0.1"
-    gulp-util "^3.0.7"
-    object-assign "^4.1.0"
-    path-is-absolute "^1.0.1"
-    readable-stream "^2.2.2"
-    slash "^1.0.0"
-    vinyl "^1.2.0"
-    vinyl-file "^2.0.0"
-
 gulp@^3.9.1:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4"
@@ -2026,10 +1998,6 @@ is-extglob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
 
-is-extglob@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-
 is-finite@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
@@ -2052,12 +2020,6 @@ is-glob@^2.0.0, is-glob@^2.0.1:
   dependencies:
     is-extglob "^1.0.0"
 
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
-  dependencies:
-    is-extglob "^2.1.0"
-
 is-my-json-valid@^2.10.0:
   version "2.16.0"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
@@ -2729,17 +2691,13 @@ parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
 
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
-
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
   dependencies:
     pinkie-promise "^2.0.0"
 
-path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
@@ -3274,13 +3232,6 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
-strip-bom-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz#f87db5ef2613f6968aa545abfe1ec728b6a829ca"
-  dependencies:
-    first-chunk-stream "^2.0.0"
-    strip-bom "^2.0.0"
-
 strip-bom@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794"
@@ -3519,17 +3470,6 @@ verror@1.3.6:
   dependencies:
     extsprintf "1.0.2"
 
-vinyl-file@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-2.0.0.tgz#a7ebf5ffbefda1b7d18d140fcb07b223efb6751a"
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.3.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-    strip-bom-stream "^2.0.0"
-    vinyl "^1.1.0"
-
 vinyl-fs@^0.3.0:
   version "0.3.14"
   resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"
@@ -3558,14 +3498,6 @@ vinyl@^0.5.0:
     clone-stats "^0.0.1"
     replace-ext "0.0.1"
 
-vinyl@^1.1.0, vinyl@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
 whet.extend@~0.9.9:
   version "0.9.9"
   resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"