Merge branch 'develop'

2017-04-11 09:10:44 +02:00 · 2017-04-11 09:10:44 +02:00 · f85292849f
commit f85292849f
parent dae2fbc110 094bb68bb2
29 changed files with 3866 additions and 2534 deletions
--- a/.gulp/index.js
+++ b/.gulp/index.js
@ -2,6 +2,7 @@
 import './tasks/changelog';
 import './tasks/bump';
 import './tasks/icons';
+import './tasks/themes';

 // export default script
-export default ['build'];
+export default ['build'];
--- a/.gulp/paths.js
+++ b/.gulp/paths.js
@ -8,4 +8,4 @@ const today = new Date()
    'dist': './dist'
  };

-export default paths;
+export default paths;
--- a/.gulp/tasks/bump.js
+++ b/.gulp/tasks/bump.js
@ -6,7 +6,7 @@

 import gulp from 'gulp';
 import runSequence from 'run-sequence';
-import colors from 'colors';
+import gutil from 'gulp-util';
 import yrgv from 'yargs';
 import bump from 'gulp-bump';
 import gulpif from 'gulp-if';
@ -18,9 +18,9 @@ gulp.task('bump', (cb) => {
    'bump-pkg-version',
    (error) => {
      if (error) {
-        console.log('[bump]'.bold.magenta + ' There was an issue bumping version:\n'.bold.red + error.message);
+        console.log(gutil.colors.magenta.bold('[bump]'), gutil.colors.red.bold(' There was an issue bumping version:\n'), error.message);
      } else {
-        console.log('[bump]'.bold.magenta + ' Finished successfully'.bold.green);
+        console.log(gutil.colors.magenta.bold('\n[bump]'), gutil.colors.green.bold(' Finished successfully\n'));
      }
      cb(error);
    }
--- a/.gulp/tasks/icons.js
+++ b/.gulp/tasks/icons.js
@ -1,56 +1,47 @@
-'use strict';
-
 /*
 * > Build Icons
 */

-import Gulp from 'gulp';
-import runSequence from 'run-sequence';
-import Template from 'gulp-template';
-import Rename from 'gulp-rename';
-import FileList from 'gulp-filelist';
-import Include from 'gulp-include';
-import Data from 'gulp-data';
+import fs from 'fs';
+import gulp from 'gulp';
+import Mustache from 'mustache';
+import gutil from 'gulp-util';
 import Paths from '../paths';

-import iconList from '../../iconlist.json';
+gulp.task('build:icons', cb => {
+  const partials = fs.readdirSync(`${Paths.src}/icons/partials`);
+  const partialData = {};
+  const files = fs.readdirSync(`${Paths.src}/icons/svgs`);
+  const icons = files.map(file => ({ name: file.split('.')[0], last: false }));
+  icons[icons.length - 1].last = true;

+  partials.forEach(partial => {
+    partialData[partial.split('.')[0]] = fs.readFileSync(
+      `${Paths.src}/icons/partials/${partial}`,
+      'utf-8'
+    );
+  });

-Gulp.task('build:icons', (cb) => {
-  runSequence(
-    'build:iconslist',
-    'build:templateicons',
-    (error) => {
-      if (error) {
-        console.log('\n[Build Icons]'.bold.magenta + ' There was an issue building icons:\n'.bold.red + error.message);
-      } else {
-        console.log('\n[Build Icons]'.bold.magenta + ' Finished successfully\n'.bold.green);
-      }
-      cb(error);
-    }
+  let contents = Mustache.render(
+    fs.readFileSync(`${Paths.src}/icons/icons-theme.json`, 'utf-8'),
+    { icons },
+    partialData
  );
+
+  try {
+    contents = JSON.stringify(JSON.parse(contents), null, 2);
+  } catch (err) {
+    gutil.log(
+      gutil.colors.red('There is an error with JSON generated for icons'),
+      err
+    );
+    cb(err);
+    return;
+  }
+
+  const path = './.material-theme-icons.tmp';
+  fs.writeFileSync(path, contents, 'utf-8');
+  gutil.log('Generated', gutil.colors.green(path));
+
+  cb();
 });
-
-
-Gulp.task('build:iconslist', () => {
-  Gulp.src(`${Paths.src}/icons/svgs/*.svg`)
-    .pipe(FileList('iconlist.json', {
-      flatten: true,
-      removeExtensions: true
-    }))
-    .pipe(Gulp.dest('./'));
-});
-
-
-Gulp.task('build:templateicons', () => {
-  Gulp.src(`${Paths.src}/icons/icons-theme.json`)
-    .pipe(Include())
-      .on('error', console.log)
-    .pipe(Data(() => ({ icons: iconList })))
-    .pipe(Template())
-    .pipe(Rename({
-      basename: ".material-theme-icons",
-      extname: ".tmp"
-    }))
-    .pipe(Gulp.dest('./'));
-});
--- a/.gulp/tasks/themes.js
+++ b/.gulp/tasks/themes.js
@ -0,0 +1,56 @@
+/*
+ * > Build Themes
+ */
+
+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(
+  `${Paths.src}/themes/theme-template.yml`,
+  'utf-8'
+);
+
+const files = fs.readdirSync(`${Paths.src}/themes/settings/specific`);
+
+// build theme variants for later use in templating
+files.forEach(file => {
+  const name = file.split('.')[0];
+  const filepath = `${Paths.src}/themes/settings/specific/${file}`;
+  const contents = fs.readFileSync(filepath, 'utf-8');
+
+  try {
+    themeVariants.push(JSON.parse(contents));
+  } catch (err) {
+    gutil.log('Error when parsing json for theme variants', err);
+  }
+});
+
+gulp.task('build:themes', cb => {
+  themeVariants.forEach(variant => {
+    const templateData = {
+      commons: themeCommons,
+      variant,
+    };
+
+    const templateJson = YAML.parse(
+      Mustache.render(themeTemplateFile, templateData)
+    );
+
+    const path = `${Paths.themes}/${variant.name}.json`;
+
+    fs.writeFileSync(
+      path,
+      JSON.stringify(templateJson, null, 2),
+      'utf-8'
+    );
+
+    gutil.log('Generated', gutil.colors.green(path));
+  });
+});
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,5 @@
-<a name="0.0.7"></a>
-## 0.0.7 (2017-02-26)
+<a name="0.0.8"></a>
+## 0.0.8 (2017-04-11)


 ### Bug Fixes
@ -12,6 +12,7 @@
 * Fix var hover background ([a471a2a](https://github.com/equinusocio/vsc-material-theme/commit/a471a2a))
 * Update json icon ([2793178](https://github.com/equinusocio/vsc-material-theme/commit/2793178))
 * Update some file icons ([88b4739](https://github.com/equinusocio/vsc-material-theme/commit/88b4739))
+* **Icons:** Fix .ts and def ts icons ([e8e9b49](https://github.com/equinusocio/vsc-material-theme/commit/e8e9b49)), closes [#10](https://github.com/equinusocio/vsc-material-theme/issues/10)


 ### Features
@ -21,6 +22,7 @@
 * first beta release ([262097f](https://github.com/equinusocio/vsc-material-theme/commit/262097f))
 * **Icons:** Add new filetype icons ([50debfe](https://github.com/equinusocio/vsc-material-theme/commit/50debfe))
 * **Icons:** Add new icons ([d02f2fe](https://github.com/equinusocio/vsc-material-theme/commit/d02f2fe))
+* first full theme implementation (wip) ([6434f44](https://github.com/equinusocio/vsc-material-theme/commit/6434f44))



--- a/README.md
+++ b/README.md
@ -1,8 +1,7 @@

 <p align="center"><img width="620px" src="http://i.imgur.com/CiYI98A.jpg"/></p>

-[![GitHub tag](https://img.shields.io/github/release/equinusocio/vsc-material-theme.svg?style=flat-square)](https://github.com/equinusocio/vsc-material-theme/releases)
-[![Beerpay](https://beerpay.io/equinusocio/vsc-material-theme/badge.svg?style=beer)](https://beerpay.io/equinusocio/vsc-material-theme)
+[![GitHub tag](https://img.shields.io/github/release/equinusocio/vsc-material-theme.svg?style=flat-square)](https://github.com/equinusocio/vsc-material-theme/releases)   [![GitHub tag](https://img.shields.io/github/issues/equinusocio/vsc-material-theme.svg?style=flat-square)](https://github.com/equinusocio/vsc-material-theme/issues)   [![Beerpay](https://beerpay.io/equinusocio/vsc-material-theme/badge.svg?style=beer)](https://beerpay.io/equinusocio/vsc-material-theme)

 The most epic theme meet Visual Studio Code. Please note that this theme is still in Beta (β) release. You can help by reporting issues [here](https://github.com/equinusocio/vsc-material-theme/issues)

--- a/iconlist.json
+++ b/iconlist.json
@ -97,8 +97,8 @@
  "todo",
  "tune",
  "twig",
-  "typescript-def",
  "typescript",
+  "typescript_def",
  "url",
  "virtual",
  "visualstudio",
--- a/icons/typescript_def.svg
+++ b/icons/typescript_def.svg
--- a/material-theme-icons.json
+++ b/material-theme-icons.json
--- a/package.json
+++ b/package.json
@ -2,7 +2,7 @@
  "name": "vsc-material-theme",
  "displayName": "Material Theme",
  "description": "The most epic theme now for Visual Studio Code",
-  "version": "0.0.7",
+  "version": "0.0.8",
  "publisher": "Equinusocio",
  "license": "Apache-2.0",
  "icon": "logo.png",
@ -19,15 +19,17 @@
    "url": "https://github.com/equinusocio/vsc-material-theme/issues"
  },
  "engines": {
-    "vscode": "^1.5.0"
+    "vscode": "^1.11.0"
  },
  "scripts": {
-    "start": "npm run remove-icons && npm run minimize-icons && npm run buildicons && npm run minimize-json",
+    "build": "npm run ricons && build-themes",
+    "icons": "npm run remove-icons && npm run minimize-icons && npm run build-icons && npm run minimize-json",
    "minimize-icons": "svgo -f src/icons/svgs -o icons",
    "minimize-json": "json-minify .material-theme-icons.tmp > material-theme-icons.json && npm run remove-icons-tmp",
    "remove-icons": "rimraf icons && rimraf material-theme-icons.json",
    "remove-icons-tmp": "rimraf .material-theme-icons.tmp",
-    "buildicons": "gulp build:icons",
+    "build-icons": "gulp build:icons",
+    "build-themes": "gulp build:themes",
    "release": "npm run bump && npm run changelog",
    "changelog": "gulp changelog",
    "bump": "gulp bump"
@ -38,15 +40,25 @@
  ],
  "contributes": {
    "themes": [
+      {
+        "label": "Material Theme",
+        "uiTheme": "vs-dark",
+        "path": "./themes/Material-Theme-Default.json"
+      },
      {
        "label": "Material Theme Darker",
        "uiTheme": "vs-dark",
-        "path": "./themes/Material-Theme-Darker.tmTheme"
+        "path": "./themes/Material-Theme-Darker.json"
+      },
+      {
+        "label": "Material Theme Palenight",
+        "uiTheme": "vs-dark",
+        "path": "./themes/Material-Theme-Palenight.json"
      },
      {
        "label": "Material Theme Lighter",
        "uiTheme": "vs",
-        "path": "./themes/Material-Theme-Lighter.tmTheme"
+        "path": "./themes/Material-Theme-Lighter.json"
      }
    ],
    "iconThemes": [
@ -58,28 +70,25 @@
    ]
  },
  "devDependencies": {
-    "babel-core": "^6.21.0",
-    "babel-preset-es2015": "^6.18.0",
-    "babel-root-import": "^4.1.5",
-    "colors": "^1.1.2",
+    "babel-core": "^6.24.0",
+    "babel-preset-es2015": "^6.24.0",
+    "babel-root-import": "^4.1.8",
    "cpx": "^1.5.0",
-    "eslint": "^3.11.0",
-    "eslint-plugin-standard": "^2.0.1",
+    "eslint": "^3.19.0",
+    "eslint-plugin-standard": "^2.1.1",
    "gulp": "^3.9.1",
-    "gulp-bump": "^2.6.1",
-    "gulp-conventional-changelog": "^1.1.0",
-    "gulp-data": "^1.2.1",
-    "gulp-filelist": "^1.0.0",
+    "gulp-bump": "^2.7.0",
+    "gulp-conventional-changelog": "^1.1.3",
    "gulp-if": "^2.0.2",
-    "gulp-include": "^2.3.1",
-    "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",
-    "rimraf": "^2.5.4",
+    "mustache": "^2.3.0",
+    "rimraf": "^2.6.1",
    "run-sequence": "^1.2.2",
    "svgo": "^0.7.1",
-    "yargs": "^6.6.0"
+    "yamljs": "^0.2.9",
+    "yargs": "^7.0.2"
  }
 }
--- a/src/icons/icons-theme.json
+++ b/src/icons/icons-theme.json
@ -1,9 +1,9 @@
 {
-  //=include "partials/iconDefinitions.js"
-  //=include "partials/fileExtensions.js"
-  //=include "partials/fileNames.js"
-  //=include "partials/fileFolders.js"
-  //=include "partials/folderNames.js"
-  //=include "partials/light.js"
-  //=include "partials/languageIds.js"
-}
+  {{> iconDefinitions}}
+  {{> fileExtensions}}
+  {{> fileNames}}
+  {{> fileFolders}}
+  {{> folderNames}}
+  {{> light}}
+  {{> languageIds}}
+}
--- a/src/icons/partials/fileExtensions.js
+++ b/src/icons/partials/fileExtensions.js
@ -80,9 +80,9 @@
  "config": "_file_settings",
  "conf": "_file_settings",
  "esx": "_file_js",
-  "ts": "_file_ts",
+  "ts": "_file_typescript",
  "tsx": "_file_react",
-  "d.ts": "_file_ts_def",
+  "d.ts": "_file_typescript_def",
  "pdf": "_file_pdf",
  "xlsx": "_file_table",
  "xls": "_file_table",
--- a/src/icons/partials/iconDefinitions.js
+++ b/src/icons/partials/iconDefinitions.js
@ -1,17 +1,19 @@
-"iconDefinitions": {<% for( var i = 0; i < icons.length; i++ ){  %>
-  "_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_<%= icons[i] %>": {
-    "iconPath": "./icons/<%= icons[i] %>.svg"
-  }<% if( i !== (icons.length - 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"
+    },
+    {{#icons}}
+    "_file_{{name}}": {
+      "iconPath": "./icons/{{name}}.svg"
+    }{{^last}},{{/last}}
+    {{/icons}}
+},
--- a/src/icons/svgs/typescript_def.svg
+++ b/src/icons/svgs/typescript_def.svg
--- a/src/themes/settings/commons.json
+++ b/src/themes/settings/commons.json
@ -0,0 +1,164 @@
+{
+  "author": "Mattia Astorino",
+  "comment": "The most epic theme now for Visual Studio Code",
+  "colors": {
+      "basics": [
+        {
+          "white": "#FFFFFFF",
+          "black": "#000000"
+        }
+      ],
+      "accents": [
+        {
+          "id": "lime",
+          "name": "Lime",
+          "hex": "#7CB342",
+          "rgb": "124, 179, 66",
+          "foreground": {
+            "hex": "#000000",
+            "rgb": "0, 0, 0"
+          }
+        },
+        {
+          "id": "purple",
+          "name": "Purple",
+          "hex": "#AB47BC",
+          "rgb": "171, 71, 188",
+          "foreground": {
+            "hex": "#FFFFFF",
+            "rgb": "255, 255, 255"
+          }
+        },
+        {
+          "id": "red",
+          "name": "Red",
+          "hex": "#E57373",
+          "rgb": "229, 115, 115",
+          "foreground": {
+            "hex": "#000000",
+            "rgb": "0, 0, 0"
+          }
+        },
+        {
+          "id": "orange",
+          "name": "Orange",
+          "hex": "#FF7042",
+          "rgb": "255, 112, 66",
+          "foreground": {
+            "hex": "#000000",
+            "rgb": "0, 0, 0"
+          }
+        },
+        {
+          "id": "yellow",
+          "name": "Yellow",
+          "hex": "#FFA000",
+          "rgb": "255, 160, 0",
+          "foreground": {
+            "hex": "#000000",
+            "rgb": "0, 0, 0"
+          }
+        },
+        {
+          "id": "indigo",
+          "name": "Indigo",
+          "hex": "#5C6BC0",
+          "rgb": "92, 107, 192",
+          "foreground": {
+            "hex": "#FFFFFF",
+            "rgb": "255, 255, 255"
+          }
+        },
+        {
+          "id": "pink",
+          "name": "Pink",
+          "hex": "#FF4081",
+          "rgb": "255, 64, 129",
+          "foreground": {
+            "hex": "#FFFFFF",
+            "rgb": "255, 255, 255"
+          }
+        },
+        {
+          "id": "blue",
+          "name": "Blue",
+          "hex": "#2979FF",
+          "rgb": "41, 121, 255",
+          "foreground": {
+            "hex": "#FFFFFF",
+            "rgb": "255, 255, 255"
+          }
+        },
+        {
+          "id": "cyan",
+          "name": "Cyan",
+          "hex": "#00BCD4",
+          "rgb": "0, 188, 212",
+          "foreground": {
+            "hex": "#000000",
+            "rgb": "0, 0, 0"
+          }
+        },
+        {
+          "id": "bright-teal",
+          "name": "Bright Teal",
+          "hex": "#64FFDA",
+          "rgb": "100, 255, 218",
+          "foreground": {
+            "hex": "#000000",
+            "rgb": "0, 0, 0"
+          }
+        },
+        {
+          "id": "acid-lime",
+          "name": "Acid Lime",
+          "hex": "#C6FF00",
+          "rgb": "198, 255, 0",
+          "foreground": {
+            "hex": "#000000",
+            "rgb": "0, 0, 0"
+          }
+        },
+        {
+          "id": "graphite",
+          "name": "Graphite",
+          "hex": "#616161",
+          "rgb": "97, 97, 97",
+          "foreground": {
+            "hex": "#FFFFFF",
+            "rgb": "255, 255, 255"
+          }
+        },
+        {
+          "id": "brba",
+          "name": "Breaking Bad",
+          "hex": "#388E3C",
+          "rgb": "56, 142, 60",
+          "foreground": {
+            "hex": "#FFFFFF",
+            "rgb": "255, 255, 255"
+          }
+        },
+        {
+          "id": "sky",
+          "name": "Sky",
+          "hex": "#84FFFF",
+          "rgb": "132, 255, 255",
+          "foreground": {
+            "hex": "#000000",
+            "rgb": "0, 0, 0"
+          }
+        },
+        {
+          "id": "tomato",
+          "name": "Tomato",
+          "hex": "#F44336",
+          "rgb": "244, 67, 54",
+          "foreground": {
+            "hex": "#FFFFFF",
+            "rgb": "255, 255, 255"
+          }
+        }
+      ]
+    }
+}
--- a/src/themes/settings/specific/darker.json
+++ b/src/themes/settings/specific/darker.json
@ -0,0 +1,36 @@
+{
+  "id": "material.theme.darker",
+  "name": "Material-Theme-Darker",
+  "scheme": {
+    "background": "#212121",
+    "comments": "#4A4A4A",
+    "caret": "#FFCC00",
+    "findHighlight": "#F8E71C",
+    "foreground": "#eeffffff",
+    "guides": "#42424270",
+    "lineNumbers": "#424242",
+    "invisibles": "#65737e",
+    "lineHighlight": "#00000050",
+    "selection": "#61616150",
+    "shadow": "#00000010",
+    "keywords": "#cfd8dc",
+    "constant": "#80CBC4",
+    "string": "#F9355A",
+    "constantEscape": "#FFC400",
+    "base": {
+      "white": "#ffffff",
+      "black": "#000000",
+      "red": "#FF5370",
+      "orange": "#F78C6C",
+      "yellow": "#FFCB6B",
+      "green": "#C3E88D",
+      "cyan": "#89DDFF",
+      "blue": "#82AAFF",
+      "paleblue": "#B2CCD6",
+      "purple": "#C792EA",
+      "brown": "#C17E70",
+      "pink": "#f07178",
+      "violet": "#bb80b3"
+    }
+  }
+}
--- a/src/themes/settings/specific/default.json
+++ b/src/themes/settings/specific/default.json
@ -0,0 +1,36 @@
+{
+  "id": "material.theme.default",
+  "name": "Material-Theme-Default",
+  "scheme": {
+    "background": "#263238",
+    "comments": "#546E7A",
+    "caret": "#FFCC00",
+    "findHighlight": "#F8E71C",
+    "foreground": "#eeffff",
+    "guides": "#37474F80",
+    "lineNumbers": "#37474F",
+    "invisibles": "#65737e",
+    "lineHighlight": "#00000050",
+    "selection": "#80CBC420",
+    "shadow": "#00000010",
+    "keywords": "#cfd8dc",
+    "constant": "#80CBC4",
+    "string": "#F9355A",
+    "constantEscape": "#FFC400",
+    "base": {
+      "white": "#ffffff",
+      "black": "#000000",
+      "red": "#FF5370",
+      "orange": "#F78C6C",
+      "yellow": "#FFCB6B",
+      "green": "#C3E88D",
+      "cyan": "#89DDFF",
+      "blue": "#82AAFF",
+      "paleblue": "#B2CCD6",
+      "purple": "#C792EA",
+      "brown": "#C17E70",
+      "pink": "#f07178",
+      "violet": "#bb80b3"
+    }
+  }
+}
--- a/src/themes/settings/specific/lighter.json
+++ b/src/themes/settings/specific/lighter.json
@ -0,0 +1,36 @@
+{
+  "id": "material.theme.lighter",
+  "name": "Material-Theme-Lighter",
+  "scheme": {
+    "background": "#FAFAFA",
+    "comments": "#CCD7DA",
+    "caret": "#27272790",
+    "findHighlight": "#F8E71C",
+    "foreground": "#80CBC4",
+    "guides": "#B0BEC570",
+    "lineNumbers": "#CFD8DC",
+    "invisibles": "#E7EAEC",
+    "lineHighlight": "#90A4AE20",
+    "selection": "#80CBC440",
+    "shadow": "#90A4AE50",
+    "keywords": "#AAB3B5",
+    "constant": "#80CBC4",
+    "string": "#F9355A",
+    "constantEscape": "#FFC400",
+    "base": {
+      "white": "#FFFFFF",
+      "black": "#000000",
+      "red": "#E53935",
+      "orange": "#F76D47",
+      "yellow": "#FFB62C",
+      "green": "#91B859",
+      "cyan": "#39ADB5",
+      "blue": "#6182B8",
+      "paleblue": "#8796B0",
+      "purple": "#7C4DFF",
+      "brown": "#C17E70",
+      "pink": "#FF5370",
+      "violet": "#945EB8"
+    }
+  }
+}
--- a/src/themes/settings/specific/palenight.json
+++ b/src/themes/settings/specific/palenight.json
@ -0,0 +1,36 @@
+{
+  "id": "material.theme.palenight",
+  "name": "Material-Theme-Palenight",
+  "scheme": {
+    "background": "#292D3E",
+    "comments": "#676E95",
+    "caret": "#FFCC00",
+    "findHighlight": "#F8E71C",
+    "foreground": "#959DCB",
+    "guides": "#4E557980",
+    "lineNumbers": "#3A3F58",
+    "invisibles": "#4E5579",
+    "lineHighlight": "#00000030",
+    "selection": "#717CB440",
+    "shadow": "#00000010",
+    "keywords": "#cfd8dc",
+    "constant": "#80CBC4",
+    "string": "#F9355A",
+    "constantEscape": "#FFC400",
+    "base": {
+      "white": "#ffffff",
+      "black": "#000000",
+      "red": "#FF5370",
+      "orange": "#F78C6C",
+      "yellow": "#FFCB6B",
+      "green": "#C3E88D",
+      "cyan": "#89DDFF",
+      "blue": "#82AAFF",
+      "paleblue": "#B2CCD6",
+      "purple": "#C792EA",
+      "brown": "#C17E70",
+      "pink": "#f07178",
+      "violet": "#bb80b3"
+    }
+  }
+}
--- a/src/themes/theme-template.yml
+++ b/src/themes/theme-template.yml
@ -0,0 +1,423 @@
+name: '{{variant.name}}'
+tokenColors:
+  - settings:
+      background: '{{variant.scheme.background}}'
+      foreground: '{{variant.scheme.base.white}}'
+  - name: Comment
+    scope:
+      - comment
+      - punctuation.definition.comment
+    settings:
+      fontStyle: italic
+      foreground: '{{variant.scheme.comments}}'
+  - name: Variables
+    scope:
+      - variable
+      - string constant.other.placeholder
+    settings:
+      foreground: '{{variant.scheme.foreground}}'
+  - name: Colors
+    scope:
+      - constant.other.color
+    settings:
+      foreground: '{{variant.scheme.base.white}}'
+  - name: Invalid
+    scope:
+      - invalid
+      - invalid.illegal
+      - invalid.broken
+    settings:
+      background: '{{variant.scheme.base.red}}'
+      foreground: '{{variant.scheme.base.white}}'
+  - name: Invalid unimplemented
+    scope:
+      - invalid.unimplemented
+    settings:
+      background: '{{variant.scheme.base.green}}'
+      foreground: '{{variant.scheme.base.white}}'
+  - name: Invalid deprecated
+    scope:
+      - invalid.deprecated
+    settings:
+      background: '{{variant.scheme.base.purple}}'
+      foreground: '{{variant.scheme.base.white}}'
+  - name: 'Keyword, Storage'
+    scope:
+      - keyword
+      - storage.type
+      - storage.modifier
+    settings:
+      foreground: '{{variant.scheme.base.purple}}'
+  - name: 'Keyword, Storage'
+    scope:
+      - Keyword
+      - Storage
+    settings:
+      fontStyle: italic
+  - name: 'Operator, Misc'
+    scope:
+      - keyword.operator
+      - constant.other.color
+      - punctuation
+      - meta.tag
+      - punctuation.definition.tag
+      - punctuation.separator.inheritance.php
+      - punctuation.definition.tag.html
+      - punctuation.definition.tag.begin.html
+      - punctuation.definition.tag.end.html
+      - punctuation.section.embedded
+      - keyword.other.template
+      - keyword.other.substitution
+    settings:
+      foreground: '{{variant.scheme.base.cyan}}'
+  - name: Tag
+    scope:
+      - entity.name.tag
+      - meta.tag.sgml
+      - markup.deleted.git_gutter
+    settings:
+      foreground: '{{variant.scheme.base.pink}}'
+  - name: 'Function, Special Method, Block Level'
+    scope:
+      - entity.name.function
+      - meta.function-call
+      - variable.function
+      - support.function
+      - keyword.other.special-method
+      - meta.block-level
+    settings:
+      foreground: '{{variant.scheme.base.blue}}'
+  - name: 'Other Variable, String Link'
+    scope:
+      - support.other.variable
+      - string.other.link
+    settings:
+      foreground: '{{variant.scheme.base.pink}}'
+  - name: 'Number, Constant, Function Argument, Tag Attribute, Embedded'
+    scope:
+      - constant.numeric
+      - constant.language
+      - support.constant
+      - constant.character
+      - variable.parameter
+      - keyword.other.unit
+    settings:
+      foreground: '{{variant.scheme.base.orange}}'
+  - name: 'String, Symbols, Inherited Class, Markup Heading'
+    scope:
+      - string
+      - constant.other.symbol
+      - constant.other.key
+      - entity.other.inherited-class
+      - markup.heading
+      - markup.inserted.git_gutter
+      - meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js
+    settings:
+      fontStyle: normal
+      foreground: '{{variant.scheme.base.green}}'
+  - name: 'Class, Support'
+    scope:
+      - entity.name.class
+      - entity.name.type.class
+      - support.type
+      - support.class
+      - support.orther.namespace.use.php
+      - meta.use.php
+      - support.other.namespace.php
+      - markup.changed.git_gutter
+      - support.type.sys-types
+    settings:
+      foreground: '{{variant.scheme.base.yellow}}'
+  - name: CSS Class and Support
+    scope:
+      - source.css support.type
+      - source.sass support.type
+      - source.scss support.type
+      - source.less support.type
+      - source.stylus support.type
+    settings:
+      foreground: '{{variant.scheme.base.paleblue}}'
+  - name: 'Sub-methods'
+    scope:
+      - entity.name.module.js
+      - variable.import.parameter.js
+      - variable.other.class.js
+    settings:
+      foreground: '{{variant.scheme.base.red}}'
+  - name: Language methods
+    scope:
+      - variable.language
+    settings:
+      fontStyle: italic
+      foreground: '{{variant.scheme.base.red}}'
+  - name: entity.name.method.js
+    scope:
+      - entity.name.method.js
+    settings:
+      fontStyle: italic
+      foreground: '{{variant.scheme.base.blue}}'
+  - name: meta.method.js
+    scope:
+      - meta.class-method.js entity.name.function.js
+      - variable.function.constructor
+    settings:
+      foreground: '{{variant.scheme.base.blue}}'
+  - name: Attributes
+    scope:
+      - entity.other.attribute-name
+    settings:
+      foreground: '{{variant.scheme.base.purple}}'
+  - name: HTML Attributes
+    scope:
+      - text.html.basic entity.other.attribute-name.html
+      - text.html.basic entity.other.attribute-name
+    settings:
+      fontStyle: italic
+      foreground: '{{variant.scheme.base.yellow}}'
+  - name: CSS Classes
+    scope:
+      - entity.other.attribute-name.class
+    settings:
+      foreground: '{{variant.scheme.base.yellow}}'
+  - name: "CSS ID's"
+    scope:
+      - source.sass keyword.control
+    settings:
+      foreground: '{{variant.scheme.base.blue}}'
+  - name: Inserted
+    scope:
+      - markup.inserted
+    settings:
+      foreground: '{{variant.scheme.base.green}}'
+  - name: Deleted
+    scope:
+      - markup.deleted
+    settings:
+      foreground: '{{variant.scheme.base.red}}'
+  - name: Changed
+    scope:
+      - markup.changed
+    settings:
+      foreground: '{{variant.scheme.base.purple}}'
+  - name: Regular Expressions
+    scope:
+      - string.regexp
+    settings:
+      foreground: '{{variant.scheme.base.cyan}}'
+  - name: Escape Characters
+    scope:
+      - constant.character.escape
+    settings:
+      foreground: '{{variant.scheme.base.cyan}}'
+  - name: URL
+    scope:
+      - '*url*'
+      - '*link*'
+      - '*uri*'
+    settings:
+      fontStyle: underline
+  - name: Decorators
+    scope:
+      - tag.decorator.js entity.name.tag.js
+      - tag.decorator.js punctuation.definition.tag.js
+    settings:
+      fontStyle: italic
+      foreground: '{{variant.scheme.base.blue}}'
+  - name: ES7 Bind Operator
+    scope:
+      - source.js constant.other.object.key.js string.unquoted.label.js
+    settings:
+      fontStyle: italic
+      foreground: '{{variant.scheme.base.red}}'
+  - name: 'JSON Key - Level 0'
+    scope:
+      - source.json meta.structure.dictionary.json support.type.property-name.json
+    settings:
+      foreground: '{{variant.scheme.base.purple}}'
+  - name: 'JSON Key - Level 1'
+    scope:
+      - source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json
+    settings:
+      foreground: '{{variant.scheme.base.yellow}}'
+  - name: 'JSON Key - Level 2'
+    scope:
+      - source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json
+    settings:
+      foreground: '{{variant.scheme.base.orange}}'
+  - name: 'JSON Key - Level 3'
+    scope:
+      - source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json
+    settings:
+      foreground: '{{variant.scheme.base.red}}'
+  - name: 'JSON Key - Level 4'
+    scope:
+      - source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json
+    settings:
+      foreground: '{{variant.scheme.base.brown}}'
+  - name: 'JSON Key - Level 5'
+    scope:
+      - source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json
+    settings:
+      foreground: '{{variant.scheme.base.blue}}'
+  - name: 'JSON Key - Level 6'
+    scope:
+      - source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json
+    settings:
+      foreground: '{{variant.scheme.base.pink}}'
+  - name: 'JSON Key - Level 7'
+    scope:
+      - source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json
+    settings:
+      foreground: '{{variant.scheme.base.purple}}'
+  - name: 'JSON Key - Level 8'
+    scope:
+      - source.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json meta.structure.dictionary.value.json meta.structure.dictionary.json support.type.property-name.json
+    settings:
+      foreground: '{{variant.scheme.base.green}}'
+  - name: 'Markdown - Plain'
+    scope:
+      - text.html.markdown
+      - punctuation.definition.list_item.markdown
+    settings:
+      foreground: '{{variant.scheme.foreground}}'
+  - name: 'Markdown - Markup Raw Inline'
+    scope:
+      - text.html.markdown markup.inline.raw.markdown
+    settings:
+      foreground: '{{variant.scheme.base.purple}}'
+  - name: 'Markdown - Markup Raw Inline Punctuation'
+    scope:
+      - text.html.markdown markup.inline.raw.markdown punctuation.definition.raw.markdown
+    settings:
+      foreground: '{{variant.scheme.invisibles}}'
+  - name: 'Markdown - Line Break'
+    scope:
+      - text.html.markdown meta.dummy.line-break
+    settings:
+      foreground: ''
+  - name: 'Markdown - Heading'
+    scope:
+      - markdown.heading
+      - 'markup.heading | markup.heading entity.name'
+      - markup.heading.markdown punctuation.definition.heading.markdown
+    settings:
+      foreground: '{{variant.scheme.base.green}}'
+  - name: 'Markup - Italic'
+    scope:
+      - markup.italic
+    settings:
+      fontStyle: italic
+      foreground: '{{variant.scheme.base.pink}}'
+  - name: 'Markup - Bold'
+    scope:
+      - markup.bold
+      - markup.bold string
+    settings:
+      fontStyle: bold
+      foreground: '{{variant.scheme.base.pink}}'
+  - name: 'Markup - Bold-Italic'
+    scope:
+      - markup.bold markup.italic
+      - markup.italic markup.bold
+      - markup.quote markup.bold
+      - markup.bold markup.italic string
+      - markup.italic markup.bold string
+      - markup.quote markup.bold string
+    settings:
+      fontStyle: bold
+      foreground: '{{variant.scheme.base.pink}}'
+  - name: 'Markup - Underline'
+    scope:
+      - markup.underline
+    settings:
+      fontStyle: underline
+      foreground: '{{variant.scheme.base.orange}}'
+  - name: 'Markup - Strike'
+    scope:
+      - markup.strike
+    settings:
+      fontStyle: strike
+      foreground: ''
+  - name: 'Markdown - Blockquote'
+    scope:
+      - markup.quote punctuation.definition.blockquote.markdown
+    settings:
+      background: '{{variant.scheme.invisibles}}'
+      foreground: '{{variant.scheme.invisibles}}'
+  - name: 'Markup - Quote'
+    scope:
+      - markup.quote
+    settings:
+      fontStyle: italic
+      foreground: ''
+  - name: 'Markdown - Link'
+    scope:
+      - string.other.link.title.markdown
+    settings:
+      foreground: '{{variant.scheme.base.blue}}'
+  - name: 'Markdown - Link Description'
+    scope:
+      - string.other.link.description.title.markdown
+    settings:
+      foreground: '{{variant.scheme.base.purple}}'
+  - name: 'Markdown - Link Anchor'
+    scope:
+      - constant.other.reference.link.markdown
+    settings:
+      foreground: '{{variant.scheme.base.yellow}}'
+  - name: 'Markup - Raw Block'
+    scope:
+      - markup.raw.block
+    settings:
+      foreground: '{{variant.scheme.base.purple}}'
+  - name: 'Markdown - Raw Block Fenced'
+    scope:
+      - markup.raw.block.fenced.markdown
+    settings:
+      foreground: '#00000050'
+  - name: 'Markdown - Fenced Bode Block'
+    scope:
+      - punctuation.definition.fenced.markdown
+    settings:
+      foreground: '#00000050'
+  - name: 'Markdown - Fenced Bode Block Variable'
+    scope:
+      - markup.raw.block.fenced.markdown
+      - variable.language.fenced.markdown
+      - punctuation.section.class.end
+    settings:
+      foreground: '{{variant.scheme.foreground}}'
+  - name: 'Markdown - Fenced Language'
+    scope:
+      - variable.language.fenced.markdown
+    settings:
+      foreground: '{{variant.scheme.invisibles}}'
+  - name: 'Markdown - Separator'
+    scope:
+      - meta.separator
+    settings:
+      fontStyle: bold
+      background: '#00000050'
+      foreground: '{{variant.scheme.invisibles}}'
+  - name: 'Markup - Table'
+    scope:
+      - markup.table
+    settings:
+      foreground: '{{variant.scheme.foreground}}'
+colors:
+  editorBackground: '{{variant.scheme.background}}'
+  editorForeground: '{{variant.scheme.foreground}}'
+  statusBarBackground: '{{variant.scheme.background}}'
+  activityBarBackground: '{{variant.scheme.background}}'
+  titleBarActiveBackground: '{{variant.scheme.background}}'
+  titleBarInactiveBackground: '{{variant.scheme.background}}'
+  sideBarBackground: '{{variant.scheme.background}}'
+  tabsContainerBackground: '{{variant.scheme.background}}'
+  inactiveTabBackground: '{{variant.scheme.background}}'
+  editorLineNumbers: '{{variant.scheme.lineNumbers}}'
+  editorLineHighlight: '{{variant.scheme.lineHighlight}}'
+  editorSelection: '{{variant.scheme.selection}}'
+  editorIndentGuides: '{{variant.scheme.guides}}'
+  inputBoxBackground: '{{variant.scheme.background}}'
+  dropdownBackground: '{{variant.scheme.background}}'
+  editorFindWidgetBackground: '{{variant.scheme.background}}'
--- a/test/--.tmcolor
+++ b/test/--.tmcolor
@ -0,0 +1,78 @@
+comment                     — for comments.
+comment.line                    — line comments, we specialize further so that the type of comment start character(s) can be extracted from the scope.
+comment.line.double-slash           — // comment
+comment.line.double-dash            — -- comment
+comment.line.number-sign            — # comment
+comment.line.percentage             — % comment
+comment.line.character              — other types of line comments.
+comment.block               — multi-line comments like /* … */ and <!-- … -->.
+comment.block.documentation     — embedded documentation.
+
+constant                — various forms of constants.
+constant.numeric        — those which represent numbers, e.g. 42, 1.3f, 0x4AB1U.
+constant.character      — those which represent characters, e.g. &lt;, \e, \031.
+constant.escape         — escape sequences like \e would be constant.character.escape.
+constant.language       — constants (generally) provided by the language which are “special” like true, false, nil, YES, NO, etc.
+constant.other          — other constants, e.g. colors in CSS.
+
+entity                          — an entity refers to a larger part of the document, for example a chapter, class, function, or tag. We do not scope the entire entity as entity.* (we use meta.* for that). But we do use entity.* for the “placeholders” in the larger entity, e.g. if the entity is a chapter, we would use entity.name.section for the chapter title.
+entity.name                     — we are naming the larger entity.
+entity.name.function            — the name of a function.
+entity.name.type                — the name of a type declaration or class.
+entity.name.tag                 — a tag name.
+entity.name.section             — the name is the name of a section/heading.
+entity.other                    — other entities.
+entity.other.inherited-class    — the superclass/baseclass name.
+entity.other.attribute-name     — the name of an attribute (mainly in tags).
+
+invalid                 — stuff which is “invalid”.
+invalid.illegal         — illegal, e.g. an ampersand or lower-than character in HTML (which is not part of an entity/tag).
+invalid.deprecated      — for deprecated stuff e.g. using an API function which is deprecated or using styling with strict HTML.
+
+keyword                 — keywords (when these do not fall into the other groups).
+keyword.control         — mainly related to flow control like continue, while, return, etc.
+keyword.operator        — operators can either be textual (e.g. or) or be characters.
+keyword.other           — other keywords.
+
+markup                      — this is for markup languages and generally applies to larger subsets of the text.
+markup.underline            — underlined text.
+markup.underline.link       — this is for links, as a convenience this is derived from markup.underline so that if there is no theme rule which specifically targets markup.underline.link then it will inherit the underline style.
+markup.bold                 — bold text (text which is strong and similar should preferably be derived from this name).
+markup.heading              — a section header. Optionally provide the heading level as the next element, for example markup.heading.2.html for <h2>…</h2> in HTML.
+markup.italic               — italic text (text which is emphasized and similar should preferably be derived from this name).
+markup.list                 — list items.
+markup.list.numbered        — numbered list items.
+markup.list.unnumbered      — unnumbered list items.
+markup.quote                — quoted (sometimes block quoted) text.
+markup.raw                  — text which is verbatim, e.g. code listings. Normally spell checking is disabled for markup.raw.
+markup.other                — other markup constructs.
+
+meta - the meta scope is generally used to markup larger parts of the document. For example the entire line which declares a function would be meta.function and the subsets would be storage.type, entity.name.function, variable.parameter etc. and only the latter would be styled. Sometimes the meta part of the scope will be used only to limit the more general element that is styled, most of the time meta scopes are however used in scope selectors for activation of bundle items. For example in Objective-C there is a meta scope for the interface declaration of a class and the implementation, allowing the same tab-triggers to expand differently, depending on context.
+
+storage             — things relating to “storage”.
+storage.type        — the type of something, class, function, int, var, etc.
+storage.modifier    — a storage modifier like static, final, abstract, etc.
+
+string                      — strings.
+string.quoted               — quoted strings.
+string.quoted.single        — single quoted strings: 'foo'.
+string.quoted.double        — double quoted strings: "foo".
+string.quoted.triple        — triple quoted strings: """Python""".
+string.quoted.other         — other types of quoting: $'shell', %s{...}.
+string.unquoted             — for things like here-docs and here-strings.
+string.interpolated         — strings which are “evaluated”: `date`, $(pwd).
+string.regexp               — regular expressions: /(\w+)/.
+string.other                — other types of strings (should rarely be used).
+
+support             — things provided by a framework or library should be below support.
+support.function    — functions provided by the framework/library. For example NSLog in Objective-C is support.function.
+support.class       — when the framework/library provides classes.
+support.type        — types provided by the framework/library, this is probably only used for languages derived from C, which has typedef (and struct). Most other languages would introduce new types as classes.
+support.constant    — constants (magic values) provided by the framework/library.
+support.variable    — variables provided by the framework/library. For example NSApp in AppKit.
+support.other       — the above should be exhaustive, but for everything else use support.other.
+
+variable                — variables. Not all languages allow easy identification (and thus markup) of these.
+variable.parameter      — when the variable is declared as the parameter.
+variable.language       — reserved language variables like this, super, self, etc.
+variable.other          — other variables, like $some_variables.
--- a/themes/Material-Theme-Darker.json
+++ b/themes/Material-Theme-Darker.json
@ -0,0 +1,682 @@
+{
+  "name": "Material-Theme-Darker",
+  "tokenColors": [
+    {
+      "settings": {
+        "background": "#212121",
+        "foreground": "#ffffff"
+      }
+    },
+    {
+      "name": "Comment",
+      "scope": [
+        "comment",
+        "punctuation.definition.comment"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#4A4A4A"
+      }
+    },
+    {
+      "name": "Variables",
+      "scope": [
+        "variable",
+        "string constant.other.placeholder"
+      ],
+      "settings": {
+        "foreground": "#eeffffff"
+      }
+    },
+    {
+      "name": "Colors",
+      "scope": [
+        "constant.other.color"
+      ],
+      "settings": {
+        "foreground": "#ffffff"
+      }
+    },
+    {
+      "name": "Invalid",
+      "scope": [
+        "invalid",
+        "invalid.illegal",
+        "invalid.broken"
+      ],
+      "settings": {
+        "background": "#FF5370",
+        "foreground": "#ffffff"
+      }
+    },
+    {
+      "name": "Invalid unimplemented",
+      "scope": [
+        "invalid.unimplemented"
+      ],
+      "settings": {
+        "background": "#C3E88D",
+        "foreground": "#ffffff"
+      }
+    },
+    {
+      "name": "Invalid deprecated",
+      "scope": [
+        "invalid.deprecated"
+      ],
+      "settings": {
+        "background": "#C792EA",
+        "foreground": "#ffffff"
+      }
+    },
+    {
+      "name": "Keyword, Storage",
+      "scope": [
+        "keyword",
+        "storage.type",
+        "storage.modifier"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "Keyword, Storage",
+      "scope": [
+        "Keyword",
+        "Storage"
+      ],
+      "settings": {
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "name": "Operator, Misc",
+      "scope": [
+        "keyword.operator",
+        "constant.other.color",
+        "punctuation",
+        "meta.tag",
+        "punctuation.definition.tag",
+        "punctuation.separator.inheritance.php",
+        "punctuation.definition.tag.html",
+        "punctuation.definition.tag.begin.html",
+        "punctuation.definition.tag.end.html",
+        "punctuation.section.embedded",
+        "keyword.other.template",
+        "keyword.other.substitution"
+      ],
+      "settings": {
+        "foreground": "#89DDFF"
+      }
+    },
+    {
+      "name": "Tag",
+      "scope": [
+        "entity.name.tag",
+        "meta.tag.sgml",
+        "markup.deleted.git_gutter"
+      ],
+      "settings": {
+        "foreground": "#f07178"
+      }
+    },
+    {
+      "name": "Function, Special Method, Block Level",
+      "scope": [
+        "entity.name.function",
+        "meta.function-call",
+        "variable.function",
+        "support.function",
+        "keyword.other.special-method",
+        "meta.block-level"
+      ],
+      "settings": {
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "Other Variable, String Link",
+      "scope": [
+        "support.other.variable",
+        "string.other.link"
+      ],
+      "settings": {
+        "foreground": "#f07178"
+      }
+    },
+    {
+      "name": "Number, Constant, Function Argument, Tag Attribute, Embedded",
+      "scope": [
+        "constant.numeric",
+        "constant.language",
+        "support.constant",
+        "constant.character",
+        "variable.parameter",
+        "keyword.other.unit"
+      ],
+      "settings": {
+        "foreground": "#F78C6C"
+      }
+    },
+    {
+      "name": "String, Symbols, Inherited Class, Markup Heading",
+      "scope": [
+        "string",
+        "constant.other.symbol",
+        "constant.other.key",
+        "entity.other.inherited-class",
+        "markup.heading",
+        "markup.inserted.git_gutter",
+        "meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js"
+      ],
+      "settings": {
+        "fontStyle": "normal",
+        "foreground": "#C3E88D"
+      }
+    },
+    {
+      "name": "Class, Support",
+      "scope": [
+        "entity.name.class",
+        "entity.name.type.class",
+        "support.type",
+        "support.class",
+        "support.orther.namespace.use.php",
+        "meta.use.php",
+        "support.other.namespace.php",
+        "markup.changed.git_gutter",
+        "support.type.sys-types"
+      ],
+      "settings": {
+        "foreground": "#FFCB6B"
+      }
+    },
+    {
+      "name": "CSS Class and Support",
+      "scope": [
+        "source.css support.type",
+        "source.sass support.type",
+        "source.scss support.type",
+        "source.less support.type",
+        "source.stylus support.type"
+      ],
+      "settings": {
+        "foreground": "#B2CCD6"
+      }
+    },
+    {
+      "name": "Sub-methods",
+      "scope": [
+        "entity.name.module.js",
+        "variable.import.parameter.js",
+        "variable.other.class.js"
+      ],
+      "settings": {
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "Language methods",
+      "scope": [
+        "variable.language"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "entity.name.method.js",
+      "scope": [
+        "entity.name.method.js"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "meta.method.js",
+      "scope": [
+        "meta.class-method.js entity.name.function.js",
+        "variable.function.constructor"
+      ],
+      "settings": {
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "Attributes",
+      "scope": [
+        "entity.other.attribute-name"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "HTML Attributes",
+      "scope": [
+        "text.html.basic entity.other.attribute-name.html",
+        "text.html.basic entity.other.attribute-name"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#FFCB6B"
+      }
+    },
+    {
+      "name": "CSS Classes",
+      "scope": [
+        "entity.other.attribute-name.class"
+      ],
+      "settings": {
+        "foreground": "#FFCB6B"
+      }
+    },
+    {
+      "name": "CSS ID's",
+      "scope": [
+        "source.sass keyword.control"
+      ],
+      "settings": {
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "Inserted",
+      "scope": [
+        "markup.inserted"
+      ],
+      "settings": {
+        "foreground": "#C3E88D"
+      }
+    },
+    {
+      "name": "Deleted",
+      "scope": [
+        "markup.deleted"
+      ],
+      "settings": {
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "Changed",
+      "scope": [
+        "markup.changed"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "Regular Expressions",
+      "scope": [
+        "string.regexp"
+      ],
+      "settings": {
+        "foreground": "#89DDFF"
+      }
+    },
+    {
+      "name": "Escape Characters",
+      "scope": [
+        "constant.character.escape"
+      ],
+      "settings": {
+        "foreground": "#89DDFF"
+      }
+    },
+    {
+      "name": "URL",
+      "scope": [
+        "*url*",
+        "*link*",
+        "*uri*"
+      ],
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    {
+      "name": "Decorators",
+      "scope": [
+        "tag.decorator.js entity.name.tag.js",
+        "tag.decorator.js punctuation.definition.tag.js"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "ES7 Bind Operator",
+      "scope": [
+        "source.js constant.other.object.key.js string.unquoted.label.js"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "JSON Key - Level 0",
+      "scope": [
+        "source.json meta.structure.dictionary.json support.type.property-name.json"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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": "#F78C6C"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "name": "Markdown - Plain",
+      "scope": [
+        "text.html.markdown",
+        "punctuation.definition.list_item.markdown"
+      ],
+      "settings": {
+        "foreground": "#eeffffff"
+      }
+    },
+    {
+      "name": "Markdown - Markup Raw Inline",
+      "scope": [
+        "text.html.markdown markup.inline.raw.markdown"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "Markdown - Markup Raw Inline Punctuation",
+      "scope": [
+        "text.html.markdown markup.inline.raw.markdown punctuation.definition.raw.markdown"
+      ],
+      "settings": {
+        "foreground": "#65737e"
+      }
+    },
+    {
+      "name": "Markdown - Line Break",
+      "scope": [
+        "text.html.markdown meta.dummy.line-break"
+      ],
+      "settings": {
+        "foreground": ""
+      }
+    },
+    {
+      "name": "Markdown - Heading",
+      "scope": [
+        "markdown.heading",
+        "markup.heading | markup.heading entity.name",
+        "markup.heading.markdown punctuation.definition.heading.markdown"
+      ],
+      "settings": {
+        "foreground": "#C3E88D"
+      }
+    },
+    {
+      "name": "Markup - Italic",
+      "scope": [
+        "markup.italic"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#f07178"
+      }
+    },
+    {
+      "name": "Markup - Bold",
+      "scope": [
+        "markup.bold",
+        "markup.bold string"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#f07178"
+      }
+    },
+    {
+      "name": "Markup - Bold-Italic",
+      "scope": [
+        "markup.bold markup.italic",
+        "markup.italic markup.bold",
+        "markup.quote markup.bold",
+        "markup.bold markup.italic string",
+        "markup.italic markup.bold string",
+        "markup.quote markup.bold string"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#f07178"
+      }
+    },
+    {
+      "name": "Markup - Underline",
+      "scope": [
+        "markup.underline"
+      ],
+      "settings": {
+        "fontStyle": "underline",
+        "foreground": "#F78C6C"
+      }
+    },
+    {
+      "name": "Markup - Strike",
+      "scope": [
+        "markup.strike"
+      ],
+      "settings": {
+        "fontStyle": "strike",
+        "foreground": ""
+      }
+    },
+    {
+      "name": "Markdown - Blockquote",
+      "scope": [
+        "markup.quote punctuation.definition.blockquote.markdown"
+      ],
+      "settings": {
+        "background": "#65737e",
+        "foreground": "#65737e"
+      }
+    },
+    {
+      "name": "Markup - Quote",
+      "scope": [
+        "markup.quote"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": ""
+      }
+    },
+    {
+      "name": "Markdown - Link",
+      "scope": [
+        "string.other.link.title.markdown"
+      ],
+      "settings": {
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "Markdown - Link Description",
+      "scope": [
+        "string.other.link.description.title.markdown"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "Markdown - Link Anchor",
+      "scope": [
+        "constant.other.reference.link.markdown"
+      ],
+      "settings": {
+        "foreground": "#FFCB6B"
+      }
+    },
+    {
+      "name": "Markup - Raw Block",
+      "scope": [
+        "markup.raw.block"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "Markdown - Raw Block Fenced",
+      "scope": [
+        "markup.raw.block.fenced.markdown"
+      ],
+      "settings": {
+        "foreground": "#00000050"
+      }
+    },
+    {
+      "name": "Markdown - Fenced Bode Block",
+      "scope": [
+        "punctuation.definition.fenced.markdown"
+      ],
+      "settings": {
+        "foreground": "#00000050"
+      }
+    },
+    {
+      "name": "Markdown - Fenced Bode Block Variable",
+      "scope": [
+        "markup.raw.block.fenced.markdown",
+        "variable.language.fenced.markdown",
+        "punctuation.section.class.end"
+      ],
+      "settings": {
+        "foreground": "#eeffffff"
+      }
+    },
+    {
+      "name": "Markdown - Fenced Language",
+      "scope": [
+        "variable.language.fenced.markdown"
+      ],
+      "settings": {
+        "foreground": "#65737e"
+      }
+    },
+    {
+      "name": "Markdown - Separator",
+      "scope": [
+        "meta.separator"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "background": "#00000050",
+        "foreground": "#65737e"
+      }
+    },
+    {
+      "name": "Markup - Table",
+      "scope": [
+        "markup.table"
+      ],
+      "settings": {
+        "foreground": "#eeffffff"
+      }
+    }
+  ],
+  "colors": {
+    "editorBackground": "#212121",
+    "editorForeground": "#eeffffff",
+    "statusBarBackground": "#212121",
+    "activityBarBackground": "#212121",
+    "titleBarActiveBackground": "#212121",
+    "titleBarInactiveBackground": "#212121",
+    "sideBarBackground": "#212121",
+    "tabsContainerBackground": "#212121",
+    "inactiveTabBackground": "#212121",
+    "editorLineNumbers": "#424242",
+    "editorLineHighlight": "#00000050",
+    "editorSelection": "#61616150",
+    "editorIndentGuides": "#42424270",
+    "inputBoxBackground": "#212121",
+    "dropdownBackground": "#212121",
+    "editorFindWidgetBackground": "#212121"
+  }
+}
--- a/themes/Material-Theme-Darker.tmTheme
+++ b/themes/Material-Theme-Darker.tmTheme
--- a/themes/Material-Theme-Default.json
+++ b/themes/Material-Theme-Default.json
@ -0,0 +1,682 @@
+{
+  "name": "Material-Theme-Default",
+  "tokenColors": [
+    {
+      "settings": {
+        "background": "#263238",
+        "foreground": "#ffffff"
+      }
+    },
+    {
+      "name": "Comment",
+      "scope": [
+        "comment",
+        "punctuation.definition.comment"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#546E7A"
+      }
+    },
+    {
+      "name": "Variables",
+      "scope": [
+        "variable",
+        "string constant.other.placeholder"
+      ],
+      "settings": {
+        "foreground": "#eeffff"
+      }
+    },
+    {
+      "name": "Colors",
+      "scope": [
+        "constant.other.color"
+      ],
+      "settings": {
+        "foreground": "#ffffff"
+      }
+    },
+    {
+      "name": "Invalid",
+      "scope": [
+        "invalid",
+        "invalid.illegal",
+        "invalid.broken"
+      ],
+      "settings": {
+        "background": "#FF5370",
+        "foreground": "#ffffff"
+      }
+    },
+    {
+      "name": "Invalid unimplemented",
+      "scope": [
+        "invalid.unimplemented"
+      ],
+      "settings": {
+        "background": "#C3E88D",
+        "foreground": "#ffffff"
+      }
+    },
+    {
+      "name": "Invalid deprecated",
+      "scope": [
+        "invalid.deprecated"
+      ],
+      "settings": {
+        "background": "#C792EA",
+        "foreground": "#ffffff"
+      }
+    },
+    {
+      "name": "Keyword, Storage",
+      "scope": [
+        "keyword",
+        "storage.type",
+        "storage.modifier"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "Keyword, Storage",
+      "scope": [
+        "Keyword",
+        "Storage"
+      ],
+      "settings": {
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "name": "Operator, Misc",
+      "scope": [
+        "keyword.operator",
+        "constant.other.color",
+        "punctuation",
+        "meta.tag",
+        "punctuation.definition.tag",
+        "punctuation.separator.inheritance.php",
+        "punctuation.definition.tag.html",
+        "punctuation.definition.tag.begin.html",
+        "punctuation.definition.tag.end.html",
+        "punctuation.section.embedded",
+        "keyword.other.template",
+        "keyword.other.substitution"
+      ],
+      "settings": {
+        "foreground": "#89DDFF"
+      }
+    },
+    {
+      "name": "Tag",
+      "scope": [
+        "entity.name.tag",
+        "meta.tag.sgml",
+        "markup.deleted.git_gutter"
+      ],
+      "settings": {
+        "foreground": "#f07178"
+      }
+    },
+    {
+      "name": "Function, Special Method, Block Level",
+      "scope": [
+        "entity.name.function",
+        "meta.function-call",
+        "variable.function",
+        "support.function",
+        "keyword.other.special-method",
+        "meta.block-level"
+      ],
+      "settings": {
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "Other Variable, String Link",
+      "scope": [
+        "support.other.variable",
+        "string.other.link"
+      ],
+      "settings": {
+        "foreground": "#f07178"
+      }
+    },
+    {
+      "name": "Number, Constant, Function Argument, Tag Attribute, Embedded",
+      "scope": [
+        "constant.numeric",
+        "constant.language",
+        "support.constant",
+        "constant.character",
+        "variable.parameter",
+        "keyword.other.unit"
+      ],
+      "settings": {
+        "foreground": "#F78C6C"
+      }
+    },
+    {
+      "name": "String, Symbols, Inherited Class, Markup Heading",
+      "scope": [
+        "string",
+        "constant.other.symbol",
+        "constant.other.key",
+        "entity.other.inherited-class",
+        "markup.heading",
+        "markup.inserted.git_gutter",
+        "meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js"
+      ],
+      "settings": {
+        "fontStyle": "normal",
+        "foreground": "#C3E88D"
+      }
+    },
+    {
+      "name": "Class, Support",
+      "scope": [
+        "entity.name.class",
+        "entity.name.type.class",
+        "support.type",
+        "support.class",
+        "support.orther.namespace.use.php",
+        "meta.use.php",
+        "support.other.namespace.php",
+        "markup.changed.git_gutter",
+        "support.type.sys-types"
+      ],
+      "settings": {
+        "foreground": "#FFCB6B"
+      }
+    },
+    {
+      "name": "CSS Class and Support",
+      "scope": [
+        "source.css support.type",
+        "source.sass support.type",
+        "source.scss support.type",
+        "source.less support.type",
+        "source.stylus support.type"
+      ],
+      "settings": {
+        "foreground": "#B2CCD6"
+      }
+    },
+    {
+      "name": "Sub-methods",
+      "scope": [
+        "entity.name.module.js",
+        "variable.import.parameter.js",
+        "variable.other.class.js"
+      ],
+      "settings": {
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "Language methods",
+      "scope": [
+        "variable.language"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "entity.name.method.js",
+      "scope": [
+        "entity.name.method.js"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "meta.method.js",
+      "scope": [
+        "meta.class-method.js entity.name.function.js",
+        "variable.function.constructor"
+      ],
+      "settings": {
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "Attributes",
+      "scope": [
+        "entity.other.attribute-name"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "HTML Attributes",
+      "scope": [
+        "text.html.basic entity.other.attribute-name.html",
+        "text.html.basic entity.other.attribute-name"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#FFCB6B"
+      }
+    },
+    {
+      "name": "CSS Classes",
+      "scope": [
+        "entity.other.attribute-name.class"
+      ],
+      "settings": {
+        "foreground": "#FFCB6B"
+      }
+    },
+    {
+      "name": "CSS ID's",
+      "scope": [
+        "source.sass keyword.control"
+      ],
+      "settings": {
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "Inserted",
+      "scope": [
+        "markup.inserted"
+      ],
+      "settings": {
+        "foreground": "#C3E88D"
+      }
+    },
+    {
+      "name": "Deleted",
+      "scope": [
+        "markup.deleted"
+      ],
+      "settings": {
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "Changed",
+      "scope": [
+        "markup.changed"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "Regular Expressions",
+      "scope": [
+        "string.regexp"
+      ],
+      "settings": {
+        "foreground": "#89DDFF"
+      }
+    },
+    {
+      "name": "Escape Characters",
+      "scope": [
+        "constant.character.escape"
+      ],
+      "settings": {
+        "foreground": "#89DDFF"
+      }
+    },
+    {
+      "name": "URL",
+      "scope": [
+        "*url*",
+        "*link*",
+        "*uri*"
+      ],
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    {
+      "name": "Decorators",
+      "scope": [
+        "tag.decorator.js entity.name.tag.js",
+        "tag.decorator.js punctuation.definition.tag.js"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "ES7 Bind Operator",
+      "scope": [
+        "source.js constant.other.object.key.js string.unquoted.label.js"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "JSON Key - Level 0",
+      "scope": [
+        "source.json meta.structure.dictionary.json support.type.property-name.json"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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": "#F78C6C"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "name": "Markdown - Plain",
+      "scope": [
+        "text.html.markdown",
+        "punctuation.definition.list_item.markdown"
+      ],
+      "settings": {
+        "foreground": "#eeffff"
+      }
+    },
+    {
+      "name": "Markdown - Markup Raw Inline",
+      "scope": [
+        "text.html.markdown markup.inline.raw.markdown"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "Markdown - Markup Raw Inline Punctuation",
+      "scope": [
+        "text.html.markdown markup.inline.raw.markdown punctuation.definition.raw.markdown"
+      ],
+      "settings": {
+        "foreground": "#65737e"
+      }
+    },
+    {
+      "name": "Markdown - Line Break",
+      "scope": [
+        "text.html.markdown meta.dummy.line-break"
+      ],
+      "settings": {
+        "foreground": ""
+      }
+    },
+    {
+      "name": "Markdown - Heading",
+      "scope": [
+        "markdown.heading",
+        "markup.heading | markup.heading entity.name",
+        "markup.heading.markdown punctuation.definition.heading.markdown"
+      ],
+      "settings": {
+        "foreground": "#C3E88D"
+      }
+    },
+    {
+      "name": "Markup - Italic",
+      "scope": [
+        "markup.italic"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#f07178"
+      }
+    },
+    {
+      "name": "Markup - Bold",
+      "scope": [
+        "markup.bold",
+        "markup.bold string"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#f07178"
+      }
+    },
+    {
+      "name": "Markup - Bold-Italic",
+      "scope": [
+        "markup.bold markup.italic",
+        "markup.italic markup.bold",
+        "markup.quote markup.bold",
+        "markup.bold markup.italic string",
+        "markup.italic markup.bold string",
+        "markup.quote markup.bold string"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#f07178"
+      }
+    },
+    {
+      "name": "Markup - Underline",
+      "scope": [
+        "markup.underline"
+      ],
+      "settings": {
+        "fontStyle": "underline",
+        "foreground": "#F78C6C"
+      }
+    },
+    {
+      "name": "Markup - Strike",
+      "scope": [
+        "markup.strike"
+      ],
+      "settings": {
+        "fontStyle": "strike",
+        "foreground": ""
+      }
+    },
+    {
+      "name": "Markdown - Blockquote",
+      "scope": [
+        "markup.quote punctuation.definition.blockquote.markdown"
+      ],
+      "settings": {
+        "background": "#65737e",
+        "foreground": "#65737e"
+      }
+    },
+    {
+      "name": "Markup - Quote",
+      "scope": [
+        "markup.quote"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": ""
+      }
+    },
+    {
+      "name": "Markdown - Link",
+      "scope": [
+        "string.other.link.title.markdown"
+      ],
+      "settings": {
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "Markdown - Link Description",
+      "scope": [
+        "string.other.link.description.title.markdown"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "Markdown - Link Anchor",
+      "scope": [
+        "constant.other.reference.link.markdown"
+      ],
+      "settings": {
+        "foreground": "#FFCB6B"
+      }
+    },
+    {
+      "name": "Markup - Raw Block",
+      "scope": [
+        "markup.raw.block"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "Markdown - Raw Block Fenced",
+      "scope": [
+        "markup.raw.block.fenced.markdown"
+      ],
+      "settings": {
+        "foreground": "#00000050"
+      }
+    },
+    {
+      "name": "Markdown - Fenced Bode Block",
+      "scope": [
+        "punctuation.definition.fenced.markdown"
+      ],
+      "settings": {
+        "foreground": "#00000050"
+      }
+    },
+    {
+      "name": "Markdown - Fenced Bode Block Variable",
+      "scope": [
+        "markup.raw.block.fenced.markdown",
+        "variable.language.fenced.markdown",
+        "punctuation.section.class.end"
+      ],
+      "settings": {
+        "foreground": "#eeffff"
+      }
+    },
+    {
+      "name": "Markdown - Fenced Language",
+      "scope": [
+        "variable.language.fenced.markdown"
+      ],
+      "settings": {
+        "foreground": "#65737e"
+      }
+    },
+    {
+      "name": "Markdown - Separator",
+      "scope": [
+        "meta.separator"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "background": "#00000050",
+        "foreground": "#65737e"
+      }
+    },
+    {
+      "name": "Markup - Table",
+      "scope": [
+        "markup.table"
+      ],
+      "settings": {
+        "foreground": "#eeffff"
+      }
+    }
+  ],
+  "colors": {
+    "editorBackground": "#263238",
+    "editorForeground": "#eeffff",
+    "statusBarBackground": "#263238",
+    "activityBarBackground": "#263238",
+    "titleBarActiveBackground": "#263238",
+    "titleBarInactiveBackground": "#263238",
+    "sideBarBackground": "#263238",
+    "tabsContainerBackground": "#263238",
+    "inactiveTabBackground": "#263238",
+    "editorLineNumbers": "#37474F",
+    "editorLineHighlight": "#00000050",
+    "editorSelection": "#80CBC420",
+    "editorIndentGuides": "#37474F80",
+    "inputBoxBackground": "#263238",
+    "dropdownBackground": "#263238",
+    "editorFindWidgetBackground": "#263238"
+  }
+}
--- a/themes/Material-Theme-Lighter.json
+++ b/themes/Material-Theme-Lighter.json
@ -0,0 +1,682 @@
+{
+  "name": "Material-Theme-Lighter",
+  "tokenColors": [
+    {
+      "settings": {
+        "background": "#FAFAFA",
+        "foreground": "#FFFFFF"
+      }
+    },
+    {
+      "name": "Comment",
+      "scope": [
+        "comment",
+        "punctuation.definition.comment"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#CCD7DA"
+      }
+    },
+    {
+      "name": "Variables",
+      "scope": [
+        "variable",
+        "string constant.other.placeholder"
+      ],
+      "settings": {
+        "foreground": "#80CBC4"
+      }
+    },
+    {
+      "name": "Colors",
+      "scope": [
+        "constant.other.color"
+      ],
+      "settings": {
+        "foreground": "#FFFFFF"
+      }
+    },
+    {
+      "name": "Invalid",
+      "scope": [
+        "invalid",
+        "invalid.illegal",
+        "invalid.broken"
+      ],
+      "settings": {
+        "background": "#E53935",
+        "foreground": "#FFFFFF"
+      }
+    },
+    {
+      "name": "Invalid unimplemented",
+      "scope": [
+        "invalid.unimplemented"
+      ],
+      "settings": {
+        "background": "#91B859",
+        "foreground": "#FFFFFF"
+      }
+    },
+    {
+      "name": "Invalid deprecated",
+      "scope": [
+        "invalid.deprecated"
+      ],
+      "settings": {
+        "background": "#7C4DFF",
+        "foreground": "#FFFFFF"
+      }
+    },
+    {
+      "name": "Keyword, Storage",
+      "scope": [
+        "keyword",
+        "storage.type",
+        "storage.modifier"
+      ],
+      "settings": {
+        "foreground": "#7C4DFF"
+      }
+    },
+    {
+      "name": "Keyword, Storage",
+      "scope": [
+        "Keyword",
+        "Storage"
+      ],
+      "settings": {
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "name": "Operator, Misc",
+      "scope": [
+        "keyword.operator",
+        "constant.other.color",
+        "punctuation",
+        "meta.tag",
+        "punctuation.definition.tag",
+        "punctuation.separator.inheritance.php",
+        "punctuation.definition.tag.html",
+        "punctuation.definition.tag.begin.html",
+        "punctuation.definition.tag.end.html",
+        "punctuation.section.embedded",
+        "keyword.other.template",
+        "keyword.other.substitution"
+      ],
+      "settings": {
+        "foreground": "#39ADB5"
+      }
+    },
+    {
+      "name": "Tag",
+      "scope": [
+        "entity.name.tag",
+        "meta.tag.sgml",
+        "markup.deleted.git_gutter"
+      ],
+      "settings": {
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "Function, Special Method, Block Level",
+      "scope": [
+        "entity.name.function",
+        "meta.function-call",
+        "variable.function",
+        "support.function",
+        "keyword.other.special-method",
+        "meta.block-level"
+      ],
+      "settings": {
+        "foreground": "#6182B8"
+      }
+    },
+    {
+      "name": "Other Variable, String Link",
+      "scope": [
+        "support.other.variable",
+        "string.other.link"
+      ],
+      "settings": {
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "Number, Constant, Function Argument, Tag Attribute, Embedded",
+      "scope": [
+        "constant.numeric",
+        "constant.language",
+        "support.constant",
+        "constant.character",
+        "variable.parameter",
+        "keyword.other.unit"
+      ],
+      "settings": {
+        "foreground": "#F76D47"
+      }
+    },
+    {
+      "name": "String, Symbols, Inherited Class, Markup Heading",
+      "scope": [
+        "string",
+        "constant.other.symbol",
+        "constant.other.key",
+        "entity.other.inherited-class",
+        "markup.heading",
+        "markup.inserted.git_gutter",
+        "meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js"
+      ],
+      "settings": {
+        "fontStyle": "normal",
+        "foreground": "#91B859"
+      }
+    },
+    {
+      "name": "Class, Support",
+      "scope": [
+        "entity.name.class",
+        "entity.name.type.class",
+        "support.type",
+        "support.class",
+        "support.orther.namespace.use.php",
+        "meta.use.php",
+        "support.other.namespace.php",
+        "markup.changed.git_gutter",
+        "support.type.sys-types"
+      ],
+      "settings": {
+        "foreground": "#FFB62C"
+      }
+    },
+    {
+      "name": "CSS Class and Support",
+      "scope": [
+        "source.css support.type",
+        "source.sass support.type",
+        "source.scss support.type",
+        "source.less support.type",
+        "source.stylus support.type"
+      ],
+      "settings": {
+        "foreground": "#8796B0"
+      }
+    },
+    {
+      "name": "Sub-methods",
+      "scope": [
+        "entity.name.module.js",
+        "variable.import.parameter.js",
+        "variable.other.class.js"
+      ],
+      "settings": {
+        "foreground": "#E53935"
+      }
+    },
+    {
+      "name": "Language methods",
+      "scope": [
+        "variable.language"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#E53935"
+      }
+    },
+    {
+      "name": "entity.name.method.js",
+      "scope": [
+        "entity.name.method.js"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#6182B8"
+      }
+    },
+    {
+      "name": "meta.method.js",
+      "scope": [
+        "meta.class-method.js entity.name.function.js",
+        "variable.function.constructor"
+      ],
+      "settings": {
+        "foreground": "#6182B8"
+      }
+    },
+    {
+      "name": "Attributes",
+      "scope": [
+        "entity.other.attribute-name"
+      ],
+      "settings": {
+        "foreground": "#7C4DFF"
+      }
+    },
+    {
+      "name": "HTML Attributes",
+      "scope": [
+        "text.html.basic entity.other.attribute-name.html",
+        "text.html.basic entity.other.attribute-name"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#FFB62C"
+      }
+    },
+    {
+      "name": "CSS Classes",
+      "scope": [
+        "entity.other.attribute-name.class"
+      ],
+      "settings": {
+        "foreground": "#FFB62C"
+      }
+    },
+    {
+      "name": "CSS ID's",
+      "scope": [
+        "source.sass keyword.control"
+      ],
+      "settings": {
+        "foreground": "#6182B8"
+      }
+    },
+    {
+      "name": "Inserted",
+      "scope": [
+        "markup.inserted"
+      ],
+      "settings": {
+        "foreground": "#91B859"
+      }
+    },
+    {
+      "name": "Deleted",
+      "scope": [
+        "markup.deleted"
+      ],
+      "settings": {
+        "foreground": "#E53935"
+      }
+    },
+    {
+      "name": "Changed",
+      "scope": [
+        "markup.changed"
+      ],
+      "settings": {
+        "foreground": "#7C4DFF"
+      }
+    },
+    {
+      "name": "Regular Expressions",
+      "scope": [
+        "string.regexp"
+      ],
+      "settings": {
+        "foreground": "#39ADB5"
+      }
+    },
+    {
+      "name": "Escape Characters",
+      "scope": [
+        "constant.character.escape"
+      ],
+      "settings": {
+        "foreground": "#39ADB5"
+      }
+    },
+    {
+      "name": "URL",
+      "scope": [
+        "*url*",
+        "*link*",
+        "*uri*"
+      ],
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    {
+      "name": "Decorators",
+      "scope": [
+        "tag.decorator.js entity.name.tag.js",
+        "tag.decorator.js punctuation.definition.tag.js"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#6182B8"
+      }
+    },
+    {
+      "name": "ES7 Bind Operator",
+      "scope": [
+        "source.js constant.other.object.key.js string.unquoted.label.js"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#E53935"
+      }
+    },
+    {
+      "name": "JSON Key - Level 0",
+      "scope": [
+        "source.json meta.structure.dictionary.json support.type.property-name.json"
+      ],
+      "settings": {
+        "foreground": "#7C4DFF"
+      }
+    },
+    {
+      "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": "#FFB62C"
+      }
+    },
+    {
+      "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": "#F76D47"
+      }
+    },
+    {
+      "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": "#E53935"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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": "#6182B8"
+      }
+    },
+    {
+      "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": "#FF5370"
+      }
+    },
+    {
+      "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": "#7C4DFF"
+      }
+    },
+    {
+      "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": "#91B859"
+      }
+    },
+    {
+      "name": "Markdown - Plain",
+      "scope": [
+        "text.html.markdown",
+        "punctuation.definition.list_item.markdown"
+      ],
+      "settings": {
+        "foreground": "#80CBC4"
+      }
+    },
+    {
+      "name": "Markdown - Markup Raw Inline",
+      "scope": [
+        "text.html.markdown markup.inline.raw.markdown"
+      ],
+      "settings": {
+        "foreground": "#7C4DFF"
+      }
+    },
+    {
+      "name": "Markdown - Markup Raw Inline Punctuation",
+      "scope": [
+        "text.html.markdown markup.inline.raw.markdown punctuation.definition.raw.markdown"
+      ],
+      "settings": {
+        "foreground": "#E7EAEC"
+      }
+    },
+    {
+      "name": "Markdown - Line Break",
+      "scope": [
+        "text.html.markdown meta.dummy.line-break"
+      ],
+      "settings": {
+        "foreground": ""
+      }
+    },
+    {
+      "name": "Markdown - Heading",
+      "scope": [
+        "markdown.heading",
+        "markup.heading | markup.heading entity.name",
+        "markup.heading.markdown punctuation.definition.heading.markdown"
+      ],
+      "settings": {
+        "foreground": "#91B859"
+      }
+    },
+    {
+      "name": "Markup - Italic",
+      "scope": [
+        "markup.italic"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "Markup - Bold",
+      "scope": [
+        "markup.bold",
+        "markup.bold string"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "Markup - Bold-Italic",
+      "scope": [
+        "markup.bold markup.italic",
+        "markup.italic markup.bold",
+        "markup.quote markup.bold",
+        "markup.bold markup.italic string",
+        "markup.italic markup.bold string",
+        "markup.quote markup.bold string"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "Markup - Underline",
+      "scope": [
+        "markup.underline"
+      ],
+      "settings": {
+        "fontStyle": "underline",
+        "foreground": "#F76D47"
+      }
+    },
+    {
+      "name": "Markup - Strike",
+      "scope": [
+        "markup.strike"
+      ],
+      "settings": {
+        "fontStyle": "strike",
+        "foreground": ""
+      }
+    },
+    {
+      "name": "Markdown - Blockquote",
+      "scope": [
+        "markup.quote punctuation.definition.blockquote.markdown"
+      ],
+      "settings": {
+        "background": "#E7EAEC",
+        "foreground": "#E7EAEC"
+      }
+    },
+    {
+      "name": "Markup - Quote",
+      "scope": [
+        "markup.quote"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": ""
+      }
+    },
+    {
+      "name": "Markdown - Link",
+      "scope": [
+        "string.other.link.title.markdown"
+      ],
+      "settings": {
+        "foreground": "#6182B8"
+      }
+    },
+    {
+      "name": "Markdown - Link Description",
+      "scope": [
+        "string.other.link.description.title.markdown"
+      ],
+      "settings": {
+        "foreground": "#7C4DFF"
+      }
+    },
+    {
+      "name": "Markdown - Link Anchor",
+      "scope": [
+        "constant.other.reference.link.markdown"
+      ],
+      "settings": {
+        "foreground": "#FFB62C"
+      }
+    },
+    {
+      "name": "Markup - Raw Block",
+      "scope": [
+        "markup.raw.block"
+      ],
+      "settings": {
+        "foreground": "#7C4DFF"
+      }
+    },
+    {
+      "name": "Markdown - Raw Block Fenced",
+      "scope": [
+        "markup.raw.block.fenced.markdown"
+      ],
+      "settings": {
+        "foreground": "#00000050"
+      }
+    },
+    {
+      "name": "Markdown - Fenced Bode Block",
+      "scope": [
+        "punctuation.definition.fenced.markdown"
+      ],
+      "settings": {
+        "foreground": "#00000050"
+      }
+    },
+    {
+      "name": "Markdown - Fenced Bode Block Variable",
+      "scope": [
+        "markup.raw.block.fenced.markdown",
+        "variable.language.fenced.markdown",
+        "punctuation.section.class.end"
+      ],
+      "settings": {
+        "foreground": "#80CBC4"
+      }
+    },
+    {
+      "name": "Markdown - Fenced Language",
+      "scope": [
+        "variable.language.fenced.markdown"
+      ],
+      "settings": {
+        "foreground": "#E7EAEC"
+      }
+    },
+    {
+      "name": "Markdown - Separator",
+      "scope": [
+        "meta.separator"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "background": "#00000050",
+        "foreground": "#E7EAEC"
+      }
+    },
+    {
+      "name": "Markup - Table",
+      "scope": [
+        "markup.table"
+      ],
+      "settings": {
+        "foreground": "#80CBC4"
+      }
+    }
+  ],
+  "colors": {
+    "editorBackground": "#FAFAFA",
+    "editorForeground": "#80CBC4",
+    "statusBarBackground": "#FAFAFA",
+    "activityBarBackground": "#FAFAFA",
+    "titleBarActiveBackground": "#FAFAFA",
+    "titleBarInactiveBackground": "#FAFAFA",
+    "sideBarBackground": "#FAFAFA",
+    "tabsContainerBackground": "#FAFAFA",
+    "inactiveTabBackground": "#FAFAFA",
+    "editorLineNumbers": "#CFD8DC",
+    "editorLineHighlight": "#90A4AE20",
+    "editorSelection": "#80CBC440",
+    "editorIndentGuides": "#B0BEC570",
+    "inputBoxBackground": "#FAFAFA",
+    "dropdownBackground": "#FAFAFA",
+    "editorFindWidgetBackground": "#FAFAFA"
+  }
+}
--- a/themes/Material-Theme-Lighter.tmTheme
+++ b/themes/Material-Theme-Lighter.tmTheme
--- a/themes/Material-Theme-Palenight.json
+++ b/themes/Material-Theme-Palenight.json
@ -0,0 +1,682 @@
+{
+  "name": "Material-Theme-Palenight",
+  "tokenColors": [
+    {
+      "settings": {
+        "background": "#292D3E",
+        "foreground": "#ffffff"
+      }
+    },
+    {
+      "name": "Comment",
+      "scope": [
+        "comment",
+        "punctuation.definition.comment"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#676E95"
+      }
+    },
+    {
+      "name": "Variables",
+      "scope": [
+        "variable",
+        "string constant.other.placeholder"
+      ],
+      "settings": {
+        "foreground": "#959DCB"
+      }
+    },
+    {
+      "name": "Colors",
+      "scope": [
+        "constant.other.color"
+      ],
+      "settings": {
+        "foreground": "#ffffff"
+      }
+    },
+    {
+      "name": "Invalid",
+      "scope": [
+        "invalid",
+        "invalid.illegal",
+        "invalid.broken"
+      ],
+      "settings": {
+        "background": "#FF5370",
+        "foreground": "#ffffff"
+      }
+    },
+    {
+      "name": "Invalid unimplemented",
+      "scope": [
+        "invalid.unimplemented"
+      ],
+      "settings": {
+        "background": "#C3E88D",
+        "foreground": "#ffffff"
+      }
+    },
+    {
+      "name": "Invalid deprecated",
+      "scope": [
+        "invalid.deprecated"
+      ],
+      "settings": {
+        "background": "#C792EA",
+        "foreground": "#ffffff"
+      }
+    },
+    {
+      "name": "Keyword, Storage",
+      "scope": [
+        "keyword",
+        "storage.type",
+        "storage.modifier"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "Keyword, Storage",
+      "scope": [
+        "Keyword",
+        "Storage"
+      ],
+      "settings": {
+        "fontStyle": "italic"
+      }
+    },
+    {
+      "name": "Operator, Misc",
+      "scope": [
+        "keyword.operator",
+        "constant.other.color",
+        "punctuation",
+        "meta.tag",
+        "punctuation.definition.tag",
+        "punctuation.separator.inheritance.php",
+        "punctuation.definition.tag.html",
+        "punctuation.definition.tag.begin.html",
+        "punctuation.definition.tag.end.html",
+        "punctuation.section.embedded",
+        "keyword.other.template",
+        "keyword.other.substitution"
+      ],
+      "settings": {
+        "foreground": "#89DDFF"
+      }
+    },
+    {
+      "name": "Tag",
+      "scope": [
+        "entity.name.tag",
+        "meta.tag.sgml",
+        "markup.deleted.git_gutter"
+      ],
+      "settings": {
+        "foreground": "#f07178"
+      }
+    },
+    {
+      "name": "Function, Special Method, Block Level",
+      "scope": [
+        "entity.name.function",
+        "meta.function-call",
+        "variable.function",
+        "support.function",
+        "keyword.other.special-method",
+        "meta.block-level"
+      ],
+      "settings": {
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "Other Variable, String Link",
+      "scope": [
+        "support.other.variable",
+        "string.other.link"
+      ],
+      "settings": {
+        "foreground": "#f07178"
+      }
+    },
+    {
+      "name": "Number, Constant, Function Argument, Tag Attribute, Embedded",
+      "scope": [
+        "constant.numeric",
+        "constant.language",
+        "support.constant",
+        "constant.character",
+        "variable.parameter",
+        "keyword.other.unit"
+      ],
+      "settings": {
+        "foreground": "#F78C6C"
+      }
+    },
+    {
+      "name": "String, Symbols, Inherited Class, Markup Heading",
+      "scope": [
+        "string",
+        "constant.other.symbol",
+        "constant.other.key",
+        "entity.other.inherited-class",
+        "markup.heading",
+        "markup.inserted.git_gutter",
+        "meta.group.braces.curly constant.other.object.key.js string.unquoted.label.js"
+      ],
+      "settings": {
+        "fontStyle": "normal",
+        "foreground": "#C3E88D"
+      }
+    },
+    {
+      "name": "Class, Support",
+      "scope": [
+        "entity.name.class",
+        "entity.name.type.class",
+        "support.type",
+        "support.class",
+        "support.orther.namespace.use.php",
+        "meta.use.php",
+        "support.other.namespace.php",
+        "markup.changed.git_gutter",
+        "support.type.sys-types"
+      ],
+      "settings": {
+        "foreground": "#FFCB6B"
+      }
+    },
+    {
+      "name": "CSS Class and Support",
+      "scope": [
+        "source.css support.type",
+        "source.sass support.type",
+        "source.scss support.type",
+        "source.less support.type",
+        "source.stylus support.type"
+      ],
+      "settings": {
+        "foreground": "#B2CCD6"
+      }
+    },
+    {
+      "name": "Sub-methods",
+      "scope": [
+        "entity.name.module.js",
+        "variable.import.parameter.js",
+        "variable.other.class.js"
+      ],
+      "settings": {
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "Language methods",
+      "scope": [
+        "variable.language"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "entity.name.method.js",
+      "scope": [
+        "entity.name.method.js"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "meta.method.js",
+      "scope": [
+        "meta.class-method.js entity.name.function.js",
+        "variable.function.constructor"
+      ],
+      "settings": {
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "Attributes",
+      "scope": [
+        "entity.other.attribute-name"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "HTML Attributes",
+      "scope": [
+        "text.html.basic entity.other.attribute-name.html",
+        "text.html.basic entity.other.attribute-name"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#FFCB6B"
+      }
+    },
+    {
+      "name": "CSS Classes",
+      "scope": [
+        "entity.other.attribute-name.class"
+      ],
+      "settings": {
+        "foreground": "#FFCB6B"
+      }
+    },
+    {
+      "name": "CSS ID's",
+      "scope": [
+        "source.sass keyword.control"
+      ],
+      "settings": {
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "Inserted",
+      "scope": [
+        "markup.inserted"
+      ],
+      "settings": {
+        "foreground": "#C3E88D"
+      }
+    },
+    {
+      "name": "Deleted",
+      "scope": [
+        "markup.deleted"
+      ],
+      "settings": {
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "Changed",
+      "scope": [
+        "markup.changed"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "Regular Expressions",
+      "scope": [
+        "string.regexp"
+      ],
+      "settings": {
+        "foreground": "#89DDFF"
+      }
+    },
+    {
+      "name": "Escape Characters",
+      "scope": [
+        "constant.character.escape"
+      ],
+      "settings": {
+        "foreground": "#89DDFF"
+      }
+    },
+    {
+      "name": "URL",
+      "scope": [
+        "*url*",
+        "*link*",
+        "*uri*"
+      ],
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    {
+      "name": "Decorators",
+      "scope": [
+        "tag.decorator.js entity.name.tag.js",
+        "tag.decorator.js punctuation.definition.tag.js"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "ES7 Bind Operator",
+      "scope": [
+        "source.js constant.other.object.key.js string.unquoted.label.js"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#FF5370"
+      }
+    },
+    {
+      "name": "JSON Key - Level 0",
+      "scope": [
+        "source.json meta.structure.dictionary.json support.type.property-name.json"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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": "#F78C6C"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "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"
+      }
+    },
+    {
+      "name": "Markdown - Plain",
+      "scope": [
+        "text.html.markdown",
+        "punctuation.definition.list_item.markdown"
+      ],
+      "settings": {
+        "foreground": "#959DCB"
+      }
+    },
+    {
+      "name": "Markdown - Markup Raw Inline",
+      "scope": [
+        "text.html.markdown markup.inline.raw.markdown"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "Markdown - Markup Raw Inline Punctuation",
+      "scope": [
+        "text.html.markdown markup.inline.raw.markdown punctuation.definition.raw.markdown"
+      ],
+      "settings": {
+        "foreground": "#4E5579"
+      }
+    },
+    {
+      "name": "Markdown - Line Break",
+      "scope": [
+        "text.html.markdown meta.dummy.line-break"
+      ],
+      "settings": {
+        "foreground": ""
+      }
+    },
+    {
+      "name": "Markdown - Heading",
+      "scope": [
+        "markdown.heading",
+        "markup.heading | markup.heading entity.name",
+        "markup.heading.markdown punctuation.definition.heading.markdown"
+      ],
+      "settings": {
+        "foreground": "#C3E88D"
+      }
+    },
+    {
+      "name": "Markup - Italic",
+      "scope": [
+        "markup.italic"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "#f07178"
+      }
+    },
+    {
+      "name": "Markup - Bold",
+      "scope": [
+        "markup.bold",
+        "markup.bold string"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#f07178"
+      }
+    },
+    {
+      "name": "Markup - Bold-Italic",
+      "scope": [
+        "markup.bold markup.italic",
+        "markup.italic markup.bold",
+        "markup.quote markup.bold",
+        "markup.bold markup.italic string",
+        "markup.italic markup.bold string",
+        "markup.quote markup.bold string"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "foreground": "#f07178"
+      }
+    },
+    {
+      "name": "Markup - Underline",
+      "scope": [
+        "markup.underline"
+      ],
+      "settings": {
+        "fontStyle": "underline",
+        "foreground": "#F78C6C"
+      }
+    },
+    {
+      "name": "Markup - Strike",
+      "scope": [
+        "markup.strike"
+      ],
+      "settings": {
+        "fontStyle": "strike",
+        "foreground": ""
+      }
+    },
+    {
+      "name": "Markdown - Blockquote",
+      "scope": [
+        "markup.quote punctuation.definition.blockquote.markdown"
+      ],
+      "settings": {
+        "background": "#4E5579",
+        "foreground": "#4E5579"
+      }
+    },
+    {
+      "name": "Markup - Quote",
+      "scope": [
+        "markup.quote"
+      ],
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": ""
+      }
+    },
+    {
+      "name": "Markdown - Link",
+      "scope": [
+        "string.other.link.title.markdown"
+      ],
+      "settings": {
+        "foreground": "#82AAFF"
+      }
+    },
+    {
+      "name": "Markdown - Link Description",
+      "scope": [
+        "string.other.link.description.title.markdown"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "Markdown - Link Anchor",
+      "scope": [
+        "constant.other.reference.link.markdown"
+      ],
+      "settings": {
+        "foreground": "#FFCB6B"
+      }
+    },
+    {
+      "name": "Markup - Raw Block",
+      "scope": [
+        "markup.raw.block"
+      ],
+      "settings": {
+        "foreground": "#C792EA"
+      }
+    },
+    {
+      "name": "Markdown - Raw Block Fenced",
+      "scope": [
+        "markup.raw.block.fenced.markdown"
+      ],
+      "settings": {
+        "foreground": "#00000050"
+      }
+    },
+    {
+      "name": "Markdown - Fenced Bode Block",
+      "scope": [
+        "punctuation.definition.fenced.markdown"
+      ],
+      "settings": {
+        "foreground": "#00000050"
+      }
+    },
+    {
+      "name": "Markdown - Fenced Bode Block Variable",
+      "scope": [
+        "markup.raw.block.fenced.markdown",
+        "variable.language.fenced.markdown",
+        "punctuation.section.class.end"
+      ],
+      "settings": {
+        "foreground": "#959DCB"
+      }
+    },
+    {
+      "name": "Markdown - Fenced Language",
+      "scope": [
+        "variable.language.fenced.markdown"
+      ],
+      "settings": {
+        "foreground": "#4E5579"
+      }
+    },
+    {
+      "name": "Markdown - Separator",
+      "scope": [
+        "meta.separator"
+      ],
+      "settings": {
+        "fontStyle": "bold",
+        "background": "#00000050",
+        "foreground": "#4E5579"
+      }
+    },
+    {
+      "name": "Markup - Table",
+      "scope": [
+        "markup.table"
+      ],
+      "settings": {
+        "foreground": "#959DCB"
+      }
+    }
+  ],
+  "colors": {
+    "editorBackground": "#292D3E",
+    "editorForeground": "#959DCB",
+    "statusBarBackground": "#292D3E",
+    "activityBarBackground": "#292D3E",
+    "titleBarActiveBackground": "#292D3E",
+    "titleBarInactiveBackground": "#292D3E",
+    "sideBarBackground": "#292D3E",
+    "tabsContainerBackground": "#292D3E",
+    "inactiveTabBackground": "#292D3E",
+    "editorLineNumbers": "#3A3F58",
+    "editorLineHighlight": "#00000030",
+    "editorSelection": "#717CB440",
+    "editorIndentGuides": "#4E557980",
+    "inputBoxBackground": "#292D3E",
+    "dropdownBackground": "#292D3E",
+    "editorFindWidgetBackground": "#292D3E"
+  }
+}
--- a/yarn.lock
+++ b/yarn.lock