diff --git a/Meetio.json b/Meetio.json
index 6dc0dce7..8b79d6d7 100644
--- a/Meetio.json
+++ b/Meetio.json
@@ -48,10 +48,13 @@
         "panel_row_match_foreground_color": "var(color_accent)",
         "panel_row_selected_match_foreground_color": "var(color_accent)",
         "input_background_color": [
+            "foreground",
+            0.05
+        ],
+        "input_border_color": [
             "background",
             1
         ],
-        "input_border_color": "var(panel_control_background_color)",
         "input_border_size": 1,
         "input_border_margin": [
             12,
@@ -100,7 +103,7 @@
         "tabset_selected_border_color": "var(color_accent)",
         "tabset_selected_border_size": [
             0,
-            2,
+            1,
             0,
             0
         ],
@@ -186,6 +189,40 @@
             ],
             "layer0.opacity": 0.2
         },
+        {
+            "class": "fold_button_control",
+            "layer0.texture": "Meetio/assets/default/arrow_right.png",
+            "layer0.tint": "var(color_accent)",
+            "layer0.opacity": 0.4,
+            "layer0.inner_margin": 0,
+            "content_margin": [
+                12,
+                12
+            ]
+        },
+        {
+            "class": "fold_button_control",
+            "attributes": [
+                "hover"
+            ],
+            "layer0.opacity": 1,
+            "content_margin": [
+                12,
+                12
+            ]
+        },
+        {
+            "class": "fold_button_control",
+            "attributes": [
+                "expanded"
+            ],
+            "layer0.texture": "Meetio/assets/default/arrow_down.png",
+            "layer0.tint": "var(color_accent)",
+            "content_margin": [
+                12,
+                12
+            ]
+        },
         {
             "class": "button_control",
             "layer0.tint": "var(button_background_color)",
@@ -585,38 +622,17 @@
             "layer0.opacity": 1
         },
         {
-            "class": "fold_button_control",
-            "layer0.texture": "Meetio/assets/default/arrow_right.png",
-            "layer0.tint": "var(color_accent)",
-            "layer0.opacity": 0.4,
-            "layer0.inner_margin": 0,
-            "content_margin": [
-                12,
-                12
-            ]
-        },
-        {
-            "class": "fold_button_control",
-            "attributes": [
-                "hover"
+            "class": "dialog",
+            "layer0.tint": [
+                "background",
+                0.94
             ],
-            "layer0.opacity": 1,
-            "content_margin": [
-                12,
-                12
-            ]
+            "layer0.opacity": 1
         },
         {
-            "class": "fold_button_control",
-            "attributes": [
-                "expanded"
-            ],
-            "layer0.texture": "Meetio/assets/default/arrow_down.png",
-            "layer0.tint": "var(color_accent)",
-            "content_margin": [
-                12,
-                12
-            ]
+            "class": "grid_layout_control",
+            "border_color": "var(grid_layout_border_color)",
+            "border_size": "var(grid_layout_border_size)"
         },
         {
             "class": "disclosure_button_control",
@@ -797,11 +813,6 @@
             ],
             "layer0.opacity": 1
         },
-        {
-            "class": "grid_layout_control",
-            "border_color": "var(grid_layout_border_color)",
-            "border_size": "var(grid_layout_border_size)"
-        },
         {
             "class": "text_line_control",
             "layer0.opacity": 1,
@@ -926,49 +937,6 @@
             ],
             "layer0.opacity": 0.8
         },
-        {
-            "class": "close_button",
-            "layer0.texture": "Meetio/assets/default/icon_close.png",
-            "layer0.tint": "var(color_accent)",
-            "layer0.opacity": 1,
-            "layer0.inner_margin": [
-                3,
-                3
-            ],
-            "content_margin": [
-                8,
-                8
-            ]
-        },
-        {
-            "class": "close_button",
-            "parents": [
-                {
-                    "class": "tree_row",
-                    "attributes": [
-                        "hover"
-                    ]
-                }
-            ],
-            "layer0.opacity": 1
-        },
-        {
-            "class": "close_button",
-            "attributes": [
-                "dirty"
-            ],
-            "layer0.texture": "Meetio/assets/default/dirty_icon.png",
-            "layer0.tint": "var(color_accent)"
-        },
-        {
-            "class": "close_button",
-            "attributes": [
-                "hover",
-                "dirty"
-            ],
-            "layer0.texture": "Meetio/assets/default/dirty_icon.png",
-            "layer0.tint": "var(color_accent)"
-        },
         {
             "class": "label_control",
             "fg": [
@@ -1020,82 +988,47 @@
             ]
         },
         {
-            "class": "progress_bar_control",
-            "layer0.tint": [
-                "background",
-                0.94
-            ],
-            "layer0.opacity": 1
-        },
-        {
-            "class": "progress_gauge_control",
+            "class": "close_button",
+            "layer0.texture": "Meetio/assets/default/icon_close.png",
             "layer0.tint": "var(color_accent)",
             "layer0.opacity": 1,
+            "layer0.inner_margin": [
+                3,
+                3
+            ],
             "content_margin": [
-                0,
+                8,
                 8
             ]
         },
         {
-            "class": "mini_quick_panel_row",
-            "layer0.tint": "var(panel_row_background_color)",
-            "layer0.inner_margin": [
-                2,
-                2,
-                2,
-                2
+            "class": "close_button",
+            "parents": [
+                {
+                    "class": "tree_row",
+                    "attributes": [
+                        "hover"
+                    ]
+                }
             ],
             "layer0.opacity": 1
         },
         {
-            "class": "mini_quick_panel_row",
+            "class": "close_button",
             "attributes": [
-                "selected"
-            ],
-            "layer0.tint": "var(panel_row_selected_background_color)"
-        },
-        {
-            "class": "quick_panel",
-            "row_padding": "var(panel_row_padding)",
-            "layer0.tint": [
-                "background",
-                1
+                "dirty"
             ],
-            "layer0.opacity": 1
-        },
-        {
-            "class": "quick_panel_row",
-            "layer0.opacity": 1
-        },
-        {
-            "class": "quick_panel_row",
-            "layer0.tint": "var(panel_row_background_color)",
-            "layer0.opacity": 1
+            "layer0.texture": "Meetio/assets/default/dirty_icon.png",
+            "layer0.tint": "var(color_accent)"
         },
         {
-            "class": "quick_panel_row",
+            "class": "close_button",
             "attributes": [
-                "selected"
+                "hover",
+                "dirty"
             ],
-            "layer0.tint": "var(panel_row_selected_background_color)"
-        },
-        {
-            "class": "quick_panel_label",
-            "font.face": "var(font_face)",
-            "font.size": "var(panel_row_font_size)",
-            "fg": "var(panel_row_foreground_color)",
-            "match_fg": "var(panel_row_match_foreground_color)",
-            "selected_fg": "var(panel_row_selected_foreground_color)",
-            "selected_match_fg": "var(panel_row_selected_match_foreground_color)"
-        },
-        {
-            "class": "quick_panel_path_label",
-            "font.face": "var(font_face)",
-            "font.size": "var(panel_row_font_size)",
-            "fg": "var(panel_row_foreground_color)",
-            "match_fg": "var(panel_row_match_foreground_color)",
-            "selected_fg": "var(panel_row_selected_foreground_color)",
-            "selected_match_fg": "var(panel_row_selected_match_foreground_color)"
+            "layer0.texture": "Meetio/assets/default/dirty_icon.png",
+            "layer0.tint": "var(color_accent)"
         },
         {
             "class": "panel_control",
@@ -1246,13 +1179,83 @@
             }
         },
         {
-            "class": "dialog",
+            "class": "progress_bar_control",
             "layer0.tint": [
                 "background",
                 0.94
             ],
             "layer0.opacity": 1
         },
+        {
+            "class": "progress_gauge_control",
+            "layer0.tint": "var(color_accent)",
+            "layer0.opacity": 1,
+            "content_margin": [
+                0,
+                8
+            ]
+        },
+        {
+            "class": "mini_quick_panel_row",
+            "layer0.tint": "var(panel_row_background_color)",
+            "layer0.inner_margin": [
+                2,
+                2,
+                2,
+                2
+            ],
+            "layer0.opacity": 1
+        },
+        {
+            "class": "mini_quick_panel_row",
+            "attributes": [
+                "selected"
+            ],
+            "layer0.tint": "var(panel_row_selected_background_color)"
+        },
+        {
+            "class": "quick_panel",
+            "row_padding": "var(panel_row_padding)",
+            "layer0.tint": [
+                "background",
+                1
+            ],
+            "layer0.opacity": 1
+        },
+        {
+            "class": "quick_panel_row",
+            "layer0.opacity": 1
+        },
+        {
+            "class": "quick_panel_row",
+            "layer0.tint": "var(panel_row_background_color)",
+            "layer0.opacity": 1
+        },
+        {
+            "class": "quick_panel_row",
+            "attributes": [
+                "selected"
+            ],
+            "layer0.tint": "var(panel_row_selected_background_color)"
+        },
+        {
+            "class": "quick_panel_label",
+            "font.face": "var(font_face)",
+            "font.size": "var(panel_row_font_size)",
+            "fg": "var(panel_row_foreground_color)",
+            "match_fg": "var(panel_row_match_foreground_color)",
+            "selected_fg": "var(panel_row_selected_foreground_color)",
+            "selected_match_fg": "var(panel_row_selected_match_foreground_color)"
+        },
+        {
+            "class": "quick_panel_path_label",
+            "font.face": "var(font_face)",
+            "font.size": "var(panel_row_font_size)",
+            "fg": "var(panel_row_foreground_color)",
+            "match_fg": "var(panel_row_match_foreground_color)",
+            "selected_fg": "var(panel_row_selected_foreground_color)",
+            "selected_match_fg": "var(panel_row_selected_match_foreground_color)"
+        },
         {
             "class": "scroll_area_control",
             "settings": [
diff --git a/Meetio.sublime-theme b/Meetio.sublime-theme
index bc8ea1dd..65efeffb 100644
--- a/Meetio.sublime-theme
+++ b/Meetio.sublime-theme
@@ -49,10 +49,13 @@
         "panel_row_match_foreground_color": "var(color_accent)",
         "panel_row_selected_match_foreground_color": "var(color_accent)",
         "input_background_color": [
+            "foreground",
+            0.05
+        ],
+        "input_border_color": [
             "background",
             1
         ],
-        "input_border_color": "var(panel_control_background_color)",
         "input_border_size": 1,
         "input_border_margin": [
             12,
@@ -101,7 +104,7 @@
         "tabset_selected_border_color": "var(color_accent)",
         "tabset_selected_border_size": [
             0,
-            2,
+            1,
             0,
             0
         ],
diff --git a/README.md b/README.md
index 2f28c254..1994895d 100755
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=for-the-badge)](https://github.com/prettier/prettier)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg?style=for-the-badge)](https://github.com/mauroreisvieira/meetio/blob/master/LICENSE)
 
-**Meetio** is the most powerful theme for Sublime Text 3 with different scheme variations only for 3176+ version.
+> **Meetio** is the most powerful theme for Sublime Text 3 with different scheme variations only for 3176+ version.
 
 **This theme is inspired upon the:**
 
diff --git a/schemes/Meetio-Cobalt.sublime-color-scheme b/schemes/Meetio-Cobalt.sublime-color-scheme
index 31a637a1..1b48e605 100644
--- a/schemes/Meetio-Cobalt.sublime-color-scheme
+++ b/schemes/Meetio-Cobalt.sublime-color-scheme
@@ -146,87 +146,209 @@
             "foreground": "var(cyan)"
         },
         {
-            "name": "[JSON] Key ",
-            "scope": "meta.mapping.key.json string.quoted.double.json",
+            "name": "[Diff] Deleted",
+            "scope": "diff.deleted, diff.deleted.char",
+            "background": "color(var(red) alpha(0.08))",
             "foreground": "var(red)"
         },
         {
-            "name": "[JSON] Value",
-            "scope": "meta.mapping.value.json string.quoted.double.json",
+            "name": "[Diff] Insert",
+            "scope": "diff.inserted, diff.inserted.char",
+            "background": "color(var(green) alpha(0.08))",
             "foreground": "var(green)"
         },
         {
-            "name": "[JSON] Constant",
-            "scope": "constant.language.json",
+            "name": "[HTML] String",
+            "scope": "text.html.basic string",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "[HTML] Operator",
+            "scope": "keyword.other.template, keyword.other.substitution",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "[HTML] Operator",
+            "scope": "keyword.operator, constant.other.color, punctuation, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html, punctuation.section.embedded",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[HTML] Attributes",
+            "scope": "entity.other.attribute-name.html, entity.other.attribute-name",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "[HTML] Tag Name",
+            "scope": "entity.name.tag",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "[HTML] Tag Attribute",
+            "scope": "text.html.basic entity.other.attribute-name",
             "foreground": "var(magenta)"
         },
         {
-            "name": "[JSON] Character Escape",
-            "scope": "constant.character.escape.json",
+            "name": "[JavaScript] String",
+            "scope": "source.js string, source.ts string",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "[JavaScript] Import",
+            "scope": "meta.import.js, meta.import.ts",
             "foreground": "var(yellow)"
         },
         {
-            "name": "[JSON] Constant Numeric",
-            "scope": "constant.numeric.json",
+            "name": "[JavaScript] Import - Export",
+            "scope": "keyword.control.import-export.js, keyword.control.import-export.ts",
             "foreground": "var(magenta)"
         },
         {
-            "name": "[JSON] Punctuation Section",
-            "scope": "punctuation.section.sequence.begin.json, punctuation.section.sequence.end.json",
+            "name": "[JavaScript] Storage Type (const, var, let)",
+            "scope": "storage.type.js, storage.type.ts",
+            "foreground": "var(pink)"
+        },
+        {
+            "name": "[JavaScript] Constructor",
+            "scope": "meta.function-call.constructor.js, entity.name.function.constructor.js, variable.language.constructor.js, meta.function-call.constructor.ts, entity.name.function.constructor.ts, variable.language.constructor.ts",
+            "foreground": "var(magenta)"
+        },
+        {
+            "name": "[JavaScript] Object Key",
+            "scope": "meta.object-literal.key.js, meta.object-literal.key.ts",
             "foreground": "var(blue)"
         },
         {
-            "name": "[JSON] Punctuation Mapping",
-            "scope": "punctuation.section.mapping.begin.json, punctuation.section.mapping.end.json",
+            "name": "[JavaScript] Dollar",
+            "scope": "variable.other.dollar.only.js, variable.other.dollar.only.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Sub Methods",
+            "scope": "entity.name.module.js, variable.import.parameter.js, variable.other.class.js",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "[JavaScript] Function",
+            "scope": "variable.function, variable.annotation, entity.name.function",
             "foreground": "var(blue)"
         },
         {
-            "name": "[JSON] Punctuation String",
-            "scope": "punctuation.definition.string.begin.json, punctuation.definition.string.end.json",
+            "name": "[JavaScript] Storage",
+            "scope": "storage.type.class.js",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "[JavaScript] Function",
+            "scope": "meta.class-method.js entity.name.function.js, variable.function",
             "foreground": "var(blue)"
         },
         {
-            "name": "[HTML] String",
-            "scope": "text.html.basic string",
-            "foreground": "var(green)"
+            "name": "[JavaScript] New",
+            "scope": "keyword.operator.word.new.js, keyword.operator.word.new.ts",
+            "foreground": "var(red)"
         },
         {
-            "name": "[HTML] Operator",
-            "scope": "keyword.other.template, keyword.other.substitution",
-            "foreground": "var(green)"
+            "name": "[JavaScript] Language Library",
+            "scope": "variable.language",
+            "foreground": "var(red)",
+            "font_style": "italic"
         },
         {
-            "name": "[HTML] Operator",
-            "scope": "keyword.operator, constant.other.color, punctuation, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html, punctuation.section.embedded",
-            "foreground": "var(cyan)"
+            "name": "[JavaScript] Library",
+            "scope": "support.function, support.macro",
+            "foreground": "var(blue)",
+            "font_style": "italic"
         },
         {
-            "name": "[HTML] Attributes",
-            "scope": "entity.other.attribute-name.html, entity.other.attribute-name",
+            "name": "[JavaScript] Support",
+            "scope": "support.type, support.class",
             "foreground": "var(yellow)"
         },
         {
-            "name": "[HTML] Tag Name",
-            "scope": "entity.name.tag",
-            "foreground": "var(red)"
+            "name": "[JavaScript] Support",
+            "scope": "keyword.control.flow.js, keyword.control.flow.ts",
+            "foreground": "var(magenta)"
         },
         {
-            "name": "[HTML] Tag Attribute",
-            "scope": "text.html.basic entity.other.attribute-name",
-            "foreground": "var(magenta)"
+            "name": "[JavaScript] Parameter",
+            "scope": "variable.parameter.function.js, variable.parameter.function.ts",
+            "foreground": "var(orange)"
         },
         {
-            "name": "[Diff] Deleted",
-            "scope": "diff.deleted, diff.deleted.char",
-            "background": "color(var(red) alpha(0.08))",
+            "name": "[JavaScript] Try Catch",
+            "scope": "keyword.control.trycatch.js, keyword.control.trycatch.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Loop",
+            "scope": "keyword.control.loop.js, keyword.control.loop.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Conditional",
+            "scope": "keyword.control.conditional.js, keyword.control.conditional.ts, keyword.control.switch.js, keyword.control.switch.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Entity Name",
+            "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JavaScript] Null",
+            "scope": "constant.language.null.js",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JavaScript] Undefined",
+            "scope": "constant.language.undefined.js",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JavaScript] Boolean",
+            "scope": "constant.language.boolean.false.js, constant.language.boolean.true.js",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JSON] Key ",
+            "scope": "meta.mapping.key.json string.quoted.double.json",
             "foreground": "var(red)"
         },
         {
-            "name": "[Diff] Insert",
-            "scope": "diff.inserted, diff.inserted.char",
-            "background": "color(var(green) alpha(0.08))",
+            "name": "[JSON] Value",
+            "scope": "meta.mapping.value.json string.quoted.double.json",
             "foreground": "var(green)"
         },
+        {
+            "name": "[JSON] Constant",
+            "scope": "constant.language.json",
+            "foreground": "var(magenta)"
+        },
+        {
+            "name": "[JSON] Character Escape",
+            "scope": "constant.character.escape.json",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "[JSON] Constant Numeric",
+            "scope": "constant.numeric.json",
+            "foreground": "var(magenta)"
+        },
+        {
+            "name": "[JSON] Punctuation Section",
+            "scope": "punctuation.section.sequence.begin.json, punctuation.section.sequence.end.json",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "[JSON] Punctuation Mapping",
+            "scope": "punctuation.section.mapping.begin.json, punctuation.section.mapping.end.json",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "[JSON] Punctuation String",
+            "scope": "punctuation.definition.string.begin.json, punctuation.definition.string.end.json",
+            "foreground": "var(blue)"
+        },
         {
             "name": "[Markdown] Deleted",
             "scope": "markup.deleted",
@@ -261,8 +383,13 @@
         },
         {
             "name": "[Markdown] Link Description",
-            "scope": "entity.name.reference.link.markdown, string.other.link.description.title.markdown",
-            "foreground": "var(magenta)"
+            "scope": "markup.list.unnumbered.markdown meta.paragraph.list.markdown meta.link.inline.description.markdown, meta.block-level.markdown markup.quote.markdown meta.link.inline.description.markdown",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "[Markdown] Image Inline",
+            "scope": "meta.paragraph.markdown meta.link.inline.description.markdown meta.image.inline.description.markdown, meta.paragraph.markdown meta.image.inline.description.markdown",
+            "foreground": "var(orange)"
         },
         {
             "name": "[Markdown] Bold",
@@ -291,11 +418,6 @@
             "scope": "markup.list.numbered.bullet",
             "foreground": "var(green)"
         },
-        {
-            "name": "[Markdown] Blockquote",
-            "scope": "markup.quote punctuation.definition.blockquote, markup.list punctuation.definition.list_item",
-            "foreground": "var(magenta)"
-        },
         {
             "name": "[Markdown] Code Inline",
             "scope": "markup.raw.inline",
@@ -303,7 +425,7 @@
         },
         {
             "name": "[Markdown] Code Block",
-            "scope": "markup.raw.block.markdown",
+            "scope": "meta.paragraph.markdown meta.code-fence.definition.begin.text.markdown-gfm, meta.paragraph.markdown meta.code-fence.definition.end.text.markdown-gfm, meta.paragraph.markdown markup.raw.code-fence.markdown-gfm",
             "background": "color(var(blue) alpha(0.05))"
         },
         {
@@ -311,6 +433,11 @@
             "scope": "(text punctuation.definition.italic | text punctuation.definition.bold)",
             "foreground": "var(magenta)"
         },
+        {
+            "name": "[Markdown] Blockquotes",
+            "scope": "text.html.markdown meta.block-level.markdown markup.quote.markdown",
+            "font_style": "italic"
+        },
         {
             "name": "Comment",
             "scope": "comment, punctuation.definition.comment",
@@ -363,133 +490,6 @@
             "foreground": "var(white)",
             "background": "color(var(yellow) alpha(0.9))"
         },
-        {
-            "name": "[JavaScript] String",
-            "scope": "source.js string, source.ts string",
-            "foreground": "var(green)"
-        },
-        {
-            "name": "[JavaScript] Import",
-            "scope": "meta.import.js, meta.import.ts",
-            "foreground": "var(yellow)"
-        },
-        {
-            "name": "[JavaScript] Import - Export",
-            "scope": "keyword.control.import-export.js, keyword.control.import-export.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Storage Type (const, var, let)",
-            "scope": "storage.type.js, storage.type.ts",
-            "foreground": "var(pink)"
-        },
-        {
-            "name": "[JavaScript] Constructor",
-            "scope": "meta.function-call.constructor.js, entity.name.function.constructor.js, variable.language.constructor.js, meta.function-call.constructor.ts, entity.name.function.constructor.ts, variable.language.constructor.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Object Key",
-            "scope": "meta.object-literal.key.js, meta.object-literal.key.ts",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] Dollar",
-            "scope": "variable.other.dollar.only.js, variable.other.dollar.only.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Sub Methods",
-            "scope": "entity.name.module.js, variable.import.parameter.js, variable.other.class.js",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Function",
-            "scope": "variable.function, variable.annotation, entity.name.function",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] Class",
-            "scope": "storage.type.class.js",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Function",
-            "scope": "meta.class-method.js entity.name.function.js, variable.function",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] New",
-            "scope": "keyword.operator.word.new.js, keyword.operator.word.new.ts",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Language Library",
-            "scope": "variable.language",
-            "foreground": "var(red)",
-            "font_style": "italic"
-        },
-        {
-            "name": "[JavaScript] Library",
-            "scope": "support.function, support.macro",
-            "foreground": "var(blue)",
-            "font_style": "italic"
-        },
-        {
-            "name": "[JavaScript] Support",
-            "scope": "support.type, support.class",
-            "foreground": "var(yellow)"
-        },
-        {
-            "name": "[JavaScript] Support",
-            "scope": "keyword.control.flow.js, keyword.control.flow.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Parameter",
-            "scope": "variable.parameter.function.js, variable.parameter.function.ts",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Try Catch",
-            "scope": "keyword.control.trycatch.js, keyword.control.trycatch.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Loop",
-            "scope": "keyword.control.loop.js, keyword.control.loop.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Conditional",
-            "scope": "keyword.control.conditional.js, keyword.control.conditional.ts, keyword.control.switch.js, keyword.control.switch.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Entity Name",
-            "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Null",
-            "scope": "constant.language.null.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Undefined",
-            "scope": "constant.language.undefined.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Boolean",
-            "scope": "constant.language.boolean.false.js, constant.language.boolean.true.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[Yaml] Key",
-            "scope": "entity.name.tag.yaml",
-            "foreground": "var(cyan)"
-        },
         {
             "name": "[PHP] Inherited Class",
             "scope": "entity.other.inherited-class.php",
@@ -519,6 +519,11 @@
             "name": "[PHP] Var",
             "scope": "support.function.var.php",
             "foreground": "var(cyan)"
+        },
+        {
+            "name": "[Yaml] Key",
+            "scope": "entity.name.tag.yaml",
+            "foreground": "var(cyan)"
         }
     ]
 }
\ No newline at end of file
diff --git a/schemes/Meetio-Darker.sublime-color-scheme b/schemes/Meetio-Darker.sublime-color-scheme
index e1d93e22..fd2ccc0a 100644
--- a/schemes/Meetio-Darker.sublime-color-scheme
+++ b/schemes/Meetio-Darker.sublime-color-scheme
@@ -146,87 +146,209 @@
             "foreground": "var(cyan)"
         },
         {
-            "name": "[JSON] Key ",
-            "scope": "meta.mapping.key.json string.quoted.double.json",
+            "name": "[Diff] Deleted",
+            "scope": "diff.deleted, diff.deleted.char",
+            "background": "color(var(red) alpha(0.08))",
             "foreground": "var(red)"
         },
         {
-            "name": "[JSON] Value",
-            "scope": "meta.mapping.value.json string.quoted.double.json",
+            "name": "[Diff] Insert",
+            "scope": "diff.inserted, diff.inserted.char",
+            "background": "color(var(green) alpha(0.08))",
             "foreground": "var(green)"
         },
         {
-            "name": "[JSON] Constant",
-            "scope": "constant.language.json",
+            "name": "[HTML] String",
+            "scope": "text.html.basic string",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "[HTML] Operator",
+            "scope": "keyword.other.template, keyword.other.substitution",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "[HTML] Operator",
+            "scope": "keyword.operator, constant.other.color, punctuation, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html, punctuation.section.embedded",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[HTML] Attributes",
+            "scope": "entity.other.attribute-name.html, entity.other.attribute-name",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "[HTML] Tag Name",
+            "scope": "entity.name.tag",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "[HTML] Tag Attribute",
+            "scope": "text.html.basic entity.other.attribute-name",
             "foreground": "var(magenta)"
         },
         {
-            "name": "[JSON] Character Escape",
-            "scope": "constant.character.escape.json",
+            "name": "[JavaScript] String",
+            "scope": "source.js string, source.ts string",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "[JavaScript] Import",
+            "scope": "meta.import.js, meta.import.ts",
             "foreground": "var(yellow)"
         },
         {
-            "name": "[JSON] Constant Numeric",
-            "scope": "constant.numeric.json",
+            "name": "[JavaScript] Import - Export",
+            "scope": "keyword.control.import-export.js, keyword.control.import-export.ts",
             "foreground": "var(magenta)"
         },
         {
-            "name": "[JSON] Punctuation Section",
-            "scope": "punctuation.section.sequence.begin.json, punctuation.section.sequence.end.json",
+            "name": "[JavaScript] Storage Type (const, var, let)",
+            "scope": "storage.type.js, storage.type.ts",
+            "foreground": "var(pink)"
+        },
+        {
+            "name": "[JavaScript] Constructor",
+            "scope": "meta.function-call.constructor.js, entity.name.function.constructor.js, variable.language.constructor.js, meta.function-call.constructor.ts, entity.name.function.constructor.ts, variable.language.constructor.ts",
+            "foreground": "var(magenta)"
+        },
+        {
+            "name": "[JavaScript] Object Key",
+            "scope": "meta.object-literal.key.js, meta.object-literal.key.ts",
             "foreground": "var(blue)"
         },
         {
-            "name": "[JSON] Punctuation Mapping",
-            "scope": "punctuation.section.mapping.begin.json, punctuation.section.mapping.end.json",
+            "name": "[JavaScript] Dollar",
+            "scope": "variable.other.dollar.only.js, variable.other.dollar.only.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Sub Methods",
+            "scope": "entity.name.module.js, variable.import.parameter.js, variable.other.class.js",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "[JavaScript] Function",
+            "scope": "variable.function, variable.annotation, entity.name.function",
             "foreground": "var(blue)"
         },
         {
-            "name": "[JSON] Punctuation String",
-            "scope": "punctuation.definition.string.begin.json, punctuation.definition.string.end.json",
+            "name": "[JavaScript] Storage",
+            "scope": "storage.type.class.js",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "[JavaScript] Function",
+            "scope": "meta.class-method.js entity.name.function.js, variable.function",
             "foreground": "var(blue)"
         },
         {
-            "name": "[HTML] String",
-            "scope": "text.html.basic string",
-            "foreground": "var(green)"
+            "name": "[JavaScript] New",
+            "scope": "keyword.operator.word.new.js, keyword.operator.word.new.ts",
+            "foreground": "var(red)"
         },
         {
-            "name": "[HTML] Operator",
-            "scope": "keyword.other.template, keyword.other.substitution",
-            "foreground": "var(green)"
+            "name": "[JavaScript] Language Library",
+            "scope": "variable.language",
+            "foreground": "var(red)",
+            "font_style": "italic"
         },
         {
-            "name": "[HTML] Operator",
-            "scope": "keyword.operator, constant.other.color, punctuation, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html, punctuation.section.embedded",
-            "foreground": "var(cyan)"
+            "name": "[JavaScript] Library",
+            "scope": "support.function, support.macro",
+            "foreground": "var(blue)",
+            "font_style": "italic"
         },
         {
-            "name": "[HTML] Attributes",
-            "scope": "entity.other.attribute-name.html, entity.other.attribute-name",
+            "name": "[JavaScript] Support",
+            "scope": "support.type, support.class",
             "foreground": "var(yellow)"
         },
         {
-            "name": "[HTML] Tag Name",
-            "scope": "entity.name.tag",
-            "foreground": "var(red)"
+            "name": "[JavaScript] Support",
+            "scope": "keyword.control.flow.js, keyword.control.flow.ts",
+            "foreground": "var(magenta)"
         },
         {
-            "name": "[HTML] Tag Attribute",
-            "scope": "text.html.basic entity.other.attribute-name",
-            "foreground": "var(magenta)"
+            "name": "[JavaScript] Parameter",
+            "scope": "variable.parameter.function.js, variable.parameter.function.ts",
+            "foreground": "var(orange)"
         },
         {
-            "name": "[Diff] Deleted",
-            "scope": "diff.deleted, diff.deleted.char",
-            "background": "color(var(red) alpha(0.08))",
+            "name": "[JavaScript] Try Catch",
+            "scope": "keyword.control.trycatch.js, keyword.control.trycatch.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Loop",
+            "scope": "keyword.control.loop.js, keyword.control.loop.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Conditional",
+            "scope": "keyword.control.conditional.js, keyword.control.conditional.ts, keyword.control.switch.js, keyword.control.switch.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Entity Name",
+            "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JavaScript] Null",
+            "scope": "constant.language.null.js",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JavaScript] Undefined",
+            "scope": "constant.language.undefined.js",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JavaScript] Boolean",
+            "scope": "constant.language.boolean.false.js, constant.language.boolean.true.js",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JSON] Key ",
+            "scope": "meta.mapping.key.json string.quoted.double.json",
             "foreground": "var(red)"
         },
         {
-            "name": "[Diff] Insert",
-            "scope": "diff.inserted, diff.inserted.char",
-            "background": "color(var(green) alpha(0.08))",
+            "name": "[JSON] Value",
+            "scope": "meta.mapping.value.json string.quoted.double.json",
             "foreground": "var(green)"
         },
+        {
+            "name": "[JSON] Constant",
+            "scope": "constant.language.json",
+            "foreground": "var(magenta)"
+        },
+        {
+            "name": "[JSON] Character Escape",
+            "scope": "constant.character.escape.json",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "[JSON] Constant Numeric",
+            "scope": "constant.numeric.json",
+            "foreground": "var(magenta)"
+        },
+        {
+            "name": "[JSON] Punctuation Section",
+            "scope": "punctuation.section.sequence.begin.json, punctuation.section.sequence.end.json",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "[JSON] Punctuation Mapping",
+            "scope": "punctuation.section.mapping.begin.json, punctuation.section.mapping.end.json",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "[JSON] Punctuation String",
+            "scope": "punctuation.definition.string.begin.json, punctuation.definition.string.end.json",
+            "foreground": "var(blue)"
+        },
         {
             "name": "[Markdown] Deleted",
             "scope": "markup.deleted",
@@ -261,8 +383,13 @@
         },
         {
             "name": "[Markdown] Link Description",
-            "scope": "entity.name.reference.link.markdown, string.other.link.description.title.markdown",
-            "foreground": "var(magenta)"
+            "scope": "markup.list.unnumbered.markdown meta.paragraph.list.markdown meta.link.inline.description.markdown, meta.block-level.markdown markup.quote.markdown meta.link.inline.description.markdown",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "[Markdown] Image Inline",
+            "scope": "meta.paragraph.markdown meta.link.inline.description.markdown meta.image.inline.description.markdown, meta.paragraph.markdown meta.image.inline.description.markdown",
+            "foreground": "var(orange)"
         },
         {
             "name": "[Markdown] Bold",
@@ -291,11 +418,6 @@
             "scope": "markup.list.numbered.bullet",
             "foreground": "var(green)"
         },
-        {
-            "name": "[Markdown] Blockquote",
-            "scope": "markup.quote punctuation.definition.blockquote, markup.list punctuation.definition.list_item",
-            "foreground": "var(magenta)"
-        },
         {
             "name": "[Markdown] Code Inline",
             "scope": "markup.raw.inline",
@@ -303,7 +425,7 @@
         },
         {
             "name": "[Markdown] Code Block",
-            "scope": "markup.raw.block.markdown",
+            "scope": "meta.paragraph.markdown meta.code-fence.definition.begin.text.markdown-gfm, meta.paragraph.markdown meta.code-fence.definition.end.text.markdown-gfm, meta.paragraph.markdown markup.raw.code-fence.markdown-gfm",
             "background": "color(var(blue) alpha(0.05))"
         },
         {
@@ -311,6 +433,11 @@
             "scope": "(text punctuation.definition.italic | text punctuation.definition.bold)",
             "foreground": "var(magenta)"
         },
+        {
+            "name": "[Markdown] Blockquotes",
+            "scope": "text.html.markdown meta.block-level.markdown markup.quote.markdown",
+            "font_style": "italic"
+        },
         {
             "name": "Comment",
             "scope": "comment, punctuation.definition.comment",
@@ -363,133 +490,6 @@
             "foreground": "var(white)",
             "background": "color(var(yellow) alpha(0.9))"
         },
-        {
-            "name": "[JavaScript] String",
-            "scope": "source.js string, source.ts string",
-            "foreground": "var(green)"
-        },
-        {
-            "name": "[JavaScript] Import",
-            "scope": "meta.import.js, meta.import.ts",
-            "foreground": "var(yellow)"
-        },
-        {
-            "name": "[JavaScript] Import - Export",
-            "scope": "keyword.control.import-export.js, keyword.control.import-export.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Storage Type (const, var, let)",
-            "scope": "storage.type.js, storage.type.ts",
-            "foreground": "var(pink)"
-        },
-        {
-            "name": "[JavaScript] Constructor",
-            "scope": "meta.function-call.constructor.js, entity.name.function.constructor.js, variable.language.constructor.js, meta.function-call.constructor.ts, entity.name.function.constructor.ts, variable.language.constructor.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Object Key",
-            "scope": "meta.object-literal.key.js, meta.object-literal.key.ts",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] Dollar",
-            "scope": "variable.other.dollar.only.js, variable.other.dollar.only.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Sub Methods",
-            "scope": "entity.name.module.js, variable.import.parameter.js, variable.other.class.js",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Function",
-            "scope": "variable.function, variable.annotation, entity.name.function",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] Class",
-            "scope": "storage.type.class.js",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Function",
-            "scope": "meta.class-method.js entity.name.function.js, variable.function",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] New",
-            "scope": "keyword.operator.word.new.js, keyword.operator.word.new.ts",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Language Library",
-            "scope": "variable.language",
-            "foreground": "var(red)",
-            "font_style": "italic"
-        },
-        {
-            "name": "[JavaScript] Library",
-            "scope": "support.function, support.macro",
-            "foreground": "var(blue)",
-            "font_style": "italic"
-        },
-        {
-            "name": "[JavaScript] Support",
-            "scope": "support.type, support.class",
-            "foreground": "var(yellow)"
-        },
-        {
-            "name": "[JavaScript] Support",
-            "scope": "keyword.control.flow.js, keyword.control.flow.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Parameter",
-            "scope": "variable.parameter.function.js, variable.parameter.function.ts",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Try Catch",
-            "scope": "keyword.control.trycatch.js, keyword.control.trycatch.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Loop",
-            "scope": "keyword.control.loop.js, keyword.control.loop.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Conditional",
-            "scope": "keyword.control.conditional.js, keyword.control.conditional.ts, keyword.control.switch.js, keyword.control.switch.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Entity Name",
-            "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Null",
-            "scope": "constant.language.null.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Undefined",
-            "scope": "constant.language.undefined.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Boolean",
-            "scope": "constant.language.boolean.false.js, constant.language.boolean.true.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[Yaml] Key",
-            "scope": "entity.name.tag.yaml",
-            "foreground": "var(cyan)"
-        },
         {
             "name": "[PHP] Inherited Class",
             "scope": "entity.other.inherited-class.php",
@@ -519,6 +519,11 @@
             "name": "[PHP] Var",
             "scope": "support.function.var.php",
             "foreground": "var(cyan)"
+        },
+        {
+            "name": "[Yaml] Key",
+            "scope": "entity.name.tag.yaml",
+            "foreground": "var(cyan)"
         }
     ]
 }
\ No newline at end of file
diff --git a/schemes/Meetio-Lighter.sublime-color-scheme b/schemes/Meetio-Lighter.sublime-color-scheme
index 93c1e78f..4d334db8 100644
--- a/schemes/Meetio-Lighter.sublime-color-scheme
+++ b/schemes/Meetio-Lighter.sublime-color-scheme
@@ -47,151 +47,6 @@
         "tags_options": "stippled_underline"
     },
     "rules": [
-        {
-            "scope": "col_AAAAAAFF",
-            "foreground": "#2A2A2AFF",
-            "background": "#AAAAAAFF"
-        },
-        {
-            "scope": "col_EEEEEEFF",
-            "foreground": "#6E6E6EFF",
-            "background": "#EEEEEEFF"
-        },
-        {
-            "scope": "col_FFFF00FF",
-            "foreground": "#616161FF",
-            "background": "#FFFF00FF"
-        },
-        {
-            "scope": "col_FF00FFFF",
-            "foreground": "#E9E9E9FF",
-            "background": "#FF00FFFF"
-        },
-        {
-            "scope": "col_FFEEEEFF",
-            "foreground": "#737373FF",
-            "background": "#FFEEEEFF"
-        },
-        {
-            "foreground": "#101010FF",
-            "scope": "col_6495EDFF",
-            "background": "#6495EDFF"
-        },
-        {
-            "foreground": "#212121FF",
-            "scope": "col_F08080FF",
-            "background": "#F08080FF"
-        },
-        {
-            "foreground": "#7C7C7CFF",
-            "scope": "col_FFFFFF7F",
-            "background": "#FFFFFF7F"
-        },
-        {
-            "foreground": "#626262FF",
-            "scope": "col_FF000022",
-            "background": "#FF000022"
-        },
-        {
-            "foreground": "#CCCCCCFF",
-            "scope": "col_FF0000FF",
-            "background": "#FF0000FF"
-        },
-        {
-            "foreground": "#ABABABFF",
-            "scope": "col_2D2B2AFF",
-            "background": "#2D2B2AFF"
-        },
-        {
-            "foreground": "#727272FF",
-            "scope": "col_F5F2F0FF",
-            "background": "#F5F2F0FF"
-        },
-        {
-            "foreground": "#FBFBFBFF",
-            "scope": "col_6772E4FF",
-            "background": "#6772E4FF"
-        },
-        {
-            "foreground": "#333333FF",
-            "scope": "col_80CBC4FF",
-            "background": "#80CBC4FF"
-        },
-        {
-            "foreground": "#D4D4D4FF",
-            "scope": "col_455A64FF",
-            "background": "#455A64FF"
-        },
-        {
-            "foreground": "#656565FF",
-            "scope": "col_00000015",
-            "background": "#00000015"
-        },
-        {
-            "foreground": "#F3F3F3FF",
-            "scope": "col_607A86FF",
-            "background": "#607A86FF"
-        },
-        {
-            "foreground": "#FEFEFEFF",
-            "scope": "col_D95468FF",
-            "background": "#D95468FF"
-        },
-        {
-            "foreground": "#ffffff",
-            "scope": "col_gutter",
-            "background": "#000000"
-        },
-        {
-            "foreground": "#FEFEFEFF",
-            "scope": "col_D26911FF",
-            "background": "#D26911FF"
-        },
-        {
-            "foreground": "#B3B3B3FF",
-            "scope": "col_333333FF",
-            "background": "#333333FF"
-        },
-        {
-            "foreground": "#808080FF",
-            "scope": "col_000000FF",
-            "background": "#000000FF"
-        },
-        {
-            "foreground": "#5D5D5DFF",
-            "scope": "col_DDDDDDFF",
-            "background": "#DDDDDDFF"
-        },
-        {
-            "foreground": "#797979FF",
-            "scope": "col_F9F9F9FF",
-            "background": "#F9F9F9FF"
-        },
-        {
-            "foreground": "#4C4C4CFF",
-            "scope": "col_CCCCCCFF",
-            "background": "#CCCCCCFF"
-        },
-        {
-            "foreground": "#7F7F7FFF",
-            "scope": "col_FFFFFFFF",
-            "background": "#FFFFFFFF"
-        },
-        {
-            "foreground": "#717171FF",
-            "scope": "col_F1F1F1FF",
-            "background": "#F1F1F1FF"
-        },
-        {
-            "foreground": "#1F1F1FFF",
-            "scope": "col_00EEAAFF",
-            "background": "#00EEAAFF"
-        },
-        {
-            "foreground": "#545454FF",
-            "scope": "col_00000026",
-            "background": "#00000026"
-        },
         {
             "name": "[CSS] String",
             "scope": "source.css string",
@@ -291,87 +146,209 @@
             "foreground": "var(cyan)"
         },
         {
-            "name": "[JSON] Key ",
-            "scope": "meta.mapping.key.json string.quoted.double.json",
+            "name": "[Diff] Deleted",
+            "scope": "diff.deleted, diff.deleted.char",
+            "background": "color(var(red) alpha(0.08))",
             "foreground": "var(red)"
         },
         {
-            "name": "[JSON] Value",
-            "scope": "meta.mapping.value.json string.quoted.double.json",
+            "name": "[Diff] Insert",
+            "scope": "diff.inserted, diff.inserted.char",
+            "background": "color(var(green) alpha(0.08))",
             "foreground": "var(green)"
         },
         {
-            "name": "[JSON] Constant",
-            "scope": "constant.language.json",
+            "name": "[HTML] String",
+            "scope": "text.html.basic string",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "[HTML] Operator",
+            "scope": "keyword.other.template, keyword.other.substitution",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "[HTML] Operator",
+            "scope": "keyword.operator, constant.other.color, punctuation, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html, punctuation.section.embedded",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[HTML] Attributes",
+            "scope": "entity.other.attribute-name.html, entity.other.attribute-name",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "[HTML] Tag Name",
+            "scope": "entity.name.tag",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "[HTML] Tag Attribute",
+            "scope": "text.html.basic entity.other.attribute-name",
             "foreground": "var(magenta)"
         },
         {
-            "name": "[JSON] Character Escape",
-            "scope": "constant.character.escape.json",
+            "name": "[JavaScript] String",
+            "scope": "source.js string, source.ts string",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "[JavaScript] Import",
+            "scope": "meta.import.js, meta.import.ts",
             "foreground": "var(yellow)"
         },
         {
-            "name": "[JSON] Constant Numeric",
-            "scope": "constant.numeric.json",
+            "name": "[JavaScript] Import - Export",
+            "scope": "keyword.control.import-export.js, keyword.control.import-export.ts",
             "foreground": "var(magenta)"
         },
         {
-            "name": "[JSON] Punctuation Section",
-            "scope": "punctuation.section.sequence.begin.json, punctuation.section.sequence.end.json",
+            "name": "[JavaScript] Storage Type (const, var, let)",
+            "scope": "storage.type.js, storage.type.ts",
+            "foreground": "var(pink)"
+        },
+        {
+            "name": "[JavaScript] Constructor",
+            "scope": "meta.function-call.constructor.js, entity.name.function.constructor.js, variable.language.constructor.js, meta.function-call.constructor.ts, entity.name.function.constructor.ts, variable.language.constructor.ts",
+            "foreground": "var(magenta)"
+        },
+        {
+            "name": "[JavaScript] Object Key",
+            "scope": "meta.object-literal.key.js, meta.object-literal.key.ts",
             "foreground": "var(blue)"
         },
         {
-            "name": "[JSON] Punctuation Mapping",
-            "scope": "punctuation.section.mapping.begin.json, punctuation.section.mapping.end.json",
+            "name": "[JavaScript] Dollar",
+            "scope": "variable.other.dollar.only.js, variable.other.dollar.only.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Sub Methods",
+            "scope": "entity.name.module.js, variable.import.parameter.js, variable.other.class.js",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "[JavaScript] Function",
+            "scope": "variable.function, variable.annotation, entity.name.function",
             "foreground": "var(blue)"
         },
         {
-            "name": "[JSON] Punctuation String",
-            "scope": "punctuation.definition.string.begin.json, punctuation.definition.string.end.json",
+            "name": "[JavaScript] Storage",
+            "scope": "storage.type.class.js",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "[JavaScript] Function",
+            "scope": "meta.class-method.js entity.name.function.js, variable.function",
             "foreground": "var(blue)"
         },
         {
-            "name": "[HTML] String",
-            "scope": "text.html.basic string",
-            "foreground": "var(green)"
+            "name": "[JavaScript] New",
+            "scope": "keyword.operator.word.new.js, keyword.operator.word.new.ts",
+            "foreground": "var(red)"
         },
         {
-            "name": "[HTML] Operator",
-            "scope": "keyword.other.template, keyword.other.substitution",
-            "foreground": "var(green)"
+            "name": "[JavaScript] Language Library",
+            "scope": "variable.language",
+            "foreground": "var(red)",
+            "font_style": "italic"
         },
         {
-            "name": "[HTML] Operator",
-            "scope": "keyword.operator, constant.other.color, punctuation, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html, punctuation.section.embedded",
-            "foreground": "var(cyan)"
+            "name": "[JavaScript] Library",
+            "scope": "support.function, support.macro",
+            "foreground": "var(blue)",
+            "font_style": "italic"
         },
         {
-            "name": "[HTML] Attributes",
-            "scope": "entity.other.attribute-name.html, entity.other.attribute-name",
+            "name": "[JavaScript] Support",
+            "scope": "support.type, support.class",
             "foreground": "var(yellow)"
         },
         {
-            "name": "[HTML] Tag Name",
-            "scope": "entity.name.tag",
-            "foreground": "var(red)"
+            "name": "[JavaScript] Support",
+            "scope": "keyword.control.flow.js, keyword.control.flow.ts",
+            "foreground": "var(magenta)"
         },
         {
-            "name": "[HTML] Tag Attribute",
-            "scope": "text.html.basic entity.other.attribute-name",
-            "foreground": "var(magenta)"
+            "name": "[JavaScript] Parameter",
+            "scope": "variable.parameter.function.js, variable.parameter.function.ts",
+            "foreground": "var(orange)"
         },
         {
-            "name": "[Diff] Deleted",
-            "scope": "diff.deleted, diff.deleted.char",
-            "background": "color(var(red) alpha(0.08))",
+            "name": "[JavaScript] Try Catch",
+            "scope": "keyword.control.trycatch.js, keyword.control.trycatch.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Loop",
+            "scope": "keyword.control.loop.js, keyword.control.loop.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Conditional",
+            "scope": "keyword.control.conditional.js, keyword.control.conditional.ts, keyword.control.switch.js, keyword.control.switch.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Entity Name",
+            "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JavaScript] Null",
+            "scope": "constant.language.null.js",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JavaScript] Undefined",
+            "scope": "constant.language.undefined.js",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JavaScript] Boolean",
+            "scope": "constant.language.boolean.false.js, constant.language.boolean.true.js",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JSON] Key ",
+            "scope": "meta.mapping.key.json string.quoted.double.json",
             "foreground": "var(red)"
         },
         {
-            "name": "[Diff] Insert",
-            "scope": "diff.inserted, diff.inserted.char",
-            "background": "color(var(green) alpha(0.08))",
+            "name": "[JSON] Value",
+            "scope": "meta.mapping.value.json string.quoted.double.json",
             "foreground": "var(green)"
         },
+        {
+            "name": "[JSON] Constant",
+            "scope": "constant.language.json",
+            "foreground": "var(magenta)"
+        },
+        {
+            "name": "[JSON] Character Escape",
+            "scope": "constant.character.escape.json",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "[JSON] Constant Numeric",
+            "scope": "constant.numeric.json",
+            "foreground": "var(magenta)"
+        },
+        {
+            "name": "[JSON] Punctuation Section",
+            "scope": "punctuation.section.sequence.begin.json, punctuation.section.sequence.end.json",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "[JSON] Punctuation Mapping",
+            "scope": "punctuation.section.mapping.begin.json, punctuation.section.mapping.end.json",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "[JSON] Punctuation String",
+            "scope": "punctuation.definition.string.begin.json, punctuation.definition.string.end.json",
+            "foreground": "var(blue)"
+        },
         {
             "name": "[Markdown] Deleted",
             "scope": "markup.deleted",
@@ -406,8 +383,13 @@
         },
         {
             "name": "[Markdown] Link Description",
-            "scope": "entity.name.reference.link.markdown, string.other.link.description.title.markdown",
-            "foreground": "var(magenta)"
+            "scope": "markup.list.unnumbered.markdown meta.paragraph.list.markdown meta.link.inline.description.markdown, meta.block-level.markdown markup.quote.markdown meta.link.inline.description.markdown",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "[Markdown] Image Inline",
+            "scope": "meta.paragraph.markdown meta.link.inline.description.markdown meta.image.inline.description.markdown, meta.paragraph.markdown meta.image.inline.description.markdown",
+            "foreground": "var(orange)"
         },
         {
             "name": "[Markdown] Bold",
@@ -436,11 +418,6 @@
             "scope": "markup.list.numbered.bullet",
             "foreground": "var(green)"
         },
-        {
-            "name": "[Markdown] Blockquote",
-            "scope": "markup.quote punctuation.definition.blockquote, markup.list punctuation.definition.list_item",
-            "foreground": "var(magenta)"
-        },
         {
             "name": "[Markdown] Code Inline",
             "scope": "markup.raw.inline",
@@ -448,7 +425,7 @@
         },
         {
             "name": "[Markdown] Code Block",
-            "scope": "markup.raw.block.markdown",
+            "scope": "meta.paragraph.markdown meta.code-fence.definition.begin.text.markdown-gfm, meta.paragraph.markdown meta.code-fence.definition.end.text.markdown-gfm, meta.paragraph.markdown markup.raw.code-fence.markdown-gfm",
             "background": "color(var(blue) alpha(0.05))"
         },
         {
@@ -456,6 +433,11 @@
             "scope": "(text punctuation.definition.italic | text punctuation.definition.bold)",
             "foreground": "var(magenta)"
         },
+        {
+            "name": "[Markdown] Blockquotes",
+            "scope": "text.html.markdown meta.block-level.markdown markup.quote.markdown",
+            "font_style": "italic"
+        },
         {
             "name": "Comment",
             "scope": "comment, punctuation.definition.comment",
@@ -508,133 +490,6 @@
             "foreground": "var(white)",
             "background": "color(var(yellow) alpha(0.9))"
         },
-        {
-            "name": "[JavaScript] String",
-            "scope": "source.js string, source.ts string",
-            "foreground": "var(green)"
-        },
-        {
-            "name": "[JavaScript] Import",
-            "scope": "meta.import.js, meta.import.ts",
-            "foreground": "var(yellow)"
-        },
-        {
-            "name": "[JavaScript] Import - Export",
-            "scope": "keyword.control.import-export.js, keyword.control.import-export.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Storage Type (const, var, let)",
-            "scope": "storage.type.js, storage.type.ts",
-            "foreground": "var(pink)"
-        },
-        {
-            "name": "[JavaScript] Constructor",
-            "scope": "meta.function-call.constructor.js, entity.name.function.constructor.js, variable.language.constructor.js, meta.function-call.constructor.ts, entity.name.function.constructor.ts, variable.language.constructor.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Object Key",
-            "scope": "meta.object-literal.key.js, meta.object-literal.key.ts",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] Dollar",
-            "scope": "variable.other.dollar.only.js, variable.other.dollar.only.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Sub Methods",
-            "scope": "entity.name.module.js, variable.import.parameter.js, variable.other.class.js",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Function",
-            "scope": "variable.function, variable.annotation, entity.name.function",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] Class",
-            "scope": "storage.type.class.js",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Function",
-            "scope": "meta.class-method.js entity.name.function.js, variable.function",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] New",
-            "scope": "keyword.operator.word.new.js, keyword.operator.word.new.ts",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Language Library",
-            "scope": "variable.language",
-            "foreground": "var(red)",
-            "font_style": "italic"
-        },
-        {
-            "name": "[JavaScript] Library",
-            "scope": "support.function, support.macro",
-            "foreground": "var(blue)",
-            "font_style": "italic"
-        },
-        {
-            "name": "[JavaScript] Support",
-            "scope": "support.type, support.class",
-            "foreground": "var(yellow)"
-        },
-        {
-            "name": "[JavaScript] Support",
-            "scope": "keyword.control.flow.js, keyword.control.flow.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Parameter",
-            "scope": "variable.parameter.function.js, variable.parameter.function.ts",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Try Catch",
-            "scope": "keyword.control.trycatch.js, keyword.control.trycatch.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Loop",
-            "scope": "keyword.control.loop.js, keyword.control.loop.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Conditional",
-            "scope": "keyword.control.conditional.js, keyword.control.conditional.ts, keyword.control.switch.js, keyword.control.switch.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Entity Name",
-            "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Null",
-            "scope": "constant.language.null.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Undefined",
-            "scope": "constant.language.undefined.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Boolean",
-            "scope": "constant.language.boolean.false.js, constant.language.boolean.true.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[Yaml] Key",
-            "scope": "entity.name.tag.yaml",
-            "foreground": "var(cyan)"
-        },
         {
             "name": "[PHP] Inherited Class",
             "scope": "entity.other.inherited-class.php",
@@ -664,6 +519,11 @@
             "name": "[PHP] Var",
             "scope": "support.function.var.php",
             "foreground": "var(cyan)"
+        },
+        {
+            "name": "[Yaml] Key",
+            "scope": "entity.name.tag.yaml",
+            "foreground": "var(cyan)"
         }
     ]
 }
\ No newline at end of file
diff --git a/schemes/Meetio-Ocean.sublime-color-scheme b/schemes/Meetio-Ocean.sublime-color-scheme
index 9364da57..0b6c32bf 100644
--- a/schemes/Meetio-Ocean.sublime-color-scheme
+++ b/schemes/Meetio-Ocean.sublime-color-scheme
@@ -146,87 +146,209 @@
             "foreground": "var(cyan)"
         },
         {
-            "name": "[JSON] Key ",
-            "scope": "meta.mapping.key.json string.quoted.double.json",
+            "name": "[Diff] Deleted",
+            "scope": "diff.deleted, diff.deleted.char",
+            "background": "color(var(red) alpha(0.08))",
             "foreground": "var(red)"
         },
         {
-            "name": "[JSON] Value",
-            "scope": "meta.mapping.value.json string.quoted.double.json",
+            "name": "[Diff] Insert",
+            "scope": "diff.inserted, diff.inserted.char",
+            "background": "color(var(green) alpha(0.08))",
             "foreground": "var(green)"
         },
         {
-            "name": "[JSON] Constant",
-            "scope": "constant.language.json",
+            "name": "[HTML] String",
+            "scope": "text.html.basic string",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "[HTML] Operator",
+            "scope": "keyword.other.template, keyword.other.substitution",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "[HTML] Operator",
+            "scope": "keyword.operator, constant.other.color, punctuation, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html, punctuation.section.embedded",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[HTML] Attributes",
+            "scope": "entity.other.attribute-name.html, entity.other.attribute-name",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "[HTML] Tag Name",
+            "scope": "entity.name.tag",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "[HTML] Tag Attribute",
+            "scope": "text.html.basic entity.other.attribute-name",
             "foreground": "var(magenta)"
         },
         {
-            "name": "[JSON] Character Escape",
-            "scope": "constant.character.escape.json",
+            "name": "[JavaScript] String",
+            "scope": "source.js string, source.ts string",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "[JavaScript] Import",
+            "scope": "meta.import.js, meta.import.ts",
             "foreground": "var(yellow)"
         },
         {
-            "name": "[JSON] Constant Numeric",
-            "scope": "constant.numeric.json",
+            "name": "[JavaScript] Import - Export",
+            "scope": "keyword.control.import-export.js, keyword.control.import-export.ts",
             "foreground": "var(magenta)"
         },
         {
-            "name": "[JSON] Punctuation Section",
-            "scope": "punctuation.section.sequence.begin.json, punctuation.section.sequence.end.json",
+            "name": "[JavaScript] Storage Type (const, var, let)",
+            "scope": "storage.type.js, storage.type.ts",
+            "foreground": "var(pink)"
+        },
+        {
+            "name": "[JavaScript] Constructor",
+            "scope": "meta.function-call.constructor.js, entity.name.function.constructor.js, variable.language.constructor.js, meta.function-call.constructor.ts, entity.name.function.constructor.ts, variable.language.constructor.ts",
+            "foreground": "var(magenta)"
+        },
+        {
+            "name": "[JavaScript] Object Key",
+            "scope": "meta.object-literal.key.js, meta.object-literal.key.ts",
             "foreground": "var(blue)"
         },
         {
-            "name": "[JSON] Punctuation Mapping",
-            "scope": "punctuation.section.mapping.begin.json, punctuation.section.mapping.end.json",
+            "name": "[JavaScript] Dollar",
+            "scope": "variable.other.dollar.only.js, variable.other.dollar.only.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Sub Methods",
+            "scope": "entity.name.module.js, variable.import.parameter.js, variable.other.class.js",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "[JavaScript] Function",
+            "scope": "variable.function, variable.annotation, entity.name.function",
             "foreground": "var(blue)"
         },
         {
-            "name": "[JSON] Punctuation String",
-            "scope": "punctuation.definition.string.begin.json, punctuation.definition.string.end.json",
+            "name": "[JavaScript] Storage",
+            "scope": "storage.type.class.js",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "[JavaScript] Function",
+            "scope": "meta.class-method.js entity.name.function.js, variable.function",
             "foreground": "var(blue)"
         },
         {
-            "name": "[HTML] String",
-            "scope": "text.html.basic string",
-            "foreground": "var(green)"
+            "name": "[JavaScript] New",
+            "scope": "keyword.operator.word.new.js, keyword.operator.word.new.ts",
+            "foreground": "var(red)"
         },
         {
-            "name": "[HTML] Operator",
-            "scope": "keyword.other.template, keyword.other.substitution",
-            "foreground": "var(green)"
+            "name": "[JavaScript] Language Library",
+            "scope": "variable.language",
+            "foreground": "var(red)",
+            "font_style": "italic"
         },
         {
-            "name": "[HTML] Operator",
-            "scope": "keyword.operator, constant.other.color, punctuation, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html, punctuation.section.embedded",
-            "foreground": "var(cyan)"
+            "name": "[JavaScript] Library",
+            "scope": "support.function, support.macro",
+            "foreground": "var(blue)",
+            "font_style": "italic"
         },
         {
-            "name": "[HTML] Attributes",
-            "scope": "entity.other.attribute-name.html, entity.other.attribute-name",
+            "name": "[JavaScript] Support",
+            "scope": "support.type, support.class",
             "foreground": "var(yellow)"
         },
         {
-            "name": "[HTML] Tag Name",
-            "scope": "entity.name.tag",
-            "foreground": "var(red)"
+            "name": "[JavaScript] Support",
+            "scope": "keyword.control.flow.js, keyword.control.flow.ts",
+            "foreground": "var(magenta)"
         },
         {
-            "name": "[HTML] Tag Attribute",
-            "scope": "text.html.basic entity.other.attribute-name",
-            "foreground": "var(magenta)"
+            "name": "[JavaScript] Parameter",
+            "scope": "variable.parameter.function.js, variable.parameter.function.ts",
+            "foreground": "var(orange)"
         },
         {
-            "name": "[Diff] Deleted",
-            "scope": "diff.deleted, diff.deleted.char",
-            "background": "color(var(red) alpha(0.08))",
+            "name": "[JavaScript] Try Catch",
+            "scope": "keyword.control.trycatch.js, keyword.control.trycatch.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Loop",
+            "scope": "keyword.control.loop.js, keyword.control.loop.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Conditional",
+            "scope": "keyword.control.conditional.js, keyword.control.conditional.ts, keyword.control.switch.js, keyword.control.switch.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Entity Name",
+            "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JavaScript] Null",
+            "scope": "constant.language.null.js",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JavaScript] Undefined",
+            "scope": "constant.language.undefined.js",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JavaScript] Boolean",
+            "scope": "constant.language.boolean.false.js, constant.language.boolean.true.js",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JSON] Key ",
+            "scope": "meta.mapping.key.json string.quoted.double.json",
             "foreground": "var(red)"
         },
         {
-            "name": "[Diff] Insert",
-            "scope": "diff.inserted, diff.inserted.char",
-            "background": "color(var(green) alpha(0.08))",
+            "name": "[JSON] Value",
+            "scope": "meta.mapping.value.json string.quoted.double.json",
             "foreground": "var(green)"
         },
+        {
+            "name": "[JSON] Constant",
+            "scope": "constant.language.json",
+            "foreground": "var(magenta)"
+        },
+        {
+            "name": "[JSON] Character Escape",
+            "scope": "constant.character.escape.json",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "[JSON] Constant Numeric",
+            "scope": "constant.numeric.json",
+            "foreground": "var(magenta)"
+        },
+        {
+            "name": "[JSON] Punctuation Section",
+            "scope": "punctuation.section.sequence.begin.json, punctuation.section.sequence.end.json",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "[JSON] Punctuation Mapping",
+            "scope": "punctuation.section.mapping.begin.json, punctuation.section.mapping.end.json",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "[JSON] Punctuation String",
+            "scope": "punctuation.definition.string.begin.json, punctuation.definition.string.end.json",
+            "foreground": "var(blue)"
+        },
         {
             "name": "[Markdown] Deleted",
             "scope": "markup.deleted",
@@ -261,8 +383,13 @@
         },
         {
             "name": "[Markdown] Link Description",
-            "scope": "entity.name.reference.link.markdown, string.other.link.description.title.markdown",
-            "foreground": "var(magenta)"
+            "scope": "markup.list.unnumbered.markdown meta.paragraph.list.markdown meta.link.inline.description.markdown, meta.block-level.markdown markup.quote.markdown meta.link.inline.description.markdown",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "[Markdown] Image Inline",
+            "scope": "meta.paragraph.markdown meta.link.inline.description.markdown meta.image.inline.description.markdown, meta.paragraph.markdown meta.image.inline.description.markdown",
+            "foreground": "var(orange)"
         },
         {
             "name": "[Markdown] Bold",
@@ -291,11 +418,6 @@
             "scope": "markup.list.numbered.bullet",
             "foreground": "var(green)"
         },
-        {
-            "name": "[Markdown] Blockquote",
-            "scope": "markup.quote punctuation.definition.blockquote, markup.list punctuation.definition.list_item",
-            "foreground": "var(magenta)"
-        },
         {
             "name": "[Markdown] Code Inline",
             "scope": "markup.raw.inline",
@@ -303,7 +425,7 @@
         },
         {
             "name": "[Markdown] Code Block",
-            "scope": "markup.raw.block.markdown",
+            "scope": "meta.paragraph.markdown meta.code-fence.definition.begin.text.markdown-gfm, meta.paragraph.markdown meta.code-fence.definition.end.text.markdown-gfm, meta.paragraph.markdown markup.raw.code-fence.markdown-gfm",
             "background": "color(var(blue) alpha(0.05))"
         },
         {
@@ -311,6 +433,11 @@
             "scope": "(text punctuation.definition.italic | text punctuation.definition.bold)",
             "foreground": "var(magenta)"
         },
+        {
+            "name": "[Markdown] Blockquotes",
+            "scope": "text.html.markdown meta.block-level.markdown markup.quote.markdown",
+            "font_style": "italic"
+        },
         {
             "name": "Comment",
             "scope": "comment, punctuation.definition.comment",
@@ -363,133 +490,6 @@
             "foreground": "var(white)",
             "background": "color(var(yellow) alpha(0.9))"
         },
-        {
-            "name": "[JavaScript] String",
-            "scope": "source.js string, source.ts string",
-            "foreground": "var(green)"
-        },
-        {
-            "name": "[JavaScript] Import",
-            "scope": "meta.import.js, meta.import.ts",
-            "foreground": "var(yellow)"
-        },
-        {
-            "name": "[JavaScript] Import - Export",
-            "scope": "keyword.control.import-export.js, keyword.control.import-export.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Storage Type (const, var, let)",
-            "scope": "storage.type.js, storage.type.ts",
-            "foreground": "var(pink)"
-        },
-        {
-            "name": "[JavaScript] Constructor",
-            "scope": "meta.function-call.constructor.js, entity.name.function.constructor.js, variable.language.constructor.js, meta.function-call.constructor.ts, entity.name.function.constructor.ts, variable.language.constructor.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Object Key",
-            "scope": "meta.object-literal.key.js, meta.object-literal.key.ts",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] Dollar",
-            "scope": "variable.other.dollar.only.js, variable.other.dollar.only.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Sub Methods",
-            "scope": "entity.name.module.js, variable.import.parameter.js, variable.other.class.js",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Function",
-            "scope": "variable.function, variable.annotation, entity.name.function",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] Class",
-            "scope": "storage.type.class.js",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Function",
-            "scope": "meta.class-method.js entity.name.function.js, variable.function",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] New",
-            "scope": "keyword.operator.word.new.js, keyword.operator.word.new.ts",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Language Library",
-            "scope": "variable.language",
-            "foreground": "var(red)",
-            "font_style": "italic"
-        },
-        {
-            "name": "[JavaScript] Library",
-            "scope": "support.function, support.macro",
-            "foreground": "var(blue)",
-            "font_style": "italic"
-        },
-        {
-            "name": "[JavaScript] Support",
-            "scope": "support.type, support.class",
-            "foreground": "var(yellow)"
-        },
-        {
-            "name": "[JavaScript] Support",
-            "scope": "keyword.control.flow.js, keyword.control.flow.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Parameter",
-            "scope": "variable.parameter.function.js, variable.parameter.function.ts",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Try Catch",
-            "scope": "keyword.control.trycatch.js, keyword.control.trycatch.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Loop",
-            "scope": "keyword.control.loop.js, keyword.control.loop.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Conditional",
-            "scope": "keyword.control.conditional.js, keyword.control.conditional.ts, keyword.control.switch.js, keyword.control.switch.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Entity Name",
-            "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Null",
-            "scope": "constant.language.null.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Undefined",
-            "scope": "constant.language.undefined.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Boolean",
-            "scope": "constant.language.boolean.false.js, constant.language.boolean.true.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[Yaml] Key",
-            "scope": "entity.name.tag.yaml",
-            "foreground": "var(cyan)"
-        },
         {
             "name": "[PHP] Inherited Class",
             "scope": "entity.other.inherited-class.php",
@@ -519,6 +519,11 @@
             "name": "[PHP] Var",
             "scope": "support.function.var.php",
             "foreground": "var(cyan)"
+        },
+        {
+            "name": "[Yaml] Key",
+            "scope": "entity.name.tag.yaml",
+            "foreground": "var(cyan)"
         }
     ]
 }
\ No newline at end of file
diff --git a/schemes/Meetio-Palenight.sublime-color-scheme b/schemes/Meetio-Palenight.sublime-color-scheme
index fc44b155..34398c52 100644
--- a/schemes/Meetio-Palenight.sublime-color-scheme
+++ b/schemes/Meetio-Palenight.sublime-color-scheme
@@ -47,26 +47,6 @@
         "tags_options": "stippled_underline"
     },
     "rules": [
-        {
-            "foreground": "#ffffff",
-            "scope": "col_gutter",
-            "background": "#000000"
-        },
-        {
-            "foreground": "#7F7F7FFF",
-            "scope": "col_FFFFFFFF",
-            "background": "#FFFFFFFF"
-        },
-        {
-            "foreground": "#101010FF",
-            "scope": "col_6495EDFF",
-            "background": "#6495EDFF"
-        },
-        {
-            "foreground": "#212121FF",
-            "scope": "col_F08080FF",
-            "background": "#F08080FF"
-        },
         {
             "name": "[CSS] String",
             "scope": "source.css string",
@@ -166,87 +146,209 @@
             "foreground": "var(cyan)"
         },
         {
-            "name": "[JSON] Key ",
-            "scope": "meta.mapping.key.json string.quoted.double.json",
+            "name": "[Diff] Deleted",
+            "scope": "diff.deleted, diff.deleted.char",
+            "background": "color(var(red) alpha(0.08))",
             "foreground": "var(red)"
         },
         {
-            "name": "[JSON] Value",
-            "scope": "meta.mapping.value.json string.quoted.double.json",
+            "name": "[Diff] Insert",
+            "scope": "diff.inserted, diff.inserted.char",
+            "background": "color(var(green) alpha(0.08))",
             "foreground": "var(green)"
         },
         {
-            "name": "[JSON] Constant",
-            "scope": "constant.language.json",
+            "name": "[HTML] String",
+            "scope": "text.html.basic string",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "[HTML] Operator",
+            "scope": "keyword.other.template, keyword.other.substitution",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "[HTML] Operator",
+            "scope": "keyword.operator, constant.other.color, punctuation, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html, punctuation.section.embedded",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[HTML] Attributes",
+            "scope": "entity.other.attribute-name.html, entity.other.attribute-name",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "[HTML] Tag Name",
+            "scope": "entity.name.tag",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "[HTML] Tag Attribute",
+            "scope": "text.html.basic entity.other.attribute-name",
             "foreground": "var(magenta)"
         },
         {
-            "name": "[JSON] Character Escape",
-            "scope": "constant.character.escape.json",
+            "name": "[JavaScript] String",
+            "scope": "source.js string, source.ts string",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "[JavaScript] Import",
+            "scope": "meta.import.js, meta.import.ts",
             "foreground": "var(yellow)"
         },
         {
-            "name": "[JSON] Constant Numeric",
-            "scope": "constant.numeric.json",
+            "name": "[JavaScript] Import - Export",
+            "scope": "keyword.control.import-export.js, keyword.control.import-export.ts",
             "foreground": "var(magenta)"
         },
         {
-            "name": "[JSON] Punctuation Section",
-            "scope": "punctuation.section.sequence.begin.json, punctuation.section.sequence.end.json",
+            "name": "[JavaScript] Storage Type (const, var, let)",
+            "scope": "storage.type.js, storage.type.ts",
+            "foreground": "var(pink)"
+        },
+        {
+            "name": "[JavaScript] Constructor",
+            "scope": "meta.function-call.constructor.js, entity.name.function.constructor.js, variable.language.constructor.js, meta.function-call.constructor.ts, entity.name.function.constructor.ts, variable.language.constructor.ts",
+            "foreground": "var(magenta)"
+        },
+        {
+            "name": "[JavaScript] Object Key",
+            "scope": "meta.object-literal.key.js, meta.object-literal.key.ts",
             "foreground": "var(blue)"
         },
         {
-            "name": "[JSON] Punctuation Mapping",
-            "scope": "punctuation.section.mapping.begin.json, punctuation.section.mapping.end.json",
+            "name": "[JavaScript] Dollar",
+            "scope": "variable.other.dollar.only.js, variable.other.dollar.only.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Sub Methods",
+            "scope": "entity.name.module.js, variable.import.parameter.js, variable.other.class.js",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "[JavaScript] Function",
+            "scope": "variable.function, variable.annotation, entity.name.function",
             "foreground": "var(blue)"
         },
         {
-            "name": "[JSON] Punctuation String",
-            "scope": "punctuation.definition.string.begin.json, punctuation.definition.string.end.json",
+            "name": "[JavaScript] Storage",
+            "scope": "storage.type.class.js",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "[JavaScript] Function",
+            "scope": "meta.class-method.js entity.name.function.js, variable.function",
             "foreground": "var(blue)"
         },
         {
-            "name": "[HTML] String",
-            "scope": "text.html.basic string",
-            "foreground": "var(green)"
+            "name": "[JavaScript] New",
+            "scope": "keyword.operator.word.new.js, keyword.operator.word.new.ts",
+            "foreground": "var(red)"
         },
         {
-            "name": "[HTML] Operator",
-            "scope": "keyword.other.template, keyword.other.substitution",
-            "foreground": "var(green)"
+            "name": "[JavaScript] Language Library",
+            "scope": "variable.language",
+            "foreground": "var(red)",
+            "font_style": "italic"
         },
         {
-            "name": "[HTML] Operator",
-            "scope": "keyword.operator, constant.other.color, punctuation, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html, punctuation.section.embedded",
-            "foreground": "var(cyan)"
+            "name": "[JavaScript] Library",
+            "scope": "support.function, support.macro",
+            "foreground": "var(blue)",
+            "font_style": "italic"
         },
         {
-            "name": "[HTML] Attributes",
-            "scope": "entity.other.attribute-name.html, entity.other.attribute-name",
+            "name": "[JavaScript] Support",
+            "scope": "support.type, support.class",
             "foreground": "var(yellow)"
         },
         {
-            "name": "[HTML] Tag Name",
-            "scope": "entity.name.tag",
-            "foreground": "var(red)"
+            "name": "[JavaScript] Support",
+            "scope": "keyword.control.flow.js, keyword.control.flow.ts",
+            "foreground": "var(magenta)"
         },
         {
-            "name": "[HTML] Tag Attribute",
-            "scope": "text.html.basic entity.other.attribute-name",
-            "foreground": "var(magenta)"
+            "name": "[JavaScript] Parameter",
+            "scope": "variable.parameter.function.js, variable.parameter.function.ts",
+            "foreground": "var(orange)"
         },
         {
-            "name": "[Diff] Deleted",
-            "scope": "diff.deleted, diff.deleted.char",
-            "background": "color(var(red) alpha(0.08))",
+            "name": "[JavaScript] Try Catch",
+            "scope": "keyword.control.trycatch.js, keyword.control.trycatch.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Loop",
+            "scope": "keyword.control.loop.js, keyword.control.loop.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Conditional",
+            "scope": "keyword.control.conditional.js, keyword.control.conditional.ts, keyword.control.switch.js, keyword.control.switch.ts",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "[JavaScript] Entity Name",
+            "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JavaScript] Null",
+            "scope": "constant.language.null.js",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JavaScript] Undefined",
+            "scope": "constant.language.undefined.js",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JavaScript] Boolean",
+            "scope": "constant.language.boolean.false.js, constant.language.boolean.true.js",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "[JSON] Key ",
+            "scope": "meta.mapping.key.json string.quoted.double.json",
             "foreground": "var(red)"
         },
         {
-            "name": "[Diff] Insert",
-            "scope": "diff.inserted, diff.inserted.char",
-            "background": "color(var(green) alpha(0.08))",
+            "name": "[JSON] Value",
+            "scope": "meta.mapping.value.json string.quoted.double.json",
             "foreground": "var(green)"
         },
+        {
+            "name": "[JSON] Constant",
+            "scope": "constant.language.json",
+            "foreground": "var(magenta)"
+        },
+        {
+            "name": "[JSON] Character Escape",
+            "scope": "constant.character.escape.json",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "[JSON] Constant Numeric",
+            "scope": "constant.numeric.json",
+            "foreground": "var(magenta)"
+        },
+        {
+            "name": "[JSON] Punctuation Section",
+            "scope": "punctuation.section.sequence.begin.json, punctuation.section.sequence.end.json",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "[JSON] Punctuation Mapping",
+            "scope": "punctuation.section.mapping.begin.json, punctuation.section.mapping.end.json",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "[JSON] Punctuation String",
+            "scope": "punctuation.definition.string.begin.json, punctuation.definition.string.end.json",
+            "foreground": "var(blue)"
+        },
         {
             "name": "[Markdown] Deleted",
             "scope": "markup.deleted",
@@ -281,8 +383,13 @@
         },
         {
             "name": "[Markdown] Link Description",
-            "scope": "entity.name.reference.link.markdown, string.other.link.description.title.markdown",
-            "foreground": "var(magenta)"
+            "scope": "markup.list.unnumbered.markdown meta.paragraph.list.markdown meta.link.inline.description.markdown, meta.block-level.markdown markup.quote.markdown meta.link.inline.description.markdown",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "[Markdown] Image Inline",
+            "scope": "meta.paragraph.markdown meta.link.inline.description.markdown meta.image.inline.description.markdown, meta.paragraph.markdown meta.image.inline.description.markdown",
+            "foreground": "var(orange)"
         },
         {
             "name": "[Markdown] Bold",
@@ -311,11 +418,6 @@
             "scope": "markup.list.numbered.bullet",
             "foreground": "var(green)"
         },
-        {
-            "name": "[Markdown] Blockquote",
-            "scope": "markup.quote punctuation.definition.blockquote, markup.list punctuation.definition.list_item",
-            "foreground": "var(magenta)"
-        },
         {
             "name": "[Markdown] Code Inline",
             "scope": "markup.raw.inline",
@@ -323,7 +425,7 @@
         },
         {
             "name": "[Markdown] Code Block",
-            "scope": "markup.raw.block.markdown",
+            "scope": "meta.paragraph.markdown meta.code-fence.definition.begin.text.markdown-gfm, meta.paragraph.markdown meta.code-fence.definition.end.text.markdown-gfm, meta.paragraph.markdown markup.raw.code-fence.markdown-gfm",
             "background": "color(var(blue) alpha(0.05))"
         },
         {
@@ -331,6 +433,11 @@
             "scope": "(text punctuation.definition.italic | text punctuation.definition.bold)",
             "foreground": "var(magenta)"
         },
+        {
+            "name": "[Markdown] Blockquotes",
+            "scope": "text.html.markdown meta.block-level.markdown markup.quote.markdown",
+            "font_style": "italic"
+        },
         {
             "name": "Comment",
             "scope": "comment, punctuation.definition.comment",
@@ -383,133 +490,6 @@
             "foreground": "var(white)",
             "background": "color(var(yellow) alpha(0.9))"
         },
-        {
-            "name": "[JavaScript] String",
-            "scope": "source.js string, source.ts string",
-            "foreground": "var(green)"
-        },
-        {
-            "name": "[JavaScript] Import",
-            "scope": "meta.import.js, meta.import.ts",
-            "foreground": "var(yellow)"
-        },
-        {
-            "name": "[JavaScript] Import - Export",
-            "scope": "keyword.control.import-export.js, keyword.control.import-export.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Storage Type (const, var, let)",
-            "scope": "storage.type.js, storage.type.ts",
-            "foreground": "var(pink)"
-        },
-        {
-            "name": "[JavaScript] Constructor",
-            "scope": "meta.function-call.constructor.js, entity.name.function.constructor.js, variable.language.constructor.js, meta.function-call.constructor.ts, entity.name.function.constructor.ts, variable.language.constructor.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Object Key",
-            "scope": "meta.object-literal.key.js, meta.object-literal.key.ts",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] Dollar",
-            "scope": "variable.other.dollar.only.js, variable.other.dollar.only.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Sub Methods",
-            "scope": "entity.name.module.js, variable.import.parameter.js, variable.other.class.js",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Function",
-            "scope": "variable.function, variable.annotation, entity.name.function",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] Class",
-            "scope": "storage.type.class.js",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Function",
-            "scope": "meta.class-method.js entity.name.function.js, variable.function",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] New",
-            "scope": "keyword.operator.word.new.js, keyword.operator.word.new.ts",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Language Library",
-            "scope": "variable.language",
-            "foreground": "var(red)",
-            "font_style": "italic"
-        },
-        {
-            "name": "[JavaScript] Library",
-            "scope": "support.function, support.macro",
-            "foreground": "var(blue)",
-            "font_style": "italic"
-        },
-        {
-            "name": "[JavaScript] Support",
-            "scope": "support.type, support.class",
-            "foreground": "var(yellow)"
-        },
-        {
-            "name": "[JavaScript] Support",
-            "scope": "keyword.control.flow.js, keyword.control.flow.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Parameter",
-            "scope": "variable.parameter.function.js, variable.parameter.function.ts",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Try Catch",
-            "scope": "keyword.control.trycatch.js, keyword.control.trycatch.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Loop",
-            "scope": "keyword.control.loop.js, keyword.control.loop.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Conditional",
-            "scope": "keyword.control.conditional.js, keyword.control.conditional.ts, keyword.control.switch.js, keyword.control.switch.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Entity Name",
-            "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Null",
-            "scope": "constant.language.null.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Undefined",
-            "scope": "constant.language.undefined.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Boolean",
-            "scope": "constant.language.boolean.false.js, constant.language.boolean.true.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[Yaml] Key",
-            "scope": "entity.name.tag.yaml",
-            "foreground": "var(cyan)"
-        },
         {
             "name": "[PHP] Inherited Class",
             "scope": "entity.other.inherited-class.php",
@@ -539,6 +519,11 @@
             "name": "[PHP] Var",
             "scope": "support.function.var.php",
             "foreground": "var(cyan)"
+        },
+        {
+            "name": "[Yaml] Key",
+            "scope": "entity.name.tag.yaml",
+            "foreground": "var(cyan)"
         }
     ]
 }
\ No newline at end of file
diff --git a/schemes/Meetio.sublime-color-scheme b/schemes/Meetio.sublime-color-scheme
index 736eccaa..a4851960 100644
--- a/schemes/Meetio.sublime-color-scheme
+++ b/schemes/Meetio.sublime-color-scheme
@@ -48,292 +48,266 @@
     },
     "rules": [
         {
-            "foreground": "#AAAAAAFF",
-            "background": "#00000015",
-            "scope": "col_00000015"
-        },
-        {
-            "foreground": "#F3F3F3FF",
-            "background": "#607A86FF",
-            "scope": "col_607A86FF"
-        },
-        {
-            "foreground": "#333333FF",
-            "background": "#80CBC4FF",
-            "scope": "col_80CBC4FF"
+            "name": "[CSS] String",
+            "scope": "source.css string",
+            "foreground": "var(green)"
         },
         {
-            "foreground": "#D4D4D4FF",
-            "background": "#455A64FF",
-            "scope": "col_455A64FF"
+            "name": "[CSS] Classes",
+            "scope": "entity.other.attribute-name.class",
+            "foreground": "var(magenta)"
         },
         {
-            "foreground": "#F8F8F8FF",
-            "scope": "col_628862FF",
-            "background": "#628862FF"
+            "name": "[CSS] Tag",
+            "scope": "entity.name.tag.css",
+            "foreground": "var(yellow)"
         },
         {
-            "foreground": "#787878FF",
-            "scope": "col_F8F9FAFF",
-            "background": "#F8F9FAFF"
+            "name": "[CSS] ID",
+            "scope": "entity.other.attribute-name.id.css",
+            "foreground": "var(red)",
+            "font_style": "bold"
         },
         {
-            "foreground": "#ACACACFF",
-            "scope": "col_0000000C",
-            "background": "#0000000C"
+            "name": "[CSS] Properties",
+            "scope": "source.css support.type, source.sass support.type, source.scss support.type, source.less support.type, source.stylus",
+            "foreground": "var(foreground)"
         },
         {
-            "foreground": "#E6E6E6FF",
-            "scope": "col_BD4147FF",
-            "background": "#BD4147FF"
+            "name": "[CSS] Variable",
+            "scope": "support.type.custom-property.css, support.type.custom-property.scss, variable.other.sass, variable.other.scss",
+            "foreground": "var(yellow)"
         },
         {
-            "foreground": "#AAAAAAFF",
-            "scope": "col_00000014",
-            "background": "#00000014"
+            "name": "[CSS] Properties Value",
+            "scope": "support.constant.property-value.css",
+            "foreground": "var(orange)"
         },
         {
-            "foreground": "#A9A9A9FF",
-            "scope": "col_00000019",
-            "background": "#00000019"
+            "name": "[CSS] Constant Numeric",
+            "scope": "constant.numeric.css",
+            "foreground": "var(orange)"
         },
         {
-            "foreground": "#E6E6E6FF",
-            "scope": "col_666666FF",
-            "background": "#666666FF"
+            "name": "[CSS] Prefix",
+            "scope": "support.type.vendor-prefix.css",
+            "foreground": "var(cyan)"
         },
         {
-            "foreground": "#686868FF",
-            "scope": "col_DFF0D8FF",
-            "background": "#DFF0D8FF"
+            "name": "[CSS] Property Name",
+            "scope": "meta.property-name.css",
+            "foreground": "var(foreground)"
         },
         {
-            "foreground": "#797979FF",
-            "scope": "col_F9F9F9FF",
-            "background": "#F9F9F9FF"
+            "name": "[CSS] Tag",
+            "scope": "source.css entity.name.tag.custom.css",
+            "foreground": "var(red)"
         },
         {
-            "foreground": "#565656FF",
-            "scope": "col_D6D6D6FF",
-            "background": "#D6D6D6FF"
+            "name": "[CSS] Pseudo Class",
+            "scope": "entity.other.pseudo-class.css",
+            "foreground": "var(red)",
+            "font_style": "italic"
         },
         {
-            "foreground": "#EDEDEDFF",
-            "scope": "col_6D6E70FF",
-            "background": "#6D6E70FF"
+            "name": "[CSS] Pseudo Element",
+            "scope": "entity.other.pseudo-element.css",
+            "foreground": "var(red)",
+            "font_style": "italic"
         },
         {
-            "foreground": "#3F3F3FFF",
-            "scope": "col_BFBFBFFF",
-            "background": "#BFBFBFFF"
+            "name": "[CSS] Important",
+            "scope": "keyword.other.important.css",
+            "foreground": "var(red)"
         },
         {
-            "foreground": "#2A2A2AFF",
-            "scope": "col_75B9F0FF",
-            "background": "#75B9F0FF"
+            "name": "[CSS] Unit",
+            "scope": "keyword.other.unit.css",
+            "foreground": "var(orange)"
         },
         {
-            "foreground": "#4C4C4CFF",
-            "scope": "col_CCCCCCFF",
-            "background": "#CCCCCCFF"
+            "name": "[CSS] Font Name",
+            "scope": "support.constant.font-name.css",
+            "foreground": "var(pink)"
         },
         {
-            "foreground": "#636363FF",
-            "scope": "col_E3E3E6FF",
-            "background": "#E3E3E6FF"
+            "name": "[CSS] Color Values",
+            "scope": "support.constant.color.w3c-standard-color-name.css, constant.other.color.rgb-value.css, support.constant.color.w3c-extended-color-keywords.css",
+            "foreground": "var(blue)"
         },
         {
-            "foreground": "#E6E6E6FF",
-            "scope": "col_DE3723FF",
-            "background": "#DE3723FF"
+            "name": "[CSS] Functions",
+            "scope": "support.function.var.css, support.function.filter.css, support.function.calc.css, support.function.gradient.css",
+            "foreground": "var(cyan)"
         },
         {
-            "foreground": "#404040FF",
-            "scope": "col_97CBF4FF",
-            "background": "#97CBF4FF"
+            "name": "[CSS] Property Vendor",
+            "scope": "support.type.property-vendor.css, support.constant.media.css",
+            "foreground": "var(cyan)"
         },
         {
-            "foreground": "#F5F5F5FF",
-            "scope": "col_737480FF",
-            "background": "#737480FF"
+            "name": "[Diff] Deleted",
+            "scope": "diff.deleted, diff.deleted.char",
+            "background": "color(var(red) alpha(0.08))",
+            "foreground": "var(red)"
         },
         {
-            "foreground": "#202020FF",
-            "scope": "col_A0A1A3FF",
-            "background": "#A0A1A3FF"
+            "name": "[Diff] Insert",
+            "scope": "diff.inserted, diff.inserted.char",
+            "background": "color(var(green) alpha(0.08))",
+            "foreground": "var(green)"
         },
         {
-            "foreground": "#727272FF",
-            "scope": "col_F2F2F2FF",
-            "background": "#F2F2F2FF"
+            "name": "[HTML] String",
+            "scope": "text.html.basic string",
+            "foreground": "var(green)"
         },
         {
-            "foreground": "#090909FF",
-            "scope": "col_669999FF",
-            "background": "#669999FF"
+            "name": "[HTML] Operator",
+            "scope": "keyword.other.template, keyword.other.substitution",
+            "foreground": "var(green)"
         },
         {
-            "foreground": "#313131FF",
-            "scope": "col_8CC1C1FF",
-            "background": "#8CC1C1FF"
+            "name": "[HTML] Operator",
+            "scope": "keyword.operator, constant.other.color, punctuation, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html, punctuation.section.embedded",
+            "foreground": "var(cyan)"
         },
         {
-            "foreground": "#808080FF",
-            "scope": "col_000000FF",
-            "background": "#000000FF"
+            "name": "[HTML] Attributes",
+            "scope": "entity.other.attribute-name.html, entity.other.attribute-name",
+            "foreground": "var(yellow)"
         },
         {
-            "foreground": "#8E8E8EFF",
-            "scope": "col_000000B2",
-            "background": "#000000B2"
+            "name": "[HTML] Tag Name",
+            "scope": "entity.name.tag",
+            "foreground": "var(red)"
         },
         {
-            "foreground": "#404040FF",
-            "scope": "col_FFFFFFB2",
-            "background": "#FFFFFFB2"
+            "name": "[HTML] Tag Attribute",
+            "scope": "text.html.basic entity.other.attribute-name",
+            "foreground": "var(magenta)"
         },
         {
-            "foreground": "#616161FF",
-            "scope": "col_FFFF00FF",
-            "background": "#FFFF00FF"
+            "name": "[JavaScript] String",
+            "scope": "source.js string, source.ts string",
+            "foreground": "var(green)"
         },
         {
-            "foreground": "#CCCCCCFF",
-            "scope": "col_FF0000FF",
-            "background": "#FF0000FF"
+            "name": "[JavaScript] Import",
+            "scope": "meta.import.js, meta.import.ts",
+            "foreground": "var(yellow)"
         },
         {
-            "foreground": "#7F7F7FFF",
-            "scope": "col_FFFFFFFF",
-            "background": "#FFFFFFFF"
+            "name": "[JavaScript] Import - Export",
+            "scope": "keyword.control.import-export.js, keyword.control.import-export.ts",
+            "foreground": "var(magenta)"
         },
         {
-            "foreground": "#ffffff",
-            "scope": "col_gutter",
-            "background": "#000000"
+            "name": "[JavaScript] Storage Type (const, var, let)",
+            "scope": "storage.type.js, storage.type.ts",
+            "foreground": "var(pink)"
         },
         {
-            "foreground": "#313131FF",
-            "scope": "col_74CCCCFF",
-            "background": "#74CCCCFF"
+            "name": "[JavaScript] Constructor",
+            "scope": "meta.function-call.constructor.js, entity.name.function.constructor.js, variable.language.constructor.js, meta.function-call.constructor.ts, entity.name.function.constructor.ts, variable.language.constructor.ts",
+            "foreground": "var(magenta)"
         },
         {
-            "foreground": "#F5F5F5FF",
-            "scope": "col_3281E8FF",
-            "background": "#3281E8FF"
+            "name": "[JavaScript] Object Key",
+            "scope": "meta.object-literal.key.js, meta.object-literal.key.ts",
+            "foreground": "var(blue)"
         },
         {
-            "foreground": "#DBDBDBFF",
-            "scope": "col_394EFFFF",
-            "background": "#394EFFFF"
+            "name": "[JavaScript] Dollar",
+            "scope": "variable.other.dollar.only.js, variable.other.dollar.only.ts",
+            "foreground": "var(cyan)"
         },
         {
-            "foreground": "#141414FF",
-            "scope": "col_FE6768FF",
-            "background": "#FE6768FF"
+            "name": "[JavaScript] Sub Methods",
+            "scope": "entity.name.module.js, variable.import.parameter.js, variable.other.class.js",
+            "foreground": "var(red)"
         },
         {
-            "foreground": "#343434FF",
-            "scope": "col_FFAB24FF",
-            "background": "#FFAB24FF"
+            "name": "[JavaScript] Function",
+            "scope": "variable.function, variable.annotation, entity.name.function",
+            "foreground": "var(blue)"
         },
         {
-            "name": "[CSS] String",
-            "scope": "source.css string",
-            "foreground": "var(green)"
+            "name": "[JavaScript] Storage",
+            "scope": "storage.type.class.js",
+            "foreground": "var(red)"
         },
         {
-            "name": "[CSS] Classes",
-            "scope": "entity.other.attribute-name.class",
-            "foreground": "var(magenta)"
+            "name": "[JavaScript] Function",
+            "scope": "meta.class-method.js entity.name.function.js, variable.function",
+            "foreground": "var(blue)"
         },
         {
-            "name": "[CSS] Tag",
-            "scope": "entity.name.tag.css",
-            "foreground": "var(yellow)"
+            "name": "[JavaScript] New",
+            "scope": "keyword.operator.word.new.js, keyword.operator.word.new.ts",
+            "foreground": "var(red)"
         },
         {
-            "name": "[CSS] ID",
-            "scope": "entity.other.attribute-name.id.css",
+            "name": "[JavaScript] Language Library",
+            "scope": "variable.language",
             "foreground": "var(red)",
-            "font_style": "bold"
+            "font_style": "italic"
         },
         {
-            "name": "[CSS] Properties",
-            "scope": "source.css support.type, source.sass support.type, source.scss support.type, source.less support.type, source.stylus",
-            "foreground": "var(foreground)"
+            "name": "[JavaScript] Library",
+            "scope": "support.function, support.macro",
+            "foreground": "var(blue)",
+            "font_style": "italic"
         },
         {
-            "name": "[CSS] Variable",
-            "scope": "support.type.custom-property.css, support.type.custom-property.scss, variable.other.sass, variable.other.scss",
+            "name": "[JavaScript] Support",
+            "scope": "support.type, support.class",
             "foreground": "var(yellow)"
         },
         {
-            "name": "[CSS] Properties Value",
-            "scope": "support.constant.property-value.css",
-            "foreground": "var(orange)"
+            "name": "[JavaScript] Support",
+            "scope": "keyword.control.flow.js, keyword.control.flow.ts",
+            "foreground": "var(magenta)"
         },
         {
-            "name": "[CSS] Constant Numeric",
-            "scope": "constant.numeric.css",
+            "name": "[JavaScript] Parameter",
+            "scope": "variable.parameter.function.js, variable.parameter.function.ts",
             "foreground": "var(orange)"
         },
         {
-            "name": "[CSS] Prefix",
-            "scope": "support.type.vendor-prefix.css",
+            "name": "[JavaScript] Try Catch",
+            "scope": "keyword.control.trycatch.js, keyword.control.trycatch.ts",
             "foreground": "var(cyan)"
         },
         {
-            "name": "[CSS] Property Name",
-            "scope": "meta.property-name.css",
-            "foreground": "var(foreground)"
-        },
-        {
-            "name": "[CSS] Tag",
-            "scope": "source.css entity.name.tag.custom.css",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[CSS] Pseudo Class",
-            "scope": "entity.other.pseudo-class.css",
-            "foreground": "var(red)",
-            "font_style": "italic"
-        },
-        {
-            "name": "[CSS] Pseudo Element",
-            "scope": "entity.other.pseudo-element.css",
-            "foreground": "var(red)",
-            "font_style": "italic"
+            "name": "[JavaScript] Loop",
+            "scope": "keyword.control.loop.js, keyword.control.loop.ts",
+            "foreground": "var(cyan)"
         },
         {
-            "name": "[CSS] Important",
-            "scope": "keyword.other.important.css",
-            "foreground": "var(red)"
+            "name": "[JavaScript] Conditional",
+            "scope": "keyword.control.conditional.js, keyword.control.conditional.ts, keyword.control.switch.js, keyword.control.switch.ts",
+            "foreground": "var(cyan)"
         },
         {
-            "name": "[CSS] Unit",
-            "scope": "keyword.other.unit.css",
+            "name": "[JavaScript] Entity Name",
+            "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)",
             "foreground": "var(orange)"
         },
         {
-            "name": "[CSS] Font Name",
-            "scope": "support.constant.font-name.css",
-            "foreground": "var(pink)"
-        },
-        {
-            "name": "[CSS] Color Values",
-            "scope": "support.constant.color.w3c-standard-color-name.css, constant.other.color.rgb-value.css, support.constant.color.w3c-extended-color-keywords.css",
-            "foreground": "var(blue)"
+            "name": "[JavaScript] Null",
+            "scope": "constant.language.null.js",
+            "foreground": "var(orange)"
         },
         {
-            "name": "[CSS] Functions",
-            "scope": "support.function.var.css, support.function.filter.css, support.function.calc.css, support.function.gradient.css",
-            "foreground": "var(cyan)"
+            "name": "[JavaScript] Undefined",
+            "scope": "constant.language.undefined.js",
+            "foreground": "var(orange)"
         },
         {
-            "name": "[CSS] Property Vendor",
-            "scope": "support.type.property-vendor.css, support.constant.media.css",
-            "foreground": "var(cyan)"
+            "name": "[JavaScript] Boolean",
+            "scope": "constant.language.boolean.false.js, constant.language.boolean.true.js",
+            "foreground": "var(orange)"
         },
         {
             "name": "[JSON] Key ",
@@ -375,48 +349,6 @@
             "scope": "punctuation.definition.string.begin.json, punctuation.definition.string.end.json",
             "foreground": "var(blue)"
         },
-        {
-            "name": "[HTML] String",
-            "scope": "text.html.basic string",
-            "foreground": "var(green)"
-        },
-        {
-            "name": "[HTML] Operator",
-            "scope": "keyword.other.template, keyword.other.substitution",
-            "foreground": "var(green)"
-        },
-        {
-            "name": "[HTML] Operator",
-            "scope": "keyword.operator, constant.other.color, punctuation, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html, punctuation.section.embedded",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[HTML] Attributes",
-            "scope": "entity.other.attribute-name.html, entity.other.attribute-name",
-            "foreground": "var(yellow)"
-        },
-        {
-            "name": "[HTML] Tag Name",
-            "scope": "entity.name.tag",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[HTML] Tag Attribute",
-            "scope": "text.html.basic entity.other.attribute-name",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[Diff] Deleted",
-            "scope": "diff.deleted, diff.deleted.char",
-            "background": "color(var(red) alpha(0.08))",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[Diff] Insert",
-            "scope": "diff.inserted, diff.inserted.char",
-            "background": "color(var(green) alpha(0.08))",
-            "foreground": "var(green)"
-        },
         {
             "name": "[Markdown] Deleted",
             "scope": "markup.deleted",
@@ -451,8 +383,13 @@
         },
         {
             "name": "[Markdown] Link Description",
-            "scope": "entity.name.reference.link.markdown, string.other.link.description.title.markdown",
-            "foreground": "var(magenta)"
+            "scope": "markup.list.unnumbered.markdown meta.paragraph.list.markdown meta.link.inline.description.markdown, meta.block-level.markdown markup.quote.markdown meta.link.inline.description.markdown",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "[Markdown] Image Inline",
+            "scope": "meta.paragraph.markdown meta.link.inline.description.markdown meta.image.inline.description.markdown, meta.paragraph.markdown meta.image.inline.description.markdown",
+            "foreground": "var(orange)"
         },
         {
             "name": "[Markdown] Bold",
@@ -481,11 +418,6 @@
             "scope": "markup.list.numbered.bullet",
             "foreground": "var(green)"
         },
-        {
-            "name": "[Markdown] Blockquote",
-            "scope": "markup.quote punctuation.definition.blockquote, markup.list punctuation.definition.list_item",
-            "foreground": "var(magenta)"
-        },
         {
             "name": "[Markdown] Code Inline",
             "scope": "markup.raw.inline",
@@ -493,7 +425,7 @@
         },
         {
             "name": "[Markdown] Code Block",
-            "scope": "markup.raw.block.markdown",
+            "scope": "meta.paragraph.markdown meta.code-fence.definition.begin.text.markdown-gfm, meta.paragraph.markdown meta.code-fence.definition.end.text.markdown-gfm, meta.paragraph.markdown markup.raw.code-fence.markdown-gfm",
             "background": "color(var(blue) alpha(0.05))"
         },
         {
@@ -501,6 +433,11 @@
             "scope": "(text punctuation.definition.italic | text punctuation.definition.bold)",
             "foreground": "var(magenta)"
         },
+        {
+            "name": "[Markdown] Blockquotes",
+            "scope": "text.html.markdown meta.block-level.markdown markup.quote.markdown",
+            "font_style": "italic"
+        },
         {
             "name": "Comment",
             "scope": "comment, punctuation.definition.comment",
@@ -553,133 +490,6 @@
             "foreground": "var(white)",
             "background": "color(var(yellow) alpha(0.9))"
         },
-        {
-            "name": "[JavaScript] String",
-            "scope": "source.js string, source.ts string",
-            "foreground": "var(green)"
-        },
-        {
-            "name": "[JavaScript] Import",
-            "scope": "meta.import.js, meta.import.ts",
-            "foreground": "var(yellow)"
-        },
-        {
-            "name": "[JavaScript] Import - Export",
-            "scope": "keyword.control.import-export.js, keyword.control.import-export.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Storage Type (const, var, let)",
-            "scope": "storage.type.js, storage.type.ts",
-            "foreground": "var(pink)"
-        },
-        {
-            "name": "[JavaScript] Constructor",
-            "scope": "meta.function-call.constructor.js, entity.name.function.constructor.js, variable.language.constructor.js, meta.function-call.constructor.ts, entity.name.function.constructor.ts, variable.language.constructor.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Object Key",
-            "scope": "meta.object-literal.key.js, meta.object-literal.key.ts",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] Dollar",
-            "scope": "variable.other.dollar.only.js, variable.other.dollar.only.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Sub Methods",
-            "scope": "entity.name.module.js, variable.import.parameter.js, variable.other.class.js",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Function",
-            "scope": "variable.function, variable.annotation, entity.name.function",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] Class",
-            "scope": "storage.type.class.js",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Function",
-            "scope": "meta.class-method.js entity.name.function.js, variable.function",
-            "foreground": "var(blue)"
-        },
-        {
-            "name": "[JavaScript] New",
-            "scope": "keyword.operator.word.new.js, keyword.operator.word.new.ts",
-            "foreground": "var(red)"
-        },
-        {
-            "name": "[JavaScript] Language Library",
-            "scope": "variable.language",
-            "foreground": "var(red)",
-            "font_style": "italic"
-        },
-        {
-            "name": "[JavaScript] Library",
-            "scope": "support.function, support.macro",
-            "foreground": "var(blue)",
-            "font_style": "italic"
-        },
-        {
-            "name": "[JavaScript] Support",
-            "scope": "support.type, support.class",
-            "foreground": "var(yellow)"
-        },
-        {
-            "name": "[JavaScript] Support",
-            "scope": "keyword.control.flow.js, keyword.control.flow.ts",
-            "foreground": "var(magenta)"
-        },
-        {
-            "name": "[JavaScript] Parameter",
-            "scope": "variable.parameter.function.js, variable.parameter.function.ts",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Try Catch",
-            "scope": "keyword.control.trycatch.js, keyword.control.trycatch.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Loop",
-            "scope": "keyword.control.loop.js, keyword.control.loop.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Conditional",
-            "scope": "keyword.control.conditional.js, keyword.control.conditional.ts, keyword.control.switch.js, keyword.control.switch.ts",
-            "foreground": "var(cyan)"
-        },
-        {
-            "name": "[JavaScript] Entity Name",
-            "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Null",
-            "scope": "constant.language.null.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Undefined",
-            "scope": "constant.language.undefined.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[JavaScript] Boolean",
-            "scope": "constant.language.boolean.false.js, constant.language.boolean.true.js",
-            "foreground": "var(orange)"
-        },
-        {
-            "name": "[Yaml] Key",
-            "scope": "entity.name.tag.yaml",
-            "foreground": "var(cyan)"
-        },
         {
             "name": "[PHP] Inherited Class",
             "scope": "entity.other.inherited-class.php",
@@ -709,6 +519,11 @@
             "name": "[PHP] Var",
             "scope": "support.function.var.php",
             "foreground": "var(cyan)"
+        },
+        {
+            "name": "[Yaml] Key",
+            "scope": "entity.name.tag.yaml",
+            "foreground": "var(cyan)"
         }
     ]
 }
\ No newline at end of file
diff --git a/src/schemes/files/rules/javascript-syntax.json b/src/schemes/files/rules/javascript-syntax.json
index 2ff37750..8c601b0d 100644
--- a/src/schemes/files/rules/javascript-syntax.json
+++ b/src/schemes/files/rules/javascript-syntax.json
@@ -45,7 +45,7 @@
         "foreground": "var(blue)"
     },
     {
-        "name": "[JavaScript] Class",
+        "name": "[JavaScript] Storage",
         "scope": "storage.type.class.js",
         "foreground": "var(red)"
     },
diff --git a/src/schemes/files/rules/markdown-syntax.json b/src/schemes/files/rules/markdown-syntax.json
index 76319666..18124e73 100644
--- a/src/schemes/files/rules/markdown-syntax.json
+++ b/src/schemes/files/rules/markdown-syntax.json
@@ -33,8 +33,13 @@
     },
     {
         "name": "[Markdown] Link Description",
-        "scope": "entity.name.reference.link.markdown, string.other.link.description.title.markdown",
-        "foreground": "var(magenta)"
+        "scope": "markup.list.unnumbered.markdown meta.paragraph.list.markdown meta.link.inline.description.markdown, meta.block-level.markdown markup.quote.markdown meta.link.inline.description.markdown",
+        "foreground": "var(yellow)"
+    },
+    {
+        "name": "[Markdown] Image Inline",
+        "scope": "meta.paragraph.markdown meta.link.inline.description.markdown meta.image.inline.description.markdown, meta.paragraph.markdown meta.image.inline.description.markdown",
+        "foreground": "var(orange)"
     },
     {
         "name": "[Markdown] Bold",
@@ -63,11 +68,6 @@
         "scope": "markup.list.numbered.bullet",
         "foreground": "var(green)"
     },
-    {
-        "name": "[Markdown] Blockquote",
-        "scope": "markup.quote punctuation.definition.blockquote, markup.list punctuation.definition.list_item",
-        "foreground": "var(magenta)"
-    },
     {
         "name": "[Markdown] Code Inline",
         "scope": "markup.raw.inline",
@@ -75,12 +75,17 @@
     },
     {
         "name": "[Markdown] Code Block",
-        "scope": "markup.raw.block.markdown",
+        "scope": "meta.paragraph.markdown meta.code-fence.definition.begin.text.markdown-gfm, meta.paragraph.markdown meta.code-fence.definition.end.text.markdown-gfm, meta.paragraph.markdown markup.raw.code-fence.markdown-gfm",
         "background": "color(var(blue) alpha(0.05))"
     },
     {
         "name": "[Markdown] Punctuation",
         "scope": "(text punctuation.definition.italic | text punctuation.definition.bold)",
         "foreground": "var(magenta)"
+    },
+    {
+        "name": "[Markdown] Blockquotes",
+        "scope": "text.html.markdown meta.block-level.markdown markup.quote.markdown",
+        "font_style": "italic"
     }
 ]
diff --git a/src/themes/variables.json b/src/themes/variables.json
index 0444045d..7deffe45 100644
--- a/src/themes/variables.json
+++ b/src/themes/variables.json
@@ -22,8 +22,8 @@
     "panel_row_selected_foreground_color"       : ["background", 1],
     "panel_row_match_foreground_color"          : "var(color_accent)",
     "panel_row_selected_match_foreground_color" : "var(color_accent)",
-    "input_background_color"                    : ["background", 1],
-    "input_border_color"                        : "var(panel_control_background_color)",
+    "input_background_color"                    : ["foreground", 0.05],
+    "input_border_color"                        : ["background", 1],
     "input_border_size"                         : 1,
     "input_border_margin"                       : [12, 8, 12, 8],
     "sidebar_background_color"                  : ["background", 0.92],
@@ -42,7 +42,7 @@
     "tabset_font_size"                          : "var(font_size_sm)",
     "tabset_background_color"                   : ["background", 0.92],
     "tabset_selected_border_color"              : "var(color_accent)",
-    "tabset_selected_border_size"               : [0, 2, 0, 0],
+    "tabset_selected_border_size"               : [0, 1, 0, 0],
     "tabset_diff_color"                         : "var(--bluish)",
     "tabset_diff_italic"                        : true,
     "tabset_height"                             : 40,