diff --git a/themes/Greyhound.draftsTheme b/themes/Greyhound.draftsTheme
index f96a60d..05a9685 100644
--- a/themes/Greyhound.draftsTheme
+++ b/themes/Greyhound.draftsTheme
@@ -1 +1,641 @@
-{"name":"Greyhound","description":"Work in progress adaptation of the Greyhound for iOS Telegram theme.\n\n`01092022-0655`","author":"David Blue","isDark":true,"scopes":{"text.normal":{"name":"Normal Text","settings":{"foreground":"foreground","fontStyle":"normal"}},"text.normal.large":{"name":"Large Text","settings":{"foreground":"foreground","fontSize":"large"}},"text.normal.extraLarge":{"name":"Extra Large Text","settings":{"foreground":"foreground","fontSize":"extraLarge"}},"text.normal.small":{"name":"Small Text","settings":{"foreground":"foreground","fontSize":"small"}},"text.normal.extraSmall":{"name":"Extra Small Text","settings":{"foreground":"foreground","fontSize":"extraSmall"}},"text.bold":{"name":"Bold","settings":{"foreground":"accent02","fontWeight":"bold"}},"text.bold.large":{"name":"Large Bold","settings":{"fontWeight":"bold","fontSize":"large"}},"text.bold.extraLarge":{"name":"Extra Large Bold","settings":{"fontWeight":"bold","fontSize":"extraLarge"}},"text.bold.small":{"name":"Small Bold","settings":{"fontWeight":"bold","fontSize":"small"}},"text.bold.extraSmall":{"name":"Extra Small Bold","settings":{"fontWeight":"bold","fontSize":"extraSmall"}},"text.italic":{"name":"Italic","settings":{"foreground":"accent03","fontStyle":"italic"}},"text.italic.large":{"name":"Large Italic","settings":{"fontStyle":"italic","fontSize":"large"}},"text.italic.extraLarge":{"name":"Extra Large Italic","settings":{"fontStyle":"italic","fontSize":"extraLarge"}},"text.italic.small":{"name":"Small Italic","settings":{"fontStyle":"italic","fontSize":"small"}},"text.italic.extraSmall":{"name":"Extra Small Italic","settings":{"fontStyle":"italic","fontSize":"extraSmall"}},"text.bolditalic":{"name":"Bold, Italic","settings":{"fontStyle":"italic","fontWeight":"bold"}},"text.bolditalic.large":{"name":"Large Bold, Italic","settings":{"fontStyle":"italic","fontWeight":"bold","fontSize":"large"}},"text.bolditalic.extraLarge":{"name":"Extra Large Bold, Italic","settings":{"fontStyle":"italic","fontWeight":"bold","fontSize":"extraLarge"}},"text.bolditalic.small":{"name":"Small Bold, Italic","settings":{"fontStyle":"italic","fontWeight":"bold","fontSize":"small"}},"text.bolditalic.extraSmall":{"name":"Extra Small Bold, Italic","settings":{"fontStyle":"italic","fontWeight":"bold","fontSize":"extraSmall"}},"text.monospace":{"name":"Monospace","settings":{"fontStyle":"monospace"}},"text.monospace.large":{"name":"Large Monospace","settings":{"fontStyle":"monospace","fontSize":"large"}},"text.monospace.extraLarge":{"name":"Extra Large Monospace","settings":{"fontStyle":"monospace","fontSize":"extraLarge"}},"text.monospace.small":{"name":"Small Monospace","settings":{"fontStyle":"monospace","fontSize":"small"}},"text.monospace.extraSmall":{"name":"Extra Small Monospace","settings":{"fontStyle":"monospace","fontSize":"extraSmall"}},"text.monospace.bold":{"name":"Monospace Bold","settings":{"fontStyle":"monospace","fontWeight":"bold"}},"text.monospace.bold.large":{"name":"Large Monospace Bold","settings":{"fontStyle":"monospace","fontWeight":"bold","fontSize":"large"}},"text.monospace.bold.extraLarge":{"name":"Extra Large Monospace Bold","settings":{"fontStyle":"monospace","fontWeight":"bold","fontSize":"extraLarge"}},"text.monospace.bold.small":{"name":"Small Monospace Bold","settings":{"fontStyle":"monospace","fontWeight":"bold","fontSize":"small"}},"text.monospace.bold.extraSmall":{"name":"Extra Small Monospace Bold","settings":{"fontStyle":"monospace","fontWeight":"bold","fontSize":"small"}},"text.monospace.italic":{"name":"Monospace Italic","settings":{"fontStyle":"monospace","foreground":"foreground"}},"text.monospace.italic.large":{"name":"Large Monospace Italic","settings":{"fontStyle":"italic, monospace","fontSize":"large"}},"text.monospace.italic.extraLarge":{"name":"Extra Large Monospace Italic","settings":{"fontStyle":"italic, monospace","fontSize":"extraLarge"}},"text.monospace.italic.small":{"name":"Small Monospace Italic","settings":{"fontStyle":"italic, monospace","fontSize":"small"}},"text.monospace.italic.extraSmall":{"name":"Extra Small Monospace Italic","settings":{"fontStyle":"italic, monospace","fontSize":"extraSmall"}},"text.underline":{"name":"Underline","settings":{"fontStyle":"underline"}},"text.heading":{"name":"Heading","settings":{"fontWeight":"bold","fontSize":"extraLarge","foreground":"accent01"}},"text.heading01":{"name":"Level 1 Heading","settings":{"fontWeight":"bold","fontSize":"extraLarge","foreground":"accent01"}},"text.heading02":{"name":"Level 2 Heading","settings":{"fontWeight":"bold","fontSize":"large","foreground":"accent02"}},"text.heading03":{"name":"Level 3 Heading","settings":{"fontWeight":"bold","fontSize":"normal","foreground":"accent03"}},"text.heading04":{"name":"Level 4 Heading","settings":{"fontWeight":"medium","foreground":"accent04"}},"text.heading05":{"name":"Level 5 Heading","settings":{"fontWeight":"regular","foreground":"accent05"}},"text.heading06":{"name":"Level 6 Heading","settings":{"fontWeight":"regular","fontSize":"small","foreground":"accent06"}},"text.link":{"name":"Link","settings":{"foreground":"link"}},"text.activeLink":{"name":"Link which is tap/clickable","settings":{"foreground":"activeLink"}},"text.quotation":{"name":"Quotation block","settings":{"fontStyle":"italic","foreground":"accent06"}},"text.url":{"name":"URL","settings":{"fontWeight":"light","fontSize":"small","foreground":"link","background":"background"}},"text.linkModeLink":{"name":"Link Mode Link","settings":{"foreground":"link","fontStyle":"underline"}},"text.strikethrough":{"name":"Strikethrough","settings":{"fontStyle":"strikethrough","foreground":"strikethrough"}},"markup":{"name":"Markup","settings":{"foreground":"markup"}},"markup.heading":{"name":"Markup","settings":{"foreground":"headingMarkup","fontWeight":"bold","fontSize":"small"}},"markup.quotation":{"name":"Markup","settings":{"foreground":"markup"}},"markup.list":{"name":"Markup","settings":{"foreground":"accent01"}},"markup.link":{"name":"Markup","settings":{"foreground":"markup"}},"markup.code":{"name":"Markup","settings":{"foreground":"markup","fontStyle":"monospace"}},"markup.addition":{"name":"Addition","settings":{"fontStyle":"italic","foreground":"addition"}},"markup.deletion":{"name":"Deletion","settings":{"fontStyle":"italic","foreground":"deletion"}},"markup.substitution":{"name":"Substitution","settings":{"fontStyle":"italic","foreground":"substitution"}},"markup.highlight":{"name":"Highlight","settings":{"fontWeight":"bold","background":"highlight","foreground":"background"}},"code.comment":{"name":"Comment","settings":{"foreground":"comment"}},"code.inline":{"name":"Inline code","settings":{"fontStyle":"monospace","foreground":"code","background":"background"}},"code.block":{"name":"Code block","settings":{"fontStyle":"monospace","foreground":"code"}},"code.literal":{"name":"Code block","settings":{"foreground":"literal"}},"code.keyword":{"name":"Keyword","settings":{"foreground":"keyword"}},"code.operator":{"name":"Operator","settings":{"foreground":"markup"}},"code.punctuation":{"name":"Operator","settings":{"foreground":"comment"}},"text.invisibles":{"name":"Invisible characters","settings":{"foreground":"invisibles"}},"color.accent01":{"name":"Accent color","settings":{"foreground":"accent01"}},"color.accent02":{"name":"Accent color","settings":{"foreground":"accent02"}},"color.accent03":{"name":"Accent color","settings":{"foreground":"accent03"}},"color.accent04":{"name":"Accent color","settings":{"foreground":"accent04"}},"color.accent05":{"name":"Accent color","settings":{"foreground":"accent05"}},"color.accent06":{"name":"Accent color","settings":{"foreground":"accent06"}},"color.blue":{"name":"Blue color","settings":{}},"color.indigo":{"name":"Blue color","settings":{}},"color.purple":{"name":"Purple color","settings":{}},"color.pink":{"name":"Pink color","settings":{}},"color.red":{"name":"Red color","settings":{}},"color.orange":{"name":"Orange color","settings":{}},"color.yellow":{"name":"Yellow color","settings":{}},"color.green":{"name":"Green color","settings":{}},"color.black":{"name":"Black color","settings":{}},"color.white":{"name":"White color","settings":{}},"color.gray":{"name":"Gray color","settings":{}}},"colors":{"editor":{"foreground":"#fffefe","background":"#2c2c2c","heading":"#d2386c","headingMarkup":"#333333","strikethrough":"#4f4f4f","comment":"#4867f8","link":"#48f8d9","activeLink":"#da2573","code":"#2a9ef1","codeBackground":"#363945","literal":"#f8d948","keyword":"#53dc87","markup":"#333333","addition":"#008000","deletion":"#a80000","substitution":"#4867f8","highlight":"#98981f","invisibles":"#666666","accent01":"#d2386c","accent02":"#f39200","accent03":"#48f8d9","accent04":"#cca203","accent05":"#fffcf2","accent06":"#efe1ce"},"interface":{"foreground":"#dbdcde","textForeground":"#dbdcde","background":"#222021","backgroundCollection":"#2c2c2c","tint":"#d2386c","tintAlternate":"#da2573","textBackground":"#222222","textCaret":"#f88148","textSelection":"#7443bc","textHighlight":"#8fa28d","promptBackground":"#722222","promptButtonBackground":"#a3379e","promptButtonForeground":"#222222","promptButtonDestructiveBackground":"#f0004d","promptButtonDestructiveForeground":"#dbdcde","caption":"#99969f","actionBarBackground":"#222222","actionBarKeyBackground":"#444444","actionBarKeyForeground":"#bbbbbb","flagged":"#ff8100","move":"#4867f8","delete":"#f0004d","tagForeground":"#d2386c","tagBackground":"#36393e","tagAddHighlight":"#efe1ce","tagRemoveHighlight":"#ffd5e1","border":"#444444","messageForeground":"#dbdcde","messageSuccess":"#009000","messageInfo":"#666b71","messageWarning":"#da2573","messageError":"#f0004d","tintGray":"#4f4f4f","tintRed":"#a80000","tintPink":"#9e00c6","tintOrange":"#ff8100","tintYellow":"#cca203","tintGreen":"#1bd51b","tintIndigo":"#00cad3","tintBlue":"#4867f8","tintViolet":"#6c00fa"}}}
\ No newline at end of file
+{
+  "name": "Greyhound",
+  "description": "A dark theme inspired by a Telegram theme.",
+  "author": "David Blue",
+  "isDark": true,
+  "scopes": {
+    "text.normal": {
+      "name": "Normal Text",
+      "settings": {
+        "foreground": "foreground",
+        "fontStyle": "normal"
+      }
+    },
+    "text.normal.large": {
+      "name": "Large Text",
+      "settings": {
+        "foreground": "foreground",
+        "fontSize": "large"
+      }
+    },
+    "text.normal.extraLarge": {
+      "name": "Extra Large Text",
+      "settings": {
+        "foreground": "foreground",
+        "fontSize": "extraLarge"
+      }
+    },
+    "text.normal.small": {
+      "name": "Small Text",
+      "settings": {
+        "foreground": "foreground",
+        "fontSize": "small"
+      }
+    },
+    "text.normal.extraSmall": {
+      "name": "Extra Small Text",
+      "settings": {
+        "foreground": "foreground",
+        "fontSize": "extraSmall"
+      }
+    },
+    "text.bold": {
+      "name": "Bold",
+      "settings": {
+        "foreground": "accent08",
+        "fontWeight": "bold"
+      }
+    },
+    "text.bold.large": {
+      "name": "Large Bold",
+      "settings": {
+        "fontWeight": "bold",
+        "fontSize": "large"
+      }
+    },
+    "text.bold.extraLarge": {
+      "name": "Extra Large Bold",
+      "settings": {
+        "fontWeight": "bold",
+        "fontSize": "extraLarge"
+      }
+    },
+    "text.bold.small": {
+      "name": "Small Bold",
+      "settings": {
+        "fontWeight": "bold",
+        "fontSize": "small"
+      }
+    },
+    "text.bold.extraSmall": {
+      "name": "Extra Small Bold",
+      "settings": {
+        "fontWeight": "bold",
+        "fontSize": "extraSmall"
+      }
+    },
+    "text.italic": {
+      "name": "Italic",
+      "settings": {
+        "foreground": "accent09",
+        "fontStyle": "italic"
+      }
+    },
+    "text.italic.large": {
+      "name": "Large Italic",
+      "settings": {
+        "fontStyle": "italic",
+        "fontSize": "large"
+      }
+    },
+    "text.italic.extraLarge": {
+      "name": "Extra Large Italic",
+      "settings": {
+        "fontStyle": "italic",
+        "fontSize": "extraLarge"
+      }
+    },
+    "text.italic.small": {
+      "name": "Small Italic",
+      "settings": {
+        "fontStyle": "italic",
+        "fontSize": "small"
+      }
+    },
+    "text.italic.extraSmall": {
+      "name": "Extra Small Italic",
+      "settings": {
+        "fontStyle": "italic",
+        "fontSize": "extraSmall"
+      }
+    },
+    "text.bolditalic": {
+      "name": "Bold, Italic",
+      "settings": {
+        "fontStyle": "italic",
+        "fontWeight": "bold"
+      }
+    },
+    "text.bolditalic.large": {
+      "name": "Large Bold, Italic",
+      "settings": {
+        "fontStyle": "italic",
+        "fontWeight": "bold",
+        "fontSize": "large"
+      }
+    },
+    "text.bolditalic.extraLarge": {
+      "name": "Extra Large Bold, Italic",
+      "settings": {
+        "fontStyle": "italic",
+        "fontWeight": "bold",
+        "fontSize": "extraLarge"
+      }
+    },
+    "text.bolditalic.small": {
+      "name": "Small Bold, Italic",
+      "settings": {
+        "fontStyle": "italic",
+        "fontWeight": "bold",
+        "fontSize": "small"
+      }
+    },
+    "text.bolditalic.extraSmall": {
+      "name": "Extra Small Bold, Italic",
+      "settings": {
+        "fontStyle": "italic",
+        "fontWeight": "bold",
+        "fontSize": "extraSmall"
+      }
+    },
+    "text.monospace": {
+      "name": "Monospace",
+      "settings": {
+        "fontStyle": "monospace"
+      }
+    },
+    "text.monospace.large": {
+      "name": "Large Monospace",
+      "settings": {
+        "fontStyle": "monospace",
+        "fontSize": "large"
+      }
+    },
+    "text.monospace.extraLarge": {
+      "name": "Extra Large Monospace",
+      "settings": {
+        "fontStyle": "monospace",
+        "fontSize": "extraLarge"
+      }
+    },
+    "text.monospace.small": {
+      "name": "Small Monospace",
+      "settings": {
+        "fontStyle": "monospace",
+        "fontSize": "small"
+      }
+    },
+    "text.monospace.extraSmall": {
+      "name": "Extra Small Monospace",
+      "settings": {
+        "fontStyle": "monospace",
+        "fontSize": "extraSmall"
+      }
+    },
+    "text.monospace.bold": {
+      "name": "Monospace Bold",
+      "settings": {
+        "fontStyle": "monospace",
+        "fontWeight": "bold"
+      }
+    },
+    "text.monospace.bold.large": {
+      "name": "Large Monospace Bold",
+      "settings": {
+        "fontStyle": "monospace",
+        "fontWeight": "bold",
+        "fontSize": "large"
+      }
+    },
+    "text.monospace.bold.extraLarge": {
+      "name": "Extra Large Monospace Bold",
+      "settings": {
+        "fontStyle": "monospace",
+        "fontWeight": "bold",
+        "fontSize": "extraLarge"
+      }
+    },
+    "text.monospace.bold.small": {
+      "name": "Small Monospace Bold",
+      "settings": {
+        "fontStyle": "monospace",
+        "fontWeight": "bold",
+        "fontSize": "small"
+      }
+    },
+    "text.monospace.bold.extraSmall": {
+      "name": "Extra Small Monospace Bold",
+      "settings": {
+        "fontStyle": "monospace",
+        "fontWeight": "bold",
+        "fontSize": "small"
+      }
+    },
+    "text.monospace.italic": {
+      "name": "Monospace Italic",
+      "settings": {
+        "fontStyle": "monospace",
+        "foreground": "foreground"
+      }
+    },
+    "text.monospace.italic.large": {
+      "name": "Large Monospace Italic",
+      "settings": {
+        "fontStyle": "italic, monospace",
+        "fontSize": "large"
+      }
+    },
+    "text.monospace.italic.extraLarge": {
+      "name": "Extra Large Monospace Italic",
+      "settings": {
+        "fontStyle": "italic, monospace",
+        "fontSize": "extraLarge"
+      }
+    },
+    "text.monospace.italic.small": {
+      "name": "Small Monospace Italic",
+      "settings": {
+        "fontStyle": "italic, monospace",
+        "fontSize": "small"
+      }
+    },
+    "text.monospace.italic.extraSmall": {
+      "name": "Extra Small Monospace Italic",
+      "settings": {
+        "fontStyle": "italic, monospace",
+        "fontSize": "extraSmall"
+      }
+    },
+    "text.underline": {
+      "name": "Underline",
+      "settings": {
+        "fontStyle": "underline"
+      }
+    },
+    "text.heading": {
+      "name": "Heading",
+      "settings": {
+        "fontWeight": "bold",
+        "fontSize": "extraLarge",
+        "foreground": "accent01"
+      }
+    },
+    "text.heading01": {
+      "name": "Level 1 Heading",
+      "settings": {
+        "fontWeight": "bold",
+        "fontSize": "extraLarge",
+        "foreground": "accent01"
+      }
+    },
+    "text.heading02": {
+      "name": "Level 2 Heading",
+      "settings": {
+        "fontWeight": "bold",
+        "fontSize": "large",
+        "foreground": "accent02"
+      }
+    },
+    "text.heading03": {
+      "name": "Level 3 Heading",
+      "settings": {
+        "fontWeight": "bold",
+        "fontSize": "normal",
+        "foreground": "accent03"
+      }
+    },
+    "text.heading04": {
+      "name": "Level 4 Heading",
+      "settings": {
+        "fontWeight": "medium",
+        "foreground": "accent04"
+      }
+    },
+    "text.heading05": {
+      "name": "Level 5 Heading",
+      "settings": {
+        "fontWeight": "regular",
+        "foreground": "accent05"
+      }
+    },
+    "text.heading06": {
+      "name": "Level 6 Heading",
+      "settings": {
+        "fontWeight": "regular",
+        "fontSize": "small",
+        "foreground": "accent06"
+      }
+    },
+    "text.link": {
+      "name": "Link",
+      "settings": {
+        "foreground": "link",
+        "fontStyle": "underline"
+      }
+    },
+    "text.activeLink": {
+      "name": "Link which is tap/clickable",
+      "settings": {
+        "foreground": "activeLink"
+      }
+    },
+    "text.quotation": {
+      "name": "Quotation block",
+      "settings": {
+        "foreground": "accent11",
+        "fontStyle": "italic"
+      }
+    },
+    "text.url": {
+      "name": "URL",
+      "settings": {
+        "foreground": "invisibles",
+        "fontWeight": "light",
+        "fontSize": "small"
+      }
+    },
+    "text.linkModeLink": {
+      "name": "Link Mode Link",
+      "settings": {
+        "foreground": "link",
+        "fontStyle": "underline"
+      }
+    },
+    "text.strikethrough": {
+      "name": "Strikethrough",
+      "settings": {
+        "fontStyle": "strikethrough",
+        "foreground": "strikethrough"
+      }
+    },
+    "markup": {
+      "name": "Markup",
+      "settings": {
+        "foreground": "markup"
+      }
+    },
+    "markup.heading": {
+      "name": "Markup",
+      "settings": {
+        "foreground": "headingMarkup",
+        "fontWeight": "bold",
+        "fontSize": "small"
+      }
+    },
+    "markup.quotation": {
+      "name": "Markup",
+      "settings": {
+        "foreground": "accent10"
+      }
+    },
+    "markup.list": {
+      "name": "Markup",
+      "settings": {
+        "foreground": "accent04"
+      }
+    },
+    "markup.link": {
+      "name": "Markup",
+      "settings": {
+        "foreground": "accent07"
+      }
+    },
+    "markup.code": {
+      "name": "Markup",
+      "settings": {
+        "foreground": "markup",
+        "fontStyle": "monospace"
+      }
+    },
+    "markup.addition": {
+      "name": "Addition",
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "addition"
+      }
+    },
+    "markup.deletion": {
+      "name": "Deletion",
+      "settings": {
+        "fontStyle": "italic, strikethrough",
+        "foreground": "deletion"
+      }
+    },
+    "markup.substitution": {
+      "name": "Substitution",
+      "settings": {
+        "fontStyle": "italic",
+        "foreground": "substitution"
+      }
+    },
+    "markup.highlight": {
+      "name": "Highlight",
+      "settings": {
+        "background": "highlight"
+      }
+    },
+    "code.comment": {
+      "name": "Comment",
+      "settings": {
+        "foreground": "comment"
+      }
+    },
+    "code.inline": {
+      "name": "Inline code",
+      "settings": {
+        "fontStyle": "monospace",
+        "foreground": "code",
+        "background": "codeBackground"
+      }
+    },
+    "code.block": {
+      "name": "Code block",
+      "settings": {
+        "fontStyle": "monospace",
+        "foreground": "code",
+        "background": "codeBackground"
+      }
+    },
+    "code.literal": {
+      "name": "Code block",
+      "settings": {
+        "foreground": "literal",
+        "background": "codeBackground"
+      }
+    },
+    "code.keyword": {
+      "name": "Keyword",
+      "settings": {
+        "foreground": "keyword"
+      }
+    },
+    "code.operator": {
+      "name": "Operator",
+      "settings": {
+        "foreground": "markup"
+      }
+    },
+    "code.punctuation": {
+      "name": "Operator",
+      "settings": {
+        "foreground": "comment"
+      }
+    },
+    "text.invisibles": {
+      "name": "Invisible characters",
+      "settings": {
+        "foreground": "invisibles"
+      }
+    },
+    "color.accent01": {
+      "name": "Accent color",
+      "settings": {
+        "foreground": "accent01"
+      }
+    },
+    "color.accent02": {
+      "name": "Accent color",
+      "settings": {
+        "foreground": "accent02"
+      }
+    },
+    "color.accent03": {
+      "name": "Accent color",
+      "settings": {
+        "foreground": "accent03"
+      }
+    },
+    "color.accent04": {
+      "name": "Accent color",
+      "settings": {
+        "foreground": "accent04"
+      }
+    },
+    "color.accent05": {
+      "name": "Accent color",
+      "settings": {
+        "foreground": "accent05"
+      }
+    },
+    "color.accent06": {
+      "name": "Accent color",
+      "settings": {
+        "foreground": "accent06"
+      }
+    },
+    "color.blue": {
+      "name": "Blue color",
+      "settings": {}
+    },
+    "color.indigo": {
+      "name": "Blue color",
+      "settings": {}
+    },
+    "color.purple": {
+      "name": "Purple color",
+      "settings": {}
+    },
+    "color.pink": {
+      "name": "Pink color",
+      "settings": {}
+    },
+    "color.red": {
+      "name": "Red color",
+      "settings": {}
+    },
+    "color.orange": {
+      "name": "Orange color",
+      "settings": {}
+    },
+    "color.yellow": {
+      "name": "Yellow color",
+      "settings": {}
+    },
+    "color.green": {
+      "name": "Green color",
+      "settings": {}
+    },
+    "color.black": {
+      "name": "Black color",
+      "settings": {}
+    },
+    "color.white": {
+      "name": "White color",
+      "settings": {}
+    },
+    "color.gray": {
+      "name": "Gray color",
+      "settings": {}
+    }
+  },
+  "colors": {
+    "editor": {
+      "foreground": "#eeeeee",
+      "background": "#1c1c1d",
+      "heading": "#f39200",
+      "headingMarkup": "#f39200",
+      "strikethrough": "#6c7179",
+      "comment": "#7b7b7b",
+      "link": "#d2386c",
+      "activeLink": "#939597",
+      "code": "#666666",
+      "codeBackground": "#121212",
+      "literal": "#e6f2ff",
+      "keyword": "#ff6700",
+      "markup": "#e6f2ff",
+      "addition": "#e6f2ff",
+      "deletion": "#908e8e",
+      "substitution": "#f39200",
+      "highlight": "#f39200",
+      "invisibles": "#e6f2ff",
+      "accent01": "#f39200",
+      "accent02": "#f39200",
+      "accent03": "#f39200",
+      "accent04": "#f39200",
+      "accent05": "#f39200",
+      "accent06": "#f39200",
+      "accent07": "#f39200",
+      "accent08": "#f39200",
+      "accent09": "#f39200",
+      "accent10": "#f39200",
+      "accent11": "#666666"
+    },
+    "interface": {
+      "foreground": "#e6f2ff",
+      "textForeground": "#e6f2ff",
+      "background": "#36393e",
+      "backgroundCollection": "#3d3d40",
+      "tint": "#f39200",
+      "tintAlternate": "#767676",
+      "textBackground": "#1c1c1d",
+      "textCaret": "#f39200",
+      "textSelection": "#e6f2ff",
+      "textHighlight": "#f39200",
+      "promptBackground": "#0f0f0f",
+      "promptButtonBackground": "#f39200",
+      "promptButtonForeground": "#e6f2ff",
+      "promptButtonDestructiveBackground": "#f88148",
+      "promptButtonDestructiveForeground": "#e6f2ff",
+      "caption": "#939597",
+      "actionBarBackground": "#3d3d40",
+      "actionBarKeyBackground": "#0f0f0f",
+      "actionBarKeyForeground": "#f39200",
+      "flagged": "#f39200",
+      "move": "#3d3d40",
+      "delete": "#ff0b00",
+      "tagForeground": "#f39200",
+      "tagBackground": "#3d3d40",
+      "tagAddHighlight": "#f39200",
+      "tagRemoveHighlight": "#e6f2ff",
+      "border": "#6c7179",
+      "messageForeground": "#e6f2ff",
+      "messageSuccess": "#f39200",
+      "messageInfo": "#525252",
+      "messageWarning": "#3d3d40",
+      "messageError": "#ff0b00",
+      "tintGray": "#6c7179",
+      "tintRed": "#d2386c",
+      "tintPink": "#cb6f9a",
+      "tintOrange": "#f39200",
+      "tintYellow": "#ffe438",
+      "tintGreen": "#2da32f",
+      "tintIndigo": "#48f8d9",
+      "tintBlue": "#4867f8",
+      "tintViolet": "#694f7d",
+      "widgetBackground": "#36393e",
+      "widgetBackgroundAlternate": "#3d3d40",
+      "widgetForeground": "#f39200",
+      "widgetForegroundAlternate": "#f88148"
+    }
+  }
+}
diff --git a/themes/Greyhound.json b/themes/Greyhound.json
index 81f9046..05a9685 100644
--- a/themes/Greyhound.json
+++ b/themes/Greyhound.json
@@ -42,7 +42,7 @@
     "text.bold": {
       "name": "Bold",
       "settings": {
-        "foreground": "accent02",
+        "foreground": "accent08",
         "fontWeight": "bold"
       }
     },
@@ -77,7 +77,7 @@
     "text.italic": {
       "name": "Italic",
       "settings": {
-        "foreground": "accent03",
+        "foreground": "accent09",
         "fontStyle": "italic"
       }
     },
@@ -319,7 +319,8 @@
     "text.link": {
       "name": "Link",
       "settings": {
-        "foreground": "link"
+        "foreground": "link",
+        "fontStyle": "underline"
       }
     },
     "text.activeLink": {
@@ -331,17 +332,16 @@
     "text.quotation": {
       "name": "Quotation block",
       "settings": {
-        "fontStyle": "italic",
-        "foreground": "accent06"
+        "foreground": "accent11",
+        "fontStyle": "italic"
       }
     },
     "text.url": {
       "name": "URL",
       "settings": {
+        "foreground": "invisibles",
         "fontWeight": "light",
-        "fontSize": "small",
-        "foreground": "link",
-        "background": "background"
+        "fontSize": "small"
       }
     },
     "text.linkModeLink": {
@@ -375,19 +375,19 @@
     "markup.quotation": {
       "name": "Markup",
       "settings": {
-        "foreground": "markup"
+        "foreground": "accent10"
       }
     },
     "markup.list": {
       "name": "Markup",
       "settings": {
-        "foreground": "accent01"
+        "foreground": "accent04"
       }
     },
     "markup.link": {
       "name": "Markup",
       "settings": {
-        "foreground": "markup"
+        "foreground": "accent07"
       }
     },
     "markup.code": {
@@ -407,7 +407,7 @@
     "markup.deletion": {
       "name": "Deletion",
       "settings": {
-        "fontStyle": "italic",
+        "fontStyle": "italic, strikethrough",
         "foreground": "deletion"
       }
     },
@@ -421,9 +421,7 @@
     "markup.highlight": {
       "name": "Highlight",
       "settings": {
-        "fontWeight": "bold",
-        "background": "highlight",
-        "foreground": "background"
+        "background": "highlight"
       }
     },
     "code.comment": {
@@ -437,20 +435,22 @@
       "settings": {
         "fontStyle": "monospace",
         "foreground": "code",
-        "background": "background"
+        "background": "codeBackground"
       }
     },
     "code.block": {
       "name": "Code block",
       "settings": {
         "fontStyle": "monospace",
-        "foreground": "code"
+        "foreground": "code",
+        "background": "codeBackground"
       }
     },
     "code.literal": {
       "name": "Code block",
       "settings": {
-        "foreground": "literal"
+        "foreground": "literal",
+        "background": "codeBackground"
       }
     },
     "code.keyword": {
@@ -560,77 +560,82 @@
   },
   "colors": {
     "editor": {
-      "foreground": "#fffefe",
-      "background": "#2c2c2c",
-      "heading": "#d2386c",
-      "headingMarkup": "#333333",
-      "strikethrough": "#4f4f4f",
-      "comment": "#4867f8",
-      "link": "#48f8d9",
-      "activeLink": "#da2573",
-      "code": "#2a9ef1",
-      "codeBackground": "#363945",
-      "literal": "#f8d948",
-      "keyword": "#53dc87",
-      "markup": "#333333",
-      "addition": "#008000",
-      "deletion": "#a80000",
-      "substitution": "#4867f8",
-      "highlight": "#98981f",
-      "invisibles": "#666666",
-      "accent01": "#d2386c",
+      "foreground": "#eeeeee",
+      "background": "#1c1c1d",
+      "heading": "#f39200",
+      "headingMarkup": "#f39200",
+      "strikethrough": "#6c7179",
+      "comment": "#7b7b7b",
+      "link": "#d2386c",
+      "activeLink": "#939597",
+      "code": "#666666",
+      "codeBackground": "#121212",
+      "literal": "#e6f2ff",
+      "keyword": "#ff6700",
+      "markup": "#e6f2ff",
+      "addition": "#e6f2ff",
+      "deletion": "#908e8e",
+      "substitution": "#f39200",
+      "highlight": "#f39200",
+      "invisibles": "#e6f2ff",
+      "accent01": "#f39200",
       "accent02": "#f39200",
-      "accent03": "#48f8d9",
-      "accent04": "#cca203",
-      "accent05": "#fffcf2",
-      "accent06": "#efe1ce"
+      "accent03": "#f39200",
+      "accent04": "#f39200",
+      "accent05": "#f39200",
+      "accent06": "#f39200",
+      "accent07": "#f39200",
+      "accent08": "#f39200",
+      "accent09": "#f39200",
+      "accent10": "#f39200",
+      "accent11": "#666666"
     },
     "interface": {
-      "foreground": "#dbdcde",
-      "textForeground": "#dbdcde",
-      "background": "#222021",
-      "backgroundCollection": "#2c2c2c",
-      "tint": "#d2386c",
-      "tintAlternate": "#da2573",
-      "textBackground": "#222222",
-      "textCaret": "#f88148",
-      "textSelection": "#7443bc",
-      "textHighlight": "#8fa28d",
-      "promptBackground": "#722222",
-      "promptButtonBackground": "#a3379e",
-      "promptButtonForeground": "#222222",
-      "promptButtonDestructiveBackground": "#f0004d",
-      "promptButtonDestructiveForeground": "#dbdcde",
-      "caption": "#99969f",
-      "actionBarBackground": "#222222",
-      "actionBarKeyBackground": "#444444",
-      "actionBarKeyForeground": "#bbbbbb",
-      "flagged": "#ff8100",
-      "move": "#4867f8",
-      "delete": "#f0004d",
-      "tagForeground": "#d2386c",
-      "tagBackground": "#36393e",
-      "tagAddHighlight": "#efe1ce",
-      "tagRemoveHighlight": "#ffd5e1",
-      "border": "#444444",
-      "messageForeground": "#dbdcde",
-      "messageSuccess": "#009000",
-      "messageInfo": "#666b71",
-      "messageWarning": "#da2573",
-      "messageError": "#f0004d",
-      "tintGray": "#4f4f4f",
-      "tintRed": "#a80000",
-      "tintPink": "#9e00c6",
-      "tintOrange": "#ff8100",
-      "tintYellow": "#cca203",
-      "tintGreen": "#1bd51b",
-      "tintIndigo": "#00cad3",
+      "foreground": "#e6f2ff",
+      "textForeground": "#e6f2ff",
+      "background": "#36393e",
+      "backgroundCollection": "#3d3d40",
+      "tint": "#f39200",
+      "tintAlternate": "#767676",
+      "textBackground": "#1c1c1d",
+      "textCaret": "#f39200",
+      "textSelection": "#e6f2ff",
+      "textHighlight": "#f39200",
+      "promptBackground": "#0f0f0f",
+      "promptButtonBackground": "#f39200",
+      "promptButtonForeground": "#e6f2ff",
+      "promptButtonDestructiveBackground": "#f88148",
+      "promptButtonDestructiveForeground": "#e6f2ff",
+      "caption": "#939597",
+      "actionBarBackground": "#3d3d40",
+      "actionBarKeyBackground": "#0f0f0f",
+      "actionBarKeyForeground": "#f39200",
+      "flagged": "#f39200",
+      "move": "#3d3d40",
+      "delete": "#ff0b00",
+      "tagForeground": "#f39200",
+      "tagBackground": "#3d3d40",
+      "tagAddHighlight": "#f39200",
+      "tagRemoveHighlight": "#e6f2ff",
+      "border": "#6c7179",
+      "messageForeground": "#e6f2ff",
+      "messageSuccess": "#f39200",
+      "messageInfo": "#525252",
+      "messageWarning": "#3d3d40",
+      "messageError": "#ff0b00",
+      "tintGray": "#6c7179",
+      "tintRed": "#d2386c",
+      "tintPink": "#cb6f9a",
+      "tintOrange": "#f39200",
+      "tintYellow": "#ffe438",
+      "tintGreen": "#2da32f",
+      "tintIndigo": "#48f8d9",
       "tintBlue": "#4867f8",
-      "tintViolet": "#6c00fa",
-      "widgetBackground": "#222021",
-      "widgetBackgroundAlternate": "#2c2c2c",
-      "widgetForeground": "#dbdcde",
-      "widgetForegroundAlternate": "#da2573"
+      "tintViolet": "#694f7d",
+      "widgetBackground": "#36393e",
+      "widgetBackgroundAlternate": "#3d3d40",
+      "widgetForeground": "#f39200",
+      "widgetForegroundAlternate": "#f88148"
     }
   }
 }