diff --git a/Default (Linux).sublime-keymap b/Default (Linux).sublime-keymap
index 9a31b70b..e2ebf89d 100644
--- a/Default (Linux).sublime-keymap	
+++ b/Default (Linux).sublime-keymap	
@@ -66,6 +66,15 @@
             { "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
         ]
     },
+    { "keys": ["tab"], "command": "indent_list_item", "context":
+        [
+            { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+            { "key": "preceding_text", "operator": "regex_contains", "operand": "^\\s*(>\\s*)?$", "match_all": true },
+            { "key": "following_text", "operator": "regex_contains", "operand": "^\\s*[*+\\-]\\s+", "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
+            { "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
+        ]
+    },
     { "keys": ["tab"], "command": "indent_list_multiitem", "context":
         [
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
@@ -82,6 +91,15 @@
             { "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
         ]
     },
+    { "keys": ["shift+tab"], "command": "indent_list_item", "args": {"reverse": true}, "context":
+        [
+            { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+            { "key": "preceding_text", "operator": "regex_contains", "operand": "^\\s*(>\\s*)?$", "match_all": true },
+            { "key": "following_text", "operator": "regex_contains", "operand": "^\\s*[*+\\-]\\s+", "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
+            { "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
+        ]
+    },
     { "keys": ["shift+tab"], "command": "indent_list_multiitem", "args": {"reverse": true}, "context":
         [
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
@@ -178,14 +196,34 @@
         ]
     },
     // Bold on Alt + B
+    { "keys": ["alt+b"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Transform Word - Bold - Asterisk.sublime-macro"}, "context":
+        [
+            { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": true },
+            { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+        ]
+    },
     { "keys": ["alt+b"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Transform Word - Bold.sublime-macro"}, "context":
         [
+            { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": false },
             { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
-    { "keys": ["alt+b"], "command": "insert_snippet", "args": {"contents": "${MD_BOLD_MARKER}$1${MD_BOLD_MARKER}"}, "context":
+    { "keys": ["alt+b"], "command": "insert_snippet", "args": {"contents": "**$1**"}, "context":
+     [
+         { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": true },
+         { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
+         { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+         { "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |\\)|]|\\}|$)", "match_all": true },
+         { "key": "preceding_text", "operator": "not_regex_contains", "operand": "['a-zA-Z0-9_]$", "match_all": true },
+         { "key": "eol_selector", "operator": "not_equal", "operand": "string.quoted.single", "match_all": true },
+         { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+     ]
+    },
+    { "keys": ["alt+b"], "command": "insert_snippet", "args": {"contents": "__$1__"}, "context":
      [
+         { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": false },
          { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
          { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
          { "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |\\)|]|\\}|$)", "match_all": true },
@@ -194,22 +232,40 @@
          { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
      ]
     },
-    { "keys": ["alt+b"], "command": "insert_snippet", "args": {"contents": "${MD_BOLD_MARKER}${SELECTION/(^[\\*_]*|[\\*_]*$)//g}${MD_BOLD_MARKER}"}, "context":
+    { "keys": ["alt+b"], "command": "insert_snippet", "args": {"contents": "**${SELECTION/(^[\\*_]*|[\\*_]*$)//g}**"}, "context":
+        [
+            { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": true },
+            { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
+            { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+        ]
+    },
+    { "keys": ["alt+b"], "command": "insert_snippet", "args": {"contents": "__${SELECTION/(^[\\*_]*|[\\*_]*$)//g}__"}, "context":
         [
+            { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": false },
             { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     // italics on Alt + I
+    { "keys": ["alt+i"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Transform Word - Italic - Asterisk.sublime-macro"}, "context":
+        [
+            { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": true },
+            { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+        ]
+    },
     { "keys": ["alt+i"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Transform Word - Italic.sublime-macro"}, "context":
         [
+            { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": false },
             { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
-    { "keys": ["alt+i"], "command": "insert_snippet", "args": {"contents": "${MD_ITALIC_MARKER}$0${MD_ITALIC_MARKER}"}, "context":
+    { "keys": ["alt+i"], "command": "insert_snippet", "args": {"contents": "*$0$*"}, "context":
      [
+         { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": true },
          { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
          { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
          { "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |\\)|]|\\}|$)", "match_all": true },
@@ -218,8 +274,28 @@
          { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
      ]
     },
-    { "keys": ["alt+i"], "command": "insert_snippet", "args": {"contents": "${MD_ITALIC_MARKER}${SELECTION/(^[\\*_]*|[\\*_]*$)//g}${MD_ITALIC_MARKER}"}, "context":
+    { "keys": ["alt+i"], "command": "insert_snippet", "args": {"contents": "_$0$_"}, "context":
+     [
+         { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": false },
+         { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
+         { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+         { "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |\\)|]|\\}|$)", "match_all": true },
+         { "key": "preceding_text", "operator": "not_regex_contains", "operand": "['a-zA-Z0-9_]$", "match_all": true },
+         { "key": "eol_selector", "operator": "not_equal", "operand": "string.quoted.single", "match_all": true },
+         { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+     ]
+    },
+    { "keys": ["alt+i"], "command": "insert_snippet", "args": {"contents": "*${SELECTION/(^[\\*_]*|[\\*_]*$)//g}*"}, "context":
+        [
+            { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": true },
+            { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
+            { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+        ]
+    },
+    { "keys": ["alt+i"], "command": "insert_snippet", "args": {"contents": "_${SELECTION/(^[\\*_]*|[\\*_]*$)//g}_"}, "context":
         [
+            { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": false },
             { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
index 903772b1..5f0d3b4c 100644
--- a/Default (OSX).sublime-keymap	
+++ b/Default (OSX).sublime-keymap	
@@ -66,6 +66,15 @@
             { "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
         ]
     },
+    { "keys": ["tab"], "command": "indent_list_item", "context":
+        [
+            { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+            { "key": "preceding_text", "operator": "regex_contains", "operand": "^\\s*(>\\s*)?$", "match_all": true },
+            { "key": "following_text", "operator": "regex_contains", "operand": "^\\s*[*+\\-]\\s+", "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
+            { "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
+        ]
+    },
     { "keys": ["tab"], "command": "indent_list_multiitem", "context":
         [
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
@@ -82,6 +91,15 @@
             { "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
         ]
     },
+    { "keys": ["shift+tab"], "command": "indent_list_item", "args": {"reverse": true}, "context":
+        [
+            { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+            { "key": "preceding_text", "operator": "regex_contains", "operand": "^\\s*(>\\s*)?$", "match_all": true },
+            { "key": "following_text", "operator": "regex_contains", "operand": "^\\s*[*+\\-]\\s+", "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
+            { "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
+        ]
+    },
     { "keys": ["shift+tab"], "command": "indent_list_multiitem", "args": {"reverse": true}, "context":
         [
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
@@ -177,15 +195,35 @@
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
-    // Bold on Super + Alt + B
+    // Bold on super + Alt + B
+    { "keys": ["super+alt+b"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Transform Word - Bold - Asterisk.sublime-macro"}, "context":
+        [
+            { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": true },
+            { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+        ]
+    },
     { "keys": ["super+alt+b"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Transform Word - Bold.sublime-macro"}, "context":
         [
+            { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": false },
             { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
-    { "keys": ["super+alt+b"], "command": "insert_snippet", "args": {"contents": "${MD_BOLD_MARKER}$1${MD_BOLD_MARKER}"}, "context":
+    { "keys": ["super+alt+b"], "command": "insert_snippet", "args": {"contents": "**$1**"}, "context":
+     [
+         { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": true },
+         { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
+         { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+         { "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |\\)|]|\\}|$)", "match_all": true },
+         { "key": "preceding_text", "operator": "not_regex_contains", "operand": "['a-zA-Z0-9_]$", "match_all": true },
+         { "key": "eol_selector", "operator": "not_equal", "operand": "string.quoted.single", "match_all": true },
+         { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+     ]
+    },
+    { "keys": ["super+alt+b"], "command": "insert_snippet", "args": {"contents": "__$1__"}, "context":
      [
+         { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": false },
          { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
          { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
          { "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |\\)|]|\\}|$)", "match_all": true },
@@ -194,22 +232,40 @@
          { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
      ]
     },
-    { "keys": ["super+alt+b"], "command": "insert_snippet", "args": {"contents": "${MD_BOLD_MARKER}${SELECTION/(^[\\*_]*|[\\*_]*$)//g}${MD_BOLD_MARKER}"}, "context":
+    { "keys": ["super+alt+b"], "command": "insert_snippet", "args": {"contents": "**${SELECTION/(^[\\*_]*|[\\*_]*$)//g}**"}, "context":
+        [
+            { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": true },
+            { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
+            { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+        ]
+    },
+    { "keys": ["super+alt+b"], "command": "insert_snippet", "args": {"contents": "__${SELECTION/(^[\\*_]*|[\\*_]*$)//g}__"}, "context":
         [
+            { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": false },
             { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
-    // italics on Super + Alt + I
+    // italics on super + Alt + I
+    { "keys": ["super+alt+i"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Transform Word - Italic - Asterisk.sublime-macro"}, "context":
+        [
+            { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": true },
+            { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+        ]
+    },
     { "keys": ["super+alt+i"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Transform Word - Italic.sublime-macro"}, "context":
         [
+            { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": false },
             { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
-    { "keys": ["super+alt+i"], "command": "insert_snippet", "args": {"contents": "${MD_ITALIC_MARKER}$0${MD_ITALIC_MARKER}"}, "context":
+    { "keys": ["super+alt+i"], "command": "insert_snippet", "args": {"contents": "*$0$*"}, "context":
      [
+         { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": true },
          { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
          { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
          { "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |\\)|]|\\}|$)", "match_all": true },
@@ -218,8 +274,28 @@
          { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
      ]
     },
-    { "keys": ["super+alt+i"], "command": "insert_snippet", "args": {"contents": "${MD_ITALIC_MARKER}${SELECTION/(^[\\*_]*|[\\*_]*$)//g}${MD_ITALIC_MARKER}"}, "context":
+    { "keys": ["super+alt+i"], "command": "insert_snippet", "args": {"contents": "_$0$_"}, "context":
+     [
+         { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": false },
+         { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
+         { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+         { "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |\\)|]|\\}|$)", "match_all": true },
+         { "key": "preceding_text", "operator": "not_regex_contains", "operand": "['a-zA-Z0-9_]$", "match_all": true },
+         { "key": "eol_selector", "operator": "not_equal", "operand": "string.quoted.single", "match_all": true },
+         { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+     ]
+    },
+    { "keys": ["super+alt+i"], "command": "insert_snippet", "args": {"contents": "*${SELECTION/(^[\\*_]*|[\\*_]*$)//g}*"}, "context":
+        [
+            { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": true },
+            { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
+            { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+        ]
+    },
+    { "keys": ["super+alt+i"], "command": "insert_snippet", "args": {"contents": "_${SELECTION/(^[\\*_]*|[\\*_]*$)//g}_"}, "context":
         [
+            { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": false },
             { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
diff --git a/Default (Windows).sublime-keymap b/Default (Windows).sublime-keymap
index 43bd5fbf..e4bc521e 100644
--- a/Default (Windows).sublime-keymap	
+++ b/Default (Windows).sublime-keymap	
@@ -66,6 +66,15 @@
             { "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
         ]
     },
+    { "keys": ["tab"], "command": "indent_list_item", "context":
+        [
+            { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+            { "key": "preceding_text", "operator": "regex_contains", "operand": "^\\s*(>\\s*)?$", "match_all": true },
+            { "key": "following_text", "operator": "regex_contains", "operand": "^\\s*[*+\\-]\\s+", "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
+            { "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
+        ]
+    },
     { "keys": ["tab"], "command": "indent_list_multiitem", "context":
         [
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
@@ -82,6 +91,15 @@
             { "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
         ]
     },
+    { "keys": ["shift+tab"], "command": "indent_list_item", "args": {"reverse": true}, "context":
+        [
+            { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+            { "key": "preceding_text", "operator": "regex_contains", "operand": "^\\s*(>\\s*)?$", "match_all": true },
+            { "key": "following_text", "operator": "regex_contains", "operand": "^\\s*[*+\\-]\\s+", "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true },
+            { "key": "selector", "operator": "not_equal", "operand": "markup.raw", "match_all": true }
+        ]
+    },
     { "keys": ["shift+tab"], "command": "indent_list_multiitem", "args": {"reverse": true}, "context":
         [
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
@@ -178,14 +196,34 @@
         ]
     },
     // Bold on Alt + B
+    { "keys": ["alt+b"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Transform Word - Bold - Asterisk.sublime-macro"}, "context":
+        [
+            { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": true },
+            { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+        ]
+    },
     { "keys": ["alt+b"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Transform Word - Bold.sublime-macro"}, "context":
         [
+            { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": false },
             { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
-    { "keys": ["alt+b"], "command": "insert_snippet", "args": {"contents": "${MD_BOLD_MARKER}$1${MD_BOLD_MARKER}"}, "context":
+    { "keys": ["alt+b"], "command": "insert_snippet", "args": {"contents": "**$1**"}, "context":
+     [
+         { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": true },
+         { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
+         { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+         { "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |\\)|]|\\}|$)", "match_all": true },
+         { "key": "preceding_text", "operator": "not_regex_contains", "operand": "['a-zA-Z0-9_]$", "match_all": true },
+         { "key": "eol_selector", "operator": "not_equal", "operand": "string.quoted.single", "match_all": true },
+         { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+     ]
+    },
+    { "keys": ["alt+b"], "command": "insert_snippet", "args": {"contents": "__$1__"}, "context":
      [
+         { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": false },
          { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
          { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
          { "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |\\)|]|\\}|$)", "match_all": true },
@@ -194,22 +232,40 @@
          { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
      ]
     },
-    { "keys": ["alt+b"], "command": "insert_snippet", "args": {"contents": "${MD_BOLD_MARKER}${SELECTION/(^[\\*_]*|[\\*_]*$)//g}${MD_BOLD_MARKER}"}, "context":
+    { "keys": ["alt+b"], "command": "insert_snippet", "args": {"contents": "**${SELECTION/(^[\\*_]*|[\\*_]*$)//g}**"}, "context":
+        [
+            { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": true },
+            { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
+            { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+        ]
+    },
+    { "keys": ["alt+b"], "command": "insert_snippet", "args": {"contents": "__${SELECTION/(^[\\*_]*|[\\*_]*$)//g}__"}, "context":
         [
+            { "key": "setting.mde.bold_marker_asterisk", "operator": "equal", "operand": false },
             { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
     // italics on Alt + I
+    { "keys": ["alt+i"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Transform Word - Italic - Asterisk.sublime-macro"}, "context":
+        [
+            { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": true },
+            { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+        ]
+    },
     { "keys": ["alt+i"], "command": "run_macro_file", "args": {"file": "Packages/MarkdownEditing/macros/Transform Word - Italic.sublime-macro"}, "context":
         [
+            { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": false },
             { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
         ]
     },
-    { "keys": ["alt+i"], "command": "insert_snippet", "args": {"contents": "${MD_ITALIC_MARKER}$0${MD_ITALIC_MARKER}"}, "context":
+    { "keys": ["alt+i"], "command": "insert_snippet", "args": {"contents": "*$0$*"}, "context":
      [
+         { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": true },
          { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
          { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
          { "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |\\)|]|\\}|$)", "match_all": true },
@@ -218,8 +274,28 @@
          { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
      ]
     },
-    { "keys": ["alt+i"], "command": "insert_snippet", "args": {"contents": "${MD_ITALIC_MARKER}${SELECTION/(^[\\*_]*|[\\*_]*$)//g}${MD_ITALIC_MARKER}"}, "context":
+    { "keys": ["alt+i"], "command": "insert_snippet", "args": {"contents": "_$0$_"}, "context":
+     [
+         { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": false },
+         { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
+         { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
+         { "key": "following_text", "operator": "regex_contains", "operand": "^(?:\t| |\\)|]|\\}|$)", "match_all": true },
+         { "key": "preceding_text", "operator": "not_regex_contains", "operand": "['a-zA-Z0-9_]$", "match_all": true },
+         { "key": "eol_selector", "operator": "not_equal", "operand": "string.quoted.single", "match_all": true },
+         { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+     ]
+    },
+    { "keys": ["alt+i"], "command": "insert_snippet", "args": {"contents": "*${SELECTION/(^[\\*_]*|[\\*_]*$)//g}*"}, "context":
+        [
+            { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": true },
+            { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
+            { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
+            { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
+        ]
+    },
+    { "keys": ["alt+i"], "command": "insert_snippet", "args": {"contents": "_${SELECTION/(^[\\*_]*|[\\*_]*$)//g}_"}, "context":
         [
+            { "key": "setting.mde.italic_marker_asterisk", "operator": "equal", "operand": false },
             { "key": "setting.auto_match_enabled", "operator": "equal", "operand": true },
             { "key": "selection_empty", "operator": "equal", "operand": false, "match_all": true },
             { "key": "selector", "operator": "equal", "operand": "text.html.markdown", "match_all": true }
diff --git a/Default.sublime-commands b/Default.sublime-commands
index af5a4c29..4b25ba80 100644
--- a/Default.sublime-commands
+++ b/Default.sublime-commands
@@ -113,6 +113,10 @@
         "caption": "MarkdownEditing: Unfold All Sections",
         "command": "unfold_all_sections"
     },
+    {
+        "caption": "MarkdownEditing: Fold All Link URLs",
+        "command": "fold_all_link_urls"
+    },
     {
         "caption": "MarkdownEditing: Find Next Heading (Same or higher level)",
         "command": "goto_next_heading", "args" :
diff --git a/Main.sublime-menu b/Main.sublime-menu
index ba27d0e6..d4c5f558 100644
--- a/Main.sublime-menu
+++ b/Main.sublime-menu
@@ -23,69 +23,36 @@
                                 "caption": "-"
                             },
                             {
+                                "command": "edit_settings",
                                 "args": {
-                                    "file": "${packages}/MarkdownEditing/Bold and Italic Markers.tmPreferences"
+                                    "base_file": "${packages}/MarkdownEditing/Bold and Italic Markers.tmPreferences",
+                                    "default": "{\n$0\n}\n"
                                 },
-                                "caption": "Bold and Italic Settings \u2013 Default",
-                                "command": "open_file"
+                                "caption": "Bold and Italic Settings"
                             },
                             {
+                                "command": "edit_settings",
                                 "args": {
-                                    "file": "${packages}/User/Bold and Italic Markers.tmPreferences"
+                                    "base_file": "${packages}/MarkdownEditing/Markdown.sublime-settings",
+                                    "default": "{\n$0\n}\n"
                                 },
-                                "caption": "Bold and Italic Settings \u2013 User",
-                                "command": "open_file"
-                            },
-                            {
-                                "caption": "-"
+                                "caption": "Markdown GFM Settings"
                             },
                             {
+                                "command": "edit_settings",
                                 "args": {
-                                    "file": "${packages}/MarkdownEditing/Markdown.sublime-settings"
+                                    "base_file": "${packages}/MarkdownEditing/Markdown (Standard).sublime-settings",
+                                    "default": "{\n$0\n}\n"
                                 },
-                                "caption": "Markdown GFM Settings \u2013 Default",
-                                "command": "open_file"
+                                "caption": "Markdown (Standard) Settings"
                             },
                             {
+                                "command": "edit_settings",
                                 "args": {
-                                    "file": "${packages}/User/Markdown.sublime-settings"
+                                    "base_file": "${packages}/MarkdownEditing/MultiMarkdown.sublime-settings",
+                                    "default": "{\n$0\n}\n"
                                 },
-                                "caption": "Markdown GFM Settings \u2013 User",
-                                "command": "open_file"
-                            },
-                            {
-                                "caption": "-"
-                            },
-                            {
-                                "args": {
-                                    "file": "${packages}/MarkdownEditing/Markdown (Standard).sublime-settings"
-                                },
-                                "caption": "Markdown (Standard) Settings \u2013 Default",
-                                "command": "open_file"
-                            },
-                            {
-                                "args": {
-                                    "file": "${packages}/User/Markdown (Standard).sublime-settings"
-                                },
-                                "caption": "Markdown (Standard) Settings \u2013 User",
-                                "command": "open_file"
-                            },
-                            {
-                                "caption": "-"
-                            },
-                            {
-                                "args": {
-                                    "file": "${packages}/MarkdownEditing/MultiMarkdown.sublime-settings"
-                                },
-                                "caption": "MultiMarkdown Settings \u2013 Default",
-                                "command": "open_file"
-                            },
-                            {
-                                "args": {
-                                    "file": "${packages}/User/MultiMarkdown.sublime-settings"
-                                },
-                                "caption": "MultiMarkdown Settings \u2013 User",
-                                "command": "open_file"
+                                "caption": "MultiMarkdown Settings"
                             },
                             {
                                 "caption": "-"
@@ -151,4 +118,4 @@
         "id": "preferences",
         "mnemonic": "n"
     }
-]
\ No newline at end of file
+]
diff --git a/Markdown (Standard).sublime-settings b/Markdown (Standard).sublime-settings
index 43ec11a8..decc1284 100644
--- a/Markdown (Standard).sublime-settings	
+++ b/Markdown (Standard).sublime-settings	
@@ -1,5 +1,6 @@
 {
 	"color_scheme": "Packages/MarkdownEditing/MarkdownEditor.tmTheme",
+	// "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-ArcDark.tmTheme",
 	// "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Dark.tmTheme",
 	// "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Yellow.tmTheme",
 
@@ -30,6 +31,10 @@
 	"caret_extra_top": 3,
 	"caret_extra_bottom": 3,
 
+	// Behavior
+	"mde.bold_marker_asterisk": true,
+	"mde.italic_marker_asterisk": true,
+
 	// add trailing #'s to headlines
 	"mde.match_header_hashes": false,
 
diff --git a/Markdown.sublime-settings b/Markdown.sublime-settings
index 8b800068..da4bc253 100644
--- a/Markdown.sublime-settings
+++ b/Markdown.sublime-settings
@@ -6,14 +6,14 @@
 		"txt"
 	],
 
-	"color_scheme": "Packages/MarkdownEditing/MarkdownEditor.tmTheme",
-	// "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Dark.tmTheme",
-	// "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Yellow.tmTheme",
+	"color_scheme": "Packages/MarkdownEditing/MarkdownEditor.sublime-color-scheme",
+	// "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Dark.sublime-color-scheme",
+	// "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Yellow.sublime-color-scheme",
 
 	// This is a quick and dirty focus theme. In order to make it work, you've to
 	// set `"highlight_line": true,` in this settings file. It is likely that there will
 	// be more mature focus improvements in the future (maybe similar to iA Writer).
-	// "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Focus.tmTheme",
+	// "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Focus.sublime-color-scheme",
 
 	"tab_size": 4,
 	"translate_tabs_to_spaces": true,
@@ -41,6 +41,10 @@
 	"caret_extra_top": 3,
 	"caret_extra_bottom": 3,
 
+	// Behavior
+	"mde.bold_marker_asterisk": true,
+	"mde.italic_marker_asterisk": true,
+
 	// add trailing #'s to headlines
 	"mde.match_header_hashes": false,
 
diff --git a/Markdown.sublime-syntax b/Markdown.sublime-syntax
index 49da24cb..227cc952 100644
--- a/Markdown.sublime-syntax
+++ b/Markdown.sublime-syntax
@@ -440,6 +440,7 @@ contexts:
     - include: fenced-obj-c
     - include: fenced-coffee
     - include: fenced-js
+    - include: fenced-json
     - include: fenced-ts
     - include: fenced-tsx
     - include: fenced-ruby
@@ -455,6 +456,9 @@ contexts:
     - include: fenced-reason
     - include: fenced-haskell
     - include: fenced-rust
+    - include: fenced-ahk
+    - include: fenced-r
+    - include: fenced-stata
     - include: fenced-undefined
   fenced-coffee:
     - match: '^(\s*[`~]{3,})\s*(coffee|cjsx)\s*$'
@@ -482,10 +486,15 @@ contexts:
       embed_scope: markup.raw.block.markdown markup.raw.block.fenced.markdown
       escape: ^(\1)\n
   fenced-js:
-    - match: '^(\s*[`~]{3,})\s*(js|jsx|json|javascript)\s*$'
+    - match: '^(\s*[`~]{3,})\s*(js|jsx|javascript)\s*$'
       embed: scope:source.js
       embed_scope: markup.raw.block.markdown markup.raw.block.fenced.markdown
       escape: ^(\1)\n
+  fenced-json:
+    - match: '^(\s*[`~]{3,})\s*(json)\s*$'
+      embed: scope:source.json
+      embed_scope: markup.raw.block.markdown markup.raw.block.fenced.markdown
+      escape: ^(\1)\n
   fenced-less:
     - match: '^(\s*[`~]{3,})\s*(less)\s*$'
       embed: scope:source.less
@@ -591,6 +600,14 @@ contexts:
       embed: scope:source.rust
       embed_scope: markup.raw.block.markdown markup.raw.block.fenced.markdown
       escape: ^(\1)\n
+  fenced-stata:
+    - match: '^(\s*[`~]{3,})\s*(s|stata|{s}|{s(\s|\,).*}|{stata}|{stata(\s|\,).*})\s*$'
+      embed: scope:source.stata
+  fenced-ahk:
+    - match: '^(\s*[`~]{3,})\s*(ahk)\s*$'
+      embed: scope:source.ahk
+      embed_scope: markup.raw.block.markdown markup.raw.block.fenced.markdown
+      escape: ^(\1)\n
   fenced-undefined:
     - match: '^(\s*[`~]{3,}).*$'
       push:
@@ -607,6 +624,11 @@ contexts:
       embed: scope:source.yaml
       embed_scope: markup.raw.block.markdown markup.raw.block.fenced.markdown
       escape: ^(\1)\n
+  fenced-r:
+    - match: '^(\s*[`~]{3,})\s*(R|r|\{r[a-zA-Z0-9.,-="\s]*\})\s*$'
+      embed: scope:source.r
+      embed_scope: markup.raw.block.markdown markup.raw.block.fenced.markdown
+      escape: ^(\1)\n
   heading:
     - match: '\G(#{1,6})(?!#)\s*(?=\S)'
       captures:
diff --git a/MarkdownEditor-ArcDark.sublime-color-scheme b/MarkdownEditor-ArcDark.sublime-color-scheme
new file mode 100644
index 00000000..d533ee65
--- /dev/null
+++ b/MarkdownEditor-ArcDark.sublime-color-scheme
@@ -0,0 +1,353 @@
+{
+    "name": "MarkdownEditing",
+    "author": "Unknown",
+    "globals":
+    {
+        "foreground": "#ffffff",
+        "background": "#383C4A",
+        "caret": "#F8F8F0",
+        "invisibles": "#31333D",
+        "line_highlight": "#2d3036",
+        "selection": "#484A58",
+        "inactive_selection": "#4a2c1a",
+        "find_highlight_foreground": "#ffffff",
+        "find_highlight": "#00186d"
+    },
+    "rules":
+    [
+        {
+            "name": "Comments",
+            "scope": "comment, comment punctuation",
+            "foreground": "#585964"
+        },
+        {
+            "name": "Comments: Preprocessor",
+            "scope": "comment.block.preprocessor",
+            "foreground": "#C77E77"
+        },
+        {
+            "name": "Invalid - Deprecated",
+            "scope": "invalid.deprecated",
+            "foreground": "#F8F8F0",
+            "background": "#AE81FF",
+            "font_style": "italic underline"
+        },
+        {
+            "name": "Invalid - Illegal",
+            "scope": "invalid.illegal",
+            "foreground": "#060d31"
+        },
+        {
+            "name": "Operators",
+            "scope": "keyword.operator",
+            "foreground": "#9d9036"
+        },
+        {
+            "name": "Keywords",
+            "scope": "keyword, storage",
+            "foreground": "#9e79d0"
+        },
+        {
+            "name": "Types",
+            "scope": "storage.type, support.type",
+            "foreground": "#98ff46"
+        },
+        {
+            "name": "Functions",
+            "scope": "entity.name.function, support.function, entity",
+            "foreground": "#9e79d0"
+        },
+        {
+            "name": "Classes",
+            "scope": "entity.name.type, entity.other.inherited-class, support.class",
+            "foreground": "#C77E77"
+        },
+        {
+            "name": "Exceptions",
+            "scope": "entity.name.exception",
+            "foreground": "#06cdcd"
+        },
+        {
+            "name": "Sections",
+            "scope": "entity.name.section,entity.name.section.markdown",
+            "foreground": "#C77E77",
+            "font_style": "bold"
+        },
+        {
+            "name": "Numbers",
+            "scope": "constant.numeric, constant",
+            "foreground": "#BBCF54"
+        },
+        {
+            "name": "Punctuation",
+            "scope": "punctuation",
+            "foreground": "#ffffff"
+        },
+        {
+            "name": "Strings",
+            "scope": "constant.character, string",
+            "foreground": "#4398f0"
+        },
+        {
+            "name": "Strings: Punctuation",
+            "scope": "string punctuation",
+            "foreground": "#1965b3"
+        },
+        {
+            "name": "Strings: Escape Sequences",
+            "scope": "constant.character.escape",
+            "font_style": "bold"
+        },
+        {
+            "name": "Strings: Symbols",
+            "scope": "constant.other.symbol",
+            "background": "#17002a",
+            "font_style": "bold"
+        },
+        {
+            "name": "Embedded Source",
+            "scope": "string source, text source",
+            "foreground": "#bcbcbc"
+        },
+        {
+            "name": "HTML: Doctype Declaration",
+            "scope": "meta.tag.sgml.doctype",
+            "foreground": "#808080"
+        },
+        {
+            "name": "HTML: Tags",
+            "scope": "text.html.markdown meta.disable-markdown entity.name.tag, text.html.markdown meta.disable-markdown meta.tag, text.html.markdown meta.disable-markdown meta.tag punctuation.definition.tag, text.html.markdown meta.disable-markdown meta.tag string.quoted meta.string-contents, text.html.markdown meta.disable-markdown meta.tag string.quoted punctuation.definition.string, text.html.markdown meta.disable-markdown meta.tag entity.other.attribute-name, text.html.markdown meta.paragraph.markdown entity.name.tag, text.html.markdown meta.paragraph.markdown meta.tag, text.html.markdown meta.paragraph.markdown meta.tag punctuation.definition.tag, text.html.markdown meta.paragraph.markdown meta.tag string.quoted meta.string-contents, text.html.markdown meta.paragraph.markdown meta.tag string.quoted punctuation.definition.string, text.html.markdown meta.paragraph.markdown meta.tag entity.other.attribute-name, text.html.markdown markup.list entity.name.tag, text.html.markdown markup.list meta.tag, text.html.markdown markup.list meta.tag punctuation.definition.tag, text.html.markdown markup.list meta.tag string.quoted meta.string-contents, text.html.markdown markup.list meta.tag string.quoted punctuation.definition.string, text.html.markdown markup.list meta.tag entity.other.attribute-name",
+            "foreground": "#555555",
+            "background": "#2e3240"
+        },
+        {
+            "name": "HTML: Embedded",
+            "scope": "source.smarty.embedded.html",
+            "foreground": "#888888"
+        },
+        {
+            "name": "HTML: Attribute Punctuation",
+            "scope": "meta.tag string punctuation,punctuation.definition.entity.html",
+            "foreground": "#6e5330"
+        },
+        {
+            "name": "HTML: Tag Punctuation",
+            "scope": "punctuation.definition.tag",
+            "foreground": "#6e5330"
+        },
+        {
+            "name": "HTML: Entities",
+            "scope": "constant.character.entity",
+            "foreground": "#926730"
+        },
+        {
+            "name": "HTML: Attribute Names",
+            "scope": "entity.other.attribute-name, text.html.markdown meta.disable-markdown meta.tag.block.any.html string.quoted.double.html, text.html.markdown meta.disable-markdown meta.tag.block.any.html string.quoted.double.html punctuation.definition",
+            "foreground": "#666666"
+        },
+        {
+            "name": "HTML: Attribute Values",
+            "scope": "meta.tag string.quoted, meta.tag string.quoted constant.character.entity",
+            "foreground": "#926730"
+        },
+        {
+            "name": "Markup: Emphasis",
+            "scope": "markup.italic, markup.italic.markdown",
+            "foreground": "#888888",
+            "font_style": "italic"
+        },
+        {
+            "name": "Markdown: Link",
+            "scope": "string.other.link.title.markdown,string.other.link.description.markdown",
+            "foreground": "#5294E2"
+        },
+        {
+            "name": "Markdown: Punctuation",
+            "scope": "punctuation.definition.metadata.markdown,punctuation.definition.string.begin.markdown, punctuation.definition.string.end.markdown, punctuation.definition.constant.markdown, punctuation.separator.key-value.markdown, punctuation.definition.constant.begin.markdown, punctuation.definition.constant.end.markdown,punctuation.definition.bold.markdown, punctuation.definition.italic.markdown, punctuation.definition.strikethrough.markdown, punctuation.definition.heading.markdown",
+            "foreground": "#555555"
+        },
+        {
+            "name": "Markdown: Lists",
+            "scope": "markup.list.unnumbered.markdown, markup.list.unnumbered.markdown meta.paragraph.list.markdown, markup.list.numbered.markdown, markup.list.numbered.markdown meta.paragraph.list.markdown",
+            "foreground": "#ffffff"
+        },
+        {
+            "name": "Markdown: Lists",
+            "scope": "markup.list.unnumbered.markdown punctuation.definition.list_item.markdown, markup.list.numbered.markdown punctuation.definition.list_item.markdown",
+            "foreground": "#ffffff"
+        },
+        {
+            "name": "Markup: Output",
+            "scope": "markup.output, markup.raw",
+            "foreground": "#808080"
+        },
+        {
+            "name": "Markup: Prompt",
+            "scope": "markup.prompt",
+            "foreground": "#aaaaaa"
+        },
+        {
+            "name": "Markup: Heading",
+            "scope": "markup.heading",
+            "foreground": "#C77E77",
+            "font_style": "bold"
+        },
+        {
+            "name": "Markup: StrongEmphasis",
+            "scope": "markup.bold_italic, markup.bold_italic.markdown",
+            "foreground": "#E8A64B",
+            "font_style": "bold italic"
+        },
+        {
+            "name": "Markup: Strong",
+            "scope": "markup.bold, markup.bold.markdown",
+            "foreground": "#E8A64B",
+            "font_style": "bold"
+        },
+        {
+            "name": "Markup: Strikethrough",
+            "scope": "markup.strikethrough, markup.strikethrough.markdown, markup.strikethrough constant.other.reference.link.markdown, markup.strikethrough entity.name.tag, markup.strikethrough markup.bold, markup.strikethrough markup.bold.markdown, markup.strikethrough markup.italic, markup.strikethrough markup.italic.markdown, markup.strikethrough markup.raw.inline.markdown, markup.strikethrough markup.underline.link.image.markdown, markup.strikethrough markup.underline.link.markdown, markup.strikethrough meta.link.inet.markdown markup.underline.link.markdown, markup.strikethrough meta.link.email.lt-gt.markdown markup.underline.link.markdown, markup.strikethrough punctuation.definition.bold.markdown, markup.strikethrough punctuation.definition.italic.markdown, markup.strikethrough punctuation.definition.constant.begin.markdown, markup.strikethrough punctuation.definition.constant.end.markdown, markup.strikethrough punctuation.definition.constant.markdown, markup.strikethrough punctuation.definition.metadata.markdown, markup.strikethrough punctuation.definition.raw.markdown, markup.strikethrough punctuation.definition.strikethrough.markdown, markup.strikethrough punctuation.definition.string.begin.markdown, markup.strikethrough punctuation.definition.string.end.markdown, markup.strikethrough punctuation.definition.tag.begin.html, markup.strikethrough punctuation.definition.tag.end.html, markup.strikethrough string.other.link.description.markdown, markup.strikethrough string.other.link.description.title.markdown, markup.strikethrough string.other.link.title.markdown",
+            "foreground": "#313131"
+        },
+        {
+            "name": "Markup: Strikethrough (Keyboard Shortcut)",
+            "scope": "markup.strikethrough markup.kbd.content, markup.strikethrough markup.kbd.content.markdown",
+            "foreground": "#484848"
+        },
+        {
+            "name": "Markup: Keyboard Shortcut",
+            "scope": "markup.kbd.content.markdown",
+            "foreground": "#ECECEC"
+        },
+        {
+            "name": "Markup: Traceback",
+            "scope": "markup.traceback",
+            "foreground": "#06cdcd"
+        },
+        {
+            "name": "Markup: Underline",
+            "scope": "markup.underline,markup.underline.link.markdown,constant.other.reference.link.markdown,meta.image.reference.markdown,meta.image.inline.markdown",
+            "foreground": "#555555"
+        },
+        {
+            "name": "Markup: Plain Link",
+            "scope": "meta.link.inet.markdown markup.underline.link.markdown, meta.link.email.lt-gt.markdown markup.underline.link.markdown",
+            "foreground": "#bbbb77"
+        },
+        {
+            "name": "Extra: Diff Range",
+            "scope": "meta.diff.range, meta.diff.index, meta.separator",
+            "foreground": "#bcbcbc",
+            "background": "#150d0a"
+        },
+        {
+            "name": "Extra: Diff From",
+            "scope": "meta.diff.header.from-file",
+            "foreground": "#bcbcbc",
+            "background": "#002222"
+        },
+        {
+            "name": "Extra: Diff To",
+            "scope": "meta.diff.header.to-file",
+            "foreground": "#bcbcbc",
+            "background": "#220022"
+        },
+        {
+            "name": "Markdown Meta",
+            "scope": "meta.header.multimarkdown,keyword.other.multimarkdown,string.unquoted.multimarkdown,punctuation.separator.key-value.multimarkdown",
+            "foreground": "#C77E77"
+        },
+        {
+            "name": "Markdown separator",
+            "scope": "meta.separator.markdown",
+            "foreground": "#555555",
+            "background": "#2e3240"
+        },
+        {
+            "name": "Blockquote",
+            "scope": "markup.quote.markdown",
+            "foreground": "#666666"
+        },
+        {
+            "name": "Blockquote (Tags)",
+            "scope": "text.html.markdown markup.quote.markdown entity.name.tag, text.html.markdown markup.quote.markdown meta.tag, text.html.markdown markup.quote.markdown meta.tag punctuation.definition.tag, text.html.markdown markup.quote.markdown meta.tag string.quoted meta.string-contents, text.html.markdown markup.quote.markdown meta.tag string.quoted punctuation.definition.string, text.html.markdown markup.quote.markdown meta.tag entity.other.attribute-name",
+            "foreground": "#313131",
+            "background": "#2e3240"
+        },
+        {
+            "name": "Blockquote (Keyboard Shortcut)",
+            "scope": "text.html.markdown markup.quote.markdown markup.kbd.content.markdown",
+            "foreground": "#8e8e8e",
+            "background": "#2e3240"
+        },
+        {
+            "name": "Blockquote (Bold)",
+            "scope": "text.html.markdown markup.quote.markdown markup.bold, text.html.markdown markup.quote.markdown markup.bold.markdown",
+            "foreground": "#666666"
+        },
+        {
+            "name": "Blockquote punctuation",
+            "scope": "punctuation.definition.blockquote.markdown",
+            "foreground": "#3E3E3E"
+        },
+        {
+            "name": "Block code",
+            "scope": "markup.raw.block.markdown",
+            "foreground": "#aaaaaa",
+            "background": "#2e3240"
+        },
+        {
+            "name": "Inline code",
+            "scope": "markup.raw.inline.markdown",
+            "background": "#2e3240"
+        },
+        {
+            "name": "Block Cursor",
+            "scope": "block_cursor",
+            "foreground": "#dedede",
+            "background": "#FF420077"
+        },
+        {
+            "name": "Brackets",
+            "scope": "entity.name.class",
+            "background": "#2e3240"
+        },
+        {
+            "name": "WordHighlight",
+            "scope": "wordhighlight",
+            "foreground": "#dedede",
+            "background": "#FF420077"
+        },
+        {
+            "name": "BracketHighlighter",
+            "scope": "brackethighlighter.default",
+            "foreground": "#dedede",
+            "background": "#FF420077"
+        },
+        {
+            "name": "GitGutter deleted",
+            "scope": "markup.deleted.git_gutter",
+            "foreground": "#F92672"
+        },
+        {
+            "name": "GitGutter inserted",
+            "scope": "markup.inserted.git_gutter",
+            "foreground": "#A6E22E"
+        },
+        {
+            "name": "GitGutter changed",
+            "scope": "markup.changed.git_gutter",
+            "foreground": "#967EFB"
+        },
+        {
+            "name": "GitGutter ignored",
+            "scope": "markup.ignored.git_gutter",
+            "foreground": "#565656"
+        },
+        {
+            "name": "GitGutter untracked",
+            "scope": "markup.untracked.git_gutter",
+            "foreground": "#565656"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/MarkdownEditor-ArcDark.tmTheme b/MarkdownEditor-ArcDark.tmTheme
deleted file mode 100644
index 3b36837d..00000000
--- a/MarkdownEditor-ArcDark.tmTheme
+++ /dev/null
@@ -1,876 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>name</key>
-    <string>MarkdownEditing</string>
-    <key>settings</key>
-    <array>
-        <dict>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-				<string>#383C4A</string>
-				<key>caret</key>
-				<string>#F8F8F0</string>
-				<key>foreground</key>
-				<string>#ffffff</string>
-				<key>invisibles</key>
-				<string>#31333D</string>
-				<key>lineHighlight</key>
-				<string>#2d3036</string>
-				<key>selection</key>
-				<string>#484A58</string>
-                <key>inactiveSelection</key>
-                <string>#4a2c1a</string>
-                <key>findHighlight</key>
-                <string>#00186d</string>
-                <key>findHighlightForeground</key>
-                <string>#ffffff</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Comments</string>
-            <key>scope</key>
-            <string>comment, comment punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#585964</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Comments: Preprocessor</string>
-            <key>scope</key>
-            <string>comment.block.preprocessor</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#C77E77</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Invalid - Deprecated</string>
-            <key>scope</key>
-            <string>invalid.deprecated</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#AE81FF</string>
-                <key>foreground</key>
-				<string>#F8F8F0</string>
-                <key>fontStyle</key>
-                <string>italic underline</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Invalid - Illegal</string>
-            <key>scope</key>
-            <string>invalid.illegal</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#060d31</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Operators</string>
-            <key>scope</key>
-            <string>keyword.operator</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#9d9036</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Keywords</string>
-            <key>scope</key>
-            <string>keyword, storage</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#9e79d0</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Types</string>
-            <key>scope</key>
-            <string>storage.type, support.type</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#98ff46</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Functions</string>
-            <key>scope</key>
-            <string>entity.name.function, support.function, entity</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#9e79d0</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Classes</string>
-            <key>scope</key>
-            <string>entity.name.type, entity.other.inherited-class, support.class</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#C77E77</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Exceptions</string>
-            <key>scope</key>
-            <string>entity.name.exception</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#06cdcd</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Sections</string>
-            <key>scope</key>
-            <string>entity.name.section,entity.name.section.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-                <key>foreground</key>
-                <string>#C77E77</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Numbers</string>
-            <key>scope</key>
-            <string>constant.numeric, constant</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#BBCF54</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Punctuation</string>
-            <key>scope</key>
-            <string>punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#ffffff</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings</string>
-            <key>scope</key>
-            <string>constant.character, string</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#4398f0</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Punctuation</string>
-            <key>scope</key>
-            <string>string punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#1965b3</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Escape Sequences</string>
-            <key>scope</key>
-            <string>constant.character.escape</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Symbols</string>
-            <key>scope</key>
-            <string>constant.other.symbol</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#17002a</string>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Embedded Source</string>
-            <key>scope</key>
-            <string>string source, text source</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#bcbcbc</string>
-            </dict>
-        </dict>
-
-        <dict>
-            <key>name</key>
-            <string>HTML: Doctype Declaration</string>
-            <key>scope</key>
-            <string>meta.tag.sgml.doctype</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#808080</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Tags</string>
-            <key>scope</key>
-            <string>
-                , text.html.markdown meta.disable-markdown entity.name.tag,
-                , text.html.markdown meta.disable-markdown meta.tag,
-                , text.html.markdown meta.disable-markdown meta.tag punctuation.definition.tag,
-                , text.html.markdown meta.disable-markdown meta.tag string.quoted meta.string-contents,
-                , text.html.markdown meta.disable-markdown meta.tag string.quoted punctuation.definition.string,
-                , text.html.markdown meta.disable-markdown meta.tag entity.other.attribute-name,
-                , text.html.markdown meta.paragraph.markdown entity.name.tag,
-                , text.html.markdown meta.paragraph.markdown meta.tag,
-                , text.html.markdown meta.paragraph.markdown meta.tag punctuation.definition.tag,
-                , text.html.markdown meta.paragraph.markdown meta.tag string.quoted meta.string-contents,
-                , text.html.markdown meta.paragraph.markdown meta.tag string.quoted punctuation.definition.string,
-                , text.html.markdown meta.paragraph.markdown meta.tag entity.other.attribute-name,
-                , text.html.markdown markup.list entity.name.tag,
-                , text.html.markdown markup.list meta.tag,
-                , text.html.markdown markup.list meta.tag punctuation.definition.tag,
-                , text.html.markdown markup.list meta.tag string.quoted meta.string-contents,
-                , text.html.markdown markup.list meta.tag string.quoted punctuation.definition.string,
-                , text.html.markdown markup.list meta.tag entity.other.attribute-name,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#555555</string>
-                <key>background</key>
-                <string>#2e3240</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Embedded</string>
-            <key>scope</key>
-            <string>source.smarty.embedded.html</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#888888</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Punctuation</string>
-            <key>scope</key>
-            <string>meta.tag string punctuation,punctuation.definition.entity.html</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#6e5330</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Tag Punctuation</string>
-            <key>scope</key>
-            <string>punctuation.definition.tag</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#6e5330</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Entities</string>
-            <key>scope</key>
-            <string>constant.character.entity</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#926730</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Names</string>
-            <key>scope</key>
-            <string>entity.other.attribute-name, text.html.markdown meta.disable-markdown meta.tag.block.any.html string.quoted.double.html, text.html.markdown meta.disable-markdown meta.tag.block.any.html string.quoted.double.html punctuation.definition</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#666666</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Values</string>
-            <key>scope</key>
-            <string>meta.tag string.quoted, meta.tag string.quoted constant.character.entity</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#926730</string>
-            </dict>
-        </dict>
-
-        <dict>
-            <key>name</key>
-            <string>Markup: Emphasis</string>
-            <key>scope</key>
-            <string>markup.italic, markup.italic.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>italic</string>
-                <key>foreground</key>
-                <string>#888888</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown: Link</string>
-            <key>scope</key>
-            <string>string.other.link.title.markdown,string.other.link.description.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#5294E2</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown: Punctuation</string>
-            <key>scope</key>
-            <string>punctuation.definition.metadata.markdown,punctuation.definition.string.begin.markdown, punctuation.definition.string.end.markdown, punctuation.definition.constant.markdown, punctuation.separator.key-value.markdown, punctuation.definition.constant.begin.markdown, punctuation.definition.constant.end.markdown,punctuation.definition.bold.markdown, punctuation.definition.italic.markdown, punctuation.definition.strikethrough.markdown, punctuation.definition.heading.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#555555</string>
-            </dict>
-        </dict>
-
-        <dict>
-            <key>name</key>
-            <string>Markdown: Lists</string>
-            <key>scope</key>
-            <string>
-                , markup.list.unnumbered.markdown,
-                , markup.list.unnumbered.markdown meta.paragraph.list.markdown,
-                , markup.list.numbered.markdown,
-                , markup.list.numbered.markdown meta.paragraph.list.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#ffffff</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown: Lists</string>
-            <key>scope</key>
-            <string>
-                , markup.list.unnumbered.markdown punctuation.definition.list_item.markdown,
-                , markup.list.numbered.markdown punctuation.definition.list_item.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#ffffff</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Output</string>
-            <key>scope</key>
-            <string>markup.output, markup.raw</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#808080</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Prompt</string>
-            <key>scope</key>
-            <string>markup.prompt</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#aaaaaa</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Heading</string>
-            <key>scope</key>
-            <string>markup.heading</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-                <key>foreground</key>
-                <string>#C77E77</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: StrongEmphasis</string>
-            <key>scope</key>
-            <string>markup.bold_italic, markup.bold_italic.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold italic</string>
-                <key>foreground</key>
-                <string>#E8A64B</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Strong</string>
-            <key>scope</key>
-            <string>markup.bold, markup.bold.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-                <key>foreground</key>
-                <string>#E8A64B</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Strikethrough</string>
-            <key>scope</key>
-            <string>
-                , markup.strikethrough,
-                , markup.strikethrough.markdown,
-                , markup.strikethrough constant.other.reference.link.markdown,
-                , markup.strikethrough entity.name.tag,
-                , markup.strikethrough markup.bold,
-                , markup.strikethrough markup.bold.markdown,
-                , markup.strikethrough markup.italic,
-                , markup.strikethrough markup.italic.markdown,
-                , markup.strikethrough markup.raw.inline.markdown,
-                , markup.strikethrough markup.underline.link.image.markdown,
-                , markup.strikethrough markup.underline.link.markdown,
-                , markup.strikethrough meta.link.inet.markdown markup.underline.link.markdown,
-                , markup.strikethrough meta.link.email.lt-gt.markdown markup.underline.link.markdown,
-                , markup.strikethrough punctuation.definition.bold.markdown,
-                , markup.strikethrough punctuation.definition.italic.markdown,
-                , markup.strikethrough punctuation.definition.constant.begin.markdown,
-                , markup.strikethrough punctuation.definition.constant.end.markdown,
-                , markup.strikethrough punctuation.definition.constant.markdown,
-                , markup.strikethrough punctuation.definition.metadata.markdown,
-                , markup.strikethrough punctuation.definition.raw.markdown,
-                , markup.strikethrough punctuation.definition.strikethrough.markdown,
-                , markup.strikethrough punctuation.definition.string.begin.markdown,
-                , markup.strikethrough punctuation.definition.string.end.markdown,
-                , markup.strikethrough punctuation.definition.tag.begin.html,
-                , markup.strikethrough punctuation.definition.tag.end.html,
-                , markup.strikethrough string.other.link.description.markdown,
-                , markup.strikethrough string.other.link.description.title.markdown,
-                , markup.strikethrough string.other.link.title.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#313131</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Strikethrough (Keyboard Shortcut)</string>
-            <key>scope</key>
-            <string>
-                , markup.strikethrough markup.kbd.content,
-                , markup.strikethrough markup.kbd.content.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#484848</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Keyboard Shortcut</string>
-            <key>scope</key>
-            <string>markup.kbd.content.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#ECECEC</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Traceback</string>
-            <key>scope</key>
-            <string>markup.traceback</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#06cdcd</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Underline</string>
-            <key>scope</key>
-            <string>markup.underline,markup.underline.link.markdown,constant.other.reference.link.markdown,meta.image.reference.markdown,meta.image.inline.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#555555</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Plain Link</string>
-            <key>scope</key>
-            <string>
-                , meta.link.inet.markdown markup.underline.link.markdown,
-                , meta.link.email.lt-gt.markdown markup.underline.link.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#bbbb77</string>
-            </dict>
-        </dict>
-
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff Range</string>
-            <key>scope</key>
-            <string>meta.diff.range, meta.diff.index, meta.separator</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#150d0a</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#bcbcbc</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff From</string>
-            <key>scope</key>
-            <string>meta.diff.header.from-file</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#002222</string>
-                <key>foreground</key>
-                <string>#bcbcbc</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff To</string>
-            <key>scope</key>
-            <string>meta.diff.header.to-file</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#220022</string>
-                <key>foreground</key>
-                <string>#bcbcbc</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown Meta</string>
-            <key>scope</key>
-            <string>meta.header.multimarkdown,keyword.other.multimarkdown,string.unquoted.multimarkdown,punctuation.separator.key-value.multimarkdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#C77E77</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown separator</string>
-            <key>scope</key>
-            <string>meta.separator.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#555555</string>
-                <key>background</key>
-                <string>#2e3240</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote</string>
-            <key>scope</key>
-            <string>markup.quote.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#666666</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote (Tags)</string>
-            <key>scope</key>
-            <string>
-                , text.html.markdown markup.quote.markdown entity.name.tag,
-                , text.html.markdown markup.quote.markdown meta.tag,
-                , text.html.markdown markup.quote.markdown meta.tag punctuation.definition.tag,
-                , text.html.markdown markup.quote.markdown meta.tag string.quoted meta.string-contents,
-                , text.html.markdown markup.quote.markdown meta.tag string.quoted punctuation.definition.string,
-                , text.html.markdown markup.quote.markdown meta.tag entity.other.attribute-name,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#313131</string>
-                <key>background</key>
-                <string>#2e3240</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote (Keyboard Shortcut)</string>
-            <key>scope</key>
-            <string>text.html.markdown markup.quote.markdown markup.kbd.content.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#2e3240</string>
-                <key>foreground</key>
-                <string>#8e8e8e</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote (Bold)</string>
-            <key>scope</key>
-            <string>
-                , text.html.markdown markup.quote.markdown markup.bold,
-                , text.html.markdown markup.quote.markdown markup.bold.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#666666</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote punctuation</string>
-            <key>scope</key>
-            <string>punctuation.definition.blockquote.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#3E3E3E</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Block code</string>
-            <key>scope</key>
-            <string>markup.raw.block.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#2e3240</string>
-                <key>foreground</key>
-                <string>#aaaaaa</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Inline code</string>
-            <key>scope</key>
-            <string>markup.raw.inline.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#2e3240</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Block Cursor</string>
-            <key>scope</key>
-            <string>block_cursor</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#dedede</string>
-                <key>background</key>
-                <string>#FF420077</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Brackets</string>
-            <key>scope</key>
-            <string>entity.name.class</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#2e3240</string>
-            </dict>
-        </dict>
-
-        <!-- Below definitions belong to thirdparty plugins. -->
-        <dict>
-            <key>name</key>
-            <string>WordHighlight</string>
-            <key>scope</key>
-            <string>wordhighlight</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#dedede</string>
-                <key>background</key>
-                <string>#FF420077</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>BracketHighlighter</string>
-            <key>scope</key>
-            <string>brackethighlighter.default</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#dedede</string>
-                <key>background</key>
-                <string>#FF420077</string>
-            </dict>
-        </dict>
-        <!-- Support for GitGutter -->
-        <dict>
-            <key>name</key>
-            <string>GitGutter deleted</string>
-            <key>scope</key>
-            <string>markup.deleted.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#F92672</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter inserted</string>
-            <key>scope</key>
-            <string>markup.inserted.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#A6E22E</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter changed</string>
-            <key>scope</key>
-            <string>markup.changed.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#967EFB</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter ignored</string>
-            <key>scope</key>
-            <string>markup.ignored.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#565656</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter untracked</string>
-            <key>scope</key>
-            <string>markup.untracked.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#565656</string>
-            </dict>
-        </dict>
-    </array>
-    <key>uuid</key>
-    <string>BF4E1964-0DB9-4E88-8142-E8F52D7EDEEC</string>
-</dict>
-</plist>
diff --git a/MarkdownEditor-Dark.sublime-color-scheme b/MarkdownEditor-Dark.sublime-color-scheme
new file mode 100644
index 00000000..58432367
--- /dev/null
+++ b/MarkdownEditor-Dark.sublime-color-scheme
@@ -0,0 +1,367 @@
+{
+    "name": "MarkdownEditing",
+    "author": "Unknown",
+    "globals":
+    {
+        "foreground": "#aaaaaa",
+        "background": "#131313",
+        "caret": "#00bbff",
+        "invisibles": "#1f1f1f",
+        "line_highlight": "#191919",
+        "selection": "#3d1700",
+        "selection_border": "#553420",
+        "inactive_selection": "#4a2c1a",
+        "shadow": "#7f7f7f",
+        "shadow_width": "6",
+        "find_highlight_foreground": "#ffffff",
+        "find_highlight": "#00186d"
+    },
+    "rules":
+    [
+        {
+            "name": "Comments",
+            "scope": "comment, comment punctuation",
+            "foreground": "#525252"
+        },
+        {
+            "name": "Comments: Preprocessor",
+            "scope": "comment.block.preprocessor",
+            "foreground": "#525252"
+        },
+        {
+            "name": "Invalid - Deprecated",
+            "scope": "invalid.deprecated",
+            "background": "#103030",
+            "font_style": "italic underline"
+        },
+        {
+            "name": "Invalid - Illegal",
+            "scope": "invalid.illegal",
+            "foreground": "#060d31"
+        },
+        {
+            "name": "Operators",
+            "scope": "keyword.operator",
+            "foreground": "#9d9036"
+        },
+        {
+            "name": "Keywords",
+            "scope": "keyword, storage",
+            "foreground": "#9e79d0"
+        },
+        {
+            "name": "Types",
+            "scope": "storage.type, support.type",
+            "foreground": "#98ff46"
+        },
+        {
+            "name": "Functions",
+            "scope": "entity.name.function, support.function, entity",
+            "foreground": "#9e79d0"
+        },
+        {
+            "name": "Classes",
+            "scope": "entity.name.type, entity.other.inherited-class, support.class",
+            "foreground": "#c5e28d"
+        },
+        {
+            "name": "Exceptions",
+            "scope": "entity.name.exception",
+            "foreground": "#06cdcd"
+        },
+        {
+            "name": "Sections",
+            "scope": "entity.name.section,entity.name.section.markdown",
+            "foreground": "#cccccc",
+            "font_style": "bold"
+        },
+        {
+            "name": "Numbers",
+            "scope": "constant.numeric, constant",
+            "foreground": "#89ac3e",
+            "background": "#0c0d00"
+        },
+        {
+            "name": "Punctuation",
+            "scope": "punctuation",
+            "foreground": "#ffffff"
+        },
+        {
+            "name": "Strings",
+            "scope": "constant.character, string",
+            "foreground": "#4398f0",
+            "background": "#0416521A"
+        },
+        {
+            "name": "Strings: Punctuation",
+            "scope": "string punctuation",
+            "foreground": "#1965b3"
+        },
+        {
+            "name": "Strings: Escape Sequences",
+            "scope": "constant.character.escape",
+            "background": "#041652CC",
+            "font_style": "bold"
+        },
+        {
+            "name": "Strings: Symbols",
+            "scope": "constant.other.symbol",
+            "background": "#17002a",
+            "font_style": "bold"
+        },
+        {
+            "name": "Embedded Source",
+            "scope": "string source, text source",
+            "foreground": "#bcbcbc"
+        },
+        {
+            "name": "HTML: Doctype Declaration",
+            "scope": "meta.tag.sgml.doctype",
+            "foreground": "#808080"
+        },
+        {
+            "name": "HTML: Tags",
+            "scope": "text.html.markdown meta.disable-markdown entity.name.tag, text.html.markdown meta.disable-markdown meta.tag, text.html.markdown meta.disable-markdown meta.tag punctuation.definition.tag, text.html.markdown meta.disable-markdown meta.tag string.quoted meta.string-contents, text.html.markdown meta.disable-markdown meta.tag string.quoted punctuation.definition.string, text.html.markdown meta.disable-markdown meta.tag entity.other.attribute-name, text.html.markdown meta.paragraph.markdown entity.name.tag, text.html.markdown meta.paragraph.markdown meta.tag, text.html.markdown meta.paragraph.markdown meta.tag punctuation.definition.tag, text.html.markdown meta.paragraph.markdown meta.tag string.quoted meta.string-contents, text.html.markdown meta.paragraph.markdown meta.tag string.quoted punctuation.definition.string, text.html.markdown meta.paragraph.markdown meta.tag entity.other.attribute-name, text.html.markdown markup.list entity.name.tag, text.html.markdown markup.list meta.tag, text.html.markdown markup.list meta.tag punctuation.definition.tag, text.html.markdown markup.list meta.tag string.quoted meta.string-contents, text.html.markdown markup.list meta.tag string.quoted punctuation.definition.string, text.html.markdown markup.list meta.tag entity.other.attribute-name",
+            "foreground": "#555555",
+            "background": "#131313"
+        },
+        {
+            "name": "HTML: Embedded",
+            "scope": "source.smarty.embedded.html",
+            "foreground": "#888888"
+        },
+        {
+            "name": "HTML: Attribute Punctuation",
+            "scope": "meta.tag string punctuation,punctuation.definition.entity.html",
+            "foreground": "#6e5330"
+        },
+        {
+            "name": "HTML: Tag Punctuation",
+            "scope": "punctuation.definition.tag",
+            "foreground": "#6e5330"
+        },
+        {
+            "name": "HTML: Entities",
+            "scope": "constant.character.entity",
+            "foreground": "#926730"
+        },
+        {
+            "name": "HTML: Attribute Names",
+            "scope": "entity.other.attribute-name, text.html.markdown meta.disable-markdown meta.tag.block.any.html string.quoted.double.html, text.html.markdown meta.disable-markdown meta.tag.block.any.html string.quoted.double.html punctuation.definition",
+            "foreground": "#666666"
+        },
+        {
+            "name": "HTML: Attribute Values",
+            "scope": "meta.tag string.quoted, meta.tag string.quoted constant.character.entity",
+            "foreground": "#926730"
+        },
+        {
+            "name": "Markup: Emphasis",
+            "scope": "markup.italic, markup.italic.markdown",
+            "foreground": "#888888",
+            "background": "#171717",
+            "font_style": "italic"
+        },
+        {
+            "name": "Markdown: Link",
+            "scope": "string.other.link.title.markdown,string.other.link.description.markdown",
+            "foreground": "#cccccc",
+            "background": "#22222200"
+        },
+        {
+            "name": "Markdown: Punctuation",
+            "scope": "punctuation.definition.metadata.markdown,punctuation.definition.string.begin.markdown, punctuation.definition.string.end.markdown, punctuation.definition.constant.markdown, punctuation.separator.key-value.markdown, punctuation.definition.constant.begin.markdown, punctuation.definition.constant.end.markdown,punctuation.definition.bold.markdown, punctuation.definition.italic.markdown, punctuation.definition.strikethrough.markdown, punctuation.definition.heading.markdown",
+            "foreground": "#555555",
+            "background": "#11111100"
+        },
+        {
+            "name": "Markdown: Lists",
+            "scope": "markup.list.unnumbered.markdown, markup.list.unnumbered.markdown meta.paragraph.list.markdown, markup.list.numbered.markdown, markup.list.numbered.markdown meta.paragraph.list.markdown",
+            "foreground": "#999999",
+            "background": "#11111100"
+        },
+        {
+            "name": "Markdown: Lists",
+            "scope": "markup.list.unnumbered.markdown punctuation.definition.list_item.markdown, markup.list.numbered.markdown punctuation.definition.list_item.markdown",
+            "foreground": "#ffffff"
+        },
+        {
+            "name": "Markup: Output",
+            "scope": "markup.output, markup.raw",
+            "foreground": "#808080"
+        },
+        {
+            "name": "Markup: Prompt",
+            "scope": "markup.prompt",
+            "foreground": "#aaaaaa"
+        },
+        {
+            "name": "Markup: Heading",
+            "scope": "markup.heading",
+            "font_style": "bold"
+        },
+        {
+            "name": "Markup: StrongEmphasis",
+            "scope": "markup.bold_italic, markup.bold_italic.markdown",
+            "foreground": "#aaaaaa",
+            "font_style": "bold italic"
+        },
+        {
+            "name": "Markup: Strong",
+            "scope": "markup.bold, markup.bold.markdown",
+            "foreground": "#aaaaaa",
+            "font_style": "bold"
+        },
+        {
+            "name": "Markup: Strikethrough",
+            "scope": "markup.strikethrough, markup.strikethrough.markdown, markup.strikethrough constant.other.reference.link.markdown, markup.strikethrough entity.name.tag, markup.strikethrough markup.bold, markup.strikethrough markup.bold.markdown, markup.strikethrough markup.italic, markup.strikethrough markup.italic.markdown, markup.strikethrough markup.raw.inline.markdown, markup.strikethrough markup.underline.link.image.markdown, markup.strikethrough markup.underline.link.markdown, markup.strikethrough meta.link.inet.markdown markup.underline.link.markdown, markup.strikethrough meta.link.email.lt-gt.markdown markup.underline.link.markdown, markup.strikethrough punctuation.definition.bold.markdown, markup.strikethrough punctuation.definition.italic.markdown, markup.strikethrough punctuation.definition.constant.begin.markdown, markup.strikethrough punctuation.definition.constant.end.markdown, markup.strikethrough punctuation.definition.constant.markdown, markup.strikethrough punctuation.definition.metadata.markdown, markup.strikethrough punctuation.definition.raw.markdown, markup.strikethrough punctuation.definition.strikethrough.markdown, markup.strikethrough punctuation.definition.string.begin.markdown, markup.strikethrough punctuation.definition.string.end.markdown, markup.strikethrough punctuation.definition.tag.begin.html, markup.strikethrough punctuation.definition.tag.end.html, markup.strikethrough string.other.link.description.markdown, markup.strikethrough string.other.link.description.title.markdown, markup.strikethrough string.other.link.title.markdown",
+            "foreground": "#313131",
+            "background": "#131313"
+        },
+        {
+            "name": "Markup: Strikethrough (Keyboard Shortcut)",
+            "scope": "markup.strikethrough markup.kbd.content, markup.strikethrough markup.kbd.content.markdown",
+            "foreground": "#484848",
+            "background": "#222222"
+        },
+        {
+            "name": "Markup: Keyboard Shortcut",
+            "scope": "markup.kbd.content.markdown",
+            "foreground": "#ECECEC",
+            "background": "#2C2C2C"
+        },
+        {
+            "name": "Markup: Traceback",
+            "scope": "markup.traceback",
+            "foreground": "#06cdcd"
+        },
+        {
+            "name": "Markup: Underline",
+            "scope": "markup.underline,markup.underline.link.markdown,constant.other.reference.link.markdown,meta.image.reference.markdown,meta.image.inline.markdown",
+            "foreground": "#555555",
+            "background": "#171717"
+        },
+        {
+            "name": "Markup: Plain Link",
+            "scope": "meta.link.inet.markdown markup.underline.link.markdown, meta.link.email.lt-gt.markdown markup.underline.link.markdown",
+            "foreground": "#bbbb77"
+        },
+        {
+            "name": "Extra: Diff Range",
+            "scope": "meta.diff.range, meta.diff.index, meta.separator",
+            "foreground": "#bcbcbc",
+            "background": "#150d0a"
+        },
+        {
+            "name": "Extra: Diff From",
+            "scope": "meta.diff.header.from-file",
+            "foreground": "#bcbcbc",
+            "background": "#002222"
+        },
+        {
+            "name": "Extra: Diff To",
+            "scope": "meta.diff.header.to-file",
+            "foreground": "#bcbcbc",
+            "background": "#220022"
+        },
+        {
+            "name": "Markdown Meta",
+            "scope": "meta.header.multimarkdown,keyword.other.multimarkdown,string.unquoted.multimarkdown,punctuation.separator.key-value.multimarkdown",
+            "foreground": "#444444",
+            "background": "#222222"
+        },
+        {
+            "name": "Markdown separator",
+            "scope": "meta.separator.markdown",
+            "foreground": "#555555",
+            "background": "#44444422"
+        },
+        {
+            "name": "Blockquote",
+            "scope": "markup.quote.markdown",
+            "foreground": "#666666"
+        },
+        {
+            "name": "Blockquote (Tags)",
+            "scope": "text.html.markdown markup.quote.markdown entity.name.tag, text.html.markdown markup.quote.markdown meta.tag, text.html.markdown markup.quote.markdown meta.tag punctuation.definition.tag, text.html.markdown markup.quote.markdown meta.tag string.quoted meta.string-contents, text.html.markdown markup.quote.markdown meta.tag string.quoted punctuation.definition.string, text.html.markdown markup.quote.markdown meta.tag entity.other.attribute-name",
+            "foreground": "#313131",
+            "background": "#131313"
+        },
+        {
+            "name": "Blockquote (Keyboard Shortcut)",
+            "scope": "text.html.markdown markup.quote.markdown markup.kbd.content.markdown",
+            "foreground": "#8e8e8e",
+            "background": "#1a1a1a"
+        },
+        {
+            "name": "Blockquote (Bold)",
+            "scope": "text.html.markdown markup.quote.markdown markup.bold, text.html.markdown markup.quote.markdown markup.bold.markdown",
+            "foreground": "#666666"
+        },
+        {
+            "name": "Blockquote punctuation",
+            "scope": "punctuation.definition.blockquote.markdown",
+            "foreground": "#3E3E3E",
+            "background": "#3E3E3E"
+        },
+        {
+            "name": "Block code",
+            "scope": "markup.raw.block.markdown",
+            "foreground": "#aaaaaa",
+            "background": "#212121"
+        },
+        {
+            "name": "Inline code",
+            "scope": "markup.raw.inline.markdown",
+            "background": "#212121"
+        },
+        {
+            "name": "Block Cursor",
+            "scope": "block_cursor",
+            "foreground": "#dedede",
+            "background": "#FF420077"
+        },
+        {
+            "name": "Brackets",
+            "scope": "entity.name.class",
+            "background": "#2A090088"
+        },
+        {
+            "name": "WordHighlight",
+            "scope": "wordhighlight",
+            "foreground": "#dedede",
+            "background": "#FF420077"
+        },
+        {
+            "name": "BracketHighlighter",
+            "scope": "brackethighlighter.default",
+            "foreground": "#dedede",
+            "background": "#FF420077"
+        },
+        {
+            "name": "GitGutter deleted",
+            "scope": "markup.deleted.git_gutter",
+            "foreground": "#F92672"
+        },
+        {
+            "name": "GitGutter inserted",
+            "scope": "markup.inserted.git_gutter",
+            "foreground": "#A6E22E"
+        },
+        {
+            "name": "GitGutter changed",
+            "scope": "markup.changed.git_gutter",
+            "foreground": "#967EFB"
+        },
+        {
+            "name": "GitGutter ignored",
+            "scope": "markup.ignored.git_gutter",
+            "foreground": "#565656"
+        },
+        {
+            "name": "GitGutter untracked",
+            "scope": "markup.untracked.git_gutter",
+            "foreground": "#565656"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/MarkdownEditor-Dark.tmTheme b/MarkdownEditor-Dark.tmTheme
deleted file mode 100644
index 87e6931a..00000000
--- a/MarkdownEditor-Dark.tmTheme
+++ /dev/null
@@ -1,904 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>name</key>
-    <string>MarkdownEditing</string>
-    <key>settings</key>
-    <array>
-        <dict>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#131313</string>
-                <key>caret</key>
-                <string>#00bbff</string>
-                <key>foreground</key>
-                <string>#aaaaaa</string>
-                <key>invisibles</key>
-                <string>#1f1f1f</string>
-                <key>lineHighlight</key>
-                <string>#191919</string>
-                <key>selection</key>
-                <string>#3d1700</string>
-                <key>selectionBorder</key>
-                <string>#553420</string>
-                <key>inactiveSelection</key>
-                <string>#4a2c1a</string>
-                <key>findHighlight</key>
-                <string>#00186d</string>
-                <key>findHighlightForeground</key>
-                <string>#ffffff</string>
-                <key>shadow</key>
-                <string>#7f7f7f</string>
-                <key>shadowWidth</key>
-                <string>6</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Comments</string>
-            <key>scope</key>
-            <string>comment, comment punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#525252</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Comments: Preprocessor</string>
-            <key>scope</key>
-            <string>comment.block.preprocessor</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#525252</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Invalid - Deprecated</string>
-            <key>scope</key>
-            <string>invalid.deprecated</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#103030</string>
-                <key>fontStyle</key>
-                <string>italic underline</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Invalid - Illegal</string>
-            <key>scope</key>
-            <string>invalid.illegal</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#060d31</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Operators</string>
-            <key>scope</key>
-            <string>keyword.operator</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#9d9036</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Keywords</string>
-            <key>scope</key>
-            <string>keyword, storage</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#9e79d0</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Types</string>
-            <key>scope</key>
-            <string>storage.type, support.type</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#98ff46</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Functions</string>
-            <key>scope</key>
-            <string>entity.name.function, support.function, entity</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#9e79d0</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Classes</string>
-            <key>scope</key>
-            <string>entity.name.type, entity.other.inherited-class, support.class</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#c5e28d</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Exceptions</string>
-            <key>scope</key>
-            <string>entity.name.exception</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#06cdcd</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Sections</string>
-            <key>scope</key>
-            <string>entity.name.section,entity.name.section.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-                <key>foreground</key>
-                <string>#cccccc</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Numbers</string>
-            <key>scope</key>
-            <string>constant.numeric, constant</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#0c0d00</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#89ac3e</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Punctuation</string>
-            <key>scope</key>
-            <string>punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#ffffff</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings</string>
-            <key>scope</key>
-            <string>constant.character, string</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#0416521A</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#4398f0</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Punctuation</string>
-            <key>scope</key>
-            <string>string punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#1965b3</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Escape Sequences</string>
-            <key>scope</key>
-            <string>constant.character.escape</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#041652CC</string>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Symbols</string>
-            <key>scope</key>
-            <string>constant.other.symbol</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#17002a</string>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Embedded Source</string>
-            <key>scope</key>
-            <string>string source, text source</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#bcbcbc</string>
-            </dict>
-        </dict>
-
-        <dict>
-            <key>name</key>
-            <string>HTML: Doctype Declaration</string>
-            <key>scope</key>
-            <string>meta.tag.sgml.doctype</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#808080</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Tags</string>
-            <key>scope</key>
-            <string>
-                , text.html.markdown meta.disable-markdown entity.name.tag,
-                , text.html.markdown meta.disable-markdown meta.tag,
-                , text.html.markdown meta.disable-markdown meta.tag punctuation.definition.tag,
-                , text.html.markdown meta.disable-markdown meta.tag string.quoted meta.string-contents,
-                , text.html.markdown meta.disable-markdown meta.tag string.quoted punctuation.definition.string,
-                , text.html.markdown meta.disable-markdown meta.tag entity.other.attribute-name,
-                , text.html.markdown meta.paragraph.markdown entity.name.tag,
-                , text.html.markdown meta.paragraph.markdown meta.tag,
-                , text.html.markdown meta.paragraph.markdown meta.tag punctuation.definition.tag,
-                , text.html.markdown meta.paragraph.markdown meta.tag string.quoted meta.string-contents,
-                , text.html.markdown meta.paragraph.markdown meta.tag string.quoted punctuation.definition.string,
-                , text.html.markdown meta.paragraph.markdown meta.tag entity.other.attribute-name,
-                , text.html.markdown markup.list entity.name.tag,
-                , text.html.markdown markup.list meta.tag,
-                , text.html.markdown markup.list meta.tag punctuation.definition.tag,
-                , text.html.markdown markup.list meta.tag string.quoted meta.string-contents,
-                , text.html.markdown markup.list meta.tag string.quoted punctuation.definition.string,
-                , text.html.markdown markup.list meta.tag entity.other.attribute-name,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#555555</string>
-                <key>background</key>
-                <string>#131313</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Embedded</string>
-            <key>scope</key>
-            <string>source.smarty.embedded.html</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#888888</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Punctuation</string>
-            <key>scope</key>
-            <string>meta.tag string punctuation,punctuation.definition.entity.html</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#6e5330</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Tag Punctuation</string>
-            <key>scope</key>
-            <string>punctuation.definition.tag</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#6e5330</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Entities</string>
-            <key>scope</key>
-            <string>constant.character.entity</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#926730</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Names</string>
-            <key>scope</key>
-            <string>entity.other.attribute-name, text.html.markdown meta.disable-markdown meta.tag.block.any.html string.quoted.double.html, text.html.markdown meta.disable-markdown meta.tag.block.any.html string.quoted.double.html punctuation.definition</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#666666</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Values</string>
-            <key>scope</key>
-            <string>meta.tag string.quoted, meta.tag string.quoted constant.character.entity</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#926730</string>
-            </dict>
-        </dict>
-
-        <dict>
-            <key>name</key>
-            <string>Markup: Emphasis</string>
-            <key>scope</key>
-            <string>markup.italic, markup.italic.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>italic</string>
-                <key>foreground</key>
-                <string>#888888</string>
-                <key>background</key>
-                <string>#171717</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown: Link</string>
-            <key>scope</key>
-            <string>string.other.link.title.markdown,string.other.link.description.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#cccccc</string>
-                <key>background</key>
-                <string>#22222200</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown: Punctuation</string>
-            <key>scope</key>
-            <string>punctuation.definition.metadata.markdown,punctuation.definition.string.begin.markdown, punctuation.definition.string.end.markdown, punctuation.definition.constant.markdown, punctuation.separator.key-value.markdown, punctuation.definition.constant.begin.markdown, punctuation.definition.constant.end.markdown,punctuation.definition.bold.markdown, punctuation.definition.italic.markdown, punctuation.definition.strikethrough.markdown, punctuation.definition.heading.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#555555</string>
-                <key>background</key>
-                <string>#11111100</string>
-            </dict>
-        </dict>
-
-        <dict>
-            <key>name</key>
-            <string>Markdown: Lists</string>
-            <key>scope</key>
-            <string>
-                , markup.list.unnumbered.markdown,
-                , markup.list.unnumbered.markdown meta.paragraph.list.markdown,
-                , markup.list.numbered.markdown,
-                , markup.list.numbered.markdown meta.paragraph.list.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#999999</string>
-                <key>background</key>
-                <string>#11111100</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown: Lists</string>
-            <key>scope</key>
-            <string>
-                , markup.list.unnumbered.markdown punctuation.definition.list_item.markdown,
-                , markup.list.numbered.markdown punctuation.definition.list_item.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#ffffff</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Output</string>
-            <key>scope</key>
-            <string>markup.output, markup.raw</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#808080</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Prompt</string>
-            <key>scope</key>
-            <string>markup.prompt</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#aaaaaa</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Heading</string>
-            <key>scope</key>
-            <string>markup.heading</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: StrongEmphasis</string>
-            <key>scope</key>
-            <string>markup.bold_italic, markup.bold_italic.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold italic</string>
-                <key>foreground</key>
-                <string>#aaaaaa</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Strong</string>
-            <key>scope</key>
-            <string>markup.bold, markup.bold.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-                <key>foreground</key>
-                <string>#aaaaaa</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Strikethrough</string>
-            <key>scope</key>
-            <string>
-                , markup.strikethrough,
-                , markup.strikethrough.markdown,
-                , markup.strikethrough constant.other.reference.link.markdown,
-                , markup.strikethrough entity.name.tag,
-                , markup.strikethrough markup.bold,
-                , markup.strikethrough markup.bold.markdown,
-                , markup.strikethrough markup.italic,
-                , markup.strikethrough markup.italic.markdown,
-                , markup.strikethrough markup.raw.inline.markdown,
-                , markup.strikethrough markup.underline.link.image.markdown,
-                , markup.strikethrough markup.underline.link.markdown,
-                , markup.strikethrough meta.link.inet.markdown markup.underline.link.markdown,
-                , markup.strikethrough meta.link.email.lt-gt.markdown markup.underline.link.markdown,
-                , markup.strikethrough punctuation.definition.bold.markdown,
-                , markup.strikethrough punctuation.definition.italic.markdown,
-                , markup.strikethrough punctuation.definition.constant.begin.markdown,
-                , markup.strikethrough punctuation.definition.constant.end.markdown,
-                , markup.strikethrough punctuation.definition.constant.markdown,
-                , markup.strikethrough punctuation.definition.metadata.markdown,
-                , markup.strikethrough punctuation.definition.raw.markdown,
-                , markup.strikethrough punctuation.definition.strikethrough.markdown,
-                , markup.strikethrough punctuation.definition.string.begin.markdown,
-                , markup.strikethrough punctuation.definition.string.end.markdown,
-                , markup.strikethrough punctuation.definition.tag.begin.html,
-                , markup.strikethrough punctuation.definition.tag.end.html,
-                , markup.strikethrough string.other.link.description.markdown,
-                , markup.strikethrough string.other.link.description.title.markdown,
-                , markup.strikethrough string.other.link.title.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#313131</string>
-                <key>background</key>
-                <string>#131313</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Strikethrough (Keyboard Shortcut)</string>
-            <key>scope</key>
-            <string>
-                , markup.strikethrough markup.kbd.content,
-                , markup.strikethrough markup.kbd.content.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#484848</string>
-                <key>background</key>
-                <string>#222222</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Keyboard Shortcut</string>
-            <key>scope</key>
-            <string>markup.kbd.content.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#2C2C2C</string>
-                <key>foreground</key>
-                <string>#ECECEC</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Traceback</string>
-            <key>scope</key>
-            <string>markup.traceback</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#06cdcd</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Underline</string>
-            <key>scope</key>
-            <string>markup.underline,markup.underline.link.markdown,constant.other.reference.link.markdown,meta.image.reference.markdown,meta.image.inline.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#171717</string>
-                <key>foreground</key>
-                <string>#555555</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Plain Link</string>
-            <key>scope</key>
-            <string>
-                , meta.link.inet.markdown markup.underline.link.markdown,
-                , meta.link.email.lt-gt.markdown markup.underline.link.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#bbbb77</string>
-            </dict>
-        </dict>
-
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff Range</string>
-            <key>scope</key>
-            <string>meta.diff.range, meta.diff.index, meta.separator</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#150d0a</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#bcbcbc</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff From</string>
-            <key>scope</key>
-            <string>meta.diff.header.from-file</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#002222</string>
-                <key>foreground</key>
-                <string>#bcbcbc</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff To</string>
-            <key>scope</key>
-            <string>meta.diff.header.to-file</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#220022</string>
-                <key>foreground</key>
-                <string>#bcbcbc</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown Meta</string>
-            <key>scope</key>
-            <string>meta.header.multimarkdown,keyword.other.multimarkdown,string.unquoted.multimarkdown,punctuation.separator.key-value.multimarkdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#222222</string>
-                <key>foreground</key>
-                <string>#444444</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown separator</string>
-            <key>scope</key>
-            <string>meta.separator.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#44444422</string>
-                <key>foreground</key>
-                <string>#555555</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote</string>
-            <key>scope</key>
-            <string>markup.quote.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#666666</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote (Tags)</string>
-            <key>scope</key>
-            <string>
-                , text.html.markdown markup.quote.markdown entity.name.tag,
-                , text.html.markdown markup.quote.markdown meta.tag,
-                , text.html.markdown markup.quote.markdown meta.tag punctuation.definition.tag,
-                , text.html.markdown markup.quote.markdown meta.tag string.quoted meta.string-contents,
-                , text.html.markdown markup.quote.markdown meta.tag string.quoted punctuation.definition.string,
-                , text.html.markdown markup.quote.markdown meta.tag entity.other.attribute-name,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#313131</string>
-                <key>background</key>
-                <string>#131313</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote (Keyboard Shortcut)</string>
-            <key>scope</key>
-            <string>text.html.markdown markup.quote.markdown markup.kbd.content.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#1a1a1a</string>
-                <key>foreground</key>
-                <string>#8e8e8e</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote (Bold)</string>
-            <key>scope</key>
-            <string>
-                , text.html.markdown markup.quote.markdown markup.bold,
-                , text.html.markdown markup.quote.markdown markup.bold.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#666666</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote punctuation</string>
-            <key>scope</key>
-            <string>punctuation.definition.blockquote.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#3E3E3E</string>
-                <key>foreground</key>
-                <string>#3E3E3E</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Block code</string>
-            <key>scope</key>
-            <string>markup.raw.block.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#212121</string>
-                <key>foreground</key>
-                <string>#aaaaaa</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Inline code</string>
-            <key>scope</key>
-            <string>markup.raw.inline.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#212121</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Block Cursor</string>
-            <key>scope</key>
-            <string>block_cursor</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#dedede</string>
-                <key>background</key>
-                <string>#FF420077</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Brackets</string>
-            <key>scope</key>
-            <string>entity.name.class</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#2A090088</string>
-            </dict>
-        </dict>
-
-        <!-- Below definitions belong to thirdparty plugins. -->
-        <dict>
-            <key>name</key>
-            <string>WordHighlight</string>
-            <key>scope</key>
-            <string>wordhighlight</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#dedede</string>
-                <key>background</key>
-                <string>#FF420077</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>BracketHighlighter</string>
-            <key>scope</key>
-            <string>brackethighlighter.default</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#dedede</string>
-                <key>background</key>
-                <string>#FF420077</string>
-            </dict>
-        </dict>
-        <!-- Support for GitGutter -->
-        <dict>
-            <key>name</key>
-            <string>GitGutter deleted</string>
-            <key>scope</key>
-            <string>markup.deleted.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#F92672</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter inserted</string>
-            <key>scope</key>
-            <string>markup.inserted.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#A6E22E</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter changed</string>
-            <key>scope</key>
-            <string>markup.changed.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#967EFB</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter ignored</string>
-            <key>scope</key>
-            <string>markup.ignored.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#565656</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter untracked</string>
-            <key>scope</key>
-            <string>markup.untracked.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#565656</string>
-            </dict>
-        </dict>
-    </array>
-    <key>uuid</key>
-    <string>BF4E1964-0DB9-4E88-8142-E8F52D7EDEEC</string>
-</dict>
-</plist>
diff --git a/MarkdownEditor-Focus.sublime-color-scheme b/MarkdownEditor-Focus.sublime-color-scheme
new file mode 100644
index 00000000..2aeb9874
--- /dev/null
+++ b/MarkdownEditor-Focus.sublime-color-scheme
@@ -0,0 +1,363 @@
+{
+    "name": "MarkdownEditing",
+    "author": "Unknown",
+    "globals":
+    {
+        "foreground": "#666666",
+        "background": "#cccccc",
+        "caret": "#00bdff",
+        "invisibles": "#E0E0E0",
+        "line_highlight": "#f3f3f3",
+        "selection": "#C2E8FF",
+        "selection_border": "#AACBDF",
+        "inactive_selection": "#B5D3E5",
+        "find_highlight_foreground": "#000000",
+        "find_highlight": "#FFE792"
+    },
+    "rules":
+    [
+        {
+            "name": "Comments",
+            "scope": "comment, comment punctuation",
+            "foreground": "#ADADAD"
+        },
+        {
+            "name": "Comments: Preprocessor",
+            "scope": "comment.block.preprocessor",
+            "foreground": "#ADADAD"
+        },
+        {
+            "name": "Comments: Documentation",
+            "scope": "comment.documentation, comment.block.documentation",
+            "foreground": "#BC670F",
+            "background": "#FFFDF7"
+        },
+        {
+            "name": "Invalid - Deprecated",
+            "scope": "invalid.deprecated",
+            "background": "#EFCFCF",
+            "font_style": "italic underline"
+        },
+        {
+            "name": "Invalid - Illegal",
+            "scope": "invalid.illegal",
+            "foreground": "#F9F2CE"
+        },
+        {
+            "name": "Operators",
+            "scope": "keyword.operator",
+            "foreground": "#626FC9"
+        },
+        {
+            "name": "Keywords",
+            "scope": "keyword, storage",
+            "foreground": "#61862F"
+        },
+        {
+            "name": "Types",
+            "scope": "storage.type, support.type",
+            "foreground": "#6700B9"
+        },
+        {
+            "name": "Language Constants",
+            "scope": "constant.language, support.constant, variable.language",
+            "foreground": "#7653C1",
+            "background": "#E8E8E8"
+        },
+        {
+            "name": "Variables",
+            "scope": "variable, support.variable",
+            "foreground": "#4C8FC7"
+        },
+        {
+            "name": "Variables: Punctuation",
+            "scope": "variable punctuation",
+            "foreground": "#4C8FC7"
+        },
+        {
+            "name": "Functions",
+            "scope": "entity.name.function, support.function, entity",
+            "foreground": "#61862F"
+        },
+        {
+            "name": "Classes",
+            "scope": "entity.name.type, entity.other.inherited-class, support.class",
+            "foreground": "#3A1D72"
+        },
+        {
+            "name": "Exceptions",
+            "scope": "entity.name.exception",
+            "foreground": "#F93232"
+        },
+        {
+            "name": "Sections",
+            "scope": "entity.name.section,entity.name.section.markdown",
+            "foreground": "#666666",
+            "font_style": "bold"
+        },
+        {
+            "name": "Numbers",
+            "scope": "constant.numeric, constant",
+            "foreground": "#7653C1",
+            "background": "#F3F2FF"
+        },
+        {
+            "name": "Punctuation",
+            "scope": "punctuation",
+            "foreground": "#000000"
+        },
+        {
+            "name": "Strings",
+            "scope": "constant.character, string",
+            "foreground": "#BC670F",
+            "background": "#FBE9AD1A"
+        },
+        {
+            "name": "Strings: Punctuation",
+            "scope": "string punctuation",
+            "foreground": "#E69A4C"
+        },
+        {
+            "name": "Strings: Escape Sequences",
+            "scope": "constant.character.escape",
+            "background": "#FBE9ADCC",
+            "font_style": "bold"
+        },
+        {
+            "name": "Strings: Regular Expressions",
+            "scope": "string.regexp",
+            "foreground": "#699D36"
+        },
+        {
+            "name": "Strings: Symbols",
+            "scope": "constant.other.symbol",
+            "background": "#E8FFD5",
+            "font_style": "bold"
+        },
+        {
+            "name": "Embedded Source",
+            "scope": "string source, text source",
+            "foreground": "#434343"
+        },
+        {
+            "name": "HTML: Doctype Declaration",
+            "scope": "meta.tag.sgml.doctype",
+            "foreground": "#7F7F7F"
+        },
+        {
+            "name": "HTML: Tags",
+            "scope": "text.html.markdown entity.name.tag,text.html.markdown punctuation.definition.tag.html",
+            "foreground": "#AAAAAA",
+            "background": "#DDDDDD00"
+        },
+        {
+            "name": "HTML: Tags",
+            "scope": "meta.disable-markdown",
+            "foreground": "#999999",
+            "background": "#DDDDDD00"
+        },
+        {
+            "name": "HTML: Attribute Punctuation",
+            "scope": "meta.tag string punctuation",
+            "foreground": "#5FAFEF"
+        },
+        {
+            "name": "HTML: Tag Punctuation",
+            "scope": "punctuation.definition.tag",
+            "foreground": "#4F9FCF"
+        },
+        {
+            "name": "HTML: Entities",
+            "scope": "constant.character.entity",
+            "foreground": "#000000"
+        },
+        {
+            "name": "HTML: Attribute Names",
+            "scope": "entity.other.attribute-name",
+            "foreground": "#4F9FCF"
+        },
+        {
+            "name": "HTML: Attribute Values",
+            "scope": "meta.tag string.quoted, meta.tag string.quoted constant.character.entity",
+            "foreground": "#D44950",
+            "background": "#FFFFFF"
+        },
+        {
+            "name": "CSS: Selectors",
+            "scope": "meta.selector, meta.selector entity, meta.selector entity punctuation, entity.name.tag.css",
+            "foreground": "#3A77BF"
+        },
+        {
+            "name": "CSS: Property Names",
+            "scope": "meta.property-name, support.type.property-name",
+            "foreground": "#D4430D"
+        },
+        {
+            "name": "CSS: Property Values",
+            "scope": "meta.property-value constant.numeric, meta.property-value constant, meta.property-value keyword",
+            "foreground": "#43A202",
+            "background": "#FFFFFF"
+        },
+        {
+            "name": "Markup: Changed",
+            "scope": "markup.changed",
+            "foreground": "#000000",
+            "background": "#FFFFDD"
+        },
+        {
+            "name": "Markup: Deletion",
+            "scope": "markup.deleted",
+            "foreground": "#000000",
+            "background": "#FFDDDD"
+        },
+        {
+            "name": "Markup: Emphasis",
+            "scope": "markup.italic, markup.italic.markdown",
+            "foreground": "#777777",
+            "font_style": "italic"
+        },
+        {
+            "name": "Markdown: Link",
+            "scope": "string.other.link.title.markdown,string.other.link.description.markdown",
+            "foreground": "#333333",
+            "background": "#DDDDDD00"
+        },
+        {
+            "name": "Markdown: Punctuation",
+            "scope": "punctuation.definition.metadata.markdown,punctuation.definition.string.begin.markdown, punctuation.definition.string.end.markdown, punctuation.definition.constant.markdown, punctuation.separator.key-value.markdown, punctuation.definition.constant.begin.markdown, punctuation.definition.constant.end.markdown,punctuation.definition.bold.markdown, punctuation.definition.italic.markdown, punctuation.definition.heading.markdown",
+            "foreground": "#AAAAAA"
+        },
+        {
+            "name": "Markdown: Punctuation",
+            "scope": "markup.list.unnumbered.markdown meta.paragraph.list.markdown, markup.list.unnumbered.markdown punctuation.definition.list_item.markdown, markup.list.numbered.markdown, markup.list.numbered.markdown meta.paragraph.list.markdown, markup.list.numbered.markdown punctuation.definition.list_item.markdown",
+            "foreground": "#666666"
+        },
+        {
+            "name": "Markdown: Paragraph",
+            "scope": "meta.paragraph.markdown",
+            "foreground": "#666666aa"
+        },
+        {
+            "name": "Markup: Error",
+            "scope": "markup.error",
+            "foreground": "#F9F2CE",
+            "background": "#F93232"
+        },
+        {
+            "name": "Markup: Insertion",
+            "scope": "markup.inserted",
+            "foreground": "#000000",
+            "background": "#DDFFDD"
+        },
+        {
+            "name": "Markup: Output",
+            "scope": "markup.output, markup.raw",
+            "foreground": "#7F7F7F"
+        },
+        {
+            "name": "Markup: Prompt",
+            "scope": "markup.prompt",
+            "foreground": "#555555"
+        },
+        {
+            "name": "Markup: Heading",
+            "scope": "markup.heading",
+            "font_style": "bold"
+        },
+        {
+            "name": "Markup: Heading",
+            "scope": "markup.heading.markdown",
+            "foreground": "#777777",
+            "font_style": "bold"
+        },
+        {
+            "name": "Markup: StrongEmphasis",
+            "scope": "markup.bold_italic, markup.bold_italic.markdown",
+            "foreground": "#777777",
+            "font_style": "bold italic"
+        },
+        {
+            "name": "Markup: Strong",
+            "scope": "markup.bold, markup.bold.markdown",
+            "foreground": "#777777",
+            "font_style": "bold"
+        },
+        {
+            "name": "Markup: Traceback",
+            "scope": "markup.traceback",
+            "foreground": "#F93232"
+        },
+        {
+            "name": "Markup: Underline",
+            "scope": "markup.underline,markup.underline.link.markdown,constant.other.reference.link.markdown,meta.image.reference.markdown,meta.image.inline.markdown",
+            "foreground": "#AAAAAA",
+            "background": "#E8E8E8"
+        },
+        {
+            "name": "Extra: Diff Range",
+            "scope": "meta.diff.range, meta.diff.index, meta.separator",
+            "foreground": "#434343",
+            "background": "#EAF2F5"
+        },
+        {
+            "name": "Extra: Diff From",
+            "scope": "meta.diff.header.from-file",
+            "foreground": "#434343",
+            "background": "#FFDDDD"
+        },
+        {
+            "name": "Extra: Diff To",
+            "scope": "meta.diff.header.to-file",
+            "foreground": "#434343",
+            "background": "#DDFFDD"
+        },
+        {
+            "name": "Markdown Meta",
+            "scope": "meta.header.multimarkdown,keyword.other.multimarkdown,string.unquoted.multimarkdown,punctuation.separator.key-value.multimarkdown",
+            "foreground": "#BBBBBB",
+            "background": "#DDDDDD"
+        },
+        {
+            "name": "Markdown separator",
+            "scope": "meta.separator.markdown",
+            "foreground": "#AAAAAA",
+            "background": "#BBBBBB"
+        },
+        {
+            "name": "Block Cursor",
+            "scope": "block_cursor",
+            "foreground": "#212121",
+            "background": "#00bdff77"
+        },
+        {
+            "name": "Brackets",
+            "scope": "entity.name.class",
+            "background": "#d5f6ff88"
+        },
+        {
+            "name": "GitGutter deleted",
+            "scope": "markup.deleted.git_gutter",
+            "foreground": "#F92672"
+        },
+        {
+            "name": "GitGutter inserted",
+            "scope": "markup.inserted.git_gutter",
+            "foreground": "#A6E22E"
+        },
+        {
+            "name": "GitGutter changed",
+            "scope": "markup.changed.git_gutter",
+            "foreground": "#967EFB"
+        },
+        {
+            "name": "GitGutter ignored",
+            "scope": "markup.ignored.git_gutter",
+            "foreground": "#565656"
+        },
+        {
+            "name": "GitGutter untracked",
+            "scope": "markup.untracked.git_gutter",
+            "foreground": "#565656"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/MarkdownEditor-Focus.tmTheme b/MarkdownEditor-Focus.tmTheme
deleted file mode 100644
index 29cf23b3..00000000
--- a/MarkdownEditor-Focus.tmTheme
+++ /dev/null
@@ -1,882 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>name</key>
-    <string>MarkdownEditing</string>
-    <key>settings</key>
-    <array>
-        <dict>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#cccccc</string>
-                <key>caret</key>
-                <string>#00bdff</string>
-                <key>foreground</key>
-                <string>#666666</string>
-                <key>invisibles</key>
-                <string>#E0E0E0</string>
-                <key>lineHighlight</key>
-                <string>#f3f3f3</string>
-                <key>selection</key>
-                <string>#C2E8FF</string>
-                <key>selectionBorder</key>
-                <string>#AACBDF</string>
-                <key>inactiveSelection</key>
-                <string>#B5D3E5</string>
-                <key>findHighlight</key>
-                <string>#FFE792</string>
-                <key>findHighlightForeground</key>
-                <string>#000000</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Comments</string>
-            <key>scope</key>
-            <string>comment, comment punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#ADADAD</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Comments: Preprocessor</string>
-            <key>scope</key>
-            <string>comment.block.preprocessor</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#ADADAD</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Comments: Documentation</string>
-            <key>scope</key>
-            <string>comment.documentation, comment.block.documentation</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FFFDF7</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#BC670F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Invalid - Deprecated</string>
-            <key>scope</key>
-            <string>invalid.deprecated</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#EFCFCF</string>
-                <key>fontStyle</key>
-                <string>italic underline</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Invalid - Illegal</string>
-            <key>scope</key>
-            <string>invalid.illegal</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#F9F2CE</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Operators</string>
-            <key>scope</key>
-            <string>keyword.operator</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#626FC9</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Keywords</string>
-            <key>scope</key>
-            <string>keyword, storage</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#61862F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Types</string>
-            <key>scope</key>
-            <string>storage.type, support.type</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#6700B9</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Language Constants</string>
-            <key>scope</key>
-            <string>constant.language, support.constant, variable.language</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#E8E8E8</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#7653C1</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Variables</string>
-            <key>scope</key>
-            <string>variable, support.variable</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#4C8FC7</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Variables: Punctuation</string>
-            <key>scope</key>
-            <string>variable punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#4C8FC7</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Functions</string>
-            <key>scope</key>
-            <string>entity.name.function, support.function, entity</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#61862F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Classes</string>
-            <key>scope</key>
-            <string>entity.name.type, entity.other.inherited-class, support.class</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#3A1D72</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Exceptions</string>
-            <key>scope</key>
-            <string>entity.name.exception</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#F93232</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Sections</string>
-            <key>scope</key>
-            <string>entity.name.section,entity.name.section.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-                <key>foreground</key>
-                <string>#666666</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Numbers</string>
-            <key>scope</key>
-            <string>constant.numeric, constant</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#F3F2FF</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#7653C1</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Punctuation</string>
-            <key>scope</key>
-            <string>punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#000000</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings</string>
-            <key>scope</key>
-            <string>constant.character, string</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FBE9AD1A</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#BC670F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Punctuation</string>
-            <key>scope</key>
-            <string>string punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#E69A4C</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Escape Sequences</string>
-            <key>scope</key>
-            <string>constant.character.escape</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FBE9ADCC</string>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Regular Expressions</string>
-            <key>scope</key>
-            <string>string.regexp</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#699D36</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Symbols</string>
-            <key>scope</key>
-            <string>constant.other.symbol</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#E8FFD5</string>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Embedded Source</string>
-            <key>scope</key>
-            <string>string source, text source</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#434343</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>-----------------------------------</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Doctype Declaration</string>
-            <key>scope</key>
-            <string>meta.tag.sgml.doctype</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#7F7F7F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Tags</string>
-            <key>scope</key>
-            <string>text.html.markdown entity.name.tag,text.html.markdown punctuation.definition.tag.html</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#DDDDDD00</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#AAAAAA</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Tags</string>
-            <key>scope</key>
-            <string>meta.disable-markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#DDDDDD00</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#999999</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Punctuation</string>
-            <key>scope</key>
-            <string>meta.tag string punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#5FAFEF</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Tag Punctuation</string>
-            <key>scope</key>
-            <string>punctuation.definition.tag</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#4F9FCF</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Entities</string>
-            <key>scope</key>
-            <string>constant.character.entity</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#000000</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Names</string>
-            <key>scope</key>
-            <string>entity.other.attribute-name</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#4F9FCF</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Values</string>
-            <key>scope</key>
-            <string>meta.tag string.quoted, meta.tag string.quoted constant.character.entity</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FFFFFF</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#D44950</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>-----------------------------------</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>CSS: Selectors</string>
-            <key>scope</key>
-            <string>meta.selector, meta.selector entity, meta.selector entity punctuation, entity.name.tag.css</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#3A77BF</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>CSS: Property Names</string>
-            <key>scope</key>
-            <string>meta.property-name, support.type.property-name</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#D4430D</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>CSS: Property Values</string>
-            <key>scope</key>
-            <string>meta.property-value constant.numeric, meta.property-value constant, meta.property-value keyword</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FFFFFF</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#43A202</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>-----------------------------------</string>
-            <key>settings</key>
-            <dict/>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Changed</string>
-            <key>scope</key>
-            <string>markup.changed</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FFFFDD</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#000000</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Deletion</string>
-            <key>scope</key>
-            <string>markup.deleted</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FFDDDD</string>
-                <key>foreground</key>
-                <string>#000000</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Emphasis</string>
-            <key>scope</key>
-            <string>markup.italic, markup.italic.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>italic</string>
-                <key>foreground</key>
-                <string>#777777</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown: Link</string>
-            <key>scope</key>
-            <string>string.other.link.title.markdown,string.other.link.description.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#333333</string>
-                <key>background</key>
-                <string>#DDDDDD00</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown: Punctuation</string>
-            <key>scope</key>
-            <string>punctuation.definition.metadata.markdown,punctuation.definition.string.begin.markdown, punctuation.definition.string.end.markdown, punctuation.definition.constant.markdown, punctuation.separator.key-value.markdown, punctuation.definition.constant.begin.markdown, punctuation.definition.constant.end.markdown,punctuation.definition.bold.markdown, punctuation.definition.italic.markdown, punctuation.definition.heading.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#AAAAAA</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown: Punctuation</string>
-            <key>scope</key>
-            <string>markup.list.unnumbered.markdown meta.paragraph.list.markdown, markup.list.unnumbered.markdown punctuation.definition.list_item.markdown, markup.list.numbered.markdown, markup.list.numbered.markdown meta.paragraph.list.markdown, markup.list.numbered.markdown punctuation.definition.list_item.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#666666</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown: Paragraph</string>
-            <key>scope</key>
-            <string>meta.paragraph.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#666666aa</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Error</string>
-            <key>scope</key>
-            <string>markup.error</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#F93232</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#F9F2CE</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Insertion</string>
-            <key>scope</key>
-            <string>markup.inserted</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#DDFFDD</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#000000</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Output</string>
-            <key>scope</key>
-            <string>markup.output, markup.raw</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#7F7F7F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Prompt</string>
-            <key>scope</key>
-            <string>markup.prompt</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#555555</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Heading</string>
-            <key>scope</key>
-            <string>markup.heading</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Heading</string>
-            <key>scope</key>
-            <string>markup.heading.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-                <key>foreground</key>
-                <string>#777777</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: StrongEmphasis</string>
-            <key>scope</key>
-            <string>markup.bold_italic, markup.bold_italic.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold italic</string>
-                <key>foreground</key>
-                <string>#777777</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Strong</string>
-            <key>scope</key>
-            <string>markup.bold, markup.bold.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-                <key>foreground</key>
-                <string>#777777</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Traceback</string>
-            <key>scope</key>
-            <string>markup.traceback</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#F93232</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Underline</string>
-            <key>scope</key>
-            <string>markup.underline,markup.underline.link.markdown,constant.other.reference.link.markdown,meta.image.reference.markdown,meta.image.inline.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#E8E8E8</string>
-                <key>foreground</key>
-                <string>#AAAAAA</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>-----------------------------------</string>
-            <key>settings</key>
-            <dict/>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff Range</string>
-            <key>scope</key>
-            <string>meta.diff.range, meta.diff.index, meta.separator</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#EAF2F5</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#434343</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff From</string>
-            <key>scope</key>
-            <string>meta.diff.header.from-file</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FFDDDD</string>
-                <key>foreground</key>
-                <string>#434343</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff To</string>
-            <key>scope</key>
-            <string>meta.diff.header.to-file</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#DDFFDD</string>
-                <key>foreground</key>
-                <string>#434343</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown Meta</string>
-            <key>scope</key>
-            <string>meta.header.multimarkdown,keyword.other.multimarkdown,string.unquoted.multimarkdown,punctuation.separator.key-value.multimarkdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#DDDDDD</string>
-                <key>foreground</key>
-                <string>#BBBBBB</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown separator</string>
-            <key>scope</key>
-            <string>meta.separator.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#BBBBBB</string>
-                <key>foreground</key>
-                <string>#AAAAAA</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Block Cursor</string>
-            <key>scope</key>
-            <string>block_cursor</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#212121</string>
-                <key>background</key>
-                <string>#00bdff77</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Brackets</string>
-            <key>scope</key>
-            <string>entity.name.class</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#d5f6ff88</string>
-            </dict>
-        </dict>
-        <!-- Support for GitGutter -->
-        <dict>
-            <key>name</key>
-            <string>GitGutter deleted</string>
-            <key>scope</key>
-            <string>markup.deleted.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#F92672</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter inserted</string>
-            <key>scope</key>
-            <string>markup.inserted.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#A6E22E</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter changed</string>
-            <key>scope</key>
-            <string>markup.changed.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#967EFB</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter ignored</string>
-            <key>scope</key>
-            <string>markup.ignored.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#565656</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter untracked</string>
-            <key>scope</key>
-            <string>markup.untracked.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#565656</string>
-            </dict>
-        </dict>
-    </array>
-    <key>uuid</key>
-    <string>BF4E1964-0DB9-4E88-8142-E8F52D7EDEEC</string>
-</dict>
-</plist>
diff --git a/MarkdownEditor-Yellow.sublime-color-scheme b/MarkdownEditor-Yellow.sublime-color-scheme
new file mode 100644
index 00000000..99c4ab4b
--- /dev/null
+++ b/MarkdownEditor-Yellow.sublime-color-scheme
@@ -0,0 +1,367 @@
+{
+    "name": "MarkdownEditing",
+    "author": "Unknown",
+    "globals":
+    {
+        "foreground": "#705442",
+        "background": "#efe9b7",
+        "caret": "#28bbc6",
+        "invisibles": "#e5ddae",
+        "line_highlight": "#eae3b2",
+        "selection": "#cce5c6",
+        "selection_border": "#b7c8ad",
+        "inactive_selection": "#c1d0b2",
+        "shadow": "#947e63",
+        "shadow_width": "6",
+        "find_highlight_foreground": "#280000",
+        "find_highlight": "#ffe471"
+    },
+    "rules":
+    [
+        {
+            "name": "Comments",
+            "scope": "comment, comment punctuation",
+            "foreground": "#baab86"
+        },
+        {
+            "name": "Comments: Preprocessor",
+            "scope": "comment.block.preprocessor",
+            "foreground": "#baab86"
+        },
+        {
+            "name": "Invalid - Deprecated",
+            "scope": "invalid.deprecated",
+            "background": "#f2cca1",
+            "font_style": "italic underline"
+        },
+        {
+            "name": "Invalid - Illegal",
+            "scope": "invalid.illegal",
+            "foreground": "#faefa0"
+        },
+        {
+            "name": "Operators",
+            "scope": "keyword.operator",
+            "foreground": "#7b6e9c"
+        },
+        {
+            "name": "Keywords",
+            "scope": "keyword, storage",
+            "foreground": "#7a8424"
+        },
+        {
+            "name": "Types",
+            "scope": "storage.type, support.type",
+            "foreground": "#7f008f"
+        },
+        {
+            "name": "Functions",
+            "scope": "entity.name.function, support.function, entity",
+            "foreground": "#7a8424"
+        },
+        {
+            "name": "Classes",
+            "scope": "entity.name.type, entity.other.inherited-class, support.class",
+            "foreground": "#591d58"
+        },
+        {
+            "name": "Exceptions",
+            "scope": "entity.name.exception",
+            "foreground": "#fa3127"
+        },
+        {
+            "name": "Sections",
+            "scope": "entity.name.section,entity.name.section.markdown",
+            "foreground": "#533228",
+            "font_style": "bold"
+        },
+        {
+            "name": "Numbers",
+            "scope": "constant.numeric, constant",
+            "foreground": "#8c5296",
+            "background": "#f5efc6"
+        },
+        {
+            "name": "Punctuation",
+            "scope": "punctuation",
+            "foreground": "#280000"
+        },
+        {
+            "name": "Strings",
+            "scope": "constant.character, string",
+            "foreground": "#c7660c",
+            "background": "#fce6861A"
+        },
+        {
+            "name": "Strings: Punctuation",
+            "scope": "string punctuation",
+            "foreground": "#ea983b"
+        },
+        {
+            "name": "Strings: Escape Sequences",
+            "scope": "constant.character.escape",
+            "background": "#fce686CC",
+            "font_style": "bold"
+        },
+        {
+            "name": "Strings: Symbols",
+            "scope": "constant.other.symbol",
+            "background": "#ecfca5",
+            "font_style": "bold"
+        },
+        {
+            "name": "Embedded Source",
+            "scope": "string source, text source",
+            "foreground": "#614234"
+        },
+        {
+            "name": "HTML: Doctype Declaration",
+            "scope": "meta.tag.sgml.doctype",
+            "foreground": "#937d62"
+        },
+        {
+            "name": "HTML: Tags",
+            "scope": "text.html.markdown meta.disable-markdown entity.name.tag, text.html.markdown meta.disable-markdown meta.tag, text.html.markdown meta.disable-markdown meta.tag punctuation.definition.tag, text.html.markdown meta.disable-markdown meta.tag string.quoted meta.string-contents, text.html.markdown meta.disable-markdown meta.tag string.quoted punctuation.definition.string, text.html.markdown meta.disable-markdown meta.tag entity.other.attribute-name, text.html.markdown meta.paragraph.markdown entity.name.tag, text.html.markdown meta.paragraph.markdown meta.tag, text.html.markdown meta.paragraph.markdown meta.tag punctuation.definition.tag, text.html.markdown meta.paragraph.markdown meta.tag string.quoted meta.string-contents, text.html.markdown meta.paragraph.markdown meta.tag string.quoted punctuation.definition.string, text.html.markdown meta.paragraph.markdown meta.tag entity.other.attribute-name, text.html.markdown markup.list entity.name.tag, text.html.markdown markup.list meta.tag, text.html.markdown markup.list meta.tag punctuation.definition.tag, text.html.markdown markup.list meta.tag string.quoted meta.string-contents, text.html.markdown markup.list meta.tag string.quoted punctuation.definition.string, text.html.markdown markup.list meta.tag entity.other.attribute-name",
+            "foreground": "#b7a884",
+            "background": "#efe9b7"
+        },
+        {
+            "name": "HTML: Embedded",
+            "scope": "source.smarty.embedded.html",
+            "foreground": "#8c755c"
+        },
+        {
+            "name": "HTML: Attribute Punctuation",
+            "scope": "meta.tag string punctuation,punctuation.definition.entity.html",
+            "foreground": "#a2aaa1"
+        },
+        {
+            "name": "HTML: Tag Punctuation",
+            "scope": "punctuation.definition.tag",
+            "foreground": "#a2aaa1"
+        },
+        {
+            "name": "HTML: Entities",
+            "scope": "constant.character.entity",
+            "foreground": "#8496a1"
+        },
+        {
+            "name": "HTML: Attribute Names",
+            "scope": "entity.other.attribute-name, text.html.markdown meta.disable-markdown meta.tag.block.any.html string.quoted.double.html, text.html.markdown meta.disable-markdown meta.tag.block.any.html string.quoted.double.html punctuation.definition",
+            "foreground": "#a99777"
+        },
+        {
+            "name": "HTML: Attribute Values",
+            "scope": "meta.tag string.quoted, meta.tag string.quoted constant.character.entity",
+            "foreground": "#8496a1"
+        },
+        {
+            "name": "Markup: Emphasis",
+            "scope": "markup.italic, markup.italic.markdown",
+            "foreground": "#8c755c",
+            "background": "#ece5b4",
+            "font_style": "italic"
+        },
+        {
+            "name": "Markdown: Link",
+            "scope": "string.other.link.title.markdown,string.other.link.description.markdown",
+            "foreground": "#533228",
+            "background": "#e2daab00"
+        },
+        {
+            "name": "Markdown: Punctuation",
+            "scope": "punctuation.definition.metadata.markdown,punctuation.definition.string.begin.markdown, punctuation.definition.string.end.markdown, punctuation.definition.constant.markdown, punctuation.separator.key-value.markdown, punctuation.definition.constant.begin.markdown, punctuation.definition.constant.end.markdown,punctuation.definition.bold.markdown, punctuation.definition.italic.markdown, punctuation.definition.strikethrough.markdown, punctuation.definition.heading.markdown",
+            "foreground": "#b7a884",
+            "background": "#f1ebb900"
+        },
+        {
+            "name": "Markdown: Lists",
+            "scope": "markup.list.unnumbered.markdown, markup.list.unnumbered.markdown meta.paragraph.list.markdown, markup.list.numbered.markdown, markup.list.numbered.markdown meta.paragraph.list.markdown",
+            "foreground": "#7e654f",
+            "background": "#f1ebb900"
+        },
+        {
+            "name": "Markdown: Lists",
+            "scope": "markup.list.unnumbered.markdown punctuation.definition.list_item.markdown, markup.list.numbered.markdown punctuation.definition.list_item.markdown",
+            "foreground": "#280000"
+        },
+        {
+            "name": "Markup: Output",
+            "scope": "markup.output, markup.raw",
+            "foreground": "#937d62"
+        },
+        {
+            "name": "Markup: Prompt",
+            "scope": "markup.prompt",
+            "foreground": "#705442"
+        },
+        {
+            "name": "Markup: Heading",
+            "scope": "markup.heading",
+            "font_style": "bold"
+        },
+        {
+            "name": "Markup: StrongEmphasis",
+            "scope": "markup.bold_italic, markup.bold_italic.markdown",
+            "foreground": "#705442",
+            "font_style": "bold italic"
+        },
+        {
+            "name": "Markup: Strong",
+            "scope": "markup.bold, markup.bold.markdown",
+            "foreground": "#705442",
+            "font_style": "bold"
+        },
+        {
+            "name": "Markup: Strikethrough",
+            "scope": "markup.strikethrough, markup.strikethrough.markdown, markup.strikethrough constant.other.reference.link.markdown, markup.strikethrough entity.name.tag, markup.strikethrough markup.bold, markup.strikethrough markup.bold.markdown, markup.strikethrough markup.italic, markup.strikethrough markup.italic.markdown, markup.strikethrough markup.raw.inline.markdown, markup.strikethrough markup.underline.link.image.markdown, markup.strikethrough markup.underline.link.markdown, markup.strikethrough meta.link.inet.markdown markup.underline.link.markdown, markup.strikethrough meta.link.email.lt-gt.markdown markup.underline.link.markdown, markup.strikethrough punctuation.definition.bold.markdown, markup.strikethrough punctuation.definition.italic.markdown, markup.strikethrough punctuation.definition.constant.begin.markdown, markup.strikethrough punctuation.definition.constant.end.markdown, markup.strikethrough punctuation.definition.constant.markdown, markup.strikethrough punctuation.definition.metadata.markdown, markup.strikethrough punctuation.definition.raw.markdown, markup.strikethrough punctuation.definition.strikethrough.markdown, markup.strikethrough punctuation.definition.string.begin.markdown, markup.strikethrough punctuation.definition.string.end.markdown, markup.strikethrough punctuation.definition.tag.begin.html, markup.strikethrough punctuation.definition.tag.end.html, markup.strikethrough string.other.link.description.markdown, markup.strikethrough string.other.link.description.title.markdown, markup.strikethrough string.other.link.title.markdown",
+            "foreground": "#d6cba0",
+            "background": "#efe9b7"
+        },
+        {
+            "name": "Markup: Strikethrough (Keyboard Shortcut)",
+            "scope": "markup.strikethrough markup.kbd.content, markup.strikethrough markup.kbd.content.markdown",
+            "foreground": "#c2b58e",
+            "background": "#e2daab"
+        },
+        {
+            "name": "Markup: Keyboard Shortcut",
+            "scope": "markup.kbd.content.markdown",
+            "foreground": "#38130f",
+            "background": "#dad0a4"
+        },
+        {
+            "name": "Markup: Traceback",
+            "scope": "markup.traceback",
+            "foreground": "#fa3127"
+        },
+        {
+            "name": "Markup: Underline",
+            "scope": "markup.underline,markup.underline.link.markdown,constant.other.reference.link.markdown,meta.image.reference.markdown,meta.image.inline.markdown",
+            "foreground": "#b7a884",
+            "background": "#ece5b4"
+        },
+        {
+            "name": "Markup: Plain Link",
+            "scope": "meta.link.inet.markdown markup.underline.link.markdown, meta.link.email.lt-gt.markdown markup.underline.link.markdown",
+            "foreground": "#624369"
+        },
+        {
+            "name": "Extra: Diff Range",
+            "scope": "meta.diff.range, meta.diff.index, meta.separator",
+            "foreground": "#614234",
+            "background": "#edefbe"
+        },
+        {
+            "name": "Extra: Diff From",
+            "scope": "meta.diff.header.from-file",
+            "foreground": "#614234",
+            "background": "#ffdaab"
+        },
+        {
+            "name": "Extra: Diff To",
+            "scope": "meta.diff.header.to-file",
+            "foreground": "#614234",
+            "background": "#e2fcab"
+        },
+        {
+            "name": "Markdown Meta",
+            "scope": "meta.header.multimarkdown,keyword.other.multimarkdown,string.unquoted.multimarkdown,punctuation.separator.key-value.multimarkdown",
+            "foreground": "#c6b991",
+            "background": "#e2daab"
+        },
+        {
+            "name": "Markdown separator",
+            "scope": "meta.separator.markdown",
+            "foreground": "#b7a884",
+            "background": "#c6b99122"
+        },
+        {
+            "name": "Blockquote",
+            "scope": "markup.quote.markdown",
+            "foreground": "#a99777"
+        },
+        {
+            "name": "Blockquote (Tags)",
+            "scope": "text.html.markdown markup.quote.markdown entity.name.tag, text.html.markdown markup.quote.markdown meta.tag, text.html.markdown markup.quote.markdown meta.tag punctuation.definition.tag, text.html.markdown markup.quote.markdown meta.tag string.quoted meta.string-contents, text.html.markdown markup.quote.markdown meta.tag string.quoted punctuation.definition.string, text.html.markdown markup.quote.markdown meta.tag entity.other.attribute-name",
+            "foreground": "#d6cba0",
+            "background": "#efe9b7"
+        },
+        {
+            "name": "Blockquote (Keyboard Shortcut)",
+            "scope": "text.html.markdown markup.quote.markdown markup.kbd.content.markdown",
+            "foreground": "#877058",
+            "background": "#e9e2b2"
+        },
+        {
+            "name": "Blockquote (Bold)",
+            "scope": "text.html.markdown markup.quote.markdown markup.bold, text.html.markdown markup.quote.markdown markup.bold.markdown",
+            "foreground": "#a99777"
+        },
+        {
+            "name": "Blockquote punctuation",
+            "scope": "punctuation.definition.blockquote.markdown",
+            "foreground": "#d7cda1",
+            "background": "#d7cda1"
+        },
+        {
+            "name": "Block code",
+            "scope": "markup.raw.block.markdown",
+            "foreground": "#705442",
+            "background": "#e3dbac"
+        },
+        {
+            "name": "Inline code",
+            "scope": "markup.raw.inline.markdown",
+            "background": "#e3dbac"
+        },
+        {
+            "name": "Block Cursor",
+            "scope": "block_cursor",
+            "foreground": "#44211a",
+            "background": "#28bbc677"
+        },
+        {
+            "name": "Brackets",
+            "scope": "entity.name.class",
+            "background": "#dcf3c688"
+        },
+        {
+            "name": "WordHighlight",
+            "scope": "wordhighlight",
+            "foreground": "#44211a",
+            "background": "#28bbc677"
+        },
+        {
+            "name": "BracketHighlighter",
+            "scope": "brackethighlighter.default",
+            "foreground": "#44211a",
+            "background": "#28bbc677"
+        },
+        {
+            "name": "GitGutter deleted",
+            "scope": "markup.deleted.git_gutter",
+            "foreground": "#F92672"
+        },
+        {
+            "name": "GitGutter inserted",
+            "scope": "markup.inserted.git_gutter",
+            "foreground": "#46A524"
+        },
+        {
+            "name": "GitGutter changed",
+            "scope": "markup.changed.git_gutter",
+            "foreground": "#700DDB"
+        },
+        {
+            "name": "GitGutter ignored",
+            "scope": "markup.ignored.git_gutter",
+            "foreground": "#565656"
+        },
+        {
+            "name": "GitGutter untracked",
+            "scope": "markup.untracked.git_gutter",
+            "foreground": "#565656"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/MarkdownEditor-Yellow.tmTheme b/MarkdownEditor-Yellow.tmTheme
deleted file mode 100644
index 428e5ae0..00000000
--- a/MarkdownEditor-Yellow.tmTheme
+++ /dev/null
@@ -1,904 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>name</key>
-    <string>MarkdownEditing</string>
-    <key>settings</key>
-    <array>
-        <dict>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#efe9b7</string>
-                <key>caret</key>
-                <string>#28bbc6</string>
-                <key>foreground</key>
-                <string>#705442</string>
-                <key>invisibles</key>
-                <string>#e5ddae</string>
-                <key>lineHighlight</key>
-                <string>#eae3b2</string>
-                <key>selection</key>
-                <string>#cce5c6</string>
-                <key>selectionBorder</key>
-                <string>#b7c8ad</string>
-                <key>inactiveSelection</key>
-                <string>#c1d0b2</string>
-                <key>findHighlight</key>
-                <string>#ffe471</string>
-                <key>findHighlightForeground</key>
-                <string>#280000</string>
-                <key>shadow</key>
-                <string>#947e63</string>
-                <key>shadowWidth</key>
-                <string>6</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Comments</string>
-            <key>scope</key>
-            <string>comment, comment punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#baab86</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Comments: Preprocessor</string>
-            <key>scope</key>
-            <string>comment.block.preprocessor</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#baab86</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Invalid - Deprecated</string>
-            <key>scope</key>
-            <string>invalid.deprecated</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#f2cca1</string>
-                <key>fontStyle</key>
-                <string>italic underline</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Invalid - Illegal</string>
-            <key>scope</key>
-            <string>invalid.illegal</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#faefa0</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Operators</string>
-            <key>scope</key>
-            <string>keyword.operator</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#7b6e9c</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Keywords</string>
-            <key>scope</key>
-            <string>keyword, storage</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#7a8424</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Types</string>
-            <key>scope</key>
-            <string>storage.type, support.type</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#7f008f</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Functions</string>
-            <key>scope</key>
-            <string>entity.name.function, support.function, entity</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#7a8424</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Classes</string>
-            <key>scope</key>
-            <string>entity.name.type, entity.other.inherited-class, support.class</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#591d58</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Exceptions</string>
-            <key>scope</key>
-            <string>entity.name.exception</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#fa3127</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Sections</string>
-            <key>scope</key>
-            <string>entity.name.section,entity.name.section.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-                <key>foreground</key>
-                <string>#533228</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Numbers</string>
-            <key>scope</key>
-            <string>constant.numeric, constant</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#f5efc6</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#8c5296</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Punctuation</string>
-            <key>scope</key>
-            <string>punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#280000</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings</string>
-            <key>scope</key>
-            <string>constant.character, string</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#fce6861A</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#c7660c</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Punctuation</string>
-            <key>scope</key>
-            <string>string punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#ea983b</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Escape Sequences</string>
-            <key>scope</key>
-            <string>constant.character.escape</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#fce686CC</string>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Symbols</string>
-            <key>scope</key>
-            <string>constant.other.symbol</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#ecfca5</string>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Embedded Source</string>
-            <key>scope</key>
-            <string>string source, text source</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#614234</string>
-            </dict>
-        </dict>
-
-        <dict>
-            <key>name</key>
-            <string>HTML: Doctype Declaration</string>
-            <key>scope</key>
-            <string>meta.tag.sgml.doctype</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#937d62</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Tags</string>
-            <key>scope</key>
-            <string>
-                , text.html.markdown meta.disable-markdown entity.name.tag,
-                , text.html.markdown meta.disable-markdown meta.tag,
-                , text.html.markdown meta.disable-markdown meta.tag punctuation.definition.tag,
-                , text.html.markdown meta.disable-markdown meta.tag string.quoted meta.string-contents,
-                , text.html.markdown meta.disable-markdown meta.tag string.quoted punctuation.definition.string,
-                , text.html.markdown meta.disable-markdown meta.tag entity.other.attribute-name,
-                , text.html.markdown meta.paragraph.markdown entity.name.tag,
-                , text.html.markdown meta.paragraph.markdown meta.tag,
-                , text.html.markdown meta.paragraph.markdown meta.tag punctuation.definition.tag,
-                , text.html.markdown meta.paragraph.markdown meta.tag string.quoted meta.string-contents,
-                , text.html.markdown meta.paragraph.markdown meta.tag string.quoted punctuation.definition.string,
-                , text.html.markdown meta.paragraph.markdown meta.tag entity.other.attribute-name,
-                , text.html.markdown markup.list entity.name.tag,
-                , text.html.markdown markup.list meta.tag,
-                , text.html.markdown markup.list meta.tag punctuation.definition.tag,
-                , text.html.markdown markup.list meta.tag string.quoted meta.string-contents,
-                , text.html.markdown markup.list meta.tag string.quoted punctuation.definition.string,
-                , text.html.markdown markup.list meta.tag entity.other.attribute-name,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#b7a884</string>
-                <key>background</key>
-                <string>#efe9b7</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Embedded</string>
-            <key>scope</key>
-            <string>source.smarty.embedded.html</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#8c755c</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Punctuation</string>
-            <key>scope</key>
-            <string>meta.tag string punctuation,punctuation.definition.entity.html</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#a2aaa1</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Tag Punctuation</string>
-            <key>scope</key>
-            <string>punctuation.definition.tag</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#a2aaa1</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Entities</string>
-            <key>scope</key>
-            <string>constant.character.entity</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#8496a1</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Names</string>
-            <key>scope</key>
-            <string>entity.other.attribute-name, text.html.markdown meta.disable-markdown meta.tag.block.any.html string.quoted.double.html, text.html.markdown meta.disable-markdown meta.tag.block.any.html string.quoted.double.html punctuation.definition</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#a99777</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Values</string>
-            <key>scope</key>
-            <string>meta.tag string.quoted, meta.tag string.quoted constant.character.entity</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#8496a1</string>
-            </dict>
-        </dict>
-
-        <dict>
-            <key>name</key>
-            <string>Markup: Emphasis</string>
-            <key>scope</key>
-            <string>markup.italic, markup.italic.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>italic</string>
-                <key>foreground</key>
-                <string>#8c755c</string>
-                <key>background</key>
-                <string>#ece5b4</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown: Link</string>
-            <key>scope</key>
-            <string>string.other.link.title.markdown,string.other.link.description.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#533228</string>
-                <key>background</key>
-                <string>#e2daab00</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown: Punctuation</string>
-            <key>scope</key>
-            <string>punctuation.definition.metadata.markdown,punctuation.definition.string.begin.markdown, punctuation.definition.string.end.markdown, punctuation.definition.constant.markdown, punctuation.separator.key-value.markdown, punctuation.definition.constant.begin.markdown, punctuation.definition.constant.end.markdown,punctuation.definition.bold.markdown, punctuation.definition.italic.markdown, punctuation.definition.strikethrough.markdown, punctuation.definition.heading.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#b7a884</string>
-                <key>background</key>
-                <string>#f1ebb900</string>
-            </dict>
-        </dict>
-
-        <dict>
-            <key>name</key>
-            <string>Markdown: Lists</string>
-            <key>scope</key>
-            <string>
-                , markup.list.unnumbered.markdown,
-                , markup.list.unnumbered.markdown meta.paragraph.list.markdown,
-                , markup.list.numbered.markdown,
-                , markup.list.numbered.markdown meta.paragraph.list.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#7e654f</string>
-                <key>background</key>
-                <string>#f1ebb900</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown: Lists</string>
-            <key>scope</key>
-            <string>
-                , markup.list.unnumbered.markdown punctuation.definition.list_item.markdown,
-                , markup.list.numbered.markdown punctuation.definition.list_item.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#280000</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Output</string>
-            <key>scope</key>
-            <string>markup.output, markup.raw</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#937d62</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Prompt</string>
-            <key>scope</key>
-            <string>markup.prompt</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#705442</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Heading</string>
-            <key>scope</key>
-            <string>markup.heading</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: StrongEmphasis</string>
-            <key>scope</key>
-            <string>markup.bold_italic, markup.bold_italic.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold italic</string>
-                <key>foreground</key>
-                <string>#705442</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Strong</string>
-            <key>scope</key>
-            <string>markup.bold, markup.bold.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-                <key>foreground</key>
-                <string>#705442</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Strikethrough</string>
-            <key>scope</key>
-            <string>
-                , markup.strikethrough,
-                , markup.strikethrough.markdown,
-                , markup.strikethrough constant.other.reference.link.markdown,
-                , markup.strikethrough entity.name.tag,
-                , markup.strikethrough markup.bold,
-                , markup.strikethrough markup.bold.markdown,
-                , markup.strikethrough markup.italic,
-                , markup.strikethrough markup.italic.markdown,
-                , markup.strikethrough markup.raw.inline.markdown,
-                , markup.strikethrough markup.underline.link.image.markdown,
-                , markup.strikethrough markup.underline.link.markdown,
-                , markup.strikethrough meta.link.inet.markdown markup.underline.link.markdown,
-                , markup.strikethrough meta.link.email.lt-gt.markdown markup.underline.link.markdown,
-                , markup.strikethrough punctuation.definition.bold.markdown,
-                , markup.strikethrough punctuation.definition.italic.markdown,
-                , markup.strikethrough punctuation.definition.constant.begin.markdown,
-                , markup.strikethrough punctuation.definition.constant.end.markdown,
-                , markup.strikethrough punctuation.definition.constant.markdown,
-                , markup.strikethrough punctuation.definition.metadata.markdown,
-                , markup.strikethrough punctuation.definition.raw.markdown,
-                , markup.strikethrough punctuation.definition.strikethrough.markdown,
-                , markup.strikethrough punctuation.definition.string.begin.markdown,
-                , markup.strikethrough punctuation.definition.string.end.markdown,
-                , markup.strikethrough punctuation.definition.tag.begin.html,
-                , markup.strikethrough punctuation.definition.tag.end.html,
-                , markup.strikethrough string.other.link.description.markdown,
-                , markup.strikethrough string.other.link.description.title.markdown,
-                , markup.strikethrough string.other.link.title.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#d6cba0</string>
-                <key>background</key>
-                <string>#efe9b7</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Strikethrough (Keyboard Shortcut)</string>
-            <key>scope</key>
-            <string>
-                , markup.strikethrough markup.kbd.content,
-                , markup.strikethrough markup.kbd.content.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#c2b58e</string>
-                <key>background</key>
-                <string>#e2daab</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Keyboard Shortcut</string>
-            <key>scope</key>
-            <string>markup.kbd.content.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#dad0a4</string>
-                <key>foreground</key>
-                <string>#38130f</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Traceback</string>
-            <key>scope</key>
-            <string>markup.traceback</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#fa3127</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Underline</string>
-            <key>scope</key>
-            <string>markup.underline,markup.underline.link.markdown,constant.other.reference.link.markdown,meta.image.reference.markdown,meta.image.inline.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#ece5b4</string>
-                <key>foreground</key>
-                <string>#b7a884</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Plain Link</string>
-            <key>scope</key>
-            <string>
-                , meta.link.inet.markdown markup.underline.link.markdown,
-                , meta.link.email.lt-gt.markdown markup.underline.link.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#624369</string>
-            </dict>
-        </dict>
-
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff Range</string>
-            <key>scope</key>
-            <string>meta.diff.range, meta.diff.index, meta.separator</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#edefbe</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#614234</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff From</string>
-            <key>scope</key>
-            <string>meta.diff.header.from-file</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#ffdaab</string>
-                <key>foreground</key>
-                <string>#614234</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff To</string>
-            <key>scope</key>
-            <string>meta.diff.header.to-file</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#e2fcab</string>
-                <key>foreground</key>
-                <string>#614234</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown Meta</string>
-            <key>scope</key>
-            <string>meta.header.multimarkdown,keyword.other.multimarkdown,string.unquoted.multimarkdown,punctuation.separator.key-value.multimarkdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#e2daab</string>
-                <key>foreground</key>
-                <string>#c6b991</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown separator</string>
-            <key>scope</key>
-            <string>meta.separator.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#c6b99122</string>
-                <key>foreground</key>
-                <string>#b7a884</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote</string>
-            <key>scope</key>
-            <string>markup.quote.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#a99777</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote (Tags)</string>
-            <key>scope</key>
-            <string>
-                , text.html.markdown markup.quote.markdown entity.name.tag,
-                , text.html.markdown markup.quote.markdown meta.tag,
-                , text.html.markdown markup.quote.markdown meta.tag punctuation.definition.tag,
-                , text.html.markdown markup.quote.markdown meta.tag string.quoted meta.string-contents,
-                , text.html.markdown markup.quote.markdown meta.tag string.quoted punctuation.definition.string,
-                , text.html.markdown markup.quote.markdown meta.tag entity.other.attribute-name,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#d6cba0</string>
-                <key>background</key>
-                <string>#efe9b7</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote (Keyboard Shortcut)</string>
-            <key>scope</key>
-            <string>text.html.markdown markup.quote.markdown markup.kbd.content.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#e9e2b2</string>
-                <key>foreground</key>
-                <string>#877058</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote (Bold)</string>
-            <key>scope</key>
-            <string>
-                , text.html.markdown markup.quote.markdown markup.bold,
-                , text.html.markdown markup.quote.markdown markup.bold.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#a99777</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote punctuation</string>
-            <key>scope</key>
-            <string>punctuation.definition.blockquote.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#d7cda1</string>
-                <key>foreground</key>
-                <string>#d7cda1</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Block code</string>
-            <key>scope</key>
-            <string>markup.raw.block.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#e3dbac</string>
-                <key>foreground</key>
-                <string>#705442</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Inline code</string>
-            <key>scope</key>
-            <string>markup.raw.inline.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#e3dbac</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Block Cursor</string>
-            <key>scope</key>
-            <string>block_cursor</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#44211a</string>
-                <key>background</key>
-                <string>#28bbc677</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Brackets</string>
-            <key>scope</key>
-            <string>entity.name.class</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#dcf3c688</string>
-            </dict>
-        </dict>
-
-        <!-- Below definitions belong to thirdparty plugins. -->
-        <dict>
-            <key>name</key>
-            <string>WordHighlight</string>
-            <key>scope</key>
-            <string>wordhighlight</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#44211a</string>
-                <key>background</key>
-                <string>#28bbc677</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>BracketHighlighter</string>
-            <key>scope</key>
-            <string>brackethighlighter.default</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#44211a</string>
-                <key>background</key>
-                <string>#28bbc677</string>
-            </dict>
-        </dict>
-        <!-- Support for GitGutter -->
-        <dict>
-            <key>name</key>
-            <string>GitGutter deleted</string>
-            <key>scope</key>
-            <string>markup.deleted.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#F92672</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter inserted</string>
-            <key>scope</key>
-            <string>markup.inserted.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#46A524</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter changed</string>
-            <key>scope</key>
-            <string>markup.changed.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#700DDB</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter ignored</string>
-            <key>scope</key>
-            <string>markup.ignored.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#565656</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter untracked</string>
-            <key>scope</key>
-            <string>markup.untracked.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#565656</string>
-            </dict>
-        </dict>
-    </array>
-    <key>uuid</key>
-    <string>BF4E1964-0DB9-4E88-8142-E8F52D7EDEEC</string>
-</dict>
-</plist>
diff --git a/MarkdownEditor.sublime-color-scheme b/MarkdownEditor.sublime-color-scheme
new file mode 100644
index 00000000..d873439a
--- /dev/null
+++ b/MarkdownEditor.sublime-color-scheme
@@ -0,0 +1,391 @@
+{
+    "name": "MarkdownEditing",
+    "author": "Unknown",
+    "globals":
+    {
+        "foreground": "#555555",
+        "background": "#ECECEC",
+        "caret": "#00bbff",
+        "invisibles": "#E0E0E0",
+        "line_highlight": "#D3D3D3",
+        "selection": "#C2E8FF",
+        "selection_border": "#AACBDF",
+        "inactive_selection": "#B5D3E5",
+        "shadow": "#808080",
+        "shadow_width": "6",
+        "find_highlight_foreground": "#000000",
+        "find_highlight": "#FFE792"
+    },
+    "rules":
+    [
+        {
+            "name": "Comments",
+            "scope": "comment, comment punctuation",
+            "foreground": "#ADADAD"
+        },
+        {
+            "name": "Comments: Preprocessor",
+            "scope": "comment.block.preprocessor",
+            "foreground": "#ADADAD"
+        },
+        {
+            "name": "Invalid - Deprecated",
+            "scope": "invalid.deprecated",
+            "background": "#EFCFCF",
+            "font_style": "italic underline"
+        },
+        {
+            "name": "Invalid - Illegal",
+            "scope": "invalid.illegal",
+            "foreground": "#F9F2CE"
+        },
+        {
+            "name": "Operators",
+            "scope": "keyword.operator",
+            "foreground": "#626FC9"
+        },
+        {
+            "name": "Keywords",
+            "scope": "keyword, storage",
+            "foreground": "#61862F"
+        },
+        {
+            "name": "Types",
+            "scope": "storage.type, support.type",
+            "foreground": "#6700B9"
+        },
+        {
+            "name": "Functions",
+            "scope": "entity.name.function, support.function, entity",
+            "foreground": "#61862F"
+        },
+        {
+            "name": "Classes",
+            "scope": "entity.name.type, entity.other.inherited-class, support.class",
+            "foreground": "#3A1D72"
+        },
+        {
+            "name": "Exceptions",
+            "scope": "entity.name.exception",
+            "foreground": "#F93232"
+        },
+        {
+            "name": "Sections",
+            "scope": "entity.name.section,entity.name.section.markdown",
+            "foreground": "#333333",
+            "font_style": "bold"
+        },
+        {
+            "name": "Numbers",
+            "scope": "constant.numeric, constant",
+            "foreground": "#7653C1",
+            "background": "#F3F2FF"
+        },
+        {
+            "name": "Punctuation",
+            "scope": "punctuation",
+            "foreground": "#000000"
+        },
+        {
+            "name": "Strings",
+            "scope": "constant.character, string",
+            "foreground": "#BC670F",
+            "background": "#FBE9AD1A"
+        },
+        {
+            "name": "Strings: Punctuation",
+            "scope": "string punctuation",
+            "foreground": "#E69A4C"
+        },
+        {
+            "name": "Strings: Escape Sequences",
+            "scope": "constant.character.escape",
+            "background": "#FBE9ADCC",
+            "font_style": "bold"
+        },
+        {
+            "name": "Strings: Symbols",
+            "scope": "constant.other.symbol",
+            "background": "#E8FFD5",
+            "font_style": "bold"
+        },
+        {
+            "name": "Embedded Source",
+            "scope": "string source, text source",
+            "foreground": "#434343"
+        },
+        {
+            "name": "HTML: Doctype Declaration",
+            "scope": "meta.tag.sgml.doctype",
+            "foreground": "#7F7F7F"
+        },
+        {
+            "name": "HTML: Tags",
+            "scope": "text.html.markdown meta.disable-markdown entity.name.tag, text.html.markdown meta.disable-markdown meta.tag, text.html.markdown meta.disable-markdown meta.tag punctuation.definition.tag, text.html.markdown meta.disable-markdown meta.tag string.quoted meta.string-contents, text.html.markdown meta.disable-markdown meta.tag string.quoted punctuation.definition.string, text.html.markdown meta.disable-markdown meta.tag entity.other.attribute-name, text.html.markdown meta.paragraph.markdown entity.name.tag, text.html.markdown meta.paragraph.markdown meta.tag, text.html.markdown meta.paragraph.markdown meta.tag punctuation.definition.tag, text.html.markdown meta.paragraph.markdown meta.tag string.quoted meta.string-contents, text.html.markdown meta.paragraph.markdown meta.tag string.quoted punctuation.definition.string, text.html.markdown meta.paragraph.markdown meta.tag entity.other.attribute-name, text.html.markdown markup.list entity.name.tag, text.html.markdown markup.list meta.tag, text.html.markdown markup.list meta.tag punctuation.definition.tag, text.html.markdown markup.list meta.tag string.quoted meta.string-contents, text.html.markdown markup.list meta.tag string.quoted punctuation.definition.string, text.html.markdown markup.list meta.tag entity.other.attribute-name",
+            "foreground": "#AAAAAA",
+            "background": "#ECECEC"
+        },
+        {
+            "name": "HTML: Embedded",
+            "scope": "source.smarty.embedded.html",
+            "foreground": "#777777"
+        },
+        {
+            "name": "HTML: Attribute Punctuation",
+            "scope": "meta.tag string punctuation,punctuation.definition.entity.html",
+            "foreground": "#91accf"
+        },
+        {
+            "name": "HTML: Tag Punctuation",
+            "scope": "punctuation.definition.tag",
+            "foreground": "#91accf"
+        },
+        {
+            "name": "HTML: Entities",
+            "scope": "constant.character.entity",
+            "foreground": "#6d98cf"
+        },
+        {
+            "name": "HTML: Attribute Names",
+            "scope": "entity.other.attribute-name, text.html.markdown meta.disable-markdown meta.tag.block.any.html string.quoted.double.html, text.html.markdown meta.disable-markdown meta.tag.block.any.html string.quoted.double.html punctuation.definition",
+            "foreground": "#999999"
+        },
+        {
+            "name": "HTML: Attribute Values",
+            "scope": "meta.tag string.quoted, meta.tag string.quoted constant.character.entity",
+            "foreground": "#6d98cf"
+        },
+        {
+            "name": "Markup: Emphasis",
+            "scope": "markup.italic, markup.italic.markdown",
+            "foreground": "#777777",
+            "background": "#E8E8E8",
+            "font_style": "italic"
+        },
+        {
+            "name": "Markdown: Link",
+            "scope": "string.other.link.title.markdown,string.other.link.description.markdown",
+            "foreground": "#333333",
+            "background": "#DDDDDD00"
+        },
+        {
+            "name": "Markdown: Punctuation",
+            "scope": "punctuation.definition.metadata.markdown,punctuation.definition.string.begin.markdown, punctuation.definition.string.end.markdown, punctuation.definition.constant.markdown, punctuation.separator.key-value.markdown, punctuation.definition.constant.begin.markdown, punctuation.definition.constant.end.markdown,punctuation.definition.bold.markdown, punctuation.definition.italic.markdown, punctuation.definition.strikethrough.markdown, punctuation.definition.heading.markdown",
+            "foreground": "#AAAAAA",
+            "background": "#EEEEEE00"
+        },
+        {
+            "name": "Markdown: Lists",
+            "scope": "markup.list.unnumbered.markdown, markup.list.unnumbered.markdown meta.paragraph.list.markdown, markup.list.numbered.markdown, markup.list.numbered.markdown meta.paragraph.list.markdown",
+            "foreground": "#666666",
+            "background": "#EEEEEE00"
+        },
+        {
+            "name": "Markdown: Lists",
+            "scope": "markup.list.unnumbered.markdown punctuation.definition.list_item.markdown, markup.list.numbered.markdown punctuation.definition.list_item.markdown",
+            "foreground": "#000000"
+        },
+        {
+            "name": "Markup: Output",
+            "scope": "markup.output, markup.raw",
+            "foreground": "#7F7F7F"
+        },
+        {
+            "name": "Markup: Prompt",
+            "scope": "markup.prompt",
+            "foreground": "#555555"
+        },
+        {
+            "name": "Markup: Heading",
+            "scope": "markup.heading",
+            "font_style": "bold"
+        },
+        {
+            "name": "Markup: StrongEmphasis",
+            "scope": "markup.bold_italic, markup.bold_italic.markdown",
+            "foreground": "#555555",
+            "font_style": "bold italic"
+        },
+        {
+            "name": "Markup: Strong",
+            "scope": "markup.bold, markup.bold.markdown",
+            "foreground": "#555555",
+            "font_style": "bold"
+        },
+        {
+            "name": "Markup: Strikethrough",
+            "scope": "markup.strikethrough, markup.strikethrough.markdown, markup.strikethrough constant.other.reference.link.markdown, markup.strikethrough entity.name.tag, markup.strikethrough markup.bold, markup.strikethrough markup.bold.markdown, markup.strikethrough markup.italic, markup.strikethrough markup.italic.markdown, markup.strikethrough markup.raw.inline.markdown, markup.strikethrough markup.underline.link.image.markdown, markup.strikethrough markup.underline.link.markdown, markup.strikethrough meta.link.inet.markdown markup.underline.link.markdown, markup.strikethrough meta.link.email.lt-gt.markdown markup.underline.link.markdown, markup.strikethrough punctuation.definition.bold.markdown, markup.strikethrough punctuation.definition.italic.markdown, markup.strikethrough punctuation.definition.constant.begin.markdown, markup.strikethrough punctuation.definition.constant.end.markdown, markup.strikethrough punctuation.definition.constant.markdown, markup.strikethrough punctuation.definition.metadata.markdown, markup.strikethrough punctuation.definition.raw.markdown, markup.strikethrough punctuation.definition.strikethrough.markdown, markup.strikethrough punctuation.definition.string.begin.markdown, markup.strikethrough punctuation.definition.string.end.markdown, markup.strikethrough punctuation.definition.tag.begin.html, markup.strikethrough punctuation.definition.tag.end.html, markup.strikethrough string.other.link.description.markdown, markup.strikethrough string.other.link.description.title.markdown, markup.strikethrough string.other.link.title.markdown",
+            "foreground": "#CECECE",
+            "background": "#ECECEC"
+        },
+        {
+            "name": "Markup: Strikethrough (Keyboard Shortcut)",
+            "scope": "markup.strikethrough markup.kbd.content, markup.strikethrough markup.kbd.content.markdown",
+            "foreground": "#B7B7B7",
+            "background": "#DDDDDD"
+        },
+        {
+            "name": "Markup: Keyboard Shortcut",
+            "scope": "markup.kbd.content.markdown",
+            "foreground": "#131313",
+            "background": "#D3D3D3"
+        },
+        {
+            "name": "Markup: Traceback",
+            "scope": "markup.traceback",
+            "foreground": "#F93232"
+        },
+        {
+            "name": "Markup: Underline",
+            "scope": "markup.underline,markup.underline.link.markdown,constant.other.reference.link.markdown,meta.image.reference.markdown,meta.image.inline.markdown",
+            "foreground": "#AAAAAA"
+        },
+        {
+            "name": "Markup: Plain Link",
+            "scope": "meta.link.inet.markdown markup.underline.link.markdown, meta.link.email.lt-gt.markdown markup.underline.link.markdown",
+            "foreground": "#444488"
+        },
+        {
+            "name": "Extra: Diff Range",
+            "scope": "meta.diff.range, meta.diff.index, meta.separator",
+            "foreground": "#434343",
+            "background": "#EAF2F5"
+        },
+        {
+            "name": "Extra: Diff From",
+            "scope": "meta.diff.header.from-file",
+            "foreground": "#434343",
+            "background": "#FFDDDD"
+        },
+        {
+            "name": "Extra: Diff To",
+            "scope": "meta.diff.header.to-file",
+            "foreground": "#434343",
+            "background": "#DDFFDD"
+        },
+        {
+            "name": "Markdown Meta",
+            "scope": "meta.header.multimarkdown,keyword.other.multimarkdown,string.unquoted.multimarkdown,punctuation.separator.key-value.multimarkdown",
+            "foreground": "#BBBBBB",
+            "background": "#DDDDDD"
+        },
+        {
+            "name": "Markdown separator",
+            "scope": "meta.separator.markdown",
+            "foreground": "#AAAAAA",
+            "background": "#BBBBBB22"
+        },
+        {
+            "name": "Blockquote",
+            "scope": "markup.quote.markdown",
+            "foreground": "#999999"
+        },
+        {
+            "name": "Blockquote (Tags)",
+            "scope": "text.html.markdown markup.quote.markdown entity.name.tag, text.html.markdown markup.quote.markdown meta.tag, text.html.markdown markup.quote.markdown meta.tag punctuation.definition.tag, text.html.markdown markup.quote.markdown meta.tag string.quoted meta.string-contents, text.html.markdown markup.quote.markdown meta.tag string.quoted punctuation.definition.string, text.html.markdown markup.quote.markdown meta.tag entity.other.attribute-name",
+            "foreground": "#CECECE",
+            "background": "#ECECEC"
+        },
+        {
+            "name": "Blockquote (Keyboard Shortcut)",
+            "scope": "text.html.markdown markup.quote.markdown markup.kbd.content.markdown",
+            "foreground": "#717171",
+            "background": "#e5e5e5"
+        },
+        {
+            "name": "Blockquote (Bold)",
+            "scope": "text.html.markdown markup.quote.markdown markup.bold, text.html.markdown markup.quote.markdown markup.bold.markdown",
+            "foreground": "#999999"
+        },
+        {
+            "name": "Blockquote punctuation",
+            "scope": "punctuation.definition.blockquote.markdown",
+            "foreground": "#D0D0D0",
+            "background": "#D0D0D0"
+        },
+        {
+            "name": "Block code",
+            "scope": "markup.raw.block.markdown",
+            "foreground": "#555555",
+            "background": "#dedede"
+        },
+        {
+            "name": "Inline code",
+            "scope": "markup.raw.inline.markdown",
+            "background": "#dedede"
+        },
+        {
+            "name": "Block Cursor",
+            "scope": "block_cursor",
+            "foreground": "#212121",
+            "background": "#00bdff77"
+        },
+        {
+            "name": "Brackets",
+            "scope": "entity.name.class",
+            "background": "#d5f6ff88"
+        },
+        {
+            "name": "WordHighlight",
+            "scope": "wordhighlight",
+            "foreground": "#212121",
+            "background": "#00bdff77"
+        },
+        {
+            "name": "BracketHighlighter",
+            "scope": "brackethighlighter.default",
+            "foreground": "#212121",
+            "background": "#00bdff77"
+        },
+        {
+            "name": "GitGutter deleted",
+            "scope": "markup.deleted.git_gutter",
+            "foreground": "#F92672"
+        },
+        {
+            "name": "GitGutter inserted",
+            "scope": "markup.inserted.git_gutter",
+            "foreground": "#46A524"
+        },
+        {
+            "name": "GitGutter changed",
+            "scope": "markup.changed.git_gutter",
+            "foreground": "#700DDB"
+        },
+        {
+            "name": "GitGutter ignored",
+            "scope": "markup.ignored.git_gutter",
+            "foreground": "#565656"
+        },
+        {
+            "name": "GitGutter untracked",
+            "scope": "markup.untracked.git_gutter",
+            "foreground": "#565656"
+        },
+        {
+            "name": "Highlight Color Warm Blue",
+            "scope": "highlight.color.ADD8E6",
+            "foreground": "#ADD8E6"
+        },
+        {
+            "name": "Highlight Color MistyRose",
+            "scope": "highlight.color.FFE4E1",
+            "foreground": "#FFE4E1"
+        },
+        {
+            "name": "Highlight Color Green Tea",
+            "scope": "highlight.color.D0F0C0",
+            "foreground": "#D0F0C0"
+        },
+        {
+            "name": "SublimeLinter: Warning",
+            "scope": "sublimelinter.mark.warning",
+            "foreground": "#DDB700"
+        },
+        {
+            "name": "SublimeLinter: Error",
+            "scope": "sublimelinter.mark.error",
+            "foreground": "#D02000"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/MarkdownEditor.tmTheme b/MarkdownEditor.tmTheme
deleted file mode 100644
index 2a0d903e..00000000
--- a/MarkdownEditor.tmTheme
+++ /dev/null
@@ -1,968 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>name</key>
-    <string>MarkdownEditing</string>
-    <key>settings</key>
-    <array>
-        <dict>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#ECECEC</string>
-                <key>caret</key>
-                <string>#00bbff</string>
-                <key>foreground</key>
-                <string>#555555</string>
-                <key>invisibles</key>
-                <string>#E0E0E0</string>
-                <key>lineHighlight</key>
-                <string>#D3D3D3</string>
-                <key>selection</key>
-                <string>#C2E8FF</string>
-                <key>selectionBorder</key>
-                <string>#AACBDF</string>
-                <key>inactiveSelection</key>
-                <string>#B5D3E5</string>
-                <key>findHighlight</key>
-                <string>#FFE792</string>
-                <key>findHighlightForeground</key>
-                <string>#000000</string>
-                <key>shadow</key>
-                <string>#808080</string>
-                <key>shadowWidth</key>
-                <string>6</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Comments</string>
-            <key>scope</key>
-            <string>comment, comment punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#ADADAD</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Comments: Preprocessor</string>
-            <key>scope</key>
-            <string>comment.block.preprocessor</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#ADADAD</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Invalid - Deprecated</string>
-            <key>scope</key>
-            <string>invalid.deprecated</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#EFCFCF</string>
-                <key>fontStyle</key>
-                <string>italic underline</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Invalid - Illegal</string>
-            <key>scope</key>
-            <string>invalid.illegal</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#F9F2CE</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Operators</string>
-            <key>scope</key>
-            <string>keyword.operator</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#626FC9</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Keywords</string>
-            <key>scope</key>
-            <string>keyword, storage</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#61862F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Types</string>
-            <key>scope</key>
-            <string>storage.type, support.type</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#6700B9</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Functions</string>
-            <key>scope</key>
-            <string>entity.name.function, support.function, entity</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#61862F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Classes</string>
-            <key>scope</key>
-            <string>entity.name.type, entity.other.inherited-class, support.class</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#3A1D72</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Exceptions</string>
-            <key>scope</key>
-            <string>entity.name.exception</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#F93232</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Sections</string>
-            <key>scope</key>
-            <string>entity.name.section,entity.name.section.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-                <key>foreground</key>
-                <string>#333333</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Numbers</string>
-            <key>scope</key>
-            <string>constant.numeric, constant</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#F3F2FF</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#7653C1</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Punctuation</string>
-            <key>scope</key>
-            <string>punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#000000</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings</string>
-            <key>scope</key>
-            <string>constant.character, string</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FBE9AD1A</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#BC670F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Punctuation</string>
-            <key>scope</key>
-            <string>string punctuation</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#E69A4C</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Escape Sequences</string>
-            <key>scope</key>
-            <string>constant.character.escape</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FBE9ADCC</string>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Strings: Symbols</string>
-            <key>scope</key>
-            <string>constant.other.symbol</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#E8FFD5</string>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Embedded Source</string>
-            <key>scope</key>
-            <string>string source, text source</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#434343</string>
-            </dict>
-        </dict>
-
-        <dict>
-            <key>name</key>
-            <string>HTML: Doctype Declaration</string>
-            <key>scope</key>
-            <string>meta.tag.sgml.doctype</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#7F7F7F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Tags</string>
-            <key>scope</key>
-            <string>
-                , text.html.markdown meta.disable-markdown entity.name.tag,
-                , text.html.markdown meta.disable-markdown meta.tag,
-                , text.html.markdown meta.disable-markdown meta.tag punctuation.definition.tag,
-                , text.html.markdown meta.disable-markdown meta.tag string.quoted meta.string-contents,
-                , text.html.markdown meta.disable-markdown meta.tag string.quoted punctuation.definition.string,
-                , text.html.markdown meta.disable-markdown meta.tag entity.other.attribute-name,
-                , text.html.markdown meta.paragraph.markdown entity.name.tag,
-                , text.html.markdown meta.paragraph.markdown meta.tag,
-                , text.html.markdown meta.paragraph.markdown meta.tag punctuation.definition.tag,
-                , text.html.markdown meta.paragraph.markdown meta.tag string.quoted meta.string-contents,
-                , text.html.markdown meta.paragraph.markdown meta.tag string.quoted punctuation.definition.string,
-                , text.html.markdown meta.paragraph.markdown meta.tag entity.other.attribute-name,
-                , text.html.markdown markup.list entity.name.tag,
-                , text.html.markdown markup.list meta.tag,
-                , text.html.markdown markup.list meta.tag punctuation.definition.tag,
-                , text.html.markdown markup.list meta.tag string.quoted meta.string-contents,
-                , text.html.markdown markup.list meta.tag string.quoted punctuation.definition.string,
-                , text.html.markdown markup.list meta.tag entity.other.attribute-name,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#AAAAAA</string>
-                <key>background</key>
-                <string>#ECECEC</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Embedded</string>
-            <key>scope</key>
-            <string>source.smarty.embedded.html</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#777777</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Punctuation</string>
-            <key>scope</key>
-            <string>meta.tag string punctuation,punctuation.definition.entity.html</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#91accf</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Tag Punctuation</string>
-            <key>scope</key>
-            <string>punctuation.definition.tag</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#91accf</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Entities</string>
-            <key>scope</key>
-            <string>constant.character.entity</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#6d98cf</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Names</string>
-            <key>scope</key>
-            <string>entity.other.attribute-name, text.html.markdown meta.disable-markdown meta.tag.block.any.html string.quoted.double.html, text.html.markdown meta.disable-markdown meta.tag.block.any.html string.quoted.double.html punctuation.definition</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#999999</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>HTML: Attribute Values</string>
-            <key>scope</key>
-            <string>meta.tag string.quoted, meta.tag string.quoted constant.character.entity</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#6d98cf</string>
-            </dict>
-        </dict>
-
-        <dict>
-            <key>name</key>
-            <string>Markup: Emphasis</string>
-            <key>scope</key>
-            <string>markup.italic, markup.italic.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>italic</string>
-                <key>foreground</key>
-                <string>#777777</string>
-                <key>background</key>
-                <string>#E8E8E8</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown: Link</string>
-            <key>scope</key>
-            <string>string.other.link.title.markdown,string.other.link.description.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#333333</string>
-                <key>background</key>
-                <string>#DDDDDD00</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown: Punctuation</string>
-            <key>scope</key>
-            <string>punctuation.definition.metadata.markdown,punctuation.definition.string.begin.markdown, punctuation.definition.string.end.markdown, punctuation.definition.constant.markdown, punctuation.separator.key-value.markdown, punctuation.definition.constant.begin.markdown, punctuation.definition.constant.end.markdown,punctuation.definition.bold.markdown, punctuation.definition.italic.markdown, punctuation.definition.strikethrough.markdown, punctuation.definition.heading.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#AAAAAA</string>
-                <key>background</key>
-                <string>#EEEEEE00</string>
-            </dict>
-        </dict>
-
-        <dict>
-            <key>name</key>
-            <string>Markdown: Lists</string>
-            <key>scope</key>
-            <string>
-                , markup.list.unnumbered.markdown,
-                , markup.list.unnumbered.markdown meta.paragraph.list.markdown,
-                , markup.list.numbered.markdown,
-                , markup.list.numbered.markdown meta.paragraph.list.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#666666</string>
-                <key>background</key>
-                <string>#EEEEEE00</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown: Lists</string>
-            <key>scope</key>
-            <string>
-                , markup.list.unnumbered.markdown punctuation.definition.list_item.markdown,
-                , markup.list.numbered.markdown punctuation.definition.list_item.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#000000</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Output</string>
-            <key>scope</key>
-            <string>markup.output, markup.raw</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#7F7F7F</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Prompt</string>
-            <key>scope</key>
-            <string>markup.prompt</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#555555</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Heading</string>
-            <key>scope</key>
-            <string>markup.heading</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: StrongEmphasis</string>
-            <key>scope</key>
-            <string>markup.bold_italic, markup.bold_italic.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold italic</string>
-                <key>foreground</key>
-                <string>#555555</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Strong</string>
-            <key>scope</key>
-            <string>markup.bold, markup.bold.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>fontStyle</key>
-                <string>bold</string>
-                <key>foreground</key>
-                <string>#555555</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Strikethrough</string>
-            <key>scope</key>
-            <string>
-                , markup.strikethrough,
-                , markup.strikethrough.markdown,
-                , markup.strikethrough constant.other.reference.link.markdown,
-                , markup.strikethrough entity.name.tag,
-                , markup.strikethrough markup.bold,
-                , markup.strikethrough markup.bold.markdown,
-                , markup.strikethrough markup.italic,
-                , markup.strikethrough markup.italic.markdown,
-                , markup.strikethrough markup.raw.inline.markdown,
-                , markup.strikethrough markup.underline.link.image.markdown,
-                , markup.strikethrough markup.underline.link.markdown,
-                , markup.strikethrough meta.link.inet.markdown markup.underline.link.markdown,
-                , markup.strikethrough meta.link.email.lt-gt.markdown markup.underline.link.markdown,
-                , markup.strikethrough punctuation.definition.bold.markdown,
-                , markup.strikethrough punctuation.definition.italic.markdown,
-                , markup.strikethrough punctuation.definition.constant.begin.markdown,
-                , markup.strikethrough punctuation.definition.constant.end.markdown,
-                , markup.strikethrough punctuation.definition.constant.markdown,
-                , markup.strikethrough punctuation.definition.metadata.markdown,
-                , markup.strikethrough punctuation.definition.raw.markdown,
-                , markup.strikethrough punctuation.definition.strikethrough.markdown,
-                , markup.strikethrough punctuation.definition.string.begin.markdown,
-                , markup.strikethrough punctuation.definition.string.end.markdown,
-                , markup.strikethrough punctuation.definition.tag.begin.html,
-                , markup.strikethrough punctuation.definition.tag.end.html,
-                , markup.strikethrough string.other.link.description.markdown,
-                , markup.strikethrough string.other.link.description.title.markdown,
-                , markup.strikethrough string.other.link.title.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#CECECE</string>
-                <key>background</key>
-                <string>#ECECEC</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Strikethrough (Keyboard Shortcut)</string>
-            <key>scope</key>
-            <string>
-                , markup.strikethrough markup.kbd.content,
-                , markup.strikethrough markup.kbd.content.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#B7B7B7</string>
-                <key>background</key>
-                <string>#DDDDDD</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Keyboard Shortcut</string>
-            <key>scope</key>
-            <string>markup.kbd.content.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#D3D3D3</string>
-                <key>foreground</key>
-                <string>#131313</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Traceback</string>
-            <key>scope</key>
-            <string>markup.traceback</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#F93232</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Underline</string>
-            <key>scope</key>
-            <string>markup.underline,markup.underline.link.markdown,constant.other.reference.link.markdown,meta.image.reference.markdown,meta.image.inline.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#AAAAAA</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markup: Plain Link</string>
-            <key>scope</key>
-            <string>
-                , meta.link.inet.markdown markup.underline.link.markdown,
-                , meta.link.email.lt-gt.markdown markup.underline.link.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#444488</string>
-            </dict>
-        </dict>
-
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff Range</string>
-            <key>scope</key>
-            <string>meta.diff.range, meta.diff.index, meta.separator</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#EAF2F5</string>
-                <key>fontStyle</key>
-                <string></string>
-                <key>foreground</key>
-                <string>#434343</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff From</string>
-            <key>scope</key>
-            <string>meta.diff.header.from-file</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#FFDDDD</string>
-                <key>foreground</key>
-                <string>#434343</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Extra: Diff To</string>
-            <key>scope</key>
-            <string>meta.diff.header.to-file</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#DDFFDD</string>
-                <key>foreground</key>
-                <string>#434343</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown Meta</string>
-            <key>scope</key>
-            <string>meta.header.multimarkdown,keyword.other.multimarkdown,string.unquoted.multimarkdown,punctuation.separator.key-value.multimarkdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#DDDDDD</string>
-                <key>foreground</key>
-                <string>#BBBBBB</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Markdown separator</string>
-            <key>scope</key>
-            <string>meta.separator.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#BBBBBB22</string>
-                <key>foreground</key>
-                <string>#AAAAAA</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote</string>
-            <key>scope</key>
-            <string>markup.quote.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#999999</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote (Tags)</string>
-            <key>scope</key>
-            <string>
-                , text.html.markdown markup.quote.markdown entity.name.tag,
-                , text.html.markdown markup.quote.markdown meta.tag,
-                , text.html.markdown markup.quote.markdown meta.tag punctuation.definition.tag,
-                , text.html.markdown markup.quote.markdown meta.tag string.quoted meta.string-contents,
-                , text.html.markdown markup.quote.markdown meta.tag string.quoted punctuation.definition.string,
-                , text.html.markdown markup.quote.markdown meta.tag entity.other.attribute-name,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#CECECE</string>
-                <key>background</key>
-                <string>#ECECEC</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote (Keyboard Shortcut)</string>
-            <key>scope</key>
-            <string>text.html.markdown markup.quote.markdown markup.kbd.content.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#e5e5e5</string>
-                <key>foreground</key>
-                <string>#717171</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote (Bold)</string>
-            <key>scope</key>
-            <string>
-                , text.html.markdown markup.quote.markdown markup.bold,
-                , text.html.markdown markup.quote.markdown markup.bold.markdown,
-            </string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#999999</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Blockquote punctuation</string>
-            <key>scope</key>
-            <string>punctuation.definition.blockquote.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#D0D0D0</string>
-                <key>foreground</key>
-                <string>#D0D0D0</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Block code</string>
-            <key>scope</key>
-            <string>markup.raw.block.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#dedede</string>
-                <key>foreground</key>
-                <string>#555555</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Inline code</string>
-            <key>scope</key>
-            <string>markup.raw.inline.markdown</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#dedede</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Block Cursor</string>
-            <key>scope</key>
-            <string>block_cursor</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#212121</string>
-                <key>background</key>
-                <string>#00bdff77</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>Brackets</string>
-            <key>scope</key>
-            <string>entity.name.class</string>
-            <key>settings</key>
-            <dict>
-                <key>background</key>
-                <string>#d5f6ff88</string>
-            </dict>
-        </dict>
-
-        <!-- Below definitions belong to thirdparty plugins. -->
-        <dict>
-            <key>name</key>
-            <string>WordHighlight</string>
-            <key>scope</key>
-            <string>wordhighlight</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#212121</string>
-                <key>background</key>
-                <string>#00bdff77</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>BracketHighlighter</string>
-            <key>scope</key>
-            <string>brackethighlighter.default</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#212121</string>
-                <key>background</key>
-                <string>#00bdff77</string>
-            </dict>
-        </dict>
-        <!-- Support for GitGutter -->
-        <dict>
-            <key>name</key>
-            <string>GitGutter deleted</string>
-            <key>scope</key>
-            <string>markup.deleted.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#F92672</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter inserted</string>
-            <key>scope</key>
-            <string>markup.inserted.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#46A524</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter changed</string>
-            <key>scope</key>
-            <string>markup.changed.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#700DDB</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter ignored</string>
-            <key>scope</key>
-            <string>markup.ignored.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#565656</string>
-            </dict>
-        </dict>
-        <dict>
-            <key>name</key>
-            <string>GitGutter untracked</string>
-            <key>scope</key>
-            <string>markup.untracked.git_gutter</string>
-            <key>settings</key>
-            <dict>
-                <key>foreground</key>
-                <string>#565656</string>
-            </dict>
-        </dict>
-        <!--======================================
-        =       Persistent Regex Highlights      =
-        =======================================-->
-        <!-- Warm Blue color -->
-        <dict>
-        	<key>name</key>
-        	<string>Highlight Color Warm Blue</string>
-        	<key>scope</key>
-        	<string>highlight.color.ADD8E6</string>
-        	<key>settings</key>
-        	<dict>
-        		<key>foreground</key>
-        		<string>#ADD8E6</string>
-        	</dict>
-        </dict>
-        <!-- Misty Rose color -->
-        <dict>
-        	<key>name</key>
-        	<string>Highlight Color MistyRose</string>
-        	<key>scope</key>
-        	<string>highlight.color.FFE4E1</string>
-        	<key>settings</key>
-        	<dict>
-        		<key>foreground</key>
-        		<string>#FFE4E1</string>
-        	</dict>
-        </dict>
-        <!-- Green Tea color -->
-        <dict>
-        	<key>name</key>
-        	<string>Highlight Color Green Tea</string>
-        	<key>scope</key>
-        	<string>highlight.color.D0F0C0</string>
-        	<key>settings</key>
-        	<dict>
-        		<key>foreground</key>
-        		<string>#D0F0C0</string>
-        	</dict>
-        </dict>
-        <!--===================================
-        =            SublimeLinter            =
-        ====================================-->
-        <!-- SublimeLinter: warning -->
-        <dict>
-        	<key>name</key>
-        	<string>SublimeLinter: Warning</string>
-        	<key>scope</key>
-        	<string>sublimelinter.mark.warning</string>
-        	<key>settings</key>
-        	<dict>
-        		<key>foreground</key>
-        		<string>#DDB700</string>
-        	</dict>
-        </dict>
-        <!-- SublimeLinter: error -->
-        <dict>
-        	<key>name</key>
-        	<string>SublimeLinter: Error</string>
-        	<key>scope</key>
-        	<string>sublimelinter.mark.error</string>
-        	<key>settings</key>
-        	<dict>
-        		<key>foreground</key>
-        		<string>#D02000</string>
-        	</dict>
-        </dict>
-    </array>
-    <key>uuid</key>
-    <string>BF4E1964-0DB9-4E88-8142-E8F52D7EDEEC</string>
-</dict>
-</plist>
diff --git a/MultiMarkdown.sublime-settings b/MultiMarkdown.sublime-settings
index ca5f232c..2c95fb29 100644
--- a/MultiMarkdown.sublime-settings
+++ b/MultiMarkdown.sublime-settings
@@ -4,14 +4,14 @@
 		"mmd"
 	],
 
-	"color_scheme": "Packages/MarkdownEditing/MarkdownEditor.tmTheme",
-	// "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Dark.tmTheme",
-	// "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Yellow.tmTheme",
+	"color_scheme": "Packages/MarkdownEditing/MarkdownEditor.sublime-color-scheme",
+	// "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Dark.sublime-color-scheme",
+	// "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Yellow.sublime-color-scheme",
 
 	// This is a quick and dirty focus theme. In order to make it work, you've to
 	// set `"highlight_line": true,` in this settings file. It is likely that there will
 	// be more mature focus improvements in the future (maybe similar to iA Writer).
-	// "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Focus.tmTheme",
+	// "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Focus.sublime-color-scheme",
 
 	"tab_size": 4,
 	"translate_tabs_to_spaces": true,
@@ -35,6 +35,10 @@
 	"caret_extra_top": 3,
 	"caret_extra_bottom": 3,
 
+	// Behavior
+	"mde.bold_marker_asterisk": true,
+	"mde.italic_marker_asterisk": true,
+
 	// add trailing #'s to headlines
 	"mde.match_header_hashes": false,
 
diff --git a/README.md b/README.md
index bbed70d9..41c78535 100644
--- a/README.md
+++ b/README.md
@@ -238,9 +238,9 @@ Bold and italic markers are configurable through ST shell variables. You can use
 
 In order to activate the dark or the yellow theme, put one of these lines to your user settings file of the flavor (`Packages/User/[flavor].sublime-settings`):
 
-    "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Dark.tmTheme",
-    "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Yellow.tmTheme",
-    "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-ArcDark.tmTheme",
+    "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Dark.sublime-color-scheme",
+    "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-Yellow.sublime-color-scheme",
+    "color_scheme": "Packages/MarkdownEditing/MarkdownEditor-ArcDark.sublime-color-scheme",
     
 
 If you want to go with your already existing theme, you can reenable it with the same method as above. Keep in mind that, that theme may not cover all the parts of the Markdown syntax that this plugin defines.
diff --git a/basic_ops.py b/basic_ops.py
new file mode 100644
index 00000000..ae2ec8e9
--- /dev/null
+++ b/basic_ops.py
@@ -0,0 +1,44 @@
+import sublime
+import sublime_plugin
+import re
+try:
+    from MarkdownEditing.mdeutils import *
+except ImportError:
+    from mdeutils import *
+
+
+class MDEBoldCommand(MDETextCommand):
+
+    def description(self):
+        return 'Apply bold style'
+
+    def run(self, edit):
+        view = self.view
+        sections = []
+        shouldUnfold = False
+        for sel in view.sel():
+            section_start = -1
+            section_end = view.size()
+            section_level = 0
+            for (title_begin, title_end, level) in all_headings(view):
+                if title_begin <= sel.a:
+                    section_start = title_end
+                    section_level = level
+                elif section_level >= level:
+                    section_end = title_begin - 1
+                    break
+            if section_start >= 0 and section_end >= section_start:
+                reg = sublime.Region(section_start, section_end)
+                folded = getFoldedRegion(view, reg)
+                if folded != None:
+                    sections.append(folded)
+                    shouldUnfold = True
+                else:
+                    sections.append(reg)
+
+        for reg in sections:
+            if shouldUnfold:
+                view.unfold(reg)
+            else:
+                view.fold(reg)
+
diff --git a/bootstrap.py b/bootstrap.py
index 4b76441a..d4f6aae0 100644
--- a/bootstrap.py
+++ b/bootstrap.py
@@ -48,7 +48,7 @@ def choose_color_theme(window):
 
 There are also inline styles like `inline code in monospace font` and ~~strikethrough style~~. __There may be ~~strikethroughed text~~ or `code text` inside bold text.__ _And There may be ~~strikethroughed text~~ or `code text` inside italic text._
 
-To reference something from a URL, [Named Links][links] and [Inline links](https://example.com/index.html) are of great help. Sometimes ![A picture][sample image] is worth a thousand words.
+To reference something from a URL, [Named Links][links], [Inline links](https://example.com/index.html) and direct link like <https://example.com/> are of great help. Sometimes ![A picture][sample image] is worth a thousand words.
 
 There are two types of lists, numbered and unnumbered.
 
@@ -88,21 +88,27 @@ def choose_color_theme(window):
 
 '''})
     view.set_syntax_file('Packages/MarkdownEditing/Markdown.tmLanguage')
-    default_mde_scheme = sublime.load_settings('Markdown.sublime-settings').get('color_scheme') or 'Packages/MarkdownEditing/MarkdownEditor.tmTheme'
+    default_mde_scheme = sublime.load_settings('Markdown.sublime-settings').get('color_scheme') or 'Packages/MarkdownEditing/MarkdownEditor.sublime-color-scheme'
     print(default_mde_scheme)
     view.settings().set('color_scheme', default_mde_scheme)
     view.set_read_only(True)
     view.set_scratch(True)
 
     global_scheme = sublime.load_settings('Preferences.sublime-settings').get('color_scheme')
-    themes = ['Packages/MarkdownEditing/MarkdownEditor.tmTheme',
-              'Packages/MarkdownEditing/MarkdownEditor-Focus.tmTheme',
-              'Packages/MarkdownEditing/MarkdownEditor-Yellow.tmTheme',
-              'Packages/MarkdownEditing/MarkdownEditor-Dark.tmTheme',
-              'Packages/MarkdownEditing/MarkdownEditor-ArcDark.tmTheme',
+    themes = ['Packages/MarkdownEditing/MarkdownEditor.sublime-color-scheme',
+              'Packages/MarkdownEditing/MarkdownEditor-Focus.sublime-color-scheme',
+              'Packages/MarkdownEditing/MarkdownEditor-Yellow.sublime-color-scheme',
+              'Packages/MarkdownEditing/MarkdownEditor-Dark.sublime-color-scheme',
+              'Packages/MarkdownEditing/MarkdownEditor-ArcDark.sublime-color-scheme',
               global_scheme]
 
-    themes_display = [re.search('[^/]+(?=\.tmTheme$)', s).group(0) + (' (Current)' if s == default_mde_scheme else '') + (' (Global)' if s == global_scheme else '') for s in themes]
+    themes_display = []
+    for s in themes:
+        m = re.search('[^/]+(?=\\.sublime-color-scheme$)', s)
+        if m is None:
+            continue
+        theme_display = m.group(0) + (' (Current)' if s == default_mde_scheme else '') + (' (Global)' if s == global_scheme else '')
+        themes_display.append(theme_display)
 
     def set_scheme(scheme):
         view.settings().set('color_scheme', scheme)
diff --git a/folding.py b/folding.py
index 109cf4e0..45228093 100644
--- a/folding.py
+++ b/folding.py
@@ -245,3 +245,17 @@ def run(self, edit, same_level=True):
             for region in new_sel:
                 view.sel().add(region)
                 view.show(region)
+
+class FoldAllLinkUrls(MDETextCommand):
+
+    def run(self, edit):
+        view = self.view
+        all_links = view.find_by_selector('markup.underline.link')
+        folded_regions = view.folded_regions()
+        folded_a_link = False
+        for link in all_links:
+            if link not in folded_regions:
+                view.fold(link)
+                folded_a_link = True
+        if not folded_a_link:
+            view.unfold(all_links)
\ No newline at end of file
diff --git a/macros/Transform Word - Bold - Asterisk.sublime-macro b/macros/Transform Word - Bold - Asterisk.sublime-macro
new file mode 100644
index 00000000..7b7c41e0
--- /dev/null
+++ b/macros/Transform Word - Bold - Asterisk.sublime-macro	
@@ -0,0 +1,4 @@
+[
+    {"command": "custom_find_under_expand"},
+    {"command": "insert_snippet", "args": {"contents": "**${SELECTION/(^[\\*_]*|[\\*_]*$)//g}**"}}
+]
diff --git a/macros/Transform Word - Bold.sublime-macro b/macros/Transform Word - Bold.sublime-macro
index 2f2c9ea2..80ab1cfc 100644
--- a/macros/Transform Word - Bold.sublime-macro	
+++ b/macros/Transform Word - Bold.sublime-macro	
@@ -1,4 +1,4 @@
 [
     {"command": "custom_find_under_expand"},
-    {"command": "insert_snippet", "args": {"contents": "${MD_BOLD_MARKER}${SELECTION/(^[\\*_]*|[\\*_]*$)//g}${MD_BOLD_MARKER}"}}
+    {"command": "insert_snippet", "args": {"contents": "__${SELECTION/(^[\\*_]*|[\\*_]*$)//g}__"}}
 ]
diff --git a/macros/Transform Word - Italic - Asterisk.sublime-macro b/macros/Transform Word - Italic - Asterisk.sublime-macro
new file mode 100644
index 00000000..ca3d122f
--- /dev/null
+++ b/macros/Transform Word - Italic - Asterisk.sublime-macro	
@@ -0,0 +1,4 @@
+[
+    {"command": "custom_find_under_expand"},
+    {"command": "insert_snippet", "args": {"contents": "*${SELECTION/(^[\\*_]*|[\\*_]*$)//g}*"}}
+]
diff --git a/macros/Transform Word - Italic.sublime-macro b/macros/Transform Word - Italic.sublime-macro
index e1cd8db7..59725210 100644
--- a/macros/Transform Word - Italic.sublime-macro	
+++ b/macros/Transform Word - Italic.sublime-macro	
@@ -1,4 +1,4 @@
 [
     {"command": "custom_find_under_expand"},
-    {"command": "insert_snippet", "args": {"contents": "${MD_ITALIC_MARKER}${SELECTION/(^[\\*_]*|[\\*_]*$)//g}${MD_ITALIC_MARKER}"}}
+    {"command": "insert_snippet", "args": {"contents": "_${SELECTION/(^[\\*_]*|[\\*_]*$)//g}_"}}
 ]
diff --git a/messages/2.2.8.md b/messages/2.2.8.md
new file mode 100644
index 00000000..c6eb0603
--- /dev/null
+++ b/messages/2.2.8.md
@@ -0,0 +1,21 @@
+# MarkdownEditing 2.2.8 Changelog
+
+Your _MarkdownEditing_ plugin is updated. Enjoy new version. For any type of
+feedback you can use [GitHub issues][issues].
+
+## Bug Fixes
+
+* Some theme display bugs are fixed.
+    - Strikethroughs are highlighted properly.
+    - Link texts are highlighted properly.
+
+## New Features
+
+* Tab/shift+tab on the beginning of the line of a list item will correctly indent/unindent that item.
+* Support AutoHotkey AHK fenced code (if supported syntax is installed)
+
+## Changes
+
+* Default four color schemes are renamed from '.tmTheme' extension to '.sublime-color-scheme'. Sublime Text seems to be smart enough to redirect .tmTheme files to .sublime-color-scheme files in settings if possible.
+
+[issues]: https://github.com/SublimeText-Markdown/MarkdownEditing/issues