diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/DarkStyle.json b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/DarkStyle.json
index acf621cae1d..5249dd3fe0e 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/DarkStyle.json
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/DarkStyle.json
@@ -1,77 +1,66 @@
 {
 	"name": "Dark",
-	"version": "1.0.5",
-	"description": "A dark scheme using colors from the Tango Project",
-	"originator": "Xamarin Inc. (http://xamarin.com)",
+	"version": "1.0.0",
+	"description": "The Visual Studio dark color scheme.",
+	"originator": "Microsoft",
 
 	"palette": [
-		{ "name": "butter2", "value": "#edd400" },
-		{ "name": "orange1", "value": "#fcaf3e" },
-		{ "name": "orange2", "value": "#f57900" },
-		{ "name": "chocolate1", "value": "#e9b96e" },
-		{ "name": "chocolate2", "value": "#c17d11" },
-		{ "name": "chocolate3", "value": "#8f5902" },
-		{ "name": "chameleon1", "value": "#8ae234" },
-		{ "name": "chameleon2", "value": "#73d216" },
-		{ "name": "chameleon3", "value": "#4e9a06" },
-		{ "name": "chameleon4", "value": "#356904" },
-		{ "name": "skyblue1", "value": "#729fcf" },
-		{ "name": "skyblue2", "value": "#3465a4" },
-		{ "name": "skyblue3", "value": "#204a87" },
-		{ "name": "plum1", "value": "#ad7fa8" },
-		{ "name": "scarletred1", "value": "#ef2929" },
-		{ "name": "scarletred2", "value": "#cc0000" },
-		{ "name": "aluminium1", "value": "#eeeeec" },
-		{ "name": "aluminium2", "value": "#d3d7cf" },
-		{ "name": "aluminium3", "value": "#babdb6" },
-		{ "name": "aluminium4", "value": "#888a85" },
-		{ "name": "aluminium5", "value": "#555753" },
-		{ "name": "aluminium6", "value": "#2e3436" },
-		{ "name": "aluminium7", "value": "#0e1416" }
+		{ "name": "text-white", "value": "#dcdcdc" },
+		{ "name": "background-black", "value": "#1e1e1e" },
+		{ "name": "comment-green", "value": "#57a64a" },
+		{ "name": "local-blue", "value": "#9cdcfe" },
+		{ "name": "string-red", "value": "#d69d85" },
+		{ "name": "number-mint", "value": "#b5cea8" },
+		{ "name": "keyword-blue", "value": "#569cd6" },
+		{ "name": "keyword-purple", "value": "#d8a0df" },
+		{ "name": "class-cyan", "value": "#4ec9b0" },
+		{ "name": "enum-yellow", "value": "#b8d7a3" },
+		{ "name": "struct-mint", "value": "#a8ceb5" },
+		{ "name": "method-yellow", "value": "#b8d7a3" }
 	],
 
 	"colors": [
-		{ "name": "Background(Read Only)", "color": "aluminium7" },
+		{ "name": "background-black(Read Only)", "color": "#000000" },
 
-		{ "name": "Search result background", "color": "#006060" },
+		{ "name": "Search result background", "color": "#773800" },
 		{ "name": "Search result background (highlighted)", "color": "#008080" },
 
 		{ "name": "Column Ruler", "color": "#2a2c2f" },
 
-		{ "name": "Fold Square", "color": "aluminium5", "secondcolor": "#1c1e1f" },
-		{ "name": "Fold Cross", "color": "aluminium5", "secondcolor": "#1c1e1f" },
+		{ "name": "Fold Square", "color": "#555753", "secondcolor": "#1c1e1f" },
+		{ "name": "Fold Cross", "color": "#555753", "secondcolor": "#1c1e1f" },
 
 		{ "name": "Indentation Guide", "color": "#444a4d" },
 
 		{ "name": "Indicator Margin", "color": "#303030" },
 		{ "name": "Indicator Margin(Separator)", "color": "#303030" },
 
-		{ "name": "Tooltip Pager Top", "color": "aluminium5" },
-		{ "name": "Tooltip Pager Triangle", "color": "aluminium2" },
-		{ "name": "Tooltip Pager Text", "color": "aluminium2" },
+		{ "name": "Tooltip Pager Top", "color": "#555753" },
+		{ "name": "Tooltip Pager Triangle", "color": "#d3d7cf" },
+		{ "name": "Tooltip Pager Text", "color": "#d3d7cf" },
 
-		{ "name": "Notification Border", "color": "aluminium1" },
+		{ "name": "Notification Border", "color": "text-white" },
 
-		{ "name": "Completion Window", "color": "aluminium6", "bordercolor": "aluminium1" },
-		{ "name": "Completion Tooltip Window", "color": "aluminium5", "bordercolor": "aluminium1" },
-		{ "name": "Completion Selection Bar Border", "color": "aluminium5" },
-		{ "name": "Completion Selection Bar Border(Inactive)", "color": "aluminium7" },
-		{ "name": "Completion Selection Bar Background", "color": "aluminium5", "secondcolor": "aluminium5" },
-		{ "name": "Completion Selection Bar Background(Inactive)", "color": "aluminium7", "secondcolor": "aluminium7" },
+		{ "name": "Completion Window", "color": "#2e3436", "bordercolor": "text-white" },
+		{ "name": "Completion Tooltip Window", "color": "#555753", "bordercolor": "text-white" },
+		{ "name": "Completion Selection Bar Border", "color": "#555753" },
+		{ "name": "Completion Selection Bar Border(Inactive)", "color": "#0e1416" },
+		{ "name": "Completion Selection Bar Background", "color": "#555753", "secondcolor": "#555753" },
+		{ "name": "Completion Selection Bar Background(Inactive)", "color": "#0e1416", "secondcolor": "#0e1416" },
 
-		{ "name": "Bookmarks", "color": "aluminium1", "secondcolor": "aluminium4" },
+		{ "name": "Bookmarks", "color": "text-white", "secondcolor": "#888a85" },
 
-		{ "name": "Underline(Error)", "color": "scarletred2" },
-		{ "name": "Underline(Warning)", "color": "butter2" },
-		{ "name": "Underline(Suggestion)", "color": "chameleon3" },
-		{ "name": "Underline(Hint)", "color": "chameleon2" },
+		{ "name": "Underline(Error)", "color": "#D85050" },
+		{ "name": "Underline(Warning)", "color": "#95DB7D" },
+		{ "name": "Underline(Suggestion)", "color": "#A5A5A5" },
+		{ "name": "Underline(Hint)", "color": "#73d216" },
 
-		{ "name": "Quick Diff(Dirty)", "color": "butter2" },
-		{ "name": "Quick Diff(Changed)", "color": "chameleon2" },
+		{ "name": "Quick Diff(Dirty)", "color": "#edd400" },
+		{ "name": "Quick Diff(Changed)", "color": "#73d216" },
 
-		{ "name": "Brace Matching(Rectangle)", "color": "#476a93", "secondcolor": "#476a93" },
-		{ "name": "Usages(Rectangle)", "color": "skyblue3", "secondcolor": "skyblue3", "bordercolor": "skyblue2" },
-		{ "name": "Changing usages(Rectangle)", "color": "chameleon4", "secondcolor": "chameleon4", "bordercolor": "chameleon3" },
+		{ "name": "Brace Matching(Rectangle)", "color": "#0e4583", "secondcolor": "#0e4583" },
+		{ "name": "Usages(Rectangle)", "color": "#48830e", "secondcolor": "#c0d3ad", "bordercolor": "#c0d3ad" },
+		{ "name": "Changing usages(Rectangle)", "color": "#356904", "secondcolor": "#356904", "bordercolor": "#4e9a06" },
 
 		{ "name": "Breakpoint Marker", "color": "#6f3535", "bordercolor": "#6f3535" },
 		{ "name": "Breakpoint Marker(Disabled)", "color": "#4d4d4d", "bordercolor": "#4d4d4d" },
@@ -83,10 +72,10 @@
 		{ "name": "Debugger Current Line Marker", "color": "#69684c", "bordercolor": "#69684c" },
 		{ "name": "Debugger Stack Line Marker", "color": "#5f7247", "bordercolor": "#5f7247" },
 
-		{ "name": "Primary Link", "color": "#7C97A6", "secondcolor": "chocolate3" },
-		{ "name": "Primary Link(Highlighted)", "color": "#7C97A6", "secondcolor": "chocolate2" },
-		{ "name": "Secondary Link", "color": "white", "secondcolor": "aluminium6" },
-		{ "name": "Secondary Link(Highlighted)", "color": "aluminium1", "secondcolor": "aluminium5" },
+		{ "name": "Primary Link", "color": "#7C97A6", "secondcolor": "#8f5902" },
+		{ "name": "Primary Link(Highlighted)", "color": "#7C97A6", "secondcolor": "#c17d11" },
+		{ "name": "Secondary Link", "color": "white", "secondcolor": "#2e3436" },
+		{ "name": "Secondary Link(Highlighted)", "color": "text-white", "secondcolor": "#555753" },
 
 		{ "name": "Message Bubble Error Marker", "color": "#b28d37" },
 		{ "name": "Message Bubble Error Tag", "color": "#e3a6a1", "secondcolor": "black" },
@@ -101,150 +90,156 @@
 		{ "name": "Message Bubble Warning Line", "color": "#807e5c" },
 		{ "name": "Message Bubble Warning Tooltip", "color": "#efe89d" },
 
-		{ "name": "Link Color", "color": "#41e2cb" },
-		{ "name": "Link Color(Active)", "color": "#41e2cb" }
+		{ "name": "Link Color", "color": "keyword-blue" },
+		{ "name": "Link Color(Active)", "color": "keyword-blue" }
 	],
 
 	"text": [
-		{ "name": "Plain Text", "fore": "aluminium1", "back": "#1c1e1f" },
-		{ "name": "Selected Text", "back": "#245176" },
-		{ "name": "Selected Text(Inactive)", "back": "aluminium5" },
-
-		{ "name": "Collapsed Text", "fore": "aluminium4", "back": "#1c1e1f" },
-
-		{ "name": "Line Numbers", "fore": "aluminium5", "back": "#242424" },
-
-		{ "name": "Punctuation", "fore": "aluminium1" },
-		{ "name": "Punctuation(Brackets)", "fore": "aluminium1" },
-
-		{ "name": "Comment(Line)", "fore": "#7a976b" },
-		{ "name": "Comment(Block)", "fore": "#7a976b" },
-		{ "name": "Comment(Doc)", "fore": "#7a976b" },
-		{ "name": "Comment(DocTag)", "fore": "aluminium4" },
-		{ "name": "Comment Tag", "fore": "#ff37ff" },
-
-		{ "name": "Excluded Code", "fore": "aluminium4" },
-
-		{ "name": "String", "fore": "#E6DB74" },
-		{ "name": "String(Escape)", "fore": "#A6AB34" },
-		{ "name": "String(C# @ Verbatim)", "fore": "#E6DB74" },
-		{ "name": "String(Regex Set Constructs)", "fore": "chameleon2" },
-		{ "name": "String(Regex Character Class)", "fore": "skyblue1" },
-		{ "name": "String(Regex Grouping Constructs)", "fore": "plum1" },
-		{ "name": "String(Regex Escape Character)", "fore": "orange2" },
-		{ "name": "String(Regex Alt Escape Character)", "fore": "orange1" },
-
-		{ "name": "Number", "fore": "chameleon1" },
-
-		{ "name": "Preprocessor", "fore": "plum1" },
-		{ "name": "Preprocessor(Region Name)", "fore": "aluminium1" },
-
-		{ "name": "Xml Text", "fore": "aluminium1" },
-		{ "name": "Xml Delimiter", "fore": "aluminium1" },
-		{ "name": "Xml Name", "fore": "skyblue1" },
-		{ "name": "Xml Attribute", "fore": "#9CDCFE" },
-		{ "name": "Xml Attribute Quotes", "fore": "#E6DB74" },
-		{ "name": "Xml Attribute Value", "fore": "#E6DB74" },
-		{ "name": "Xml Comment", "fore": "aluminium4" },
-		{ "name": "Xml CData Section", "fore": "aluminium1" },
-
-		{ "name": "Html Attribute Name", "fore": "aluminium1" },
-		{ "name": "Html Attribute Value", "fore": "#E6DB74" },
-		{ "name": "Html Comment", "fore": "aluminium4" },
-		{ "name": "Html Element Name", "fore": "skyblue1" },
-		{ "name": "Html Entity", "fore": "skyblue1" },
-		{ "name": "Html Operator", "fore": "aluminium1" },
-		{ "name": "Html Server-Side Script", "fore": "black", "back": "#d2d295" },
-		{ "name": "Html Tag Delimiter", "fore": "aluminium1" },
-		{ "name": "Razor Code", "fore": "aluminium1", "back": "aluminium7" },
-
-		{ "name": "Tooltip Text", "fore": "#d1d1cd", "back": "#525759" },
-		{ "name": "Notification Text", "fore": "aluminium1", "back": "aluminium5" },
-
-		{ "name": "Completion Text", "fore": "aluminium1" },
-		{ "name": "Completion Matching Substring", "fore": "plum1" },
-
-		{ "name": "Completion Selected Text", "fore": "aluminium1" },
-		{ "name": "Completion Selected Matching Substring", "fore": "plum1" },
-
-		{ "name": "Completion Selected Text(Inactive)", "fore": "aluminium1" },
-		{ "name": "Completion Selected Matching Substring(Inactive)", "fore": "plum1" },
-
-		{ "name": "Keyword(Access)", "fore": "skyblue1" },
-		{ "name": "Keyword(Type)", "fore": "skyblue1" },
-		{ "name": "Keyword(Operator)", "fore": "skyblue1" },
-		{ "name": "Keyword(Selection)", "fore": "skyblue1" },
-		{ "name": "Keyword(Iteration)", "fore": "skyblue1" },
-		{ "name": "Keyword(Jump)", "fore": "skyblue1" },
-		{ "name": "Keyword(Context)", "fore": "skyblue1" },
-		{ "name": "Keyword(Exception)", "fore": "skyblue1" },
-		{ "name": "Keyword(Modifiers)", "fore": "skyblue1" },
-		{ "name": "Keyword(Constants)", "fore": "skyblue1" },
-		{ "name": "Keyword(Void)", "fore": "skyblue1" },
-		{ "name": "Keyword(Namespace)", "fore": "skyblue1" },
-		{ "name": "Keyword(Property)", "fore": "skyblue1" },
-		{ "name": "Keyword(Declaration)", "fore": "skyblue1" },
-		{ "name": "Keyword(Parameter)", "fore": "skyblue1" },
-		{ "name": "Keyword(Operator Declaration)", "fore": "skyblue1" },
-		{ "name": "Keyword(Other)", "fore": "skyblue1" },
-
-		{ "name": "User Types", "fore": "#4ec9b0" },
-		{ "name": "User Types(Enums)", "fore": "#b8d7a3" },
-		{ "name": "User Types(Interfaces)", "fore": "#b8d7a3" },
-		{ "name": "User Types(Delegates)", "fore": "#4ec9b0" },
-		{ "name": "User Types(Value types)", "fore": "#4ec9b0" },
-		{ "name": "User Types(Type parameters)", "fore": "#4ec9b0" },
-		{ "name": "User Types(Mutable)", "fore": "#ffd21c" },
-
-		{ "name": "User Field Usage", "fore": "aluminium1" },
-		{ "name": "User Field Declaration", "fore": "aluminium1" },
-
-		{ "name": "User Property Usage", "fore": "aluminium1" },
-		{ "name": "User Property Declaration", "fore": "aluminium1" },
-
-		{ "name": "User Event Usage", "fore": "aluminium1" },
-		{ "name": "User Event Declaration", "fore": "aluminium1" },
-
-		{ "name": "User Method Usage", "fore": "aluminium1" },
-		{ "name": "User Method Declaration", "fore": "aluminium1" },
-
-		{ "name": "User Parameter Usage", "fore": "aluminium1" },
-		{ "name": "User Parameter Declaration", "fore": "aluminium1" },
-
-		{ "name": "User Variable Usage", "fore": "aluminium1" },
-		{ "name": "User Variable Declaration", "fore": "aluminium1" },
-
-		{ "name": "Syntax Error", "fore": "scarletred1" },
-
-		{ "name": "String Format Items", "fore": "aluminium1" },
-
-		{ "name": "Breakpoint Text", "fore": "white", "back": "#6f3535" },
-
-		{ "name": "Debugger Current Statement", "fore": "white", "back": "#69684c" },
-		{ "name": "Debugger Stack Line", "fore": "white", "back": "#5c6b4d" },
-
-		{ "name": "Diff Line(Added)", "fore": "chameleon1" },
-		{ "name": "Diff Line(Removed)", "fore": "scarletred2" },
-		{ "name": "Diff Line(Changed)", "fore": "plum1" },
-		{ "name": "Diff Header", "fore": "chameleon1", "weight": "bold" },
-		{ "name": "Diff Header(Separator)", "fore": "aluminium4", "weight": "bold" },
-		{ "name": "Diff Header(Old)", "fore": "scarletred2", "weight": "bold" },
-		{ "name": "Diff Header(New)", "fore": "chameleon1", "weight": "bold" },
-		{ "name": "Diff Location", "fore": "chameleon1", "weight": "bold" },
+		{ "name": "Plain Text", "fore": "text-white", "back": "background-black" },
+		{ "name": "Selected Text", "back": "#264F78" },
+		{ "name": "Selected Text(Inactive)", "back": "#343434" },
+
+		{ "name": "Collapsed Text", "fore": "#888a85", "back": "background-black" },
+
+		{ "name": "Line Numbers", "fore": "#2b91af", "back": "background-black" },
+
+		{ "name": "Punctuation", "fore": "text-white" },
+		{ "name": "Punctuation(Brackets)", "fore": "text-white" },
+
+		{ "name": "Comment(Line)", "fore": "comment-green" },
+		{ "name": "Comment(Block)", "fore": "comment-green" },
+		{ "name": "Comment(Doc)", "fore": "comment-green" },
+		{ "name": "Comment(DocTag)", "fore": "comment-green" },
+		{ "name": "Comment Tag", "fore": "comment-green" },
+
+		{ "name": "Excluded Code", "fore": "#989898" },
+
+		{ "name": "String", "fore": "string-red" },
+		{ "name": "String(Escape)", "fore": "#ffd68f" },
+		{ "name": "String(C# @ Verbatim)", "fore": "string-red" },
+		{ "name": "String(Regex Set Constructs)", "fore": "#05c3ba" },
+		{ "name": "String(Regex Character Class)", "fore": "#2e8dfe" },
+		{ "name": "String(Regex Grouping Constructs)", "fore": "#05c3ba" },
+		{ "name": "String(Regex Escape Character)", "fore": "#d69d85" },
+		{ "name": "String(Regex Alt Escape Character)", "fore": "#ffd68f" },
+
+		{ "name": "Number", "fore": "number-mint" },
+
+		{ "name": "Preprocessor", "fore": "#9b9b9b" },
+		{ "name": "Preprocessor(Region Name)", "fore": "text-white" },
+
+		{ "name": "Xml Text", "fore": "#c8c8c8" },
+		{ "name": "Xml Delimiter", "fore": "#808080" },
+		{ "name": "Xml Name", "fore": "keyword-blue" },
+		{ "name": "Xml Attribute", "fore": "#92caf4" },
+		{ "name": "Xml Attribute Quotes", "fore": "#808080" },
+		{ "name": "Xml Attribute Value", "fore": "#c8c8c8" },
+		{ "name": "Xml Comment", "fore": "comment-green" },
+		{ "name": "Xml CData Section", "fore": "#e9d585" },
+
+    { "name": "Xaml Text", "fore": "#ababab" },
+		{ "name": "Xaml Delimiter", "fore": "#808080" },
+		{ "name": "Xaml Name", "fore": "#e6e6e6" },
+		{ "name": "Xaml Attribute", "fore": "#92caf4" },
+		{ "name": "Xaml Attribute Quotes", "fore": "#808080" },
+		{ "name": "Xaml Attribute Value", "fore": "keyword-blue" },
+		{ "name": "Xaml Comment", "fore": "comment-green" },
+		{ "name": "Xaml CData Section", "fore": "#c0d088" },
+
+		{ "name": "Html Attribute Name", "fore": "#9cdcfe" },
+		{ "name": "Html Attribute Value", "fore": "#c8c8c8" },
+		{ "name": "Html Comment", "fore": "#57a64a" },
+		{ "name": "Html Element Name", "fore": "keyword-blue" },
+		{ "name": "Html Entity", "fore": "#00a0a0" },
+		{ "name": "Html Operator", "fore": "#b4b4b4" },
+		{ "name": "Html Server-Side Script", "fore": "black", "back": "#ffffb3" },
+		{ "name": "Html Tag Delimiter", "fore": "#808080" },
+		{ "name": "Razor Code", "back": "#505050" },
+
+		{ "name": "Tooltip Text", "fore": "#f1f1f1", "back": "#424245" },
+		{ "name": "Notification Text", "fore": "text-white", "back": "#505050" },
+
+		{ "name": "Completion Text", "fore": "text-white" },
+		{ "name": "Completion Matching Substring", "fore": "#ad7fa8" },
+
+		{ "name": "Completion Selected Text", "fore": "text-white" },
+		{ "name": "Completion Selected Matching Substring", "fore": "#ad7fa8" },
+
+		{ "name": "Completion Selected Text(Inactive)", "fore": "text-white" },
+		{ "name": "Completion Selected Matching Substring(Inactive)", "fore": "#ad7fa8" },
+
+		{ "name": "Keyword(Access)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Type)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Operator)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Selection)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Iteration)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Jump)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Context)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Exception)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Modifiers)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Constants)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Void)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Namespace)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Property)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Declaration)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Parameter)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Operator Declaration)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Other)", "fore": "keyword-blue" },
+
+		{ "name": "User Types", "fore": "class-cyan" },
+		{ "name": "User Types(Enums)", "fore": "enum-yellow" },
+		{ "name": "User Types(Interfaces)", "fore": "enum-yellow" },
+		{ "name": "User Types(Delegates)", "fore": "class-cyan" },
+		{ "name": "User Types(Value types)", "fore": "struct-mint" },
+		{ "name": "User Types(Type parameters)", "fore": "enum-yellow" },
+
+		{ "name": "User Field Usage", "fore": "text-white" },
+		{ "name": "User Field Declaration", "fore": "text-white" },
+
+		{ "name": "User Property Usage", "fore": "text-white" },
+		{ "name": "User Property Declaration", "fore": "text-white" },
+
+		{ "name": "User Event Usage", "fore": "text-white" },
+		{ "name": "User Event Declaration", "fore": "text-white" },
+
+		{ "name": "User Method Usage", "fore": "method-yellow" },
+		{ "name": "User Method Declaration", "fore": "method-yellow" },
+
+		{ "name": "User Parameter Usage", "fore": "local-blue" },
+		{ "name": "User Parameter Declaration", "fore": "local-blue" },
+
+		{ "name": "User Variable Usage", "fore": "local-blue" },
+		{ "name": "User Variable Declaration", "fore": "local-blue" },
+
+		{ "name": "Syntax Error", "fore": "#fc3e36" },
+
+		{ "name": "Breakpoint Text", "fore": "white", "back": "#8c2f2f" },
+
+		{ "name": "Debugger Current Statement", "fore": "black", "back": "#eff284" },
+		{ "name": "Debugger Stack Line", "fore": "black", "back": "#b5cea8" },
+
+		{ "name": "Diff Line(Added)", "fore": "#8ae234" },
+		{ "name": "Diff Line(Removed)", "fore": "#cc0000" },
+		{ "name": "Diff Line(Changed)", "fore": "#ad7fa8" },
+		{ "name": "Diff Header", "fore": "#8ae234", "weight": "bold" },
+		{ "name": "Diff Header(Separator)", "fore": "#888a85", "weight": "bold" },
+		{ "name": "Diff Header(Old)", "fore": "#cc0000", "weight": "bold" },
+		{ "name": "Diff Header(New)", "fore": "#8ae234", "weight": "bold" },
+		{ "name": "Diff Location", "fore": "#8ae234", "weight": "bold" },
 
 		{ "name": "Preview Diff Removed Line", "fore": "#5c2c2c", "back": "#dcb4b4" },
 		{ "name": "Preview Diff Added Line", "fore": "#235423", "back": "#a4d9a4" },
 
-		{ "name": "Css Comment", "fore": "aluminium4" },
-		{ "name": "Css Property Name", "fore": "aluminium1" },
-		{ "name": "Css Property Value", "fore": "butter2" },
-		{ "name": "Css Selector", "fore": "aluminium1" },
-		{ "name": "Css String Value", "fore": "butter2" },
-		{ "name": "Css Keyword", "fore": "plum1" },
-
-		{ "name": "Script Comment", "fore": "aluminium4" },
-		{ "name": "Script Keyword", "fore": "plum1" },
-		{ "name": "Script Number", "fore": "butter2" },
-		{ "name": "Script String", "fore": "butter2" }
+		{ "name": "Css Comment", "fore": "comment-green" },
+		{ "name": "Css Property Name", "fore": "#9cdcfe" },
+		{ "name": "Css Property Value", "fore": "#c8c8c8" },
+		{ "name": "Css Selector", "fore": "#d6ba7d" },
+		{ "name": "Css String Value", "fore": "string-red" },
+		{ "name": "Css Keyword", "fore": "keyword-blue" },
+
+		{ "name": "Script Comment", "fore": "comment-green" },
+		{ "name": "Script Keyword", "fore": "keyword-blue" },
+		{ "name": "Script Number", "fore": "number-mint" },
+		{ "name": "Script String", "fore": "string-red" }
 	]
-}
+}
\ No newline at end of file
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/LegacyDarkStyle.json b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/LegacyDarkStyle.json
new file mode 100644
index 00000000000..174c8977a1f
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/LegacyDarkStyle.json
@@ -0,0 +1,250 @@
+{
+	"name": "Legacy - Dark",
+	"version": "1.0.5",
+	"description": "The legacy dark color scheme, used in versions of Visual Studio for Mac prior to v8.5.",
+	"originator": "Xamarin Inc. (http://xamarin.com)",
+
+	"palette": [
+		{ "name": "butter2", "value": "#edd400" },
+		{ "name": "orange1", "value": "#fcaf3e" },
+		{ "name": "orange2", "value": "#f57900" },
+		{ "name": "chocolate1", "value": "#e9b96e" },
+		{ "name": "chocolate2", "value": "#c17d11" },
+		{ "name": "chocolate3", "value": "#8f5902" },
+		{ "name": "chameleon1", "value": "#8ae234" },
+		{ "name": "chameleon2", "value": "#73d216" },
+		{ "name": "chameleon3", "value": "#4e9a06" },
+		{ "name": "chameleon4", "value": "#356904" },
+		{ "name": "skyblue1", "value": "#729fcf" },
+		{ "name": "skyblue2", "value": "#3465a4" },
+		{ "name": "skyblue3", "value": "#204a87" },
+		{ "name": "plum1", "value": "#ad7fa8" },
+		{ "name": "scarletred1", "value": "#ef2929" },
+		{ "name": "scarletred2", "value": "#cc0000" },
+		{ "name": "aluminium1", "value": "#eeeeec" },
+		{ "name": "aluminium2", "value": "#d3d7cf" },
+		{ "name": "aluminium3", "value": "#babdb6" },
+		{ "name": "aluminium4", "value": "#888a85" },
+		{ "name": "aluminium5", "value": "#555753" },
+		{ "name": "aluminium6", "value": "#2e3436" },
+		{ "name": "aluminium7", "value": "#0e1416" }
+	],
+
+	"colors": [
+		{ "name": "Background(Read Only)", "color": "aluminium7" },
+
+		{ "name": "Search result background", "color": "#006060" },
+		{ "name": "Search result background (highlighted)", "color": "#008080" },
+
+		{ "name": "Column Ruler", "color": "#2a2c2f" },
+
+		{ "name": "Fold Square", "color": "aluminium5", "secondcolor": "#1c1e1f" },
+		{ "name": "Fold Cross", "color": "aluminium5", "secondcolor": "#1c1e1f" },
+
+		{ "name": "Indentation Guide", "color": "#444a4d" },
+
+		{ "name": "Indicator Margin", "color": "#303030" },
+		{ "name": "Indicator Margin(Separator)", "color": "#303030" },
+
+		{ "name": "Tooltip Pager Top", "color": "aluminium5" },
+		{ "name": "Tooltip Pager Triangle", "color": "aluminium2" },
+		{ "name": "Tooltip Pager Text", "color": "aluminium2" },
+
+		{ "name": "Notification Border", "color": "aluminium1" },
+
+		{ "name": "Completion Window", "color": "aluminium6", "bordercolor": "aluminium1" },
+		{ "name": "Completion Tooltip Window", "color": "aluminium5", "bordercolor": "aluminium1" },
+		{ "name": "Completion Selection Bar Border", "color": "aluminium5" },
+		{ "name": "Completion Selection Bar Border(Inactive)", "color": "aluminium7" },
+		{ "name": "Completion Selection Bar Background", "color": "aluminium5", "secondcolor": "aluminium5" },
+		{ "name": "Completion Selection Bar Background(Inactive)", "color": "aluminium7", "secondcolor": "aluminium7" },
+
+		{ "name": "Bookmarks", "color": "aluminium1", "secondcolor": "aluminium4" },
+
+		{ "name": "Underline(Error)", "color": "scarletred2" },
+		{ "name": "Underline(Warning)", "color": "butter2" },
+		{ "name": "Underline(Suggestion)", "color": "chameleon3" },
+		{ "name": "Underline(Hint)", "color": "chameleon2" },
+
+		{ "name": "Quick Diff(Dirty)", "color": "butter2" },
+		{ "name": "Quick Diff(Changed)", "color": "chameleon2" },
+
+		{ "name": "Brace Matching(Rectangle)", "color": "#476a93", "secondcolor": "#476a93" },
+		{ "name": "Usages(Rectangle)", "color": "skyblue3", "secondcolor": "skyblue3", "bordercolor": "skyblue2" },
+		{ "name": "Changing usages(Rectangle)", "color": "chameleon4", "secondcolor": "chameleon4", "bordercolor": "chameleon3" },
+
+		{ "name": "Breakpoint Marker", "color": "#6f3535", "bordercolor": "#6f3535" },
+		{ "name": "Breakpoint Marker(Disabled)", "color": "#4d4d4d", "bordercolor": "#4d4d4d" },
+		{ "name": "Breakpoint Marker(Invalid)", "color": "#604343", "bordercolor": "#604343" },
+
+		{ "name": "Current Line Marker", "color": "#2a2c2f", "secondcolor": "#2a2c2f" },
+		{ "name": "Current Line Marker(Inactive)", "color": "#2a2c2f", "secondcolor": "#2a2c2f" },
+
+		{ "name": "Debugger Current Line Marker", "color": "#69684c", "bordercolor": "#69684c" },
+		{ "name": "Debugger Stack Line Marker", "color": "#5f7247", "bordercolor": "#5f7247" },
+
+		{ "name": "Primary Link", "color": "#7C97A6", "secondcolor": "chocolate3" },
+		{ "name": "Primary Link(Highlighted)", "color": "#7C97A6", "secondcolor": "chocolate2" },
+		{ "name": "Secondary Link", "color": "white", "secondcolor": "aluminium6" },
+		{ "name": "Secondary Link(Highlighted)", "color": "aluminium1", "secondcolor": "aluminium5" },
+
+		{ "name": "Message Bubble Error Marker", "color": "#b28d37" },
+		{ "name": "Message Bubble Error Tag", "color": "#e3a6a1", "secondcolor": "black" },
+		{ "name": "Message Bubble Error Counter", "color": "black", "secondcolor": "#e3a6a1" },
+		{ "name": "Message Bubble Error IconMargin", "color": "#735c54", "bordercolor": "#805b4d" },
+		{ "name": "Message Bubble Error Line", "color": "#7b645c" },
+		{ "name": "Message Bubble Error Tooltip", "color": "#e3a6a1" },
+
+		{ "name": "Message Bubble Warning Tag", "color": "#efe89d", "secondcolor": "black" },
+		{ "name": "Message Bubble Warning Counter", "color": "black", "secondcolor": "#efe89d" },
+		{ "name": "Message Bubble Warning IconMargin", "color": "#777553", "bordercolor": "#948e51" },
+		{ "name": "Message Bubble Warning Line", "color": "#807e5c" },
+		{ "name": "Message Bubble Warning Tooltip", "color": "#efe89d" },
+
+		{ "name": "Link Color", "color": "#41e2cb" },
+		{ "name": "Link Color(Active)", "color": "#41e2cb" }
+	],
+
+	"text": [
+		{ "name": "Plain Text", "fore": "aluminium1", "back": "#1c1e1f" },
+		{ "name": "Selected Text", "back": "#245176" },
+		{ "name": "Selected Text(Inactive)", "back": "aluminium5" },
+
+		{ "name": "Collapsed Text", "fore": "aluminium4", "back": "#1c1e1f" },
+
+		{ "name": "Line Numbers", "fore": "aluminium5", "back": "#242424" },
+
+		{ "name": "Punctuation", "fore": "aluminium1" },
+		{ "name": "Punctuation(Brackets)", "fore": "aluminium1" },
+
+		{ "name": "Comment(Line)", "fore": "#7a976b" },
+		{ "name": "Comment(Block)", "fore": "#7a976b" },
+		{ "name": "Comment(Doc)", "fore": "#7a976b" },
+		{ "name": "Comment(DocTag)", "fore": "aluminium4" },
+		{ "name": "Comment Tag", "fore": "#ff37ff" },
+
+		{ "name": "Excluded Code", "fore": "aluminium4" },
+
+		{ "name": "String", "fore": "#E6DB74" },
+		{ "name": "String(Escape)", "fore": "#A6AB34" },
+		{ "name": "String(C# @ Verbatim)", "fore": "#E6DB74" },
+		{ "name": "String(Regex Set Constructs)", "fore": "chameleon2" },
+		{ "name": "String(Regex Character Class)", "fore": "skyblue1" },
+		{ "name": "String(Regex Grouping Constructs)", "fore": "plum1" },
+		{ "name": "String(Regex Escape Character)", "fore": "orange2" },
+		{ "name": "String(Regex Alt Escape Character)", "fore": "orange1" },
+
+		{ "name": "Number", "fore": "chameleon1" },
+
+		{ "name": "Preprocessor", "fore": "plum1" },
+		{ "name": "Preprocessor(Region Name)", "fore": "aluminium1" },
+
+		{ "name": "Xml Text", "fore": "aluminium1" },
+		{ "name": "Xml Delimiter", "fore": "aluminium1" },
+		{ "name": "Xml Name", "fore": "skyblue1" },
+		{ "name": "Xml Attribute", "fore": "#9CDCFE" },
+		{ "name": "Xml Attribute Quotes", "fore": "#E6DB74" },
+		{ "name": "Xml Attribute Value", "fore": "#E6DB74" },
+		{ "name": "Xml Comment", "fore": "aluminium4" },
+		{ "name": "Xml CData Section", "fore": "aluminium1" },
+
+		{ "name": "Html Attribute Name", "fore": "aluminium1" },
+		{ "name": "Html Attribute Value", "fore": "#E6DB74" },
+		{ "name": "Html Comment", "fore": "aluminium4" },
+		{ "name": "Html Element Name", "fore": "skyblue1" },
+		{ "name": "Html Entity", "fore": "skyblue1" },
+		{ "name": "Html Operator", "fore": "aluminium1" },
+		{ "name": "Html Server-Side Script", "fore": "black", "back": "#d2d295" },
+		{ "name": "Html Tag Delimiter", "fore": "aluminium1" },
+		{ "name": "Razor Code", "fore": "aluminium1", "back": "aluminium7" },
+
+		{ "name": "Tooltip Text", "fore": "#d1d1cd", "back": "#525759" },
+		{ "name": "Notification Text", "fore": "aluminium1", "back": "aluminium5" },
+
+		{ "name": "Completion Text", "fore": "aluminium1" },
+		{ "name": "Completion Matching Substring", "fore": "plum1" },
+
+		{ "name": "Completion Selected Text", "fore": "aluminium1" },
+		{ "name": "Completion Selected Matching Substring", "fore": "plum1" },
+
+		{ "name": "Completion Selected Text(Inactive)", "fore": "aluminium1" },
+		{ "name": "Completion Selected Matching Substring(Inactive)", "fore": "plum1" },
+
+		{ "name": "Keyword(Access)", "fore": "skyblue1" },
+		{ "name": "Keyword(Type)", "fore": "skyblue1" },
+		{ "name": "Keyword(Operator)", "fore": "skyblue1" },
+		{ "name": "Keyword(Selection)", "fore": "skyblue1" },
+		{ "name": "Keyword(Iteration)", "fore": "skyblue1" },
+		{ "name": "Keyword(Jump)", "fore": "skyblue1" },
+		{ "name": "Keyword(Context)", "fore": "skyblue1" },
+		{ "name": "Keyword(Exception)", "fore": "skyblue1" },
+		{ "name": "Keyword(Modifiers)", "fore": "skyblue1" },
+		{ "name": "Keyword(Constants)", "fore": "skyblue1" },
+		{ "name": "Keyword(Void)", "fore": "skyblue1" },
+		{ "name": "Keyword(Namespace)", "fore": "skyblue1" },
+		{ "name": "Keyword(Property)", "fore": "skyblue1" },
+		{ "name": "Keyword(Declaration)", "fore": "skyblue1" },
+		{ "name": "Keyword(Parameter)", "fore": "skyblue1" },
+		{ "name": "Keyword(Operator Declaration)", "fore": "skyblue1" },
+		{ "name": "Keyword(Other)", "fore": "skyblue1" },
+
+		{ "name": "User Types", "fore": "#4ec9b0" },
+		{ "name": "User Types(Enums)", "fore": "#b8d7a3" },
+		{ "name": "User Types(Interfaces)", "fore": "#b8d7a3" },
+		{ "name": "User Types(Delegates)", "fore": "#4ec9b0" },
+		{ "name": "User Types(Value types)", "fore": "#4ec9b0" },
+		{ "name": "User Types(Type parameters)", "fore": "#4ec9b0" },
+		{ "name": "User Types(Mutable)", "fore": "#ffd21c" },
+
+		{ "name": "User Field Usage", "fore": "aluminium1" },
+		{ "name": "User Field Declaration", "fore": "aluminium1" },
+
+		{ "name": "User Property Usage", "fore": "aluminium1" },
+		{ "name": "User Property Declaration", "fore": "aluminium1" },
+
+		{ "name": "User Event Usage", "fore": "aluminium1" },
+		{ "name": "User Event Declaration", "fore": "aluminium1" },
+
+		{ "name": "User Method Usage", "fore": "aluminium1" },
+		{ "name": "User Method Declaration", "fore": "aluminium1" },
+
+		{ "name": "User Parameter Usage", "fore": "aluminium1" },
+		{ "name": "User Parameter Declaration", "fore": "aluminium1" },
+
+		{ "name": "User Variable Usage", "fore": "aluminium1" },
+		{ "name": "User Variable Declaration", "fore": "aluminium1" },
+
+		{ "name": "Syntax Error", "fore": "scarletred1" },
+
+		{ "name": "String Format Items", "fore": "aluminium1" },
+
+		{ "name": "Breakpoint Text", "fore": "white", "back": "#6f3535" },
+
+		{ "name": "Debugger Current Statement", "fore": "white", "back": "#69684c" },
+		{ "name": "Debugger Stack Line", "fore": "white", "back": "#5c6b4d" },
+
+		{ "name": "Diff Line(Added)", "fore": "chameleon1" },
+		{ "name": "Diff Line(Removed)", "fore": "scarletred2" },
+		{ "name": "Diff Line(Changed)", "fore": "plum1" },
+		{ "name": "Diff Header", "fore": "chameleon1", "weight": "bold" },
+		{ "name": "Diff Header(Separator)", "fore": "aluminium4", "weight": "bold" },
+		{ "name": "Diff Header(Old)", "fore": "scarletred2", "weight": "bold" },
+		{ "name": "Diff Header(New)", "fore": "chameleon1", "weight": "bold" },
+		{ "name": "Diff Location", "fore": "chameleon1", "weight": "bold" },
+
+		{ "name": "Preview Diff Removed Line", "fore": "#5c2c2c", "back": "#dcb4b4" },
+		{ "name": "Preview Diff Added Line", "fore": "#235423", "back": "#a4d9a4" },
+
+		{ "name": "Css Comment", "fore": "aluminium4" },
+		{ "name": "Css Property Name", "fore": "aluminium1" },
+		{ "name": "Css Property Value", "fore": "butter2" },
+		{ "name": "Css Selector", "fore": "aluminium1" },
+		{ "name": "Css String Value", "fore": "butter2" },
+		{ "name": "Css Keyword", "fore": "plum1" },
+
+		{ "name": "Script Comment", "fore": "aluminium4" },
+		{ "name": "Script Keyword", "fore": "plum1" },
+		{ "name": "Script Number", "fore": "butter2" },
+		{ "name": "Script String", "fore": "butter2" }
+	]
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/LegacyLightStyle.json b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/LegacyLightStyle.json
new file mode 100644
index 00000000000..cb1c07c6552
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/LegacyLightStyle.json
@@ -0,0 +1,249 @@
+{
+	"name": "Legacy - Light",
+	"version": "1.4.5",
+	"description": "The legacy light color scheme, used in versions of Visual Studio for Mac prior to v8.5.",
+	"originator": "Xamarin Inc. (http://xamarin.com)",
+
+	"palette": [
+		{ "name": "text-black", "value": "#222222" },
+		{ "name": "comment-gray", "value": "#888a85" },
+		{ "name": "chameleon1", "value": "#8ae234" },
+		{ "name": "chameleon2", "value": "#73d216" },
+		{ "name": "chameleon3", "value": "#4e9a06" },
+		{ "name": "skyblue2", "value": "#3465a4" },
+		{ "name": "plum2", "value": "#75507b" },
+		{ "name": "scarletred1", "value": "#ef2929" },
+		{ "name": "aluminium1", "value": "#eeeeec" },
+		{ "name": "aluminium2", "value": "#d3d7cf" },
+		{ "name": "aluminium3", "value": "#babdb6" },
+		{ "name": "aluminium4", "value": "#888a85" },
+		{ "name": "literal-orange", "value": "#db7100" },
+		{ "name": "literal-escape", "value": "#A53E00" },
+		{ "name": "keyword-teal", "value": "#009695" },
+		{ "name": "selection-bg", "value": "#b5d5ff" },
+		{ "name": "invalid-red", "value": "#C44D58" },
+		{ "name": "orangesicle", "value": "#fdab75" },
+		{ "name": "orangesicle-light", "value": "#fed9c0" }
+	],
+
+	"colors": [
+		{ "name": "Background(Read Only)", "color": "white" },
+
+		{ "name": "Search result background", "color": "#fcff54" },
+		{ "name": "Search result background (highlighted)", "color": "#fffc38" },
+
+		{ "name": "Column Ruler", "color": "#eeeeee" },
+
+		{ "name": "Fold Square", "color": "#cdcecc", "secondcolor": "white" },
+		{ "name": "Fold Cross", "color": "#b1b2b0", "secondcolor": "white" },
+
+		{ "name": "Indentation Guide", "color": "#e5e5e5" },
+
+		{ "name": "Indicator Margin", "color": "#f6f6f6" },
+		{ "name": "Indicator Margin(Separator)", "color": "#f6f6f6" },
+
+		{ "name": "Tooltip Pager Top", "color": "#ffffff" },
+		{ "name": "Tooltip Pager Triangle", "color": "#737373" },
+		{ "name": "Tooltip Pager Text", "color": "#828282" },
+
+		{ "name": "Notification Border", "color": "#D2B457" },
+
+		{ "name": "Completion Window", "color": "#F0F6F8", "bordercolor": "#b2b2b2" },
+		{ "name": "Completion Tooltip Window", "color": "#fafae2", "bordercolor": "#b2b2b2" },
+		{ "name": "Completion Selection Bar Border", "color": "#C9C9C9" },
+		{ "name": "Completion Selection Bar Border(Inactive)", "color": "#666666" },
+		{ "name": "Completion Selection Bar Background", "color": "#f8fcfc", "secondcolor": "#dff4f0" },
+		{ "name": "Completion Selection Bar Background(Inactive)", "color": "white", "secondcolor": "white" },
+
+		{ "name": "Bookmarks", "color": "white", "secondcolor": "skyblue" },
+
+		{ "name": "Underline(Error)", "color": "#E896A0" },
+		{ "name": "Underline(Warning)", "color": "#FEB958" },
+		{ "name": "Underline(Suggestion)", "color": "#9CC0EA" },
+		{ "name": "Underline(Hint)", "color": "#9CC0EA" },
+
+		{ "name": "Quick Diff(Dirty)", "color": "orangesicle-light" },
+		{ "name": "Quick Diff(Changed)", "color": "orangesicle" },
+
+		{ "name": "Brace Matching(Rectangle)", "color": "#fde5d6", "secondcolor": "#fde5d6" },
+		{ "name": "Usages(Rectangle)", "color": "#B1DFF9", "secondcolor": "#B1DFF9", "bordercolor": "#B1DFF9" },
+		{ "name": "Changing usages(Rectangle)", "color": "#FFD6DD", "secondcolor": "#FFD6DD", "bordercolor": "#FFD6DD" },
+
+		{ "name": "Breakpoint Marker", "color": "#f9dbda", "bordercolor": "#f9dbda" },
+		{ "name": "Breakpoint Marker(Disabled)", "color": "#e9e9e9", "bordercolor": "#e9e9e9" },
+		{ "name": "Breakpoint Marker(Invalid)", "color": "#f1e3e3", "bordercolor": "#f1e3e3" },
+
+		{ "name": "Current Line Marker", "color": "#f7f7f7", "secondcolor": "#f7f7f7" },
+		{ "name": "Current Line Marker(Inactive)", "color": "#f7f7f7", "secondcolor": "#f7f7f7" },
+
+		{ "name": "Debugger Current Line Marker", "color": "#f8f4a1", "bordercolor": "#f8f4a1" },
+		{ "name": "Debugger Stack Line Marker", "color": "#d0efa9", "bordercolor": "#d0efa9" },
+
+		{ "name": "Primary Link", "color": "#E4D0E2", "secondcolor": "chameleon2" },
+		{ "name": "Primary Link(Highlighted)", "color": "#E4D0E2", "secondcolor": "chameleon1" },
+		{ "name": "Secondary Link", "color": "aluminium2", "secondcolor": "white" },
+		{ "name": "Secondary Link(Highlighted)", "color": "aluminium3", "secondcolor": "aluminium1" },
+
+		{ "name": "Message Bubble Error Marker", "color": "#df6962" },
+		{ "name": "Message Bubble Error Tag", "color": "#d83f3f", "secondcolor": "white" },
+		{ "name": "Message Bubble Error Counter", "color": "white", "secondcolor": "#d83f3f" },
+		{ "name": "Message Bubble Error IconMargin", "color": "#d83f3f", "bordercolor": "#d83f3f" },
+		{ "name": "Message Bubble Error Line", "color": "#fbe4e6" },
+		{ "name": "Message Bubble Error Tooltip", "color": "#D10B0B" },
+
+		{ "name": "Message Bubble Warning Marker", "color": "#b28d37" },
+		{ "name": "Message Bubble Warning Tag", "color": "#e68100", "secondcolor": "white" },
+		{ "name": "Message Bubble Warning Counter", "color": "white", "secondcolor": "#e68100" },
+		{ "name": "Message Bubble Warning IconMargin", "color": "#e68100", "bordercolor": "#e68100" },
+		{ "name": "Message Bubble Warning Line", "color": "#fff1da" },
+		{ "name": "Message Bubble Warning Tooltip", "color": "#D1590B" },
+
+		{ "name": "Link Color", "color": "#26c8b1" },
+		{ "name": "Link Color(Active)", "color": "#26c8b1" }
+	],
+
+	"text": [
+		{ "name": "Plain Text", "fore": "text-black", "back": "white" },
+		{ "name": "Selected Text", "back": "selection-bg" },
+		{ "name": "Selected Text(Inactive)", "back": "aluminium2" },
+
+		{ "name": "Collapsed Text", "fore": "comment-gray", "back": "white" },
+
+		{ "name": "Line Numbers", "fore": "aluminium4", "back": "white" },
+
+		{ "name": "Punctuation", "fore": "text-black" },
+		{ "name": "Punctuation(Brackets)", "fore": "text-black" },
+
+		{ "name": "Comment(Line)", "fore": "comment-gray" },
+		{ "name": "Comment(Block)", "fore": "comment-gray" },
+		{ "name": "Comment(Doc)", "fore": "comment-gray" },
+		{ "name": "Comment(DocTag)", "fore": "comment-gray" },
+		{ "name": "Comment Tag", "fore": "#ff37ff" },
+
+		{ "name": "Excluded Code", "fore": "comment-gray" },
+
+		{ "name": "String", "fore": "literal-orange" },
+		{ "name": "String(Escape)", "fore": "literal-escape" },
+		{ "name": "String(C# @ Verbatim)", "fore": "literal-orange" },
+		{ "name": "String(Regex Set Constructs)", "fore": "#e5ae41" },
+		{ "name": "String(Regex Character Class)", "fore": "#6fb3f8" },
+		{ "name": "String(Regex Grouping Constructs)", "fore": "#2b922b" },
+		{ "name": "String(Regex Escape Character)", "fore": "#ff0d80" },
+		{ "name": "String(Regex Alt Escape Character)", "fore": "#faafba" },
+
+		{ "name": "Number", "fore": "literal-orange" },
+
+		{ "name": "Preprocessor", "fore": "#c12dad" },
+		{ "name": "Preprocessor(Region Name)", "fore": "#c12dad" },
+
+		{ "name": "Xml Text", "fore": "text-black" },
+		{ "name": "Xml Delimiter", "fore": "text-black" },
+		{ "name": "Xml Name", "fore": "skyblue2" },
+		{ "name": "Xml Attribute", "fore": "text-black" },
+		{ "name": "Xml Attribute Quotes", "fore": "literal-orange" },
+		{ "name": "Xml Attribute Value", "fore": "literal-orange" },
+		{ "name": "Xml Comment", "fore": "comment-gray" },
+		{ "name": "Xml CData Section", "fore": "text-black" },
+
+		{ "name": "Html Attribute Name", "fore": "text-black" },
+		{ "name": "Html Attribute Value", "fore": "literal-orange" },
+		{ "name": "Html Comment", "fore": "comment-gray" },
+		{ "name": "Html Element Name", "fore": "skyblue2" },
+		{ "name": "Html Entity", "fore": "#c12dad" },
+		{ "name": "Html Operator", "fore": "skyblue2" },
+		{ "name": "Html Server-Side Script", "fore": "text-black", "back": "#ffff33" },
+		{ "name": "Html Tag Delimiter", "fore": "skyblue2" },
+		{ "name": "Razor Code", "fore": "text-black", "back": "#fdfaed" },
+
+		{ "name": "Tooltip Text", "fore": "text-black", "back": "#fafae3" },
+		{ "name": "Notification Text", "fore": "text-black", "back": "#feffe9" },
+
+		{ "name": "Completion Text", "fore": "#434343" },
+		{ "name": "Completion Matching Substring", "fore": "#BA3373" },
+
+		{ "name": "Completion Selected Text", "fore": "#434343" },
+		{ "name": "Completion Selected Matching Substring", "fore": "#BA3373" },
+
+		{ "name": "Completion Selected Text(Inactive)", "fore": "#434343" },
+		{ "name": "Completion Selected Matching Substring(Inactive)", "fore": "#BA3373" },
+
+		{ "name": "Keyword(Access)", "fore": "keyword-teal" },
+		{ "name": "Keyword(Type)", "fore": "keyword-teal" },
+		{ "name": "Keyword(Operator)", "fore": "keyword-teal" },
+		{ "name": "Keyword(Selection)", "fore": "keyword-teal" },
+		{ "name": "Keyword(Iteration)", "fore": "keyword-teal" },
+		{ "name": "Keyword(Jump)", "fore": "keyword-teal" },
+		{ "name": "Keyword(Context)", "fore": "keyword-teal" },
+		{ "name": "Keyword(Exception)", "fore": "keyword-teal" },
+		{ "name": "Keyword(Modifiers)", "fore": "keyword-teal" },
+		{ "name": "Keyword(Constants)", "fore": "keyword-teal" },
+		{ "name": "Keyword(Void)", "fore": "keyword-teal" },
+		{ "name": "Keyword(Namespace)", "fore": "keyword-teal" },
+		{ "name": "Keyword(Property)", "fore": "keyword-teal" },
+		{ "name": "Keyword(Declaration)", "fore": "keyword-teal" },
+		{ "name": "Keyword(Parameter)", "fore": "keyword-teal" },
+		{ "name": "Keyword(Operator Declaration)", "fore": "keyword-teal" },
+		{ "name": "Keyword(Other)", "fore": "keyword-teal" },
+
+		{ "name": "User Types", "fore": "skyblue2" },
+		{ "name": "User Types(Enums)", "fore": "skyblue2" },
+		{ "name": "User Types(Interfaces)", "fore": "skyblue2" },
+		{ "name": "User Types(Delegates)", "fore": "skyblue2" },
+		{ "name": "User Types(Value types)", "fore": "skyblue2" },
+		{ "name": "User Types(Type parameters)", "fore": "skyblue2" },
+		{ "name": "User Types(Mutable)", "fore": "#a08000" },
+
+		{ "name": "User Field Usage", "fore": "text-black" },
+		{ "name": "User Field Declaration", "fore": "text-black" },
+
+		{ "name": "User Property Usage", "fore": "text-black" },
+		{ "name": "User Property Declaration", "fore": "text-black" },
+
+		{ "name": "User Event Usage", "fore": "text-black" },
+		{ "name": "User Event Declaration", "fore": "text-black" },
+
+		{ "name": "User Method Usage", "fore": "text-black" },
+		{ "name": "User Method Declaration", "fore": "text-black" },
+
+		{ "name": "User Parameter Usage", "fore": "text-black" },
+		{ "name": "User Parameter Declaration", "fore": "text-black" },
+
+		{ "name": "User Variable Usage", "fore": "text-black" },
+		{ "name": "User Variable Declaration", "fore": "text-black" },
+
+		{ "name": "Syntax Error", "fore": "invalid-red" },
+
+		{ "name": "String Format Items", "fore": "#FF0000" },
+
+		{ "name": "Breakpoint Text", "fore": "text-black", "back": "#ffe8e7" },
+
+		{ "name": "Debugger Current Statement", "fore": "text-black", "back": "#f8f4a1" },
+		{ "name": "Debugger Stack Line", "fore": "text-black", "back": "#ccfca6" },
+
+		{ "name": "Diff Line(Added)", "fore": "skyblue2" },
+		{ "name": "Diff Line(Removed)", "fore": "scarletred1" },
+		{ "name": "Diff Line(Changed)", "fore": "plum2" },
+		{ "name": "Diff Header", "fore": "chameleon3", "weight": "bold" },
+		{ "name": "Diff Header(Separator)", "fore": "chameleon3", "weight": "bold" },
+		{ "name": "Diff Header(Old)", "fore": "scarletred1", "weight": "bold" },
+		{ "name": "Diff Header(New)", "fore": "skyblue2", "weight": "bold" },
+		{ "name": "Diff Location", "fore": "plum2", "weight": "bold" },
+
+		{ "name": "Preview Diff Removed Line", "fore": "#a14d4d", "back": "#fcf8f8" },
+		{ "name": "Preview Diff Added Line", "fore": "#419b41", "back": "#edf8ed" },
+
+		{ "name": "Css Comment", "fore": "comment-gray" },
+		{ "name": "Css Property Name", "fore": "text-black" },
+		{ "name": "Css Property Value", "fore": "literal-orange" },
+		{ "name": "Css Selector", "fore": "#3b6fa6" },
+		{ "name": "Css String Value", "fore": "literal-orange" },
+		{ "name": "Css Keyword", "fore": "keyword-teal" },
+
+		{ "name": "Script Comment", "fore": "comment-gray" },
+		{ "name": "Script Identifier" },
+		{ "name": "Script Keyword", "fore": "keyword-teal" },
+		{ "name": "Script Number", "fore": "literal-orange" },
+		{ "name": "Script Operator" },
+		{ "name": "Script String", "fore": "literal-orange" }
+	]
+}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/LightStyle.json b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/LightStyle.json
index d81188ce490..a36c0c30388 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/LightStyle.json
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/LightStyle.json
@@ -1,197 +1,123 @@
 {
 	"name": "Light",
-	"version": "1.4.5",
-	"description": "Bright and friendly, just like Xamarin",
-	"originator": "Xamarin Inc. (http://xamarin.com)",
+	"version": "1.0.0",
+	"description": "The Visual Studio light color scheme.",
+	"originator": "Microsoft",
 
 	"palette": [
 		{ "name": "text-black", "value": "#222222" },
-		{ "name": "comment-gray", "value": "#888a85" },
-		{ "name": "chameleon1", "value": "#8ae234" },
-		{ "name": "chameleon2", "value": "#73d216" },
-		{ "name": "chameleon3", "value": "#4e9a06" },
-		{ "name": "skyblue2", "value": "#3465a4" },
-		{ "name": "plum2", "value": "#75507b" },
-		{ "name": "scarletred1", "value": "#ef2929" },
-		{ "name": "aluminium1", "value": "#eeeeec" },
-		{ "name": "aluminium2", "value": "#d3d7cf" },
-		{ "name": "aluminium3", "value": "#babdb6" },
-		{ "name": "aluminium4", "value": "#888a85" },
-		{ "name": "literal-orange", "value": "#db7100" },
-		{ "name": "literal-escape", "value": "#A53E00" },
-		{ "name": "keyword-teal", "value": "#009695" },
-		{ "name": "selection-bg", "value": "#b5d5ff" },
-		{ "name": "invalid-red", "value": "#C44D58" },
-		{ "name": "orangesicle", "value": "#fdab75" },
-		{ "name": "orangesicle-light", "value": "#fed9c0" }
+		{ "name": "background-white", "value": "white" },
+		{ "name": "comment-green", "value": "#008000" },
+		{ "name": "local-blue", "value": "#1f377f" },
+		{ "name": "string-red", "value": "#a31515" },
+		{ "name": "keyword-blue", "value": "#0000ff" },
+		{ "name": "keyword-purple", "value": "#8f08c4" },
+		{ "name": "semantic-type", "value": "#508FAE" },
+		{ "name": "method-yellow", "value": "#74531f" }
 	],
 
 	"colors": [
 		{ "name": "Background(Read Only)", "color": "white" },
 
-		{ "name": "Search result background", "color": "#fcff54" },
-		{ "name": "Search result background (highlighted)", "color": "#fffc38" },
+		{ "name": "Underline(Error)", "color": "#FF0000" },
+		{ "name": "Underline(Warning)", "color": "comment-green" },
 
-		{ "name": "Column Ruler", "color": "#eeeeee" },
-
-		{ "name": "Fold Square", "color": "#cdcecc", "secondcolor": "white" },
-		{ "name": "Fold Cross", "color": "#b1b2b0", "secondcolor": "white" },
-
-		{ "name": "Indentation Guide", "color": "#e5e5e5" },
+		{ "name": "Quick Diff(Dirty)", "color": "yellow" },
+		{ "name": "Quick Diff(Changed)", "color": "green" },
 
 		{ "name": "Indicator Margin", "color": "#f6f6f6" },
 		{ "name": "Indicator Margin(Separator)", "color": "#f6f6f6" },
 
-		{ "name": "Tooltip Pager Top", "color": "#ffffff" },
-		{ "name": "Tooltip Pager Triangle", "color": "#737373" },
-		{ "name": "Tooltip Pager Text", "color": "#828282" },
-
-		{ "name": "Notification Border", "color": "#D2B457" },
-
-		{ "name": "Completion Window", "color": "#F0F6F8", "bordercolor": "#b2b2b2" },
-		{ "name": "Completion Tooltip Window", "color": "#fafae2", "bordercolor": "#b2b2b2" },
-		{ "name": "Completion Selection Bar Border", "color": "#C9C9C9" },
-		{ "name": "Completion Selection Bar Border(Inactive)", "color": "#666666" },
-		{ "name": "Completion Selection Bar Background", "color": "#f8fcfc", "secondcolor": "#dff4f0" },
-		{ "name": "Completion Selection Bar Background(Inactive)", "color": "white", "secondcolor": "white" },
-
-		{ "name": "Bookmarks", "color": "white", "secondcolor": "skyblue" },
-
-		{ "name": "Underline(Error)", "color": "#E896A0" },
-		{ "name": "Underline(Warning)", "color": "#FEB958" },
-		{ "name": "Underline(Suggestion)", "color": "#9CC0EA" },
-		{ "name": "Underline(Hint)", "color": "#9CC0EA" },
-
-		{ "name": "Quick Diff(Dirty)", "color": "orangesicle-light" },
-		{ "name": "Quick Diff(Changed)", "color": "orangesicle" },
-
-		{ "name": "Brace Matching(Rectangle)", "color": "#fde5d6", "secondcolor": "#fde5d6" },
-		{ "name": "Usages(Rectangle)", "color": "#B1DFF9", "secondcolor": "#B1DFF9", "bordercolor": "#B1DFF9" },
-		{ "name": "Changing usages(Rectangle)", "color": "#FFD6DD", "secondcolor": "#FFD6DD", "bordercolor": "#FFD6DD" },
-
-		{ "name": "Breakpoint Marker", "color": "#f9dbda", "bordercolor": "#f9dbda" },
-		{ "name": "Breakpoint Marker(Disabled)", "color": "#e9e9e9", "bordercolor": "#e9e9e9" },
-		{ "name": "Breakpoint Marker(Invalid)", "color": "#f1e3e3", "bordercolor": "#f1e3e3" },
-
-		{ "name": "Current Line Marker", "color": "#f7f7f7", "secondcolor": "#f7f7f7" },
-		{ "name": "Current Line Marker(Inactive)", "color": "#f7f7f7", "secondcolor": "#f7f7f7" },
-
-		{ "name": "Debugger Current Line Marker", "color": "#f8f4a1", "bordercolor": "#f8f4a1" },
-		{ "name": "Debugger Stack Line Marker", "color": "#d0efa9", "bordercolor": "#d0efa9" },
-
-		{ "name": "Primary Link", "color": "#E4D0E2", "secondcolor": "chameleon2" },
-		{ "name": "Primary Link(Highlighted)", "color": "#E4D0E2", "secondcolor": "chameleon1" },
-		{ "name": "Secondary Link", "color": "aluminium2", "secondcolor": "white" },
-		{ "name": "Secondary Link(Highlighted)", "color": "aluminium3", "secondcolor": "aluminium1" },
+		{ "name": "Message Bubble Warning IconMargin", "color": "#e68100", "bordercolor": "#e68100" },
 
-		{ "name": "Message Bubble Error Marker", "color": "#df6962" },
-		{ "name": "Message Bubble Error Tag", "color": "#d83f3f", "secondcolor": "white" },
-		{ "name": "Message Bubble Error Counter", "color": "white", "secondcolor": "#d83f3f" },
-		{ "name": "Message Bubble Error IconMargin", "color": "#d83f3f", "bordercolor": "#d83f3f" },
-		{ "name": "Message Bubble Error Line", "color": "#fbe4e6" },
-		{ "name": "Message Bubble Error Tooltip", "color": "#D10B0B" },
+		{ "name": "Brace Matching(Rectangle)", "color": "#e2e6d6", "secondcolor": "#e2e6d6" },
+		{ "name": "Usages(Rectangle)", "color": "#E2E6E6", "secondcolor": "#E2E6E6", "bordercolor": "#E2E6E6" },
 
-		{ "name": "Message Bubble Warning Marker", "color": "#b28d37" },
-		{ "name": "Message Bubble Warning Tag", "color": "#e68100", "secondcolor": "white" },
-		{ "name": "Message Bubble Warning Counter", "color": "white", "secondcolor": "#e68100" },
-		{ "name": "Message Bubble Warning IconMargin", "color": "#e68100", "bordercolor": "#e68100" },
-		{ "name": "Message Bubble Warning Line", "color": "#fff1da" },
-		{ "name": "Message Bubble Warning Tooltip", "color": "#D1590B" },
+		{ "name": "Search result background", "color": "#F6B94D" },
 
-		{ "name": "Link Color", "color": "#26c8b1" },
-		{ "name": "Link Color(Active)", "color": "#26c8b1" }
+		{ "name": "Link Color", "color": "keyword-blue" },
+		{ "name": "Link Color(Active)", "color": "keyword-blue" }
 	],
 
 	"text": [
-		{ "name": "Plain Text", "fore": "text-black", "back": "white" },
-		{ "name": "Selected Text", "back": "selection-bg" },
-		{ "name": "Selected Text(Inactive)", "back": "aluminium2" },
+		{ "name": "Plain Text", "fore": "text-black", "back": "background-white" },
+		{ "name": "Selected Text", "back": "#94c4ec" },
+		{ "name": "Selected Text(Inactive)", "back": "#e5ebf1" },
 
-		{ "name": "Collapsed Text", "fore": "comment-gray", "back": "white" },
+		{ "name": "Collapsed Text", "fore": "#808080", "back": "background-white" },
 
-		{ "name": "Line Numbers", "fore": "aluminium4", "back": "white" },
+		{ "name": "Line Numbers", "fore": "#2b91af", "back": "background-white" },
 
 		{ "name": "Punctuation", "fore": "text-black" },
 		{ "name": "Punctuation(Brackets)", "fore": "text-black" },
 
-		{ "name": "Comment(Line)", "fore": "comment-gray" },
-		{ "name": "Comment(Block)", "fore": "comment-gray" },
-		{ "name": "Comment(Doc)", "fore": "comment-gray" },
-		{ "name": "Comment(DocTag)", "fore": "comment-gray" },
-		{ "name": "Comment Tag", "fore": "#ff37ff" },
-
-		{ "name": "Excluded Code", "fore": "comment-gray" },
-
-		{ "name": "String", "fore": "literal-orange" },
-		{ "name": "String(Escape)", "fore": "literal-escape" },
-		{ "name": "String(C# @ Verbatim)", "fore": "literal-orange" },
-		{ "name": "String(Regex Set Constructs)", "fore": "#e5ae41" },
-		{ "name": "String(Regex Character Class)", "fore": "#6fb3f8" },
-		{ "name": "String(Regex Grouping Constructs)", "fore": "#2b922b" },
-		{ "name": "String(Regex Escape Character)", "fore": "#ff0d80" },
-		{ "name": "String(Regex Alt Escape Character)", "fore": "#faafba" },
-
-		{ "name": "Number", "fore": "literal-orange" },
-
-		{ "name": "Preprocessor", "fore": "#c12dad" },
-		{ "name": "Preprocessor(Region Name)", "fore": "#c12dad" },
-
-		{ "name": "Xml Text", "fore": "text-black" },
-		{ "name": "Xml Delimiter", "fore": "text-black" },
-		{ "name": "Xml Name", "fore": "skyblue2" },
-		{ "name": "Xml Attribute", "fore": "text-black" },
-		{ "name": "Xml Attribute Quotes", "fore": "literal-orange" },
-		{ "name": "Xml Attribute Value", "fore": "literal-orange" },
-		{ "name": "Xml Comment", "fore": "comment-gray" },
-		{ "name": "Xml CData Section", "fore": "text-black" },
-
-		{ "name": "Html Attribute Name", "fore": "text-black" },
-		{ "name": "Html Attribute Value", "fore": "literal-orange" },
-		{ "name": "Html Comment", "fore": "comment-gray" },
-		{ "name": "Html Element Name", "fore": "skyblue2" },
-		{ "name": "Html Entity", "fore": "#c12dad" },
-		{ "name": "Html Operator", "fore": "skyblue2" },
-		{ "name": "Html Server-Side Script", "fore": "text-black", "back": "#ffff33" },
-		{ "name": "Html Tag Delimiter", "fore": "skyblue2" },
-		{ "name": "Razor Code", "fore": "text-black", "back": "#fdfaed" },
-
-		{ "name": "Tooltip Text", "fore": "text-black", "back": "#fafae3" },
-		{ "name": "Notification Text", "fore": "text-black", "back": "#feffe9" },
-
-		{ "name": "Completion Text", "fore": "#434343" },
-		{ "name": "Completion Matching Substring", "fore": "#BA3373" },
-
-		{ "name": "Completion Selected Text", "fore": "#434343" },
-		{ "name": "Completion Selected Matching Substring", "fore": "#BA3373" },
-
-		{ "name": "Completion Selected Text(Inactive)", "fore": "#434343" },
-		{ "name": "Completion Selected Matching Substring(Inactive)", "fore": "#BA3373" },
-
-		{ "name": "Keyword(Access)", "fore": "keyword-teal" },
-		{ "name": "Keyword(Type)", "fore": "keyword-teal" },
-		{ "name": "Keyword(Operator)", "fore": "keyword-teal" },
-		{ "name": "Keyword(Selection)", "fore": "keyword-teal" },
-		{ "name": "Keyword(Iteration)", "fore": "keyword-teal" },
-		{ "name": "Keyword(Jump)", "fore": "keyword-teal" },
-		{ "name": "Keyword(Context)", "fore": "keyword-teal" },
-		{ "name": "Keyword(Exception)", "fore": "keyword-teal" },
-		{ "name": "Keyword(Modifiers)", "fore": "keyword-teal" },
-		{ "name": "Keyword(Constants)", "fore": "keyword-teal" },
-		{ "name": "Keyword(Void)", "fore": "keyword-teal" },
-		{ "name": "Keyword(Namespace)", "fore": "keyword-teal" },
-		{ "name": "Keyword(Property)", "fore": "keyword-teal" },
-		{ "name": "Keyword(Declaration)", "fore": "keyword-teal" },
-		{ "name": "Keyword(Parameter)", "fore": "keyword-teal" },
-		{ "name": "Keyword(Operator Declaration)", "fore": "keyword-teal" },
-		{ "name": "Keyword(Other)", "fore": "keyword-teal" },
-
-		{ "name": "User Types", "fore": "skyblue2" },
-		{ "name": "User Types(Enums)", "fore": "skyblue2" },
-		{ "name": "User Types(Interfaces)", "fore": "skyblue2" },
-		{ "name": "User Types(Delegates)", "fore": "skyblue2" },
-		{ "name": "User Types(Value types)", "fore": "skyblue2" },
-		{ "name": "User Types(Type parameters)", "fore": "skyblue2" },
-		{ "name": "User Types(Mutable)", "fore": "#a08000" },
+		{ "name": "Comment(Line)", "fore": "comment-green" },
+		{ "name": "Comment(Block)", "fore": "comment-green" },
+		{ "name": "Comment(Doc)", "fore": "comment-green" },
+		{ "name": "Comment(DocTag)", "fore": "comment-green" },
+		{ "name": "Comment Tag", "fore": "#b901b9" },
+
+		{ "name": "Excluded Code", "fore": "#808080" },
+
+		{ "name": "String", "fore": "string-red" },
+		{ "name": "String(Escape)", "fore": "#b776fb" },
+		{ "name": "String(C# @ Verbatim)", "fore": "string-red" },
+
+		{ "name": "Number", "fore": "text-black" },
+
+		{ "name": "Preprocessor", "fore": "#808080" },
+		{ "name": "Preprocessor(Region Name)", "fore": "text-black" },
+
+		{ "name": "Xml Delimiter", "fore": "keyword-blue" },
+		{ "name": "Xml Name", "fore": "#a31515" },
+		{ "name": "Xml Attribute", "fore": "#FF0000" },
+		{ "name": "Xml Attribute Quotes", "fore": "text-black" },
+		{ "name": "Xml Attribute Value", "fore": "keyword-blue" },
+		{ "name": "Xml Comment", "fore": "#008000" },
+		{ "name": "Xml CData Section", "fore": "#808080" },
+
+    { "name": "Xaml Delimiter", "fore": "keyword-blue" },
+		{ "name": "Xaml Name", "fore": "#a31515" },
+		{ "name": "Xaml Attribute", "fore": "#FF0000" },
+		{ "name": "Xaml Attribute Quotes", "fore": "text-black" },
+		{ "name": "Xaml Attribute Value", "fore": "keyword-blue" },
+		{ "name": "Xaml Comment", "fore": "#008000" },
+		{ "name": "Xaml CData Section", "fore": "#808080" }, 
+
+		{ "name": "Html Attribute Name", "fore": "#FF0000" },
+		{ "name": "Html Attribute Value", "fore": "keyword-blue" },
+		{ "name": "Html Comment", "fore": "#006400" },
+		{ "name": "Html Element Name", "fore": "#800000" },
+		{ "name": "Html Entity", "fore": "#FF0000" },
+		{ "name": "Html Operator", "fore": "keyword-blue" },
+		{ "name": "Html Server-Side Script", "fore": "text-black", "back": "#FFFF00" },
+		{ "name": "Html Tag Delimiter", "fore": "keyword-blue" },
+		{ "name": "Razor Code", "back": "#e5e5e5" },
+
+		{ "name": "Keyword(Access)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Type)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Operator)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Selection)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Iteration)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Jump)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Context)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Exception)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Modifiers)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Constants)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Void)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Namespace)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Property)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Declaration)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Parameter)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Operator Declaration)", "fore": "keyword-blue" },
+		{ "name": "Keyword(Other)", "fore": "keyword-blue" },
+
+		{ "name": "User Types", "fore": "semantic-type" },
+		{ "name": "User Types(Enums)", "fore": "semantic-type" },
+		{ "name": "User Types(Interfaces)", "fore": "semantic-type" },
+		{ "name": "User Types(Delegates)", "fore": "semantic-type" },
+		{ "name": "User Types(Value types)", "fore": "semantic-type" },
+		{ "name": "User Types(Type parameters)", "fore": "semantic-type" },
 
 		{ "name": "User Field Usage", "fore": "text-black" },
 		{ "name": "User Field Declaration", "fore": "text-black" },
@@ -202,48 +128,31 @@
 		{ "name": "User Event Usage", "fore": "text-black" },
 		{ "name": "User Event Declaration", "fore": "text-black" },
 
-		{ "name": "User Method Usage", "fore": "text-black" },
-		{ "name": "User Method Declaration", "fore": "text-black" },
-
-		{ "name": "User Parameter Usage", "fore": "text-black" },
-		{ "name": "User Parameter Declaration", "fore": "text-black" },
-
-		{ "name": "User Variable Usage", "fore": "text-black" },
-		{ "name": "User Variable Declaration", "fore": "text-black" },
-
-		{ "name": "Syntax Error", "fore": "invalid-red" },
+		{ "name": "User Method Usage", "fore": "method-yellow" },
+		{ "name": "User Method Declaration", "fore": "method-yellow" },
 
-		{ "name": "String Format Items", "fore": "#FF0000" },
+		{ "name": "User Parameter Usage", "fore": "local-blue" },
+		{ "name": "User Parameter Declaration", "fore": "local-blue" },
 
-		{ "name": "Breakpoint Text", "fore": "text-black", "back": "#ffe8e7" },
+		{ "name": "User Variable Usage", "fore": "local-blue" },
+		{ "name": "User Variable Declaration", "fore": "local-blue" },
+		
+		{ "name": "Syntax Error", "fore": "#FF0000" },
 
-		{ "name": "Debugger Current Statement", "fore": "text-black", "back": "#f8f4a1" },
-		{ "name": "Debugger Stack Line", "fore": "text-black", "back": "#ccfca6" },
+		{ "name": "Breakpoint Text", "fore": "text-black", "back": "#963945" },
 
-		{ "name": "Diff Line(Added)", "fore": "skyblue2" },
-		{ "name": "Diff Line(Removed)", "fore": "scarletred1" },
-		{ "name": "Diff Line(Changed)", "fore": "plum2" },
-		{ "name": "Diff Header", "fore": "chameleon3", "weight": "bold" },
-		{ "name": "Diff Header(Separator)", "fore": "chameleon3", "weight": "bold" },
-		{ "name": "Diff Header(Old)", "fore": "scarletred1", "weight": "bold" },
-		{ "name": "Diff Header(New)", "fore": "skyblue2", "weight": "bold" },
-		{ "name": "Diff Location", "fore": "plum2", "weight": "bold" },
+		{ "name": "Debugger Current Statement", "fore": "text-black", "back": "#FFEE61" },
 
-		{ "name": "Preview Diff Removed Line", "fore": "#a14d4d", "back": "#fcf8f8" },
-		{ "name": "Preview Diff Added Line", "fore": "#419b41", "back": "#edf8ed" },
+		{ "name": "Css Comment", "fore": "#006400" },
+		{ "name": "Css Property Name", "fore": "#FF0000" },
+		{ "name": "Css Property Value", "fore": "keyword-blue" },
+		{ "name": "Css Selector", "fore": "#800000" },
+		{ "name": "Css String Value", "fore": "keyword-blue" },
+		{ "name": "Css Keyword", "fore": "keyword-blue" },
 
-		{ "name": "Css Comment", "fore": "comment-gray" },
-		{ "name": "Css Property Name", "fore": "text-black" },
-		{ "name": "Css Property Value", "fore": "literal-orange" },
-		{ "name": "Css Selector", "fore": "#3b6fa6" },
-		{ "name": "Css String Value", "fore": "literal-orange" },
-		{ "name": "Css Keyword", "fore": "keyword-teal" },
+		{ "name": "Script Comment", "fore": "comment-green" },
+		{ "name": "Script Keyword", "fore": "keyword-blue" },
 
-		{ "name": "Script Comment", "fore": "comment-gray" },
-		{ "name": "Script Identifier" },
-		{ "name": "Script Keyword", "fore": "keyword-teal" },
-		{ "name": "Script Number", "fore": "literal-orange" },
-		{ "name": "Script Operator" },
-		{ "name": "Script String", "fore": "literal-orange" }
+		{ "name": "Tooltip Text", "fore": "text-black", "back": "#fafae3" }
 	]
 }
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/VisualStudioStyle.json b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/VisualStudioStyle.json
index 34e384984cf..6c2b51d809b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/VisualStudioStyle.json
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Editor.Highlighting/themes/VisualStudioStyle.json
@@ -6,14 +6,19 @@
 
 "palette": [
 		{ "name": "text-black", "value": "#222222" },
+		{ "name": "background-white", "value": "white" },
 		{ "name": "comment-green", "value": "#008000" },
+		{ "name": "local-blue", "value": "#1f377f" },
+		{ "name": "string-red", "value": "#a31515" },
 		{ "name": "keyword-blue", "value": "#0000ff" },
+		{ "name": "keyword-purple", "value": "#8f08c4" },
 		{ "name": "semantic-type", "value": "#508FAE" },
-    { "name": "selection-bg", "value": "#94CAED" }
-    ],
+		{ "name": "method-yellow", "value": "#74531f" },
+		{ "name": "selection-bg", "value": "#94CAED" }
+	],
 
 	"colors": [
-		{ "name": "Background(Read Only)", "color": "#FFFFFF" },
+		{ "name": "Background(Read Only)", "color": "white" },
 
 		{ "name": "Underline(Error)", "color": "#FF0000" },
 		{ "name": "Underline(Warning)", "color": "comment-green" },
@@ -26,9 +31,8 @@
 
 		{ "name": "Message Bubble Warning IconMargin", "color": "#e68100", "bordercolor": "#e68100" },
 
-    { "name": "Brace Matching(Rectangle)", "color": "#e2e6d6", "secondcolor": "#e2e6d6" },
-
-    { "name": "Usages(Rectangle)", "color": "#E2E6E6", "secondcolor": "#E2E6E6", "bordercolor": "#E2E6E6" },
+		{ "name": "Brace Matching(Rectangle)", "color": "#e2e6d6", "secondcolor": "#e2e6d6" }
+    		{ "name": "Usages(Rectangle)", "color": "#E2E6E6", "secondcolor": "#E2E6E6", "bordercolor": "#E2E6E6" },
 		{ "name": "Search result background", "color": "#F6B94D" },
 		
 		{ "name": "Link Color", "color": "keyword-blue" },
@@ -36,15 +40,16 @@
 	],
 
 	"text": [
-		{ "name": "Plain Text", "fore": "text-black", "back": "#FFFFFF" },
+		{ "name": "Plain Text", "fore": "text-black", "back": "background-white" },
 		{ "name": "Selected Text", "back": "selection-bg" },
 		{ "name": "Selected Text(Inactive)", "fore": "white", "back": "selection-bg" },
 
-		{ "name": "Collapsed Text", "fore": "comment-green", "back": "white" },
+		{ "name": "Collapsed Text", "fore": "#808080", "back": "background-white" },
 
-		{ "name": "Line Numbers", "fore": "semantic-type", "back": "#FFFFFF" },
+		{ "name": "Line Numbers", "fore": "#2b91af", "back": "background-white" },
 
-		{ "name": "Punctuation(Brackets)", "fore": "#000000", "back": "#FFFFFF" },
+		{ "name": "Punctuation", "fore": "text-black" },
+		{ "name": "Punctuation(Brackets)", "fore": "text-black" },
 
 		{ "name": "Comment(Line)", "fore": "comment-green" },
 		{ "name": "Comment(Block)", "fore": "comment-green" },
@@ -52,21 +57,23 @@
 		{ "name": "Comment(DocTag)", "fore": "comment-green" },
 		{ "name": "Comment Tag", "fore": "#b901b9" },
 
-		{ "name": "Excluded Code", "fore": "comment-green" },
+		{ "name": "Excluded Code", "fore": "#808080" },
+
+		{ "name": "String", "fore": "string-red" },
+		{ "name": "String(Escape)", "fore": "#b776fb" },
+		{ "name": "String(C# @ Verbatim)", "fore": "string-red" },
 
-		{ "name": "String", "fore": "#A31515" },
-		{ "name": "String(Escape)", "fore": "#A31515" },
-		{ "name": "String(C# @ Verbatim)", "fore": "#A31515" },
+		{ "name": "Number", "fore": "text-black" },
 
-		{ "name": "Preprocessor", "fore": "keyword-blue" },
-		{ "name": "Preprocessor(Region Name)", "fore": "#000000" },
+		{ "name": "Preprocessor", "fore": "#808080" },
+		{ "name": "Preprocessor(Region Name)", "fore": "text-black" },
 
 		{ "name": "Xml Delimiter", "fore": "keyword-blue" },
 		{ "name": "Xml Name", "fore": "#A31515" },
 		{ "name": "Xml Attribute", "fore": "#FF0000" },
-		{ "name": "Xml Attribute Quotes", "fore": "#000000" },
+		{ "name": "Xml Attribute Quotes", "fore": "text-black" },
 		{ "name": "Xml Attribute Value", "fore": "keyword-blue" },
-		{ "name": "Xml Comment", "fore": "#006400" },
+		{ "name": "Xml Comment", "fore": "#008000" },
 		{ "name": "Xml CData Section", "fore": "#808080" },
 
 		{ "name": "Html Attribute Name", "fore": "#FF0000" },
@@ -75,9 +82,9 @@
 		{ "name": "Html Element Name", "fore": "#800000" },
 		{ "name": "Html Entity", "fore": "#FF0000" },
 		{ "name": "Html Operator", "fore": "keyword-blue" },
-		{ "name": "Html Server-Side Script", "fore": "black", "back": "#FFFF33" },
+		{ "name": "Html Server-Side Script", "fore": "text-black", "back": "#FFFF00" },
 		{ "name": "Html Tag Delimiter", "fore": "keyword-blue" },
-		{ "name": "Razor Code", "back": "#E7EFF2" },
+		{ "name": "Razor Code", "back": "#e5e5e5" },
 
 		{ "name": "Keyword(Access)", "fore": "keyword-blue" },
 		{ "name": "Keyword(Type)", "fore": "keyword-blue" },
@@ -102,19 +109,38 @@
 		{ "name": "User Types(Interfaces)", "fore": "semantic-type" },
 		{ "name": "User Types(Delegates)", "fore": "semantic-type" },
 		{ "name": "User Types(Value types)", "fore": "semantic-type" },
+		{ "name": "User Types(Type parameters)", "fore": "semantic-type" },
+
+		{ "name": "User Field Usage", "fore": "text-black" },
+		{ "name": "User Field Declaration", "fore": "text-black" },
+
+		{ "name": "User Property Usage", "fore": "text-black" },
+		{ "name": "User Property Declaration", "fore": "text-black" },
 
+		{ "name": "User Event Usage", "fore": "text-black" },
+		{ "name": "User Event Declaration", "fore": "text-black" },
+
+		{ "name": "User Method Usage", "fore": "method-yellow" },
+		{ "name": "User Method Declaration", "fore": "method-yellow" },
+
+		{ "name": "User Parameter Usage", "fore": "local-blue" },
+		{ "name": "User Parameter Declaration", "fore": "local-blue" },
+
+		{ "name": "User Variable Usage", "fore": "local-blue" },
+		{ "name": "User Variable Declaration", "fore": "local-blue" },
+		
 		{ "name": "Syntax Error", "fore": "#FF0000" },
 
-		{ "name": "Breakpoint Text", "fore": "#000000", "back": "#963945" },
+		{ "name": "Breakpoint Text", "fore": "text-black", "back": "#963945" },
 
-		{ "name": "Debugger Current Statement", "fore": "#000000", "back": "#FFEE61" },
+		{ "name": "Debugger Current Statement", "fore": "text-black", "back": "#FFEE61" },
 
-		{ "name": "Css Comment", "fore": "#006400" },
-		{ "name": "Css Property Name", "fore": "#FF0000" },
-		{ "name": "Css Property Value", "fore": "keyword-blue" },
-		{ "name": "Css Selector", "fore": "#800000" },
-		{ "name": "Css String Value", "fore": "keyword-blue" },
-		{ "name": "Css Keyword", "fore": "keyword-blue" },
+		{ "name": "Css Comment", "fore": "#006400", "weight": "bold" },
+		{ "name": "Css Property Name", "fore": "#FF0000", "weight": "bold" },
+		{ "name": "Css Property Value", "fore": "keyword-blue", "weight": "bold" },
+		{ "name": "Css Selector", "fore": "#800000", "weight": "bold" },
+		{ "name": "Css String Value", "fore": "keyword-blue", "weight": "bold" },
+		{ "name": "Css Keyword", "fore": "keyword-blue", "weight": "bold" },
 
 		{ "name": "Script Comment", "fore": "comment-green" },
 		{ "name": "Script Keyword", "fore": "keyword-blue" },
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
index 9d85bab7a4f..6a131ffb960 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
@@ -2909,7 +2909,6 @@
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\SolarizedDarkStyle.json" />
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\SolarizedLightStyle.json" />
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\TangoStyle.json" />
-    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\VisualStudioStyle.json" />
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\HCLightStyle.json" />
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\HCDarkStyle.json" />
     <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\syntaxes\CSharp\C#.sublime-syntax" />
@@ -3108,6 +3107,8 @@
     <EmbeddedResource Include="icons\add-16~dark~sel%402x.png" />
     <EmbeddedResource Include="icons\add-16~sel.png" />
     <EmbeddedResource Include="icons\add-16~sel%402x.png" />
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\LegacyDarkStyle.json" />
+    <EmbeddedResource Include="MonoDevelop.Ide.Editor.Highlighting\themes\LegacyLightStyle.json" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MonoDevelop.Components.Commands\ICustomCommandTarget.cs" />