diff --git a/src/theme/css/syntax/ayu.css b/src/theme/css/syntax/ayu.css
index 5eafbdcf..d89afe41 100644
--- a/src/theme/css/syntax/ayu.css
+++ b/src/theme/css/syntax/ayu.css
@@ -3,135 +3,108 @@
  */
 
 .syn-code {
- color: #c5c8c6;
- background-color: #1d1f21;
+ color: #ffee99;
 }
 
-.syn-variable.syn-parameter.syn-function {
- color: #c5c8c6;
-}
 .syn-comment, .syn-punctuation.syn-definition.syn-comment {
- color: #969896;
+ color: #5c6773;
 }
 .syn-punctuation.syn-definition.syn-string, .syn-punctuation.syn-definition.syn-variable, .syn-punctuation.syn-definition.syn-string, .syn-punctuation.syn-definition.syn-parameters, .syn-punctuation.syn-definition.syn-string, .syn-punctuation.syn-definition.syn-array {
- color: #c5c8c6;
+ color: #5c6773;
 }
 .syn-none {
- color: #c5c8c6;
+ color: #5c6773;
 }
 .syn-keyword.syn-operator {
- color: #c5c8c6;
+ color: #5c6773;
 }
 .syn-keyword {
- color: #b294bb;
+ color: #ff7733;
 }
 .syn-variable {
- color: #cc6666;
+ color: #ff7733;
 }
 .syn-entity.syn-name.syn-function, .syn-meta.syn-require, .syn-support.syn-function.syn-any-method {
- color: #81a2be;
+ color: #36a3d9;
 }
 .syn-entity.syn-name.syn-label {
- color: #a3685a;
+ color: #ffee99;
 }
 .syn-support.syn-class, .syn-entity.syn-name.syn-class, .syn-entity.syn-name.syn-type.syn-class {
- color: #f0c674;
+ color: #ffee99;
 }
 .syn-meta.syn-class {
- color: #ffffff;
+ color: #ffee99;
 }
 .syn-keyword.syn-other.syn-special-method {
- color: #81a2be;
+ color: #36a3d9;
 }
 .syn-storage {
- color: #b294bb;
+ color: #ff7733;
 }
 .syn-support.syn-function {
- color: #8abeb7;
+ color: #36a3d9;
 }
 .syn-string, .syn-constant.syn-other.syn-symbol, .syn-entity.syn-other.syn-inherited-class {
- color: #b5bd68;
+ color: #b8cc52;
 }
 .syn-constant.syn-numeric {
- color: #de935f;
+ color: #ffee99;
 }
 .syn-none {
- color: #de935f;
+ color: #ffee99;
 }
 .syn-none {
- color: #de935f;
+ color: #ffee99;
 }
 .syn-constant {
- color: #de935f;
+ color: #ffee99;
 }
 .syn-entity.syn-name.syn-tag {
- color: #cc6666;
+ color: #00568d;
 }
 .syn-entity.syn-other.syn-attribute-name {
- color: #de935f;
+ color: #ff7733;
 }
 .syn-entity.syn-other.syn-attribute-name.syn-id, .syn-punctuation.syn-definition.syn-entity {
- color: #81a2be;
+ color: #ff7733;
 }
 .syn-meta.syn-selector {
- color: #b294bb;
+ color: #ff7733;
 }
 .syn-none {
- color: #de935f;
+ color: #ffee99;
 }
 .syn-markup.syn-heading .syn-punctuation.syn-definition.syn-heading, .syn-entity.syn-name.syn-section {
- color: #81a2be;
-}
-.syn-keyword.syn-other.syn-unit {
- color: #de935f;
+ color: #ffb454;
 }
 .syn-markup.syn-bold, .syn-punctuation.syn-definition.syn-bold {
- color: #f0c674;
 font-weight: bold;
 }
 .syn-markup.syn-italic, .syn-punctuation.syn-definition.syn-italic {
- color: #b294bb;
 font-style: italic;
 }
-.syn-markup.syn-raw.syn-inline {
- color: #b5bd68;
-}
 .syn-string.syn-other.syn-link, .syn-punctuation.syn-definition.syn-string.syn-end.syn-markdown, .syn-punctuation.syn-definition.syn-string.syn-begin.syn-markdown {
- color: #cc6666;
+ color: #ff7733;
 }
 .syn-meta.syn-link {
- color: #de935f;
+ color: #ff7733;
 }
 .syn-markup.syn-list {
- color: #cc6666;
+ color: #b8cc52;
 }
 .syn-markup.syn-quote {
- color: #de935f;
+ color: #5c6773;
 }
 .syn-meta.syn-separator {
  color: #c5c8c6;
  background-color: #373b41;
 }
-.syn-markup.syn-inserted {
- color: #b5bd68;
-}
-.syn-markup.syn-deleted {
- color: #cc6666;
-}
-.syn-markup.syn-changed {
- color: #b294bb;
-}
 .syn-constant.syn-other.syn-color {
- color: #8abeb7;
+ color: #ffee99;
 }
 .syn-string.syn-regexp {
- color: #8abeb7;
-}
-.syn-constant.syn-character.syn-escape {
- color: #8abeb7;
-}
-.syn-punctuation.syn-section.syn-embedded, .syn-variable.syn-interpolation {
- color: #b294bb;
+ color: #ff7733;
 }
 .syn-invalid.syn-illegal {
  color: #ffffff;
diff --git a/src/theme/css/syntax/light.css b/src/theme/css/syntax/light.css
index ec72e9d5..b778db1b 100644
--- a/src/theme/css/syntax/light.css
+++ b/src/theme/css/syntax/light.css
@@ -11,7 +11,7 @@
  color: #6e6b5e;
 }
 .syn-comment, .syn-punctuation.syn-definition.syn-comment {
- color: #999580;
+ color: #575757;
 }
 .syn-punctuation.syn-definition.syn-string, .syn-punctuation.syn-definition.syn-variable, .syn-punctuation.syn-definition.syn-string, .syn-punctuation.syn-definition.syn-parameters, .syn-punctuation.syn-definition.syn-string, .syn-punctuation.syn-definition.syn-array {
  color: #6e6b5e;
@@ -26,19 +26,19 @@
  color: #b854d4;
 }
 .syn-variable {
- color: #d73737;
+ color: #d70025;
 }
 .syn-entity.syn-name.syn-function, .syn-meta.syn-require, .syn-support.syn-function.syn-any-method {
- color: #6684e1;
+ color: #0030f2;
 }
 .syn-support.syn-class, .syn-entity.syn-name.syn-class, .syn-entity.syn-name.syn-type.syn-class {
- color: #b65611;
+ color: #b21e00;
 }
 .syn-meta.syn-class {
  color: #292824;
 }
 .syn-keyword.syn-other.syn-special-method {
- color: #6684e1;
+ color: #0030f2;
 }
 .syn-storage {
  color: #b854d4;
@@ -47,43 +47,43 @@
  color: #1fad83;
 }
 .syn-string, .syn-constant.syn-other.syn-symbol, .syn-entity.syn-other.syn-inherited-class {
- color: #60ac39;
+ color: #008200;
 }
 .syn-constant.syn-numeric {
- color: #b65611;
+ color: #b21e00;
 }
 .syn-none {
- color: #b65611;
+ color: #b21e00;
 }
 .syn-none {
- color: #b65611;
+ color: #b21e00;
 }
 .syn-constant {
- color: #b65611;
+ color: #b21e00;
 }
 .syn-entity.syn-name.syn-tag {
- color: #d73737;
+ color: #d70025;
 }
 .syn-entity.syn-other.syn-attribute-name {
- color: #b65611;
+ color: #b21e00;
 }
 .syn-entity.syn-other.syn-attribute-name.syn-id, .syn-punctuation.syn-definition.syn-entity {
- color: #6684e1;
+ color: #0030f2;
 }
 .syn-meta.syn-selector {
  color: #b854d4;
 }
 .syn-none {
- color: #b65611;
+ color: #b21e00;
 }
 .syn-markup.syn-heading .syn-punctuation.syn-definition.syn-heading, .syn-entity.syn-name.syn-section {
- color: #6684e1;
+ color: #0030f2;
 }
 .syn-keyword.syn-other.syn-unit {
- color: #b65611;
+ color: #b21e00;
 }
 .syn-markup.syn-bold, .syn-punctuation.syn-definition.syn-bold {
- color: #b65611;
+ color: #b21e00;
 font-weight: bold;
 }
 .syn-markup.syn-italic, .syn-punctuation.syn-definition.syn-italic {
@@ -91,29 +91,29 @@ font-weight: bold;
 font-style: italic;
 }
 .syn-markup.syn-raw.syn-inline {
- color: #60ac39;
+ color: #008200;
 }
 .syn-string.syn-other.syn-link {
- color: #d73737;
+ color: #d70025;
 }
 .syn-meta.syn-link {
- color: #b65611;
+ color: #b21e00;
 }
 .syn-markup.syn-list {
- color: #d73737;
+ color: #d70025;
 }
 .syn-markup.syn-quote {
- color: #b65611;
+ color: #b21e00;
 }
 .syn-meta.syn-separator {
  color: #6e6b5e;
  background-color: #e8e4cf;
 }
 .syn-markup.syn-inserted {
- color: #60ac39;
+ color: #008200;
 }
 .syn-markup.syn-deleted {
- color: #d73737;
+ color: #d70025;
 }
 .syn-markup.syn-changed {
  color: #b854d4;
@@ -132,11 +132,11 @@ font-style: italic;
 }
 .syn-invalid.syn-illegal {
  color: #fefbec;
- background-color: #d73737;
+ background-color: #d70025;
 }
 .syn-invalid.syn-broken {
  color: #20201d;
- background-color: #b65611;
+ background-color: #b21e00;
 }
 .syn-invalid.syn-deprecated {
  color: #fefbec;
diff --git a/src/theme/syntax-themes/ayu.tmTheme b/src/theme/syntax-themes/ayu.tmTheme
index b25c81db..837f80da 100644
--- a/src/theme/syntax-themes/ayu.tmTheme
+++ b/src/theme/syntax-themes/ayu.tmTheme
@@ -2,46 +2,17 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<!-- an increased-contrast theme based loosely on Ayu :: originally from https://github.com/rust-lang/mdBook/blob/601ebc5499ac8758937585d3d0254852027ecab6/src/theme/ayu-highlight.css -->
 	<key>author</key>
-	<string>Template: Chris Kempson, Scheme: Chris Kempson (http://chriskempson.com)</string>
+	<string>Template: Chris Kempson, Scheme: Chris Kempson (http://chriskempson.com), Michael Howell (https://notriddle.com)</string>
 	<key>name</key>
 	<string>Base16 Tomorrow Night</string>
 	<key>semanticClass</key>
 	<string>theme.base16.tomorrow-night</string>
 	<key>colorSpaceName</key>
 	<string>sRGB</string>
-	<key>gutterSettings</key>
-	<dict>
-		<key>background</key>
-		<string>#282a2e</string>
-		<key>divider</key>
-		<string>#282a2e</string>
-		<key>foreground</key>
-		<string>#969896</string>
-		<key>selectionBackground</key>
-		<string>#373b41</string>
-		<key>selectionForeground</key>
-		<string>#b4b7b4</string>
-	</dict>
 	<key>settings</key>
 	<array>
-		<dict>
-			<key>settings</key>
-			<dict>
-				<key>background</key>
-				<string>#1d1f21</string>
-				<key>caret</key>
-				<string>#c5c8c6</string>
-				<key>foreground</key>
-				<string>#c5c8c6</string>
-				<key>invisibles</key>
-				<string>#969896</string>
-				<key>lineHighlight</key>
-				<string>#96989655</string>
-				<key>selection</key>
-				<string>#373b41</string>
-			</dict>
-		</dict>
 		<dict>
 			<key>name</key>
 			<string>Text</string>
@@ -50,7 +21,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#c5c8c6</string>
+				<string>#ffee99</string>
 			</dict>
 		</dict>
 		<dict>
@@ -61,7 +32,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#969896</string>
+				<string>#5c6773</string>
 			</dict>
 		</dict>
 		<dict>
@@ -72,7 +43,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#c5c8c6</string>
+				<string>#5c6773</string>
 			</dict>
 		</dict>
 		<dict>
@@ -83,7 +54,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#c5c8c6</string>
+				<string>#5c6773</string>
 			</dict>
 		</dict>
 		<dict>
@@ -94,7 +65,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#c5c8c6</string>
+				<string>#5c6773</string>
 			</dict>
 		</dict>
 		<dict>
@@ -105,7 +76,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#b294bb</string>
+				<string>#ff7733</string>
 			</dict>
 		</dict>
 		<dict>
@@ -116,7 +87,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#cc6666</string>
+				<string>#ff7733</string>
 			</dict>
 		</dict>
 		<dict>
@@ -127,7 +98,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#81a2be</string>
+				<string>#36a3d9</string>
 			</dict>
 		</dict>
 		<dict>
@@ -138,7 +109,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#a3685a</string>
+				<string>#ffee99</string>
 			</dict>
 		</dict>
 		<dict>
@@ -149,7 +120,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#f0c674</string>
+				<string>#ffee99</string>
 			</dict>
 		</dict>
 		<dict>
@@ -160,7 +131,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#ffffff</string>
+				<string>#ffee99</string>
 			</dict>
 		</dict>
 		<dict>
@@ -171,7 +142,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#81a2be</string>
+				<string>#36a3d9</string>
 			</dict>
 		</dict>
 		<dict>
@@ -182,7 +153,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#b294bb</string>
+				<string>#ff7733</string>
 			</dict>
 		</dict>
 		<dict>
@@ -193,7 +164,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#8abeb7</string>
+				<string>#36a3d9</string>
 			</dict>
 		</dict>
 		<dict>
@@ -204,7 +175,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#b5bd68</string>
+				<string>#b8cc52</string>
 			</dict>
 		</dict>
 		<dict>
@@ -215,7 +186,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#de935f</string>
+				<string>#ffee99</string>
 			</dict>
 		</dict>
 		<dict>
@@ -226,7 +197,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#de935f</string>
+				<string>#ffee99</string>
 			</dict>
 		</dict>
 		<dict>
@@ -237,7 +208,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#de935f</string>
+				<string>#ffee99</string>
 			</dict>
 		</dict>
 		<dict>
@@ -248,7 +219,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#de935f</string>
+				<string>#ffee99</string>
 			</dict>
 		</dict>
 		<dict>
@@ -259,7 +230,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#cc6666</string>
+				<string>#00568d</string>
 			</dict>
 		</dict>
 		<dict>
@@ -270,7 +241,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#de935f</string>
+				<string>#ff7733</string>
 			</dict>
 		</dict>
 		<dict>
@@ -281,7 +252,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#81a2be</string>
+				<string>#ff7733</string>
 			</dict>
 		</dict>
 		<dict>
@@ -292,7 +263,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#b294bb</string>
+				<string>#ff7733</string>
 			</dict>
 		</dict>
 		<dict>
@@ -303,7 +274,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#de935f</string>
+				<string>#ffee99</string>
 			</dict>
 		</dict>
 		<dict>
@@ -316,18 +287,7 @@
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
-				<string>#81a2be</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>Units</string>
-			<key>scope</key>
-			<string>keyword.other.unit</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#de935f</string>
+				<string>#ffb454</string>
 			</dict>
 		</dict>
 		<dict>
@@ -339,8 +299,6 @@
 			<dict>
 				<key>fontStyle</key>
 				<string>bold</string>
-				<key>foreground</key>
-				<string>#f0c674</string>
 			</dict>
 		</dict>
 		<dict>
@@ -352,19 +310,6 @@
 			<dict>
 				<key>fontStyle</key>
 				<string>italic</string>
-				<key>foreground</key>
-				<string>#b294bb</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>Code</string>
-			<key>scope</key>
-			<string>markup.raw.inline</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#b5bd68</string>
 			</dict>
 		</dict>
 		<dict>
@@ -375,7 +320,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#cc6666</string>
+				<string>#ff7733</string>
 			</dict>
 		</dict>
 		<dict>
@@ -386,7 +331,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#de935f</string>
+				<string>#ff7733</string>
 			</dict>
 		</dict>
 		<dict>
@@ -397,7 +342,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#cc6666</string>
+				<string>#b8cc52</string>
 			</dict>
 		</dict>
 		<dict>
@@ -408,7 +353,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#de935f</string>
+				<string>#5c6773</string>
 			</dict>
 		</dict>
 		<dict>
@@ -424,39 +369,6 @@
 				<string>#c5c8c6</string>
 			</dict>
 		</dict>
-		<dict>
-			<key>name</key>
-			<string>Inserted</string>
-			<key>scope</key>
-			<string>markup.inserted</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#b5bd68</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>Deleted</string>
-			<key>scope</key>
-			<string>markup.deleted</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#cc6666</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>Changed</string>
-			<key>scope</key>
-			<string>markup.changed</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#b294bb</string>
-			</dict>
-		</dict>
 		<dict>
 			<key>name</key>
 			<string>Colors</string>
@@ -465,7 +377,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#8abeb7</string>
+				<string>#ffee99</string>
 			</dict>
 		</dict>
 		<dict>
@@ -476,29 +388,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#8abeb7</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>Escape Characters</string>
-			<key>scope</key>
-			<string>constant.character.escape</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#8abeb7</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>name</key>
-			<string>Embedded</string>
-			<key>scope</key>
-			<string>punctuation.section.embedded, variable.interpolation</string>
-			<key>settings</key>
-			<dict>
-				<key>foreground</key>
-				<string>#b294bb</string>
+				<string>#ff7733</string>
 			</dict>
 		</dict>
 		<dict>
diff --git a/src/theme/syntax-themes/dark.tmTheme b/src/theme/syntax-themes/dark.tmTheme
index b25c81db..6d3f3c82 100644
--- a/src/theme/syntax-themes/dark.tmTheme
+++ b/src/theme/syntax-themes/dark.tmTheme
@@ -2,8 +2,9 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<!-- based loosely on https://github.com/rust-lang/mdBook/blob/601ebc5499ac8758937585d3d0254852027ecab6/src/theme/tomorrow-night.css -->
 	<key>author</key>
-	<string>Template: Chris Kempson, Scheme: Chris Kempson (http://chriskempson.com)</string>
+	<string>Template: Chris Kempson, Scheme: Chris Kempson (http://chriskempson.com), Michael Howell</string>
 	<key>name</key>
 	<string>Base16 Tomorrow Night</string>
 	<key>semanticClass</key>
diff --git a/src/theme/syntax-themes/light.tmTheme b/src/theme/syntax-themes/light.tmTheme
index 87d3353b..473dfd49 100644
--- a/src/theme/syntax-themes/light.tmTheme
+++ b/src/theme/syntax-themes/light.tmTheme
@@ -2,27 +2,15 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<!-- an increased-contrast theme based loosely on Base16 Atelier Dune Light :: originally from https://github.com/rust-lang/mdBook/blob/601ebc5499ac8758937585d3d0254852027ecab6/src/theme/highlight.css -->
 	<key>author</key>
-	<string>Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/dune)</string>
+	<string>Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/dune), Michael Howell (https://notriddle.com)</string>
 	<key>name</key>
 	<string>Base16 Atelier Dune Light</string>
 	<key>semanticClass</key>
 	<string>base16.atelierdune.light</string>
 	<key>colorSpaceName</key>
 	<string>sRGB</string>
-	<key>gutterSettings</key>
-	<dict>
-		<key>background</key>
-		<string>#fefbec</string>
-		<key>divider</key>
-		<string>#fefbec</string>
-		<key>foreground</key>
-		<string>#6e6b5e</string>
-		<key>selectionBackground</key>
-		<string>#fefbec</string>
-		<key>selectionForeground</key>
-		<string>#a6a28c</string>
-	</dict>
 	<key>settings</key>
 	<array>
 		<dict>
@@ -37,7 +25,7 @@
 				<key>invisibles</key>
 				<string>#e8e4cf</string>
 				<key>lineHighlight</key>
-				<string>#99958055</string>
+				<string>#57575755</string>
 				<key>selection</key>
 				<string>#e8e4cf</string>
 			</dict>
@@ -61,7 +49,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#999580</string>
+				<string>#575757</string>
 			</dict>
 		</dict>
 		<dict>
@@ -116,7 +104,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#d73737</string>
+				<string>#d70025</string>
 			</dict>
 		</dict>
 		<dict>
@@ -127,7 +115,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#6684e1</string>
+				<string>#0030f2</string>
 			</dict>
 		</dict>
 		<dict>
@@ -138,7 +126,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#b65611</string>
+				<string>#b21e00</string>
 			</dict>
 		</dict>
 		<dict>
@@ -160,7 +148,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#6684e1</string>
+				<string>#0030f2</string>
 			</dict>
 		</dict>
 		<dict>
@@ -193,7 +181,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#60ac39</string>
+				<string>#008200</string>
 			</dict>
 		</dict>
 		<dict>
@@ -204,7 +192,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#b65611</string>
+				<string>#b21e00</string>
 			</dict>
 		</dict>
 		<dict>
@@ -215,7 +203,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#b65611</string>
+				<string>#b21e00</string>
 			</dict>
 		</dict>
 		<dict>
@@ -226,7 +214,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#b65611</string>
+				<string>#b21e00</string>
 			</dict>
 		</dict>
 		<dict>
@@ -237,7 +225,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#b65611</string>
+				<string>#b21e00</string>
 			</dict>
 		</dict>
 		<dict>
@@ -248,7 +236,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#d73737</string>
+				<string>#d70025</string>
 			</dict>
 		</dict>
 		<dict>
@@ -259,7 +247,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#b65611</string>
+				<string>#b21e00</string>
 			</dict>
 		</dict>
 		<dict>
@@ -270,7 +258,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#6684e1</string>
+				<string>#0030f2</string>
 			</dict>
 		</dict>
 		<dict>
@@ -292,7 +280,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#b65611</string>
+				<string>#b21e00</string>
 			</dict>
 		</dict>
 		<dict>
@@ -305,7 +293,7 @@
 				<key>fontStyle</key>
 				<string></string>
 				<key>foreground</key>
-				<string>#6684e1</string>
+				<string>#0030f2</string>
 			</dict>
 		</dict>
 		<dict>
@@ -316,7 +304,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#b65611</string>
+				<string>#b21e00</string>
 			</dict>
 		</dict>
 		<dict>
@@ -329,7 +317,7 @@
 				<key>fontStyle</key>
 				<string>bold</string>
 				<key>foreground</key>
-				<string>#b65611</string>
+				<string>#b21e00</string>
 			</dict>
 		</dict>
 		<dict>
@@ -353,7 +341,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#60ac39</string>
+				<string>#008200</string>
 			</dict>
 		</dict>
 		<dict>
@@ -364,7 +352,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#d73737</string>
+				<string>#d70025</string>
 			</dict>
 		</dict>
 		<dict>
@@ -375,7 +363,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#b65611</string>
+				<string>#b21e00</string>
 			</dict>
 		</dict>
 		<dict>
@@ -386,7 +374,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#d73737</string>
+				<string>#d70025</string>
 			</dict>
 		</dict>
 		<dict>
@@ -397,7 +385,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#b65611</string>
+				<string>#b21e00</string>
 			</dict>
 		</dict>
 		<dict>
@@ -421,7 +409,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#60ac39</string>
+				<string>#008200</string>
 			</dict>
 		</dict>
 		<dict>
@@ -432,7 +420,7 @@
 			<key>settings</key>
 			<dict>
 				<key>foreground</key>
-				<string>#d73737</string>
+				<string>#d70025</string>
 			</dict>
 		</dict>
 		<dict>
@@ -498,7 +486,7 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#d73737</string>
+				<string>#d70025</string>
 				<key>foreground</key>
 				<string>#fefbec</string>
 			</dict>
@@ -511,7 +499,7 @@
 			<key>settings</key>
 			<dict>
 				<key>background</key>
-				<string>#b65611</string>
+				<string>#b21e00</string>
 				<key>foreground</key>
 				<string>#20201d</string>
 			</dict>
diff --git a/src/theme/syntaxes/Console.sublime-syntax b/src/theme/syntaxes/Console.sublime-syntax
new file mode 100644
index 00000000..21ff8d21
--- /dev/null
+++ b/src/theme/syntaxes/Console.sublime-syntax
@@ -0,0 +1,23 @@
+%YAML 1.2
+---
+# http://www.sublimetext.com/docs/3/syntax.html
+name: Console
+file_extensions:
+  - console
+scope: console
+contexts:
+  main:
+    - include: comments
+  comments:
+    - match: "\\$"
+      scope: string.dollar-prompt.console
+      push:
+        - meta_scope: support.class.dollar-prompt.console
+        - match: $\n?
+          pop: true
+    - match: "#"
+      scope: string.hash-prompt.console
+      push:
+        - meta_scope: support.class.hash-prompt.console
+        - match: $\n?
+          pop: true