From 164802e95a923b52faad1ad50f2e6d0911f29979 Mon Sep 17 00:00:00 2001
From: Mattia Astorino <astorino.mattia@gmail.com>
Date: Tue, 7 Jan 2020 15:36:28 +0100
Subject: [PATCH] Various schemes improvements...or not

---
 CODE_OF_CONDUCT.md                            |  2 +-
 .../themes/Material-Theme-Darker-Legacy.json  | 15 ------
 scripts/generator/color-set.ts                | 54 ++++++++++++++++---
 3 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 059647c..4771913 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -26,7 +26,7 @@ Examples of unacceptable behavior by participants include:
 
 Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they `deem` inappropriate, threatening, offensive, or harmful.
 
 ## Scope
 
diff --git a/legacy/themes/Material-Theme-Darker-Legacy.json b/legacy/themes/Material-Theme-Darker-Legacy.json
index 8d24a34..e9413c7 100644
--- a/legacy/themes/Material-Theme-Darker-Legacy.json
+++ b/legacy/themes/Material-Theme-Darker-Legacy.json
@@ -116,21 +116,6 @@
         "fontStyle": "italic"
       }
     },
-    "base": {
-      "white": "#ffffff",
-      "black": "#000000",
-      "red": "#FF5370",
-      "orange": "#F78C6C",
-      "yellow": "#FFCB6B",
-      "green": "#C3E88D",
-      "cyan": "#89DDFF",
-      "blue": "#82AAFF",
-      "paleblue": "#B2CCD6",
-      "purple": "#C792EA",
-      "brown": "#916b53",
-      "pink": "#ff9cac",
-      "violet": "#bb80b3"
-    }
     {
       "name": "Tag",
       "scope": [
diff --git a/scripts/generator/color-set.ts b/scripts/generator/color-set.ts
index 014c1f1..89d5d03 100644
--- a/scripts/generator/color-set.ts
+++ b/scripts/generator/color-set.ts
@@ -31,9 +31,9 @@ export const getColorSet = (theme: ThemeSetting): IColorSet => {
       cssId: theme.scheme.base.orange,
       cssTag: theme.scheme.base.yellow,
       function: theme.scheme.base.blue,
-      functionCall: theme.scheme.base.blue,
+      functionCall: theme.scheme.base.purple,
       number: theme.scheme.base.orange,
-      identifier: theme.scheme.foreground,
+      identifier: theme.scheme.base.cyan,
       keyword: theme.scheme.base.red,
       string: theme.scheme.base.green,
       stringEscape: theme.scheme.foreground,
@@ -44,10 +44,52 @@ export const getColorSet = (theme: ThemeSetting): IColorSet => {
     */
     customTokens: [
       {
-        name: 'String',
-        scope: ['string.quoted'],
+        name: 'Markdown - Blockquote',
+        scope: [
+          'markup.quote'
+        ],
         settings: {
-          foreground: theme.scheme.base.green
+          fontStyle: 'italic',
+          foreground: theme.scheme.base.cyan
+        }
+      },
+      {
+        name: 'Markdown - Fenced Language',
+        scope: [
+          'markup.fenced_code.block'
+        ],
+        settings: {
+          foreground: `${theme.scheme.foreground}90`
+        }
+      },
+      {
+        name: 'Markdown - Blockquote Punctuation',
+        scope: [
+          'punctuation.definition.quote'
+        ],
+        settings: {
+          foreground: theme.scheme.base.pink
+        }
+      },
+      {
+        name: 'Variables',
+        scope: [
+          'variable',
+          'string constant.other.placeholder'
+        ],
+        settings: {
+          foreground: theme.scheme.foreground
+        }
+      },
+      {
+        name: 'Keyword, Storage',
+        scope: [
+          'keyword',
+          'storage.type',
+          'storage.modifier'
+        ],
+        settings: {
+          foreground: theme.scheme.base.purple
         }
       },
       {
@@ -68,7 +110,7 @@ export const getColorSet = (theme: ThemeSetting): IColorSet => {
         }
       },
       {
-        name: 'Keyword, Storage',
+        name: 'Keyword Control',
         scope: [
           'keyword.control'
         ],