From cba20b50c0d65cb39f45b3aabcd5a2c15e663ac5 Mon Sep 17 00:00:00 2001
From: Mauro Reis Vieira <mauroreisvieira@gmail.com>
Date: Fri, 25 Jan 2019 21:06:58 +0000
Subject: [PATCH] feat: added new Scheme: "Meetio Ocean"

---
 Meetio.json                                   | 104 ++---
 Meetio.sublime-theme                          |  17 +-
 README.md                                     |  20 +
 schemes/Meetio-Darker.sublime-color-scheme    |  56 +--
 schemes/Meetio-Lighter.sublime-color-scheme   |  48 +--
 schemes/Meetio-Ocean.sublime-color-scheme     | 379 ++++++++++++++++++
 schemes/Meetio-Palenight.sublime-color-scheme | 327 ++++++++++++++-
 schemes/Meetio.sublime-color-scheme           | 238 +----------
 src/schemes/Meetio-Darker.json                |  11 +-
 src/schemes/Meetio-Lighter.json               |   3 +-
 src/schemes/Meetio-Ocean.json                 | 379 ++++++++++++++++++
 src/schemes/Meetio-Palenight.json             |  27 +-
 src/schemes/Meetio.json                       |   3 +-
 src/themes/default/inputs.json                |   9 +-
 src/themes/variables.json                     |   2 +
 15 files changed, 1205 insertions(+), 418 deletions(-)
 create mode 100644 schemes/Meetio-Ocean.sublime-color-scheme
 create mode 100644 src/schemes/Meetio-Ocean.json

diff --git a/Meetio.json b/Meetio.json
index 76ca71fb..1576b7ad 100644
--- a/Meetio.json
+++ b/Meetio.json
@@ -20,6 +20,11 @@
             "background",
             1
         ],
+        "input_border_size": 0,
+        "input_border_color": [
+            "foreground",
+            0
+        ],
         "panel_control_background_color": [
             "background",
             0.94
@@ -28,20 +33,20 @@
             "background",
             0.92
         ],
+        "sidebar_icon_folder_color": "var(color_accent)",
+        "sidebar_icon_folder_expanded_color": "var(color_accent)",
         "sidebar_label_foreground_color": [
             "foreground",
             0.8
         ],
-        "sidebar_label_selected_foreground_color": [
-            "foreground",
-            0.9
-        ],
-        "sidebar_icon_folder_color": "var(color_accent)",
-        "sidebar_icon_folder_expanded_color": "var(color_accent)",
         "sidebar_label_selected_background_color": [
             "foreground",
             0.05
         ],
+        "sidebar_label_selected_foreground_color": [
+            "foreground",
+            0.9
+        ],
         "status_bar_background_color": "color(var(color_accent) blenda(var(color_black) 30%))",
         "status_bar_label_foreground_color": "var(color_white)",
         "tabset_background_color": [
@@ -124,6 +129,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)",
@@ -522,40 +561,6 @@
             ],
             "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"
-            ],
-            "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": "dialog",
             "layer0.tint": [
@@ -718,14 +723,8 @@
                 9
             ]
         },
-        {
-            "class": "grid_layout_control",
-            "border_color": "color(var(color_accent) blenda(var(color_black) 30%))",
-            "border_size": 2
-        },
         {
             "class": "text_line_control",
-            "layer0.texture": "",
             "layer0.opacity": 1,
             "layer0.inner_margin": [
                 20,
@@ -733,6 +732,10 @@
                 20,
                 5
             ],
+            "layer1.tint": "var(input_border_color)",
+            "layer1.opacity": 1,
+            "layer1.inner_margin": "var(input_border_size)",
+            "layer1.draw_center": false,
             "tint_index": 1,
             "layer0.tint": "var(input_background_color)",
             "content_margin": [
@@ -753,6 +756,7 @@
                     "class": "overlay_control"
                 }
             ],
+            "layer1.opacity": 0,
             "content_margin": [
                 52,
                 10,
@@ -770,6 +774,7 @@
                     "class": "overlay_control"
                 }
             ],
+            "layer1.opacity": 0,
             "layer2.inner_margin": [
                 52,
                 48,
@@ -795,6 +800,7 @@
                     "class": "switch_project_window"
                 }
             ],
+            "layer1.opacity": 0,
             "content_margin": [
                 52,
                 10,
@@ -822,6 +828,7 @@
             "layer2.texture": "Meetio/assets/default/icon_search.png",
             "layer2.tint": "var(color_accent)",
             "layer2.opacity": 1,
+            "layer1.opacity": 0,
             "settings": [
                 "meetio_input_search_icon"
             ]
@@ -847,6 +854,11 @@
             ],
             "layer0.opacity": 0.8
         },
+        {
+            "class": "grid_layout_control",
+            "border_color": "color(var(color_accent) blenda(var(color_black) 30%))",
+            "border_size": 2
+        },
         {
             "class": "label_control",
             "fg": [
diff --git a/Meetio.sublime-theme b/Meetio.sublime-theme
index f1db0031..dc86f90b 100644
--- a/Meetio.sublime-theme
+++ b/Meetio.sublime-theme
@@ -21,6 +21,11 @@
             "background",
             1
         ],
+        "input_border_size": 0,
+        "input_border_color": [
+            "foreground",
+            0
+        ],
         "panel_control_background_color": [
             "background",
             0.94
@@ -29,20 +34,20 @@
             "background",
             0.92
         ],
+        "sidebar_icon_folder_color": "var(color_accent)",
+        "sidebar_icon_folder_expanded_color": "var(color_accent)",
         "sidebar_label_foreground_color": [
             "foreground",
             0.8
         ],
-        "sidebar_label_selected_foreground_color": [
-            "foreground",
-            0.9
-        ],
-        "sidebar_icon_folder_color": "var(color_accent)",
-        "sidebar_icon_folder_expanded_color": "var(color_accent)",
         "sidebar_label_selected_background_color": [
             "foreground",
             0.05
         ],
+        "sidebar_label_selected_foreground_color": [
+            "foreground",
+            0.9
+        ],
         "status_bar_background_color": "color(var(color_accent) blenda(var(color_black) 30%))",
         "status_bar_label_foreground_color": "var(color_white)",
         "tabset_background_color": [
diff --git a/README.md b/README.md
index 8b296af1..cad945d9 100755
--- a/README.md
+++ b/README.md
@@ -100,6 +100,26 @@ You can also open the settings from the command palette by searching `Meetio: Th
   }
 ```
 
+### Do you like Material Theme?
+Just past the follow options in `Meetio: Theme Configuration`.
+
+```json
+  "sidebar_background_color": ["background", 1.0],
+  "sidebar_icon_folder_color": "#607a86",
+  "sidebar_icon_folder_color": "#607a86",
+  "sidebar_label_foreground_color": "#607a86",
+  "sidebar_label_selected_background_color": "#00000015",
+  "sidebar_label_selected_foreground_color": "var(color_accent)",
+  "status_bar_background_color": ["background", 1.0],
+  "status_bar_label_foreground_color": "#607a86",
+  "tabset_background_color": ["background", 1.0],
+  "title_bar_background": ["background", 1.0],
+  "panel_control_background_color": ["background", 1.0],
+  "title_bar_foreground_color": "#607a86",
+  "input_border_size": [0, 0, 0, 1],
+  "input_border_color": ["foreground", 0.1],
+```
+
 ### Recommended settings for a better experience:
 
 ```json
diff --git a/schemes/Meetio-Darker.sublime-color-scheme b/schemes/Meetio-Darker.sublime-color-scheme
index 4a1e716d..40bf8080 100644
--- a/schemes/Meetio-Darker.sublime-color-scheme
+++ b/schemes/Meetio-Darker.sublime-color-scheme
@@ -3,16 +3,17 @@
     "author": "Mauro Reis Vieira <mauroreisvieira@gmail.com",
     "variables": {
         "primary"     : "#7dcac4",
+        "foreground"  : "#fefefe",
         "background"  : "#212121",
         "black"       : "#121212",
-        "blue"        : "#64b5f6",
+        "blue"        : "#82aaff",
         "cyan"        : "#89ddff",
         "gray"        : "#65737e",
-        "green"       : "#81c784",
+        "green"       : "#c3e88d",
         "orange"      : "#f78c6c",
         "pink"        : "#f06292",
-        "purple"      : "#ba68c8",
-        "red"         : "#f07178",
+        "purple"      : "#bb80b3",
+        "red"         : "#ff5370",
         "deep-orange" : "#f97b58",
         "light-blue"  : "#e1f5fe",
         "deep-purple" : "#b39ddb",
@@ -20,7 +21,7 @@
         "yellow"      : "#ffcb6b"
     },
    "globals": {
-        "foreground"                  : "var(white)",
+        "foreground"                  : "var(foreground)",
         "background"                  : "var(background)",
         "caret"                       : "var(yellow)",
         "line_highlight"              : "color(var(white) alpha(0.1))",
@@ -44,51 +45,6 @@
         "tags_options"                : "stippled_underline"
     },
     "rules": [
-        {
-            "background": "#000000",
-            "foreground": "#ffffff",
-            "scope": "col_gutter"
-        },
-        {
-            "background": "#7B88CCFF",
-            "foreground": "#0B0B0BFF",
-            "scope": "col_7B88CCFF"
-        },
-        {
-            "background": "#455A64FF",
-            "foreground": "#D4D4D4FF",
-            "scope": "col_455A64FF"
-        },
-        {
-            "background": "#A3A3A3FF",
-            "foreground": "#232323FF",
-            "scope": "col_A3A3A3FF"
-        },
-        {
-            "background": "#C1685CFF",
-            "foreground": "#010101FF",
-            "scope": "col_C1685CFF"
-        },
-        {
-            "background": "#479E8EFF",
-            "foreground": "#020202FF",
-            "scope": "col_479E8EFF"
-        },
-        {
-            "background": "#7DCAC4FF",
-            "foreground": "#323232FF",
-            "scope": "col_7DCAC4FF"
-        },
-        {
-            "background": "#D33131FF",
-            "foreground": "#E1E1E1FF",
-            "scope": "col_D33131FF"
-        },
-        {
-            "background": "#FFFFFFFF",
-            "foreground": "#7F7F7FFF",
-            "scope": "col_FFFFFFFF"
-        },
         {
             "name": "Comment",
             "scope": "comment, punctuation.definition.comment",
diff --git a/schemes/Meetio-Lighter.sublime-color-scheme b/schemes/Meetio-Lighter.sublime-color-scheme
index 6de68594..fea77d53 100644
--- a/schemes/Meetio-Lighter.sublime-color-scheme
+++ b/schemes/Meetio-Lighter.sublime-color-scheme
@@ -3,6 +3,7 @@
     "author": "Mauro Reis Vieira <mauroreisvieira@gmail.com",
     "variables": {
         "primary"     : "#7dcac4",
+        "foreground"  : "#40525a",
         "background"  : "#fafafa",
         "black"       : "#40525a",
         "blue"        : "#6181b8",
@@ -20,7 +21,7 @@
         "yellow"      : "#ffb62e"
     },
       "globals": {
-        "foreground"                  : "var(black)",
+        "foreground"                  : "var(foreground)",
         "background"                  : "var(background)",
         "caret"                       : "var(yellow)",
         "line_highlight"              : "color(var(black) alpha(0.1))",
@@ -44,51 +45,6 @@
         "tags_options"                : "stippled_underline"
     },
     "rules": [
-        {
-            "background": "#000000",
-            "foreground": "#ffffff",
-            "scope": "col_gutter"
-        },
-        {
-            "background": "#7B88CCFF",
-            "foreground": "#0B0B0BFF",
-            "scope": "col_7B88CCFF"
-        },
-        {
-            "background": "#455A64FF",
-            "foreground": "#D4D4D4FF",
-            "scope": "col_455A64FF"
-        },
-        {
-            "background": "#A3A3A3FF",
-            "foreground": "#232323FF",
-            "scope": "col_A3A3A3FF"
-        },
-        {
-            "background": "#C1685CFF",
-            "foreground": "#010101FF",
-            "scope": "col_C1685CFF"
-        },
-        {
-            "background": "#479E8EFF",
-            "foreground": "#020202FF",
-            "scope": "col_479E8EFF"
-        },
-        {
-            "background": "#7DCAC4FF",
-            "foreground": "#323232FF",
-            "scope": "col_7DCAC4FF"
-        },
-        {
-            "background": "#D33131FF",
-            "foreground": "#E1E1E1FF",
-            "scope": "col_D33131FF"
-        },
-        {
-            "background": "#FFFFFFFF",
-            "foreground": "#7F7F7FFF",
-            "scope": "col_FFFFFFFF"
-        },
         {
             "name": "Comment",
             "scope": "comment, punctuation.definition.comment",
diff --git a/schemes/Meetio-Ocean.sublime-color-scheme b/schemes/Meetio-Ocean.sublime-color-scheme
new file mode 100644
index 00000000..aa4c4e7a
--- /dev/null
+++ b/schemes/Meetio-Ocean.sublime-color-scheme
@@ -0,0 +1,379 @@
+{
+    "name": "Meetio-Ocean",
+    "author": "Mauro Reis Vieira <mauroreisvieira@gmail.com",
+    "variables": {
+        "primary"     : "#7dcac4",
+        "foreground"  : "#fefefe",
+        "background"  : "#193448",
+        "black"       : "#546d79",
+        "blue"        : "#40c4fe",
+        "cyan"        : "#9effff",
+        "gray"        : "#3d3d3d",
+        "green"       : "#9eff80",
+        "orange"      : "#da8f49",
+        "pink"        : "#ffa5f3",
+        "purple"      : "#967efb",
+        "red"         : "#ed6e74",
+        "deep-orange" : "#f97b58",
+        "light-blue"  : "#e1f5fe",
+        "deep-purple" : "#c2afff",
+        "white"       : "#fefefe",
+        "yellow"      : "#ffc600"
+    },
+    "globals": {
+        "foreground"                  : "var(foreground)",
+        "background"                  : "var(background)",
+        "caret"                       : "var(yellow)",
+        "line_highlight"              : "color(var(white) alpha(0.1))",
+        "selection"                   : "color(var(light-blue) alpha(0.1))",
+        "selection_border"            : "var(blue)",
+        "inactive_selection"          : "color(var(light-blue) alpha(0.1))",
+        "misspelling"                 : "var(red)",
+        "shadow"                      : "color(var(background) alpha(0.5))",
+        "accent"                      : "var(primary)",
+        "active_guide"                : "var(cyan)",
+        "stack_guide"                 : "var(cyan)",
+        "highlight"                   : "var(cyan)",
+        "fold_marker"                 : "var(yellow)",
+        "find_highlight_foreground"   : "var(gray)",
+        "find_highlight"              : "var(yellow)",
+        "brackets_options"            : "underline",
+        "brackets_foreground"         : "var(orange)",
+        "bracket_contents_options"    : "underline",
+        "bracket_contents_foreground" : "var(cyan)",
+        "tags_foreground"             : "var(deep-purple)",
+        "tags_options"                : "stippled_underline"
+    },
+    "rules": [
+        {
+            "name": "Comment",
+            "scope": "comment, punctuation.definition.comment",
+            "foreground": "color(var(white) alpha(0.3))"
+        },
+        {
+            "name": "String",
+            "scope": "string",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "Number",
+            "scope": "constant.numeric",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "User-defined constant",
+            "scope": "constant.character, constant.other",
+            "foreground": "var(deep-purple)"
+        },
+        {
+            "name": "Member Variable",
+            "scope": "variable.member",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "Keyword",
+            "scope": "keyword - keyword.operator, keyword.operator.word",
+            "foreground": "var(deep-purple)"
+        },
+        {
+            "name": "Operator, Misc",
+            "scope": "keyword.operator, constant.other.color, punctuation, meta.tag, punctuation.definition.tag, punctuation.separator.inheritance.php, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html, punctuation.section.embedded, keyword.other.template, keyword.other.substitution",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "Punctuation",
+            "scope": "punctuation.terminator, punctuation.section",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "Punctuation",
+            "scope": "punctuation.section",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "Annotation Punctuation",
+            "scope": "punctuation.definition.annotation",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "Variable SASS",
+            "scope": "variable.other.php, variable.other.sass, variable.other.scss",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "JavaScript Dollar",
+            "scope": "variable.other.dollar.only.js, variable.other.object.dollar.only.js, variable.type.dollar.only.js, support.class.dollar.only.js",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "Class, Support",
+            "scope": "entity.name.class, entity.name.type.class, support.other.namespace.use.php, meta.use.php, support.other.namespace.php, markup.changed.git_gutter, support.type.sys-types",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "HTML Attributes",
+            "scope": "text.html.basic entity.other.attribute-name.html, text.html.basic entity.other.attribute-name",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "CSS Classes",
+            "scope": "entity.other.attribute-name.class",
+            "foreground": "var(deep-purple)"
+        },
+        {
+            "name": "CSS Class and Support",
+            "scope": "source.css support.type, source.sass support.type, source.scss support.type, source.less support.type, source.stylus support.type",
+            "foreground": "var(white)"
+        },
+        {
+            "name": "Sub Methods",
+            "scope": "entity.name.module.js, variable.import.parameter.js, variable.other.class.js",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "Meta Method Javascript",
+            "scope": "meta.class-method.js entity.name.function.js, variable.function.constructor",
+            "foreground": "var(pink)"
+        },
+        {
+            "name": "Storage",
+            "scope": "storage",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "Storage type",
+            "scope": "storage.type",
+            "foreground": "var(deep-purple)",
+            "font_style": "italic"
+        },
+        {
+            "name": "Entity name",
+            "scope": "entity.name.function",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "Entity name",
+            "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "Inherited class",
+            "scope": "entity.other.inherited-class",
+            "foreground": "var(cyan)",
+            "font_style": "italic underline"
+        },
+        {
+            "name": "Function argument",
+            "scope": "variable.parameter",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "Language variable",
+            "scope": "variable.language",
+            "foreground": "var(red)",
+            "font_style": "italic"
+        },
+        {
+            "name": "Tag name",
+            "scope": "entity.name.tag",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "Tag attribute",
+            "scope": "entity.other.attribute-name",
+            "foreground": "var(deep-purple)"
+        },
+        {
+            "name": "Function call",
+            "scope": "variable.function, variable.annotation",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "Library function",
+            "scope": "support.function, support.macro",
+            "foreground": "var(blue)",
+            "font_style": "italic"
+        },
+        {
+            "name": "Library constant",
+            "scope": "support.constant",
+            "foreground": "var(deep-purple)"
+        },
+        {
+            "name": "Library class/type",
+            "scope": "support.type, support.class",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "Invalid",
+            "scope": "invalid",
+            "foreground": "var(white)",
+            "background": "var(red)"
+        },
+        {
+            "name": "Invalid deprecated",
+            "scope": "invalid.deprecated",
+            "foreground": "var(white)",
+            "background": "var(purple)"
+        },
+        {
+            "name": "YAML Key",
+            "scope": "entity.name.tag.yaml",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "YAML String",
+            "scope": "source.yaml string.unquoted",
+            "foreground": "var(foreground)"
+        },
+        {
+            "name": "diff.header",
+            "scope": "meta.diff, meta.diff.header",
+            "foreground": "var(deep-purple)"
+        },
+        {
+            "name": "diff.deleted",
+            "scope": "markup.deleted",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "diff.inserted",
+            "scope": "markup.inserted",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "diff.changed",
+            "scope": "markup.changed",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "CSS Properties",
+            "scope": "support.type.property-name",
+            "foreground": "var(foreground)"
+        },
+        {
+            "scope": "constant.numeric.line-number.match",
+            "foreground": "var(red)"
+        },
+        {
+            "scope": "message.error",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "JSON Key - Level 0",
+            "scope": "source.json meta.structure.dictionary.json string.quoted.double.json - meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta.structure.dictionary.json punctuation.definition.string - meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string",
+            "foreground": "var(deep-purple)"
+        },
+        {
+            "name": "JSON Key - Level 1",
+            "scope": "source.json meta meta.structure.dictionary.json string.quoted.double.json - meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta.structure.dictionary.json punctuation.definition.string - meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "JSON Key - Level 2",
+            "scope": "source.json meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "JSON Key - Level 3",
+            "scope": "source.json meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "JSON Key - Level 4",
+            "scope": "source.json meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "JSON Key - Level 5",
+            "scope": "source.json meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string",
+            "foreground": "var(deep-orange)"
+        },
+        {
+            "name": "JSON Key - Level 6",
+            "scope": "source.json meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "JSON Key - Level 7",
+            "scope": "source.json meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string",
+            "foreground": "var(purple)"
+        },
+        {
+            "name": "markup headings",
+            "scope": "markup.heading",
+            "font_style": "bold"
+        },
+        {
+            "name": "markup headings",
+            "scope": "markup.heading punctuation.definition.heading",
+            "foreground": "var(deep-orange)"
+        },
+        {
+            "name": "markup h1",
+            "scope": "markup.heading.1 punctuation.definition.heading",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "markup links",
+            "scope": "string.other.link, markup.underline.link",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "markup bold",
+            "scope": "markup.bold",
+            "font_style": "bold",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "markup italic",
+            "scope": "markup.italic",
+            "font_style": "italic"
+        },
+        {
+            "name": "markup bold/italic",
+            "scope": "markup.italic markup.bold | markup.bold markup.italic",
+            "font_style": "bold italic"
+        },
+        {
+            "name": "markup hr",
+            "scope": "punctuation.definition.thematic-break",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "markup numbered list bullet",
+            "scope": "markup.list.numbered.bullet",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "markup blockquote",
+            "scope": "markup.quote punctuation.definition.blockquote, markup.list punctuation.definition.list_item",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "markup code",
+            "scope": "markup.raw",
+            "background": "color(var(light-blue) alpha(0.1))"
+        },
+        {
+            "name": "markup code",
+            "scope": "markup.raw.inline",
+            "background": "color(var(light-blue) alpha(0.1))"
+        },
+        {
+            "name": "markup punctuation",
+            "scope": "(text punctuation.definition.italic | text punctuation.definition.bold)",
+            "foreground": "var(deep-purple)"
+        },
+        {
+            "name": "Number, Constant, Function Argument, Tag Attribute, Embedded",
+            "scope": "constant.numeric, constant.language, support.constant, constant.character, variable.parameter, keyword.other.unit",
+            "foreground": "var(deep-orange)"
+        },
+        {
+            "name": "Object Keys",
+            "scope": "string.unquoted.label.js, meta.object-literal.key.js, string.unquoted.label.jsx, meta.object-literal.key.jsx, string.unquoted.label.ts, meta.object-literal.key.ts, meta.function.return-type.ts, meta.function.parameters.ts",
+            "foreground": "var(red)"
+        }
+    ]
+}
diff --git a/schemes/Meetio-Palenight.sublime-color-scheme b/schemes/Meetio-Palenight.sublime-color-scheme
index 31d5d1f3..02f5f648 100644
--- a/schemes/Meetio-Palenight.sublime-color-scheme
+++ b/schemes/Meetio-Palenight.sublime-color-scheme
@@ -3,24 +3,25 @@
     "author": "Mauro Reis Vieira <mauroreisvieira@gmail.com",
     "variables": {
         "primary"     : "#7dcac4",
-        "background"  : "#193448",
-        "black"       : "#546d79",
-        "blue"        : "#40c4fe",
-        "cyan"        : "#9effff",
+        "foreground"  : "#a6accd",
+        "background"  : "#292d3e",
+        "black"       : "#000000",
+        "blue"        : "#82aaff",
+        "cyan"        : "#89ddff",
         "gray"        : "#3d3d3d",
-        "green"       : "#9eff80",
-        "orange"      : "#da8f49",
-        "pink"        : "#ffa5f3",
-        "purple"      : "#967efb",
-        "red"         : "#ed6e74",
+        "green"       : "#c3e88d",
+        "orange"      : "#f78c6c",
+        "pink"        : "#f07178",
+        "purple"      : "#c792ea",
+        "red"         : "#ff5370",
         "deep-orange" : "#f97b58",
-        "light-blue"  : "#e1f5fe",
+        "light-blue"  : "#b2ccd6",
         "deep-purple" : "#c2afff",
-        "white"       : "#fefefe",
-        "yellow"      : "#ffc600"
+        "white"       : "#ffffff",
+        "yellow"      : "#ffcb6b"
     },
     "globals": {
-        "foreground"                  : "var(white)",
+        "foreground"                  : "var(foreground)",
         "background"                  : "var(background)",
         "caret"                       : "var(yellow)",
         "line_highlight"              : "color(var(white) alpha(0.1))",
@@ -44,6 +45,306 @@
         "tags_options"                : "stippled_underline"
     },
     "rules": [
+        {
+            "foreground": "#D4D4D4FF",
+            "background": "#455A64FF",
+            "scope": "col_455A64FF"
+        },
+        {
+            "foreground": "#010101FF",
+            "background": "#C1685CFF",
+            "scope": "col_C1685CFF"
+        },
+        {
+            "foreground": "#232323FF",
+            "background": "#A3A3A3FF",
+            "scope": "col_A3A3A3FF"
+        },
+        {
+            "foreground": "#E1E1E1FF",
+            "background": "#D33131FF",
+            "scope": "col_D33131FF"
+        },
+        {
+            "foreground": "#0B0B0BFF",
+            "background": "#7B88CCFF",
+            "scope": "col_7B88CCFF"
+        },
+        {
+            "foreground": "#FDFDFDFF",
+            "background": "#D95757FF",
+            "scope": "col_D95757FF"
+        },
+        {
+            "foreground": "#171717FF",
+            "background": "#F07178FF",
+            "scope": "col_F07178FF"
+        },
+        {
+            "foreground": "#FDFDFDFF",
+            "background": "#6181B8FF",
+            "scope": "col_6181B8FF"
+        },
+        {
+            "foreground": "#323232FF",
+            "background": "#7DCAC4FF",
+            "scope": "col_7DCAC4FF"
+        },
+        {
+            "foreground": "#4F4F4FFF",
+            "background": "#FFCB6BFF",
+            "scope": "col_FFCB6BFF"
+        },
+        {
+            "foreground": "#272727FF",
+            "background": "#C692C6FF",
+            "scope": "col_C692C6FF"
+        },
+        {
+            "foreground": "#3D3D3DFF",
+            "background": "#C2AFFFFF",
+            "scope": "col_C2AFFFFF"
+        },
+        {
+            "foreground": "#3A3A3AFF",
+            "background": "#F9AE58FF",
+            "scope": "col_F9AE58FF"
+        },
+        {
+            "foreground": "#2A2A2AFF",
+            "background": "#B39DDBFF",
+            "scope": "col_B39DDBFF"
+        },
+        {
+            "foreground": "#616161FF",
+            "background": "#9EFFFFFF",
+            "scope": "col_9EFFFFFF"
+        },
+        {
+            "foreground": "#282828FF",
+            "background": "#F78C6CFF",
+            "scope": "col_F78C6CFF"
+        },
+        {
+            "foreground": "#FBFBFBFF",
+            "background": "#6772E4FF",
+            "scope": "col_6772E4FF"
+        },
+        {
+            "foreground": "#232323FF",
+            "background": "#40C4FEFF",
+            "scope": "col_40C4FEFF"
+        },
+        {
+            "foreground": "#0B0B0BFF",
+            "background": "#BA68C8FF",
+            "scope": "col_BA68C8FF"
+        },
+        {
+            "foreground": "#7F7F7FFF",
+            "background": "#FFFFFFFF",
+            "scope": "col_FFFFFFFF"
+        },
+        {
+            "foreground": "#404040FF",
+            "background": "#FFC600FF",
+            "scope": "col_FFC600FF"
+        },
+        {
+            "foreground": "#3C3C3CFF",
+            "background": "#FFB62EFF",
+            "scope": "col_FFB62EFF"
+        },
+        {
+            "foreground": "#242424FF",
+            "background": "#64B5F6FF",
+            "scope": "col_64B5F6FF"
+        },
+        {
+            "foreground": "#535353FF",
+            "background": "#9EFF80FF",
+            "scope": "col_9EFF80FF"
+        },
+        {
+            "foreground": "#1C1C1CFF",
+            "background": "#F97B58FF",
+            "scope": "col_F97B58FF"
+        },
+        {
+            "foreground": "#E6E6E6FF",
+            "background": "#546D79FF",
+            "scope": "col_546D79FF"
+        },
+        {
+            "foreground": "#141414FF",
+            "background": "#ED6E74FF",
+            "scope": "col_ED6E74FF"
+        },
+        {
+            "foreground": "#A1A1A1FF",
+            "background": "#212121FF",
+            "scope": "col_212121FF"
+        },
+        {
+            "foreground": "#333333FF",
+            "background": "#97C892FF",
+            "scope": "col_97C892FF"
+        },
+        {
+            "foreground": "#BDBDBDFF",
+            "background": "#3D3D3DFF",
+            "scope": "col_3D3D3DFF"
+        },
+        {
+            "foreground": "#2A2A2AFF",
+            "background": "#81C784FF",
+            "scope": "col_81C784FF"
+        },
+        {
+            "foreground": "#B2B2B2FF",
+            "background": "#2C343BFF",
+            "scope": "col_2C343BFF"
+        },
+        {
+            "foreground": "#333333FF",
+            "background": "#80CBC4FF",
+            "scope": "col_80CBC4FF"
+        },
+        {
+            "foreground": "#090909FF",
+            "background": "#FF5370FF",
+            "scope": "col_FF5370FF"
+        },
+        {
+            "foreground": "#4B4B4BFF",
+            "background": "#FBC959FF",
+            "scope": "col_FBC959FF"
+        },
+        {
+            "foreground": "#AEAEAEFF",
+            "background": "#193448FF",
+            "scope": "col_193448FF"
+        },
+        {
+            "foreground": "#7A7A7AFF",
+            "background": "#FAFAFAFF",
+            "scope": "col_FAFAFAFF"
+        },
+        {
+            "foreground": "#6F6F6FFF",
+            "background": "#EFEFEFFF",
+            "scope": "col_EFEFEFFF"
+        },
+        {
+            "foreground": "#3F3F3FFF",
+            "background": "#81D4FAFF",
+            "scope": "col_81D4FAFF"
+        },
+        {
+            "foreground": "#7E7E7EFF",
+            "background": "#FEFEFEFF",
+            "scope": "col_FEFEFEFF"
+        },
+        {
+            "foreground": "#404040FF",
+            "background": "#FFB266FF",
+            "scope": "col_FFB266FF"
+        },
+        {
+            "foreground": "#020202FF",
+            "background": "#479E8EFF",
+            "scope": "col_479E8EFF"
+        },
+        {
+            "foreground": "#EFEFEFFF",
+            "background": "#7C4DFFFF",
+            "scope": "col_7C4DFFFF"
+        },
+        {
+            "foreground": "#F0F0F0FF",
+            "background": "#65737EFF",
+            "scope": "col_65737EFF"
+        },
+        {
+            "foreground": "#707070FF",
+            "background": "#E1F5FEFF",
+            "scope": "col_E1F5FEFF"
+        },
+        {
+            "foreground": "#181818FF",
+            "background": "#5BB3B4FF",
+            "scope": "col_5BB3B4FF"
+        },
+        {
+            "foreground": "#1D1D1DFF",
+            "background": "#DA8F49FF",
+            "scope": "col_DA8F49FF"
+        },
+        {
+            "foreground": "#EAEAEAFF",
+            "background": "#E53734FF",
+            "scope": "col_E53734FF"
+        },
+        {
+            "foreground": "#474747FF",
+            "background": "#89DDFFFF",
+            "scope": "col_89DDFFFF"
+        },
+        {
+            "foreground": "#2B2B2BFF",
+            "background": "#C792EAFF",
+            "scope": "col_C792EAFF"
+        },
+        {
+            "foreground": "#090909FF",
+            "background": "#FF526FFF",
+            "scope": "col_FF526FFF"
+        },
+        {
+            "foreground": "#111111FF",
+            "background": "#F06292FF",
+            "scope": "col_F06292FF"
+        },
+        {
+            "foreground": "#131313FF",
+            "background": "#967EFBFF",
+            "scope": "col_967EFBFF"
+        },
+        {
+            "foreground": "#484848FF",
+            "background": "#FFA5F3FF",
+            "scope": "col_FFA5F3FF"
+        },
+        {
+            "foreground": "#0E0E0EFF",
+            "background": "#6398CEFF",
+            "scope": "col_6398CEFF"
+        },
+        {
+            "foreground": "#929292FF",
+            "background": "#121212FF",
+            "scope": "col_121212FF"
+        },
+        {
+            "foreground": "#ffffff",
+            "background": "#000000",
+            "scope": "col_gutter"
+        },
+        {
+            "foreground": "#F3F3F3FF",
+            "background": "#607A86FF",
+            "scope": "col_607A86FF"
+        },
+        {
+            "foreground": "#A9A9A9FF",
+            "background": "#00000015",
+            "scope": "col_00000015"
+        },
+        {
+            "foreground": "#272727FF",
+            "background": "#82AAFFFF",
+            "scope": "col_82AAFFFF"
+        },
         {
             "name": "Comment",
             "scope": "comment, punctuation.definition.comment",
diff --git a/schemes/Meetio.sublime-color-scheme b/schemes/Meetio.sublime-color-scheme
index d565b067..1691b974 100644
--- a/schemes/Meetio.sublime-color-scheme
+++ b/schemes/Meetio.sublime-color-scheme
@@ -4,6 +4,7 @@
     "variables": {
         "primary"     : "#7dcac4",
         "background"  : "#263137",
+        "foreground"  : "#fefefe",
         "black"       : "#121212",
         "blue"        : "#6398ce",
         "cyan"        : "#5bb3b4",
@@ -20,7 +21,7 @@
         "yellow"      : "#fbc959"
     },
    "globals": {
-        "foreground"                  : "var(white)",
+        "foreground"                  : "var(foreground)",
         "background"                  : "var(background)",
         "caret"                       : "var(yellow)",
         "line_highlight"              : "color(var(white) alpha(0.1))",
@@ -44,241 +45,6 @@
         "tags_options"                : "stippled_underline"
     },
     "rules": [
-        {
-            "background": "#1A1C1DC7",
-            "foreground": "#9F9F9FFF",
-            "scope": "col_1A1C1DC7"
-        },
-        {
-            "background": "#263238C7",
-            "foreground": "#AEAEAEFF",
-            "scope": "col_263238C7"
-        },
-        {
-            "background": "#11111101",
-            "foreground": "#AEAEAEFF",
-            "scope": "col_11111101"
-        },
-        {
-            "background": "#11111111",
-            "foreground": "#ACACACFF",
-            "scope": "col_11111111"
-        },
-        {
-            "background": "#111111FF",
-            "foreground": "#919191FF",
-            "scope": "col_111111FF"
-        },
-        {
-            "background": "#22222222",
-            "foreground": "#ACACACFF",
-            "scope": "col_22222222"
-        },
-        {
-            "background": "#222222FF",
-            "foreground": "#A2A2A2FF",
-            "scope": "col_222222FF"
-        },
-        {
-            "background": "#65737EFF",
-            "foreground": "#F0F0F0FF",
-            "scope": "col_65737EFF"
-        },
-        {
-            "background": "#C3E88DFF",
-            "foreground": "#525252FF",
-            "scope": "col_C3E88DFF"
-        },
-        {
-            "background": "#FFCC00FF",
-            "foreground": "#434343FF",
-            "scope": "col_FFCC00FF"
-        },
-        {
-            "background": "#F78C6CFF",
-            "foreground": "#282828FF",
-            "scope": "col_F78C6CFF"
-        },
-        {
-            "background": "#546E7AFF",
-            "foreground": "#E7E7E7FF",
-            "scope": "col_546E7AFF"
-        },
-        {
-            "background": "#80CBC420",
-            "foreground": "#BFBFBFFF",
-            "scope": "col_80CBC420"
-        },
-        {
-            "background": "#82AAFFFF",
-            "foreground": "#272727FF",
-            "scope": "col_82AAFFFF"
-        },
-        {
-            "background": "#EEFFFFFF",
-            "foreground": "#797979FF",
-            "scope": "col_EEFFFFFF"
-        },
-        {
-            "background": "#FFFFFF10",
-            "foreground": "#BBBBBBFF",
-            "scope": "col_FFFFFF10"
-        },
-        {
-            "background": "#FF5370FF",
-            "foreground": "#090909FF",
-            "scope": "col_FF5370FF"
-        },
-        {
-            "background": "#EEFFFF20",
-            "foreground": "#C7C7C7FF",
-            "scope": "col_EEFFFF20"
-        },
-        {
-            "background": "#37474FFF",
-            "foreground": "#C3C3C3FF",
-            "scope": "col_37474FFF"
-        },
-        {
-            "background": "#00000030",
-            "foreground": "#A5A5A5FF",
-            "scope": "col_00000030"
-        },
-        {
-            "background": "#EEFFFF10",
-            "foreground": "#BBBBBBFF",
-            "scope": "col_EEFFFF10"
-        },
-        {
-            "background": "#FFCB6BFF",
-            "foreground": "#4F4F4FFF",
-            "scope": "col_FFCB6BFF"
-        },
-        {
-            "background": "#C792EAFF",
-            "foreground": "#2B2B2BFF",
-            "scope": "col_C792EAFF"
-        },
-        {
-            "background": "#607A86FF",
-            "foreground": "#F3F3F3FF",
-            "scope": "col_607A86FF"
-        },
-        {
-            "background": "#263238FF",
-            "foreground": "#AFAFAFFF",
-            "scope": "col_263238FF"
-        },
-        {
-            "background": "#89DDFFFF",
-            "foreground": "#474747FF",
-            "scope": "col_89DDFFFF"
-        },
-        {
-            "background": "#B2CCD6FF",
-            "foreground": "#454545FF",
-            "scope": "col_B2CCD6FF"
-        },
-        {
-            "background": "#303C41FF",
-            "foreground": "#B8B8B8FF",
-            "scope": "col_303C41FF"
-        },
-        {
-            "background": "#F07178FF",
-            "foreground": "#171717FF",
-            "scope": "col_F07178FF"
-        },
-        {
-            "background": "#BB80B3FF",
-            "foreground": "#171717FF",
-            "scope": "col_BB80B3FF"
-        },
-        {
-            "background": "#C17E70FF",
-            "foreground": "#101010FF",
-            "scope": "col_C17E70FF"
-        },
-        {
-            "background": "#000000FF",
-            "foreground": "#808080FF",
-            "scope": "col_000000FF"
-        },
-        {
-            "background": "#FF00FFFF",
-            "foreground": "#E9E9E9FF",
-            "scope": "col_FF00FFFF"
-        },
-        {
-            "background": "#FFFF0001",
-            "foreground": "#AFAFAFFF",
-            "scope": "col_FFFF0001"
-        },
-        {
-            "background": "#FFFF00FF",
-            "foreground": "#616161FF",
-            "scope": "col_FFFF00FF"
-        },
-        {
-            "background": "#FF0000FF",
-            "foreground": "#CCCCCCFF",
-            "scope": "col_FF0000FF"
-        },
-        {
-            "background": "#9850FFFF",
-            "foreground": "#F9F9F9FF",
-            "scope": "col_9850FFFF"
-        },
-        {
-            "background": "#7B88CCFF",
-            "foreground": "#0B0B0BFF",
-            "scope": "col_7B88CCFF"
-        },
-        {
-            "background": "#A3A3A3FF",
-            "foreground": "#232323FF",
-            "scope": "col_A3A3A3FF"
-        },
-        {
-            "background": "#455A64FF",
-            "foreground": "#D4D4D4FF",
-            "scope": "col_455A64FF"
-        },
-        {
-            "background": "#FFFFFFFF",
-            "foreground": "#7F7F7FFF",
-            "scope": "col_FFFFFFFF"
-        },
-        {
-            "background": "#C1685CFF",
-            "foreground": "#010101FF",
-            "scope": "col_C1685CFF"
-        },
-        {
-            "background": "#7DCAC4FF",
-            "foreground": "#323232FF",
-            "scope": "col_7DCAC4FF"
-        },
-        {
-            "background": "#D33131FF",
-            "foreground": "#E1E1E1FF",
-            "scope": "col_D33131FF"
-        },
-        {
-            "background": "#479E8EFF",
-            "foreground": "#020202FF",
-            "scope": "col_479E8EFF"
-        },
-        {
-            "background": "#000000",
-            "foreground": "#ffffff",
-            "scope": "col_gutter"
-        },
-        {
-            "background": "#6200EEFF",
-            "foreground": "#B8B8B8FF",
-            "scope": "col_6200EEFF"
-        },
         {
             "name": "Comment",
             "scope": "comment, punctuation.definition.comment",
diff --git a/src/schemes/Meetio-Darker.json b/src/schemes/Meetio-Darker.json
index 2916b667..40bf8080 100644
--- a/src/schemes/Meetio-Darker.json
+++ b/src/schemes/Meetio-Darker.json
@@ -3,16 +3,17 @@
     "author": "Mauro Reis Vieira <mauroreisvieira@gmail.com",
     "variables": {
         "primary"     : "#7dcac4",
+        "foreground"  : "#fefefe",
         "background"  : "#212121",
         "black"       : "#121212",
-        "blue"        : "#64b5f6",
+        "blue"        : "#82aaff",
         "cyan"        : "#89ddff",
         "gray"        : "#65737e",
-        "green"       : "#81c784",
+        "green"       : "#c3e88d",
         "orange"      : "#f78c6c",
         "pink"        : "#f06292",
-        "purple"      : "#ba68c8",
-        "red"         : "#f07178",
+        "purple"      : "#bb80b3",
+        "red"         : "#ff5370",
         "deep-orange" : "#f97b58",
         "light-blue"  : "#e1f5fe",
         "deep-purple" : "#b39ddb",
@@ -20,7 +21,7 @@
         "yellow"      : "#ffcb6b"
     },
    "globals": {
-        "foreground"                  : "var(white)",
+        "foreground"                  : "var(foreground)",
         "background"                  : "var(background)",
         "caret"                       : "var(yellow)",
         "line_highlight"              : "color(var(white) alpha(0.1))",
diff --git a/src/schemes/Meetio-Lighter.json b/src/schemes/Meetio-Lighter.json
index 9a8f65e7..fea77d53 100644
--- a/src/schemes/Meetio-Lighter.json
+++ b/src/schemes/Meetio-Lighter.json
@@ -3,6 +3,7 @@
     "author": "Mauro Reis Vieira <mauroreisvieira@gmail.com",
     "variables": {
         "primary"     : "#7dcac4",
+        "foreground"  : "#40525a",
         "background"  : "#fafafa",
         "black"       : "#40525a",
         "blue"        : "#6181b8",
@@ -20,7 +21,7 @@
         "yellow"      : "#ffb62e"
     },
       "globals": {
-        "foreground"                  : "var(black)",
+        "foreground"                  : "var(foreground)",
         "background"                  : "var(background)",
         "caret"                       : "var(yellow)",
         "line_highlight"              : "color(var(black) alpha(0.1))",
diff --git a/src/schemes/Meetio-Ocean.json b/src/schemes/Meetio-Ocean.json
new file mode 100644
index 00000000..aa4c4e7a
--- /dev/null
+++ b/src/schemes/Meetio-Ocean.json
@@ -0,0 +1,379 @@
+{
+    "name": "Meetio-Ocean",
+    "author": "Mauro Reis Vieira <mauroreisvieira@gmail.com",
+    "variables": {
+        "primary"     : "#7dcac4",
+        "foreground"  : "#fefefe",
+        "background"  : "#193448",
+        "black"       : "#546d79",
+        "blue"        : "#40c4fe",
+        "cyan"        : "#9effff",
+        "gray"        : "#3d3d3d",
+        "green"       : "#9eff80",
+        "orange"      : "#da8f49",
+        "pink"        : "#ffa5f3",
+        "purple"      : "#967efb",
+        "red"         : "#ed6e74",
+        "deep-orange" : "#f97b58",
+        "light-blue"  : "#e1f5fe",
+        "deep-purple" : "#c2afff",
+        "white"       : "#fefefe",
+        "yellow"      : "#ffc600"
+    },
+    "globals": {
+        "foreground"                  : "var(foreground)",
+        "background"                  : "var(background)",
+        "caret"                       : "var(yellow)",
+        "line_highlight"              : "color(var(white) alpha(0.1))",
+        "selection"                   : "color(var(light-blue) alpha(0.1))",
+        "selection_border"            : "var(blue)",
+        "inactive_selection"          : "color(var(light-blue) alpha(0.1))",
+        "misspelling"                 : "var(red)",
+        "shadow"                      : "color(var(background) alpha(0.5))",
+        "accent"                      : "var(primary)",
+        "active_guide"                : "var(cyan)",
+        "stack_guide"                 : "var(cyan)",
+        "highlight"                   : "var(cyan)",
+        "fold_marker"                 : "var(yellow)",
+        "find_highlight_foreground"   : "var(gray)",
+        "find_highlight"              : "var(yellow)",
+        "brackets_options"            : "underline",
+        "brackets_foreground"         : "var(orange)",
+        "bracket_contents_options"    : "underline",
+        "bracket_contents_foreground" : "var(cyan)",
+        "tags_foreground"             : "var(deep-purple)",
+        "tags_options"                : "stippled_underline"
+    },
+    "rules": [
+        {
+            "name": "Comment",
+            "scope": "comment, punctuation.definition.comment",
+            "foreground": "color(var(white) alpha(0.3))"
+        },
+        {
+            "name": "String",
+            "scope": "string",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "Number",
+            "scope": "constant.numeric",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "User-defined constant",
+            "scope": "constant.character, constant.other",
+            "foreground": "var(deep-purple)"
+        },
+        {
+            "name": "Member Variable",
+            "scope": "variable.member",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "Keyword",
+            "scope": "keyword - keyword.operator, keyword.operator.word",
+            "foreground": "var(deep-purple)"
+        },
+        {
+            "name": "Operator, Misc",
+            "scope": "keyword.operator, constant.other.color, punctuation, meta.tag, punctuation.definition.tag, punctuation.separator.inheritance.php, punctuation.definition.tag.html, punctuation.definition.tag.begin.html, punctuation.definition.tag.end.html, punctuation.section.embedded, keyword.other.template, keyword.other.substitution",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "Punctuation",
+            "scope": "punctuation.terminator, punctuation.section",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "Punctuation",
+            "scope": "punctuation.section",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "Annotation Punctuation",
+            "scope": "punctuation.definition.annotation",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "Variable SASS",
+            "scope": "variable.other.php, variable.other.sass, variable.other.scss",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "JavaScript Dollar",
+            "scope": "variable.other.dollar.only.js, variable.other.object.dollar.only.js, variable.type.dollar.only.js, support.class.dollar.only.js",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "Class, Support",
+            "scope": "entity.name.class, entity.name.type.class, support.other.namespace.use.php, meta.use.php, support.other.namespace.php, markup.changed.git_gutter, support.type.sys-types",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "HTML Attributes",
+            "scope": "text.html.basic entity.other.attribute-name.html, text.html.basic entity.other.attribute-name",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "CSS Classes",
+            "scope": "entity.other.attribute-name.class",
+            "foreground": "var(deep-purple)"
+        },
+        {
+            "name": "CSS Class and Support",
+            "scope": "source.css support.type, source.sass support.type, source.scss support.type, source.less support.type, source.stylus support.type",
+            "foreground": "var(white)"
+        },
+        {
+            "name": "Sub Methods",
+            "scope": "entity.name.module.js, variable.import.parameter.js, variable.other.class.js",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "Meta Method Javascript",
+            "scope": "meta.class-method.js entity.name.function.js, variable.function.constructor",
+            "foreground": "var(pink)"
+        },
+        {
+            "name": "Storage",
+            "scope": "storage",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "Storage type",
+            "scope": "storage.type",
+            "foreground": "var(deep-purple)",
+            "font_style": "italic"
+        },
+        {
+            "name": "Entity name",
+            "scope": "entity.name.function",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "Entity name",
+            "scope": "entity.name - (entity.name.section | entity.name.tag | entity.name.label)",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "Inherited class",
+            "scope": "entity.other.inherited-class",
+            "foreground": "var(cyan)",
+            "font_style": "italic underline"
+        },
+        {
+            "name": "Function argument",
+            "scope": "variable.parameter",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "Language variable",
+            "scope": "variable.language",
+            "foreground": "var(red)",
+            "font_style": "italic"
+        },
+        {
+            "name": "Tag name",
+            "scope": "entity.name.tag",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "Tag attribute",
+            "scope": "entity.other.attribute-name",
+            "foreground": "var(deep-purple)"
+        },
+        {
+            "name": "Function call",
+            "scope": "variable.function, variable.annotation",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "Library function",
+            "scope": "support.function, support.macro",
+            "foreground": "var(blue)",
+            "font_style": "italic"
+        },
+        {
+            "name": "Library constant",
+            "scope": "support.constant",
+            "foreground": "var(deep-purple)"
+        },
+        {
+            "name": "Library class/type",
+            "scope": "support.type, support.class",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "Invalid",
+            "scope": "invalid",
+            "foreground": "var(white)",
+            "background": "var(red)"
+        },
+        {
+            "name": "Invalid deprecated",
+            "scope": "invalid.deprecated",
+            "foreground": "var(white)",
+            "background": "var(purple)"
+        },
+        {
+            "name": "YAML Key",
+            "scope": "entity.name.tag.yaml",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "YAML String",
+            "scope": "source.yaml string.unquoted",
+            "foreground": "var(foreground)"
+        },
+        {
+            "name": "diff.header",
+            "scope": "meta.diff, meta.diff.header",
+            "foreground": "var(deep-purple)"
+        },
+        {
+            "name": "diff.deleted",
+            "scope": "markup.deleted",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "diff.inserted",
+            "scope": "markup.inserted",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "diff.changed",
+            "scope": "markup.changed",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "CSS Properties",
+            "scope": "support.type.property-name",
+            "foreground": "var(foreground)"
+        },
+        {
+            "scope": "constant.numeric.line-number.match",
+            "foreground": "var(red)"
+        },
+        {
+            "scope": "message.error",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "JSON Key - Level 0",
+            "scope": "source.json meta.structure.dictionary.json string.quoted.double.json - meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta.structure.dictionary.json punctuation.definition.string - meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string",
+            "foreground": "var(deep-purple)"
+        },
+        {
+            "name": "JSON Key - Level 1",
+            "scope": "source.json meta meta.structure.dictionary.json string.quoted.double.json - meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta.structure.dictionary.json punctuation.definition.string - meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string",
+            "foreground": "var(yellow)"
+        },
+        {
+            "name": "JSON Key - Level 2",
+            "scope": "source.json meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "JSON Key - Level 3",
+            "scope": "source.json meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "JSON Key - Level 4",
+            "scope": "source.json meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "JSON Key - Level 5",
+            "scope": "source.json meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string",
+            "foreground": "var(deep-orange)"
+        },
+        {
+            "name": "JSON Key - Level 6",
+            "scope": "source.json meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string",
+            "foreground": "var(cyan)"
+        },
+        {
+            "name": "JSON Key - Level 7",
+            "scope": "source.json meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json string.quoted.double.json - meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json string.quoted.double.json, source.json meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json punctuation.definition.string - meta meta meta meta meta meta meta meta meta meta meta meta meta meta.structure.dictionary.json meta.structure.dictionary.value.json punctuation.definition.string",
+            "foreground": "var(purple)"
+        },
+        {
+            "name": "markup headings",
+            "scope": "markup.heading",
+            "font_style": "bold"
+        },
+        {
+            "name": "markup headings",
+            "scope": "markup.heading punctuation.definition.heading",
+            "foreground": "var(deep-orange)"
+        },
+        {
+            "name": "markup h1",
+            "scope": "markup.heading.1 punctuation.definition.heading",
+            "foreground": "var(red)"
+        },
+        {
+            "name": "markup links",
+            "scope": "string.other.link, markup.underline.link",
+            "foreground": "var(blue)"
+        },
+        {
+            "name": "markup bold",
+            "scope": "markup.bold",
+            "font_style": "bold",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "markup italic",
+            "scope": "markup.italic",
+            "font_style": "italic"
+        },
+        {
+            "name": "markup bold/italic",
+            "scope": "markup.italic markup.bold | markup.bold markup.italic",
+            "font_style": "bold italic"
+        },
+        {
+            "name": "markup hr",
+            "scope": "punctuation.definition.thematic-break",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "markup numbered list bullet",
+            "scope": "markup.list.numbered.bullet",
+            "foreground": "var(green)"
+        },
+        {
+            "name": "markup blockquote",
+            "scope": "markup.quote punctuation.definition.blockquote, markup.list punctuation.definition.list_item",
+            "foreground": "var(orange)"
+        },
+        {
+            "name": "markup code",
+            "scope": "markup.raw",
+            "background": "color(var(light-blue) alpha(0.1))"
+        },
+        {
+            "name": "markup code",
+            "scope": "markup.raw.inline",
+            "background": "color(var(light-blue) alpha(0.1))"
+        },
+        {
+            "name": "markup punctuation",
+            "scope": "(text punctuation.definition.italic | text punctuation.definition.bold)",
+            "foreground": "var(deep-purple)"
+        },
+        {
+            "name": "Number, Constant, Function Argument, Tag Attribute, Embedded",
+            "scope": "constant.numeric, constant.language, support.constant, constant.character, variable.parameter, keyword.other.unit",
+            "foreground": "var(deep-orange)"
+        },
+        {
+            "name": "Object Keys",
+            "scope": "string.unquoted.label.js, meta.object-literal.key.js, string.unquoted.label.jsx, meta.object-literal.key.jsx, string.unquoted.label.ts, meta.object-literal.key.ts, meta.function.return-type.ts, meta.function.parameters.ts",
+            "foreground": "var(red)"
+        }
+    ]
+}
diff --git a/src/schemes/Meetio-Palenight.json b/src/schemes/Meetio-Palenight.json
index 31d5d1f3..55c43669 100644
--- a/src/schemes/Meetio-Palenight.json
+++ b/src/schemes/Meetio-Palenight.json
@@ -3,24 +3,25 @@
     "author": "Mauro Reis Vieira <mauroreisvieira@gmail.com",
     "variables": {
         "primary"     : "#7dcac4",
-        "background"  : "#193448",
-        "black"       : "#546d79",
-        "blue"        : "#40c4fe",
-        "cyan"        : "#9effff",
+        "foreground"  : "#a6accd",
+        "background"  : "#292d3e",
+        "black"       : "#000000",
+        "blue"        : "#82aaff",
+        "cyan"        : "#89ddff",
         "gray"        : "#3d3d3d",
-        "green"       : "#9eff80",
-        "orange"      : "#da8f49",
-        "pink"        : "#ffa5f3",
-        "purple"      : "#967efb",
-        "red"         : "#ed6e74",
+        "green"       : "#c3e88d",
+        "orange"      : "#f78c6c",
+        "pink"        : "#f07178",
+        "purple"      : "#c792ea",
+        "red"         : "#ff5370",
         "deep-orange" : "#f97b58",
-        "light-blue"  : "#e1f5fe",
+        "light-blue"  : "#b2ccd6",
         "deep-purple" : "#c2afff",
-        "white"       : "#fefefe",
-        "yellow"      : "#ffc600"
+        "white"       : "#ffffff",
+        "yellow"      : "#ffcb6b"
     },
     "globals": {
-        "foreground"                  : "var(white)",
+        "foreground"                  : "var(foreground)",
         "background"                  : "var(background)",
         "caret"                       : "var(yellow)",
         "line_highlight"              : "color(var(white) alpha(0.1))",
diff --git a/src/schemes/Meetio.json b/src/schemes/Meetio.json
index aabe1641..1691b974 100644
--- a/src/schemes/Meetio.json
+++ b/src/schemes/Meetio.json
@@ -4,6 +4,7 @@
     "variables": {
         "primary"     : "#7dcac4",
         "background"  : "#263137",
+        "foreground"  : "#fefefe",
         "black"       : "#121212",
         "blue"        : "#6398ce",
         "cyan"        : "#5bb3b4",
@@ -20,7 +21,7 @@
         "yellow"      : "#fbc959"
     },
    "globals": {
-        "foreground"                  : "var(white)",
+        "foreground"                  : "var(foreground)",
         "background"                  : "var(background)",
         "caret"                       : "var(yellow)",
         "line_highlight"              : "color(var(white) alpha(0.1))",
diff --git a/src/themes/default/inputs.json b/src/themes/default/inputs.json
index 95bbde14..72f0a7de 100644
--- a/src/themes/default/inputs.json
+++ b/src/themes/default/inputs.json
@@ -1,9 +1,12 @@
 [
     {
         "class": "text_line_control",
-        "layer0.texture": "",
         "layer0.opacity": 1.0,
         "layer0.inner_margin": [20, 5, 20, 5],
+        "layer1.tint": "var(input_border_color)",
+        "layer1.opacity": 1.0,
+        "layer1.inner_margin": "var(input_border_size)",
+        "layer1.draw_center": false,
         "tint_index": 1,
         "layer0.tint": "var(input_background_color)",
         "content_margin": [10, 8, 12, 8]
@@ -12,12 +15,14 @@
         "class": "text_line_control",
         "platforms": ["osx", "linux"],
         "parents": [{ "class": "overlay_control" }],
+        "layer1.opacity": 0,
         "content_margin": [52, 10, 10, 10],
         "settings": ["meetio_input_search_icon"]
     },
     {
         "class": "text_line_control",
         "parents": [{ "class": "overlay_control" }],
+        "layer1.opacity": 0,
         "layer2.inner_margin": [52, 48, 0, 0],
         "layer2.draw_center": false,
         "layer2.texture": "Meetio/assets/default/icon_search.png",
@@ -29,6 +34,7 @@
         "class": "text_line_control",
         "platforms": ["osx", "linux"],
         "parents": [{ "class": "switch_project_window" }],
+        "layer1.opacity": 0,
         "content_margin": [52, 10, 10, 10],
         "settings": ["meetio_input_search_icon"]
     },
@@ -40,6 +46,7 @@
         "layer2.texture": "Meetio/assets/default/icon_search.png",
         "layer2.tint": "var(color_accent)",
         "layer2.opacity": 1.0,
+        "layer1.opacity": 0,
         "settings": ["meetio_input_search_icon"]
     },
     {
diff --git a/src/themes/variables.json b/src/themes/variables.json
index c29cf91b..0d4b9bcf 100644
--- a/src/themes/variables.json
+++ b/src/themes/variables.json
@@ -10,6 +10,8 @@
     "button_background_color_hover"           : "var(color_accent)",
     "button_min_size"                         : [80, 28],
     "input_background_color"                  : ["background", 1.0],
+    "input_border_size"                       : 0,
+    "input_border_color"                      : ["foreground", 0],
     "panel_control_background_color"          : ["background", 0.94],
     "sidebar_background_color"                : ["background", 0.92],
     "sidebar_icon_folder_color"               : "var(color_accent)",