From 9638cbdd3f9d05b4888e757590ab17a8de1bea21 Mon Sep 17 00:00:00 2001
From: royqh1979 <royqh1979@gmail.com>
Date: Wed, 3 Nov 2021 23:27:05 +0800
Subject: [PATCH] - enhancement: can use symbols' own foreground color to draw
 selection or the current line  - enhancement: can use different colors to
 highlight the current word and the selections  - enhancement: can set
 editor's default background / foreground color. They must be setted to make
 the custom color schemes correctly.  - enhancement: can set the color for the
 current line's number in the gutter  - all predefined color schemes updated.

---
 NEWS.md                                       |   5 +-
 RedPandaIDE/colorschemes/Borland.scheme       |  19 +-
 RedPandaIDE/colorschemes/Classic.scheme       |  20 +-
 RedPandaIDE/colorschemes/Classic_Plus.scheme  |  20 +-
 RedPandaIDE/colorschemes/GSS_Hacker.scheme    | 456 +++++++++--------
 .../colorschemes/Intellij_Classic.scheme      | 437 ++++++++++-------
 RedPandaIDE/colorschemes/Matrix.scheme        | 441 ++++++++++-------
 RedPandaIDE/colorschemes/Obsidian.scheme      | 442 ++++++++++-------
 RedPandaIDE/colorschemes/Obvilion.scheme      | 464 ++++++++++--------
 .../colorschemes/Plastic_Code_Wrap.scheme     | 442 ++++++++++-------
 RedPandaIDE/colorschemes/Twilight.scheme      | 442 ++++++++++-------
 RedPandaIDE/colorschemes/VS_Code.scheme       |   2 +-
 RedPandaIDE/colorschemes/Visual_Studio.scheme | 434 +++++++++-------
 RedPandaIDE/editor.cpp                        |  69 +--
 RedPandaIDE/qsynedit/SynEdit.h                |   2 +-
 RedPandaIDE/qsynedit/TextPainter.cpp          |  33 +-
 RedPandaIDE/qsynedit/TextPainter.h            |   1 +
 RedPandaIDE/utils.cpp                         |   7 +-
 RedPandaIDE/widgets/classbrowser.cpp          |   2 +-
 RedPandaIDE/widgets/coloredit.cpp             |   2 +-
 20 files changed, 2157 insertions(+), 1583 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index f3d21be6..2e3b6de7 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -11,8 +11,11 @@ Version 0.7.8
  - fix: When replace in the editor, "Yes to All" and "No" button doesn't work correctly.
  - fix: crash when editing non-c/c++ files
  - enhancement: set the alpha value of scheme colors
- - enhancement: can use symbols' own scheme color to draw selection
+ - enhancement: can use symbols' own foreground color to draw selection or the current line
  - enhancement: can use different colors to highlight the current word and the selections
+ - enhancement: can set editor's default background / foreground color. They must be setted to make the custom color schemes correctly.
+ - enhancement: can set the color for the current line's number in the gutter
+ - all predefined color schemes updated. 
 
 Version 0.7.7
  - enhancement: Problem Set 
diff --git a/RedPandaIDE/colorschemes/Borland.scheme b/RedPandaIDE/colorschemes/Borland.scheme
index 2f2a8145..e28c4ff5 100644
--- a/RedPandaIDE/colorschemes/Borland.scheme
+++ b/RedPandaIDE/colorschemes/Borland.scheme
@@ -112,8 +112,6 @@
 		"strikeout" : false
 	},
 	"Space" : {
-		"foreground" : "#1313FF",
-		"background" : "#000080",
 		"bold" : false,
 		"italic" : false,
 		"underlined" : false,
@@ -140,17 +138,24 @@
 		"underlined" : false,
 		"strikeout" : false
 	},
+    "Editor Text": {
+        "foreground" : "#FFFF00",
+		"background" : "#000080"
+    },
+    "Current Highlighted Word": {
+        "background": "#50ffffff"
+    },
 	"Selected text" : {
-		"foreground" : "#000000",
-		"background" : "#C0C0C0"
+		"background" : "#64aa00ff"
 	},
 	"Gutter" : {
 		"foreground" : "#FFFF00",
 		"background" : "#000080"
 	},
+	"Gutter Active Line" : {
+		"foreground" : "#FFFFFF"
+	},
 	"Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#FF0000"
 	},
 	"Error" : {
 		"foreground" : "#FFFFFF",
@@ -164,7 +169,7 @@
 		"foreground" : "#FFFF00"
 	},
 	"Active Line" : {
-		"background" : "#000050"
+		"background" : "#645555ff"
 	},
 	"Warning" : {
 		"foreground" : "#FFAA00"
diff --git a/RedPandaIDE/colorschemes/Classic.scheme b/RedPandaIDE/colorschemes/Classic.scheme
index 37ae4883..0ab392ad 100644
--- a/RedPandaIDE/colorschemes/Classic.scheme
+++ b/RedPandaIDE/colorschemes/Classic.scheme
@@ -112,8 +112,6 @@
 		"strikeout" : false
 	},
 	"Space" : {
-		"foreground" : "#C0C0C0",
-		"background" : "#FFFFFF",
 		"bold" : false,
 		"italic" : false,
 		"underlined" : false,
@@ -141,24 +139,20 @@
 		"strikeout" : false
 	},
 	"Selected text" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#000080"
+		"background" : "#64aaff7f"
 	},
 	"Gutter" : {
 		"foreground" : "#000000",
 		"background" : "#F0F0F0"
 	},
 	"Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#FF0000"
 	},
 	"Error" : {
 		"foreground" : "#FFFFFF",
 		"background" : "#800000"
 	},
 	"Active Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#0000FF"
+		"background" : "#500055ff"
 	},
 	"Fold Line" : {
 		"foreground" : "#000000"
@@ -169,6 +163,16 @@
 	"Warning" : {
 		"foreground" : "#9B6900"
 	},
+    "Gutter Active Line": {
+        "foreground": "#ff0000ff"
+    },
+    "Current Highlighted Word": {
+        "background": "#64ffaaff"
+    },
+    "Editor Text": {
+        "background": "#ffffffff",
+        "foreground": "#ff000000"
+    },
 	"Indent Guide Line" : {
 		"foreground" : "#C0C0C0"
 	},
diff --git a/RedPandaIDE/colorschemes/Classic_Plus.scheme b/RedPandaIDE/colorschemes/Classic_Plus.scheme
index 65b3dab1..7874fa74 100644
--- a/RedPandaIDE/colorschemes/Classic_Plus.scheme
+++ b/RedPandaIDE/colorschemes/Classic_Plus.scheme
@@ -112,8 +112,6 @@
 		"strikeout" : false
 	},
 	"Space" : {
-		"foreground" : "#C0C0C0",
-		"background" : "#FFFFFF",
 		"bold" : false,
 		"italic" : false,
 		"underlined" : false,
@@ -141,24 +139,20 @@
 		"strikeout" : false
 	},
 	"Selected text" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#000080"
+		"background" : "#64aaff7f"
 	},
 	"Gutter" : {
 		"foreground" : "#000000",
 		"background" : "#F0F0F0"
 	},
 	"Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#FF0000"
 	},
 	"Error" : {
 		"foreground" : "#FFFFFF",
 		"background" : "#800000"
 	},
 	"Active Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#0000FF"
+		"background" : "#500055ff"
 	},
 	"Fold Line" : {
 		"foreground" : "#000000"
@@ -169,6 +163,16 @@
 	"Warning" : {
 		"foreground" : "#9B6900"
 	},
+    "Gutter Active Line": {
+        "foreground": "#ff0000ff"
+    },
+    "Current Highlighted Word": {
+        "background": "#64ffaaff"
+    },
+    "Editor Text": {
+        "background": "#ffffffff",
+        "foreground": "#ff000000"
+    },
 	"Indent Guide Line" : {
 		"foreground" : "#C0C0C0"
 	},
diff --git a/RedPandaIDE/colorschemes/GSS_Hacker.scheme b/RedPandaIDE/colorschemes/GSS_Hacker.scheme
index e5509fe2..cf11a3bb 100644
--- a/RedPandaIDE/colorschemes/GSS_Hacker.scheme
+++ b/RedPandaIDE/colorschemes/GSS_Hacker.scheme
@@ -1,205 +1,255 @@
 {
-	"Assembler" : {
-		"foreground" : "#009CFF",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Character" : {
-		"foreground" : "#C732FB",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Class" : {
-		"foreground" : "#009CFF",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Comment" : {
-		"foreground" : "#577A57",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Escape sequences" : {
-		"foreground" : "#EEDEC9",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Float" : {
-		"foreground" : "#EEDEC9",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Function" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Global variable" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Hexadecimal" : {
-		"foreground" : "#EEDEC9",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Identifier" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Illegal Char" : {
-		"foreground" : "#F44747",
-		"background" : "#056109",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Local Variable" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Number" : {
-		"foreground" : "#EEDEC9",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Octal" : {
-		"foreground" : "#EEDEC9",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Preprocessor" : {
-		"foreground" : "#009CFF",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Reserved Word" : {
-		"foreground" : "#AFFF80",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Space" : {
-		"foreground" : "#505050",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"String" : {
-		"foreground" : "#1667CA",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Symbol" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Variable" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#171717",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Selected text" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#4E5F1C"
-	},
-	"Gutter" : {
-		"foreground" : "#06ED02",
-		"background" : "#000000"
-	},
-	"Breakpoint" : {
-		"foreground" : "#000000",
-		"background" : "#41AD00"
-	},
-	"Error" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#C22026"
-	},
-	"Active Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#008E99"
-	},
-	"Fold Line" : {
-		"foreground" : "#A5A5A5"
-	},
-	"Active Line" : {
-		"background" : "#323232"
-	},
-	"Warning" : {
-		"foreground" : "#FFAA00"
-	},
-	"Indent Guide Line" : {
-		"foreground" : "#C0C0C0"
-	},
-	"brace/parenthesis/bracket level 1" : {
-		"foreground" : "#AFFF80"
-	},
-	"brace/parenthesis/bracket level 2" : {
-		"foreground" : "#FFFFFF"
-	},
-	"brace/parenthesis/bracket level 3" : {
-		"foreground" : "#1667CA"
-	},
-	"brace/parenthesis/bracket level 4" : {
-		"foreground" : "#FFFFFF"
-	}
+    "Active Breakpoint": {
+        "background": "#5000aaff",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Active Line": {
+        "background": "#ff323232",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Assembler": {
+        "bold": false,
+        "foreground": "#ff009cff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Breakpoint": {
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Character": {
+        "bold": false,
+        "foreground": "#ffc732fb",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Class": {
+        "bold": false,
+        "foreground": "#ff009cff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Comment": {
+        "bold": false,
+        "foreground": "#ff577a57",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Current Highlighted Word": {
+        "background": "#50ffaaff",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Editor Text": {
+        "background": "#ff171717",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Error": {
+        "background": "#ffc22026",
+        "bold": false,
+        "foreground": "#ffff0000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Escape sequences": {
+        "bold": false,
+        "foreground": "#ffeedec9",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Float": {
+        "bold": false,
+        "foreground": "#ffeedec9",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Fold Line": {
+        "bold": false,
+        "foreground": "#ffa5a5a5",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Function": {
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Global variable": {
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Gutter": {
+        "background": "#ff000000",
+        "bold": false,
+        "foreground": "#ff06ed02",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Gutter Active Line": {
+        "bold": false,
+        "foreground": "#ffffaaff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Hexadecimal": {
+        "bold": false,
+        "foreground": "#ffeedec9",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Identifier": {
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Illegal Char": {
+        "bold": false,
+        "foreground": "#fff44747",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Indent Guide Line": {
+        "bold": false,
+        "foreground": "#ffc0c0c0",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Local Variable": {
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Number": {
+        "bold": false,
+        "foreground": "#ffeedec9",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Octal": {
+        "bold": false,
+        "foreground": "#ffeedec9",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Preprocessor": {
+        "bold": false,
+        "foreground": "#ff009cff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Reserved Word": {
+        "bold": false,
+        "foreground": "#ffafff80",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Selected text": {
+        "background": "#28aaff7f",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Space": {
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "String": {
+        "bold": false,
+        "foreground": "#ff1667ca",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Symbol": {
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Variable": {
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Warning": {
+        "bold": false,
+        "foreground": "#ffffaa00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 1": {
+        "bold": false,
+        "foreground": "#ffafff80",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 2": {
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 3": {
+        "bold": false,
+        "foreground": "#ff1667ca",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 4": {
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    }
 }
diff --git a/RedPandaIDE/colorschemes/Intellij_Classic.scheme b/RedPandaIDE/colorschemes/Intellij_Classic.scheme
index e09151af..d96065dc 100644
--- a/RedPandaIDE/colorschemes/Intellij_Classic.scheme
+++ b/RedPandaIDE/colorschemes/Intellij_Classic.scheme
@@ -1,186 +1,255 @@
 {
-	"Assembler" : {
-		"foreground" : "#0000FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Character" : {
-		"foreground" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Class" : {
-		"foreground" : "#008080",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Comment" : {
-		"foreground" : "#8C8C8C",
-		"bold" : false,
-		"italic" : true,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Escape sequences" : {
-		"foreground" : "#FF0000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Float" : {
-		"foreground" : "#800080",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Function" : {
-		"foreground" : "#00627A",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Global variable" : {
-		"foreground" : "#660E7A",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Hexadecimal" : {
-		"foreground" : "#800080",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Identifier" : {
-		"foreground" : "#080808",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Illegal Char" : {
-		"foreground" : "#FF0000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Local Variable" : {
-		"foreground" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Number" : {
-		"foreground" : "#1750EB",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Octal" : {
-		"foreground" : "#800080",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Preprocessor" : {
-		"foreground" : "#1F542E",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Reserved Word" : {
-		"foreground" : "#0033B3",
-		"bold" : true,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Space" : {
-		"foreground" : "#C0C0C0",
-		"background" : "#FFFFFF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"String" : {
-		"foreground" : "#007D17",
-		"bold" : true,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Symbol" : {
-		"foreground" : "#C10000",
-		"bold" : true,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Variable" : {
-		"foreground" : "#400080",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Selected text" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#000080"
-	},
-	"Gutter" : {
-		"foreground" : "#000000",
-		"background" : "#F0F0F0"
-	},
-	"Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#FF0000"
-	},
-	"Error" : {
-                "foreground" : "#FF0000"
-	},
-	"Active Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#0000FF"
-	},
-	"Fold Line" : {
-		"foreground" : "#000000"
-	},
-	"Active Line" : {
-		"background" : "#CCFFFF"
-	},
-	"Warning" : {
-		"foreground" : "#9B6900"
-	},
-	"Indent Guide Line" : {
-		"foreground" : "#C0C0C0"
-	},
-	"brace/parenthesis/bracket level 1" : {
-		"foreground" : "#0033B3"
-	},
-	"brace/parenthesis/bracket level 2" : {
-		"foreground" : "#C10000"
-	},
-	"brace/parenthesis/bracket level 3" : {
-		"foreground" : "#007D17"
-	},
-	"brace/parenthesis/bracket level 4" : {
-		"foreground" : "#080808"
-	}
+    "Active Breakpoint": {
+        "background": "#500000ff",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Active Line": {
+        "background": "#fffffae3",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Assembler": {
+        "bold": false,
+        "foreground": "#ff0000ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Breakpoint": {
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Character": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Class": {
+        "bold": false,
+        "foreground": "#ff008080",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Comment": {
+        "bold": false,
+        "foreground": "#ff8c8c8c",
+        "italic": true,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Current Highlighted Word": {
+        "background": "#64aaaaff",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Editor Text": {
+        "background": "#ffffffff",
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Error": {
+        "bold": false,
+        "foreground": "#ffff0000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Escape sequences": {
+        "bold": false,
+        "foreground": "#ffff0000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Float": {
+        "bold": false,
+        "foreground": "#ff800080",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Fold Line": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Function": {
+        "bold": false,
+        "foreground": "#ff00627a",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Global variable": {
+        "bold": false,
+        "foreground": "#ff660e7a",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Gutter": {
+        "background": "#fff0f0f0",
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Gutter Active Line": {
+        "bold": false,
+        "foreground": "#ff5500ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Hexadecimal": {
+        "bold": false,
+        "foreground": "#ff800080",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Identifier": {
+        "bold": false,
+        "foreground": "#ff080808",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Illegal Char": {
+        "bold": false,
+        "foreground": "#ffff0000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Indent Guide Line": {
+        "bold": false,
+        "foreground": "#ffc0c0c0",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Local Variable": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Number": {
+        "bold": false,
+        "foreground": "#ff1750eb",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Octal": {
+        "bold": false,
+        "foreground": "#ff800080",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Preprocessor": {
+        "bold": false,
+        "foreground": "#ff1f542e",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Reserved Word": {
+        "bold": true,
+        "foreground": "#ff0033b3",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Selected text": {
+        "background": "#ff5974ab",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Space": {
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "String": {
+        "bold": true,
+        "foreground": "#ff007d17",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Symbol": {
+        "bold": true,
+        "foreground": "#ffc10000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Variable": {
+        "bold": false,
+        "foreground": "#ff400080",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Warning": {
+        "bold": false,
+        "foreground": "#ff9b6900",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 1": {
+        "bold": false,
+        "foreground": "#ff0033b3",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 2": {
+        "bold": false,
+        "foreground": "#ffc10000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 3": {
+        "bold": false,
+        "foreground": "#ff007d17",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 4": {
+        "bold": false,
+        "foreground": "#ff080808",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    }
 }
diff --git a/RedPandaIDE/colorschemes/Matrix.scheme b/RedPandaIDE/colorschemes/Matrix.scheme
index 9a5da5b7..a242ddd2 100644
--- a/RedPandaIDE/colorschemes/Matrix.scheme
+++ b/RedPandaIDE/colorschemes/Matrix.scheme
@@ -1,188 +1,257 @@
 {
-	"Assembler" : {
-		"foreground" : "#00FF00",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Character" : {
-		"foreground" : "#3366FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Class" : {
-		"foreground" : "#33CCCC",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Comment" : {
-		"foreground" : "#3366FF",
-		"bold" : false,
-		"italic" : true,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Escape sequences" : {
-		"foreground" : "#0000FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Float" : {
-		"foreground" : "#FF00FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Function" : {
-		"foreground" : "#00FF00",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Global variable" : {
-		"foreground" : "#00FF00",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Hexadecimal" : {
-		"foreground" : "#FF00FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Identifier" : {
-		"foreground" : "#00FF00",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Illegal Char" : {
-		"foreground" : "#F44747",
-		"background" : "#800000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Local Variable" : {
-		"foreground" : "#00FF00",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Number" : {
-		"foreground" : "#0000FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Octal" : {
-		"foreground" : "#FF00FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Preprocessor" : {
-		"foreground" : "#33CCCC",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Reserved Word" : {
-		"foreground" : "#008000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Space" : {
-		"foreground" : "#505050",
-		"background" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"String" : {
-		"foreground" : "#C3C3C3",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Symbol" : {
-		"foreground" : "#FF0000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Variable" : {
-		"foreground" : "#00FF00",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Selected text" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#000080"
-	},
-	"Gutter" : {
-		"foreground" : "#00FF00",
-		"background" : "#000000"
-	},
-	"Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#808080"
-	},
-	"Error" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#FF0000"
-	},
-	"Active Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#0000FF"
-	},
-	"Fold Line" : {
-		"foreground" : "#FF0000"
-	},
-	"Active Line" : {
-		"background" : "#202020"
-	},
-	"Warning" : {
-		"foreground" : "#FFAA00"
-	},
-	"Indent Guide Line" : {
-		"foreground" : "#C0C0C0"
-	},
-	"brace/parenthesis/bracket level 1" : {
-		"foreground" : "#008000"
-	},
-	"brace/parenthesis/bracket level 2" : {
-		"foreground" : "#FF0000"
-	},
-	"brace/parenthesis/bracket level 3" : {
-		"foreground" : "#C3C3C3"
-	},
-	"brace/parenthesis/bracket level 4" : {
-		"foreground" : "#00FF00"
-	}
+    "Active Breakpoint": {
+        "background": "#ff0000ff",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Active Line": {
+        "background": "#ff202020",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Assembler": {
+        "bold": false,
+        "foreground": "#ff00ff00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Breakpoint": {
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Character": {
+        "bold": false,
+        "foreground": "#ff3366ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Class": {
+        "bold": false,
+        "foreground": "#ff33cccc",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Comment": {
+        "bold": false,
+        "foreground": "#ff3366ff",
+        "italic": true,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Current Highlighted Word": {
+        "background": "#50ffff7f",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Editor Text": {
+        "background": "#ff000000",
+        "bold": false,
+        "foreground": "#ff00ff00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Error": {
+        "background": "#ffff0000",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Escape sequences": {
+        "bold": false,
+        "foreground": "#ff0000ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Float": {
+        "bold": false,
+        "foreground": "#ffff00ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Fold Line": {
+        "bold": false,
+        "foreground": "#ffff0000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Function": {
+        "bold": false,
+        "foreground": "#ff00ff00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Global variable": {
+        "bold": false,
+        "foreground": "#ff00ff00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Gutter": {
+        "background": "#ff000000",
+        "bold": false,
+        "foreground": "#ff00ff00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Gutter Active Line": {
+        "bold": false,
+        "foreground": "#ffff007f",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Hexadecimal": {
+        "bold": false,
+        "foreground": "#ffff00ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Identifier": {
+        "bold": false,
+        "foreground": "#ff00ff00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Illegal Char": {
+        "bold": false,
+        "foreground": "#fff44747",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Indent Guide Line": {
+        "bold": false,
+        "foreground": "#ffc0c0c0",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Local Variable": {
+        "bold": false,
+        "foreground": "#ff00ff00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Number": {
+        "bold": false,
+        "foreground": "#ff0000ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Octal": {
+        "bold": false,
+        "foreground": "#ffff00ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Preprocessor": {
+        "bold": false,
+        "foreground": "#ff33cccc",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Reserved Word": {
+        "bold": false,
+        "foreground": "#ff008000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Selected text": {
+        "background": "#ff000080",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Space": {
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "String": {
+        "bold": false,
+        "foreground": "#ffc3c3c3",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Symbol": {
+        "bold": false,
+        "foreground": "#ffff0000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Variable": {
+        "bold": false,
+        "foreground": "#ff00ff00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Warning": {
+        "bold": false,
+        "foreground": "#ffffaa00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 1": {
+        "bold": false,
+        "foreground": "#ff008000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 2": {
+        "bold": false,
+        "foreground": "#ffff0000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 3": {
+        "bold": false,
+        "foreground": "#ffc3c3c3",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 4": {
+        "bold": false,
+        "foreground": "#ff00ff00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    }
 }
diff --git a/RedPandaIDE/colorschemes/Obsidian.scheme b/RedPandaIDE/colorschemes/Obsidian.scheme
index e72d36aa..8457748c 100644
--- a/RedPandaIDE/colorschemes/Obsidian.scheme
+++ b/RedPandaIDE/colorschemes/Obsidian.scheme
@@ -1,187 +1,259 @@
 {
-	"Assembler" : {
-		"foreground" : "#93C763",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Character" : {
-		"foreground" : "#FF8409",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Class" : {
-		"foreground" : "#A082BD",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Comment" : {
-		"foreground" : "#66747B",
-		"bold" : false,
-		"italic" : true,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Escape sequences" : {
-		"foreground" : "#FFCD22",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Float" : {
-		"foreground" : "#FFCD22",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Function" : {
-		"foreground" : "#E0E2E4",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Global variable" : {
-		"foreground" : "#E0E2E4",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Hexadecimal" : {
-		"foreground" : "#FFCD22",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Identifier" : {
-		"foreground" : "#E0E2E4",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Illegal Char" : {
-		"foreground" : "#FF0000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Local Variable" : {
-		"foreground" : "#E0E2E4",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Number" : {
-		"foreground" : "#FFCD22",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Octal" : {
-		"foreground" : "#FFCD22",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Preprocessor" : {
-		"foreground" : "#A082BD",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Reserved Word" : {
-		"foreground" : "#678CB1",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Space" : {
-		"foreground" : "#505050",
-		"background" : "#293134",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"String" : {
-		"foreground" : "#EC7600",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Symbol" : {
-		"foreground" : "#E8E2B7",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Variable" : {
-		"foreground" : "#E0E2E4",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Selected text" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#404E51"
-	},
-	"Gutter" : {
-		"foreground" : "#6A8088",
-		"background" : "#2F383C"
-	},
-	"Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#99CC00"
-	},
-	"Error" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#D51212"
-	},
-	"Active Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#00CCFF"
-	},
-	"Fold Line" : {
-		"foreground" : "#C00000"
-	},
-	"Active Line" : {
-		"background" : "#323232"
-	},
-	"Warning" : {
-		"foreground" : "#FFAA00"
-	},
-	"Indent Guide Line" : {
-		"foreground" : "#C0C0C0"
-	},
-	"brace/parenthesis/bracket level 1" : {
-		"foreground" : "#678CB1"
-	},
-	"brace/parenthesis/bracket level 2" : {
-		"foreground" : "#E8E2B7"
-	},
-	"brace/parenthesis/bracket level 3" : {
-		"foreground" : "#EC7600"
-	},
-	"brace/parenthesis/bracket level 4" : {
-		"foreground" : "#E0E2E4"
-	}
+    "Active Breakpoint": {
+        "background": "#ff00ccff",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Active Line": {
+        "background": "#ff323232",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Assembler": {
+        "bold": false,
+        "foreground": "#ff93c763",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Breakpoint": {
+        "background": "#ff99cc00",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Character": {
+        "bold": false,
+        "foreground": "#ffff8409",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Class": {
+        "bold": false,
+        "foreground": "#ffa082bd",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Comment": {
+        "bold": false,
+        "foreground": "#ff66747b",
+        "italic": true,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Current Highlighted Word": {
+        "background": "#3caaaaff",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Editor Text": {
+        "background": "#ff293134",
+        "bold": false,
+        "foreground": "#ffe0e2e4",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Error": {
+        "background": "#ffd51212",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Escape sequences": {
+        "bold": false,
+        "foreground": "#ffffcd22",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Float": {
+        "bold": false,
+        "foreground": "#ffffcd22",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Fold Line": {
+        "bold": false,
+        "foreground": "#ffc00000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Function": {
+        "bold": false,
+        "foreground": "#ffe0e2e4",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Global variable": {
+        "bold": false,
+        "foreground": "#ffe0e2e4",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Gutter": {
+        "background": "#ff2f383c",
+        "bold": false,
+        "foreground": "#ff6a8088",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Gutter Active Line": {
+        "bold": false,
+        "foreground": "#ffaaaaff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Hexadecimal": {
+        "bold": false,
+        "foreground": "#ffffcd22",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Identifier": {
+        "bold": false,
+        "foreground": "#ffe0e2e4",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Illegal Char": {
+        "bold": false,
+        "foreground": "#ffff0000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Indent Guide Line": {
+        "bold": false,
+        "foreground": "#ffc0c0c0",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Local Variable": {
+        "bold": false,
+        "foreground": "#ffe0e2e4",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Number": {
+        "bold": false,
+        "foreground": "#ffffcd22",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Octal": {
+        "bold": false,
+        "foreground": "#ffffcd22",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Preprocessor": {
+        "bold": false,
+        "foreground": "#ffa082bd",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Reserved Word": {
+        "bold": false,
+        "foreground": "#ff678cb1",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Selected text": {
+        "background": "#ff404e51",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Space": {
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "String": {
+        "bold": false,
+        "foreground": "#ffec7600",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Symbol": {
+        "bold": false,
+        "foreground": "#ffe8e2b7",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Variable": {
+        "bold": false,
+        "foreground": "#ffe0e2e4",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Warning": {
+        "bold": false,
+        "foreground": "#ffffaa00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 1": {
+        "bold": false,
+        "foreground": "#ff678cb1",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 2": {
+        "bold": false,
+        "foreground": "#ffe8e2b7",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 3": {
+        "bold": false,
+        "foreground": "#ffec7600",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 4": {
+        "bold": false,
+        "foreground": "#ffe0e2e4",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    }
 }
diff --git a/RedPandaIDE/colorschemes/Obvilion.scheme b/RedPandaIDE/colorschemes/Obvilion.scheme
index 8e15615a..a0db4a96 100644
--- a/RedPandaIDE/colorschemes/Obvilion.scheme
+++ b/RedPandaIDE/colorschemes/Obvilion.scheme
@@ -1,198 +1,270 @@
 {
-	"Assembler" : {
-		"foreground" : "#79ABFF",
-		"background" : "#1E1E1E",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Character" : {
-		"foreground" : "#D25252",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Class" : {
-		"foreground" : "#79ABFF",
-		"background" : "#1E1E1E",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Comment" : {
-		"foreground" : "#C7DD0C",
-		"background" : "#1E1E1E",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Escape sequences" : {
-		"foreground" : "#7FB347",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Float" : {
-		"foreground" : "#7FB347",
-		"background" : "#1E1E1E",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Function" : {
-		"foreground" : "#BED6FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Global variable" : {
-		"foreground" : "#BED6FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Hexadecimal" : {
-		"foreground" : "#7FB347",
-		"background" : "#1E1E1E",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Identifier" : {
-		"foreground" : "#BED6FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Illegal Char" : {
-		"foreground" : "#F44747",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Local Variable" : {
-		"foreground" : "#BED6FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Number" : {
-		"foreground" : "#7FB347",
-		"background" : "#1E1E1E",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Octal" : {
-		"foreground" : "#7FB347",
-		"background" : "#1E1E1E",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Preprocessor" : {
-		"foreground" : "#79ABFF",
-		"background" : "#1E1E1E",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Reserved Word" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#1E1E1E",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Space" : {
-		"foreground" : "#505050",
-		"background" : "#1E1E1E",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"String" : {
-		"foreground" : "#FFC600",
-		"background" : "#1E1E1E",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Symbol" : {
-		"foreground" : "#D9E577",
-		"background" : "#1E1E1E",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Variable" : {
-		"foreground" : "#BED6FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Selected text" : {
-		"foreground" : "#D0D0D0",
-		"background" : "#000000"
-	},
-	"Gutter" : {
-		"foreground" : "#D0D0D0",
-		"background" : "#323232"
-	},
-	"Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#808000"
-	},
-	"Error" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#FF2A55"
-	},
-	"Active Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#33CCCC"
-	},
-	"Fold Line" : {
-		"foreground" : "#FF9900"
-	},
-	"Active Line" : {
-		"background" : "#323232"
-	},
-	"Warning" : {
-		"foreground" : "#FFAA00"
-	},
-	"Indent Guide Line" : {
-		"foreground" : "#C0C0C0"
-	},
-	"brace/parenthesis/bracket level 1" : {
-		"foreground" : "#FFFFFF"
-	},
-	"brace/parenthesis/bracket level 2" : {
-		"foreground" : "#D9E577"
-	},
-	"brace/parenthesis/bracket level 3" : {
-		"foreground" : "#FFC600"
-	},
-	"brace/parenthesis/bracket level 4" : {
-		"foreground" : "#BED6FF"
-	}
+    "Active Breakpoint": {
+        "background": "#ff33cccc",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Active Line": {
+        "background": "#ff323232",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Assembler": {
+        "background": "#ff1e1e1e",
+        "bold": false,
+        "foreground": "#ff79abff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Breakpoint": {
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Character": {
+        "bold": false,
+        "foreground": "#ffd25252",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Class": {
+        "background": "#ff1e1e1e",
+        "bold": false,
+        "foreground": "#ff79abff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Comment": {
+        "background": "#ff1e1e1e",
+        "bold": false,
+        "foreground": "#ffc7dd0c",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Current Highlighted Word": {
+        "background": "#3c33cccc",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Editor Text": {
+        "background": "#ff1e1e1e",
+        "bold": false,
+        "foreground": "#ff505050",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Error": {
+        "background": "#ffff2a55",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Escape sequences": {
+        "bold": false,
+        "foreground": "#ff7fb347",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Float": {
+        "background": "#ff1e1e1e",
+        "bold": false,
+        "foreground": "#ff7fb347",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Fold Line": {
+        "bold": false,
+        "foreground": "#ffff9900",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Function": {
+        "bold": false,
+        "foreground": "#ffbed6ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Global variable": {
+        "bold": false,
+        "foreground": "#ffbed6ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Gutter": {
+        "background": "#ff323232",
+        "bold": false,
+        "foreground": "#ffd0d0d0",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Gutter Active Line": {
+        "bold": false,
+        "foreground": "#ffaaaaff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Hexadecimal": {
+        "background": "#ff1e1e1e",
+        "bold": false,
+        "foreground": "#ff7fb347",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Identifier": {
+        "bold": false,
+        "foreground": "#ffbed6ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Illegal Char": {
+        "bold": false,
+        "foreground": "#fff44747",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Indent Guide Line": {
+        "bold": false,
+        "foreground": "#ffc0c0c0",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Local Variable": {
+        "bold": false,
+        "foreground": "#ffbed6ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Number": {
+        "background": "#ff1e1e1e",
+        "bold": false,
+        "foreground": "#ff7fb347",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Octal": {
+        "background": "#ff1e1e1e",
+        "bold": false,
+        "foreground": "#ff7fb347",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Preprocessor": {
+        "background": "#ff1e1e1e",
+        "bold": false,
+        "foreground": "#ff79abff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Reserved Word": {
+        "background": "#ff1e1e1e",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Selected text": {
+        "background": "#ff000000",
+        "bold": false,
+        "foreground": "#ffd0d0d0",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Space": {
+        "background": "#ff1e1e1e",
+        "bold": false,
+        "foreground": "#ff505050",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "String": {
+        "background": "#ff1e1e1e",
+        "bold": false,
+        "foreground": "#ffffc600",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Symbol": {
+        "background": "#ff1e1e1e",
+        "bold": false,
+        "foreground": "#ffd9e577",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Variable": {
+        "bold": false,
+        "foreground": "#ffbed6ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Warning": {
+        "bold": false,
+        "foreground": "#ffffaa00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 1": {
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 2": {
+        "bold": false,
+        "foreground": "#ffd9e577",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 3": {
+        "bold": false,
+        "foreground": "#ffffc600",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 4": {
+        "bold": false,
+        "foreground": "#ffbed6ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    }
 }
diff --git a/RedPandaIDE/colorschemes/Plastic_Code_Wrap.scheme b/RedPandaIDE/colorschemes/Plastic_Code_Wrap.scheme
index 7f3b39c0..93aa0fe1 100644
--- a/RedPandaIDE/colorschemes/Plastic_Code_Wrap.scheme
+++ b/RedPandaIDE/colorschemes/Plastic_Code_Wrap.scheme
@@ -1,187 +1,259 @@
 {
-	"Assembler" : {
-		"foreground" : "#FF00FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Character" : {
-		"foreground" : "#55E439",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Class" : {
-		"foreground" : "#FFAA00",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Comment" : {
-		"foreground" : "#1E9AE0",
-		"bold" : false,
-		"italic" : true,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Escape sequences" : {
-		"foreground" : "#FF3A83",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Float" : {
-		"foreground" : "#FF3A83",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Function" : {
-		"foreground" : "#FFFFFF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Global variable" : {
-		"foreground" : "#9CDCFE",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Hexadecimal" : {
-		"foreground" : "#FF3A83",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Identifier" : {
-		"foreground" : "#BFBFFF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Illegal Char" : {
-		"foreground" : "#F44747",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Local Variable" : {
-		"foreground" : "#9CDCFE",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Number" : {
-		"foreground" : "#FF3A83",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Octal" : {
-		"foreground" : "#FF3A83",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Preprocessor" : {
-		"foreground" : "#FFAA00",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Reserved Word" : {
-		"foreground" : "#F6F080",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Space" : {
-		"foreground" : "#505050",
-		"background" : "#0B161D",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"String" : {
-		"foreground" : "#55E439",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Symbol" : {
-		"foreground" : "#FFAA00",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Variable" : {
-		"foreground" : "#9CDCFE",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Selected text" : {
-		"foreground" : "#00FFFF",
-		"background" : "#000000"
-	},
-	"Gutter" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#2E3436"
-	},
-	"Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#99CC00"
-	},
-	"Error" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#D51212"
-	},
-	"Active Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#00CCFF"
-	},
-	"Fold Line" : {
-		"foreground" : "#C00000"
-	},
-	"Active Line" : {
-		"background" : "#323232"
-	},
-	"Warning" : {
-		"foreground" : "#FFAA00"
-	},
-	"Indent Guide Line" : {
-		"foreground" : "#C0C0C0"
-	},
-	"brace/parenthesis/bracket level 1" : {
-		"foreground" : "#F6F080"
-	},
-	"brace/parenthesis/bracket level 2" : {
-		"foreground" : "#FFAA00"
-	},
-	"brace/parenthesis/bracket level 3" : {
-		"foreground" : "#55E439"
-	},
-	"brace/parenthesis/bracket level 4" : {
-		"foreground" : "#BFBFFF"
-	}
+    "Active Breakpoint": {
+        "background": "#ff00ccff",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Active Line": {
+        "background": "#ff323232",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Assembler": {
+        "bold": false,
+        "foreground": "#ffff00ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Breakpoint": {
+        "background": "#ff99cc00",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Character": {
+        "bold": false,
+        "foreground": "#ff55e439",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Class": {
+        "bold": false,
+        "foreground": "#ffffaa00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Comment": {
+        "bold": false,
+        "foreground": "#ff1e9ae0",
+        "italic": true,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Current Highlighted Word": {
+        "background": "#3299cc00",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Editor Text": {
+        "background": "#ff0b161d",
+        "bold": false,
+        "foreground": "#ff505050",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Error": {
+        "background": "#ffd51212",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Escape sequences": {
+        "bold": false,
+        "foreground": "#ffff3a83",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Float": {
+        "bold": false,
+        "foreground": "#ffff3a83",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Fold Line": {
+        "bold": false,
+        "foreground": "#ffc00000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Function": {
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Global variable": {
+        "bold": false,
+        "foreground": "#ff9cdcfe",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Gutter": {
+        "background": "#ff2e3436",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Gutter Active Line": {
+        "bold": false,
+        "foreground": "#ffaaaaff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Hexadecimal": {
+        "bold": false,
+        "foreground": "#ffff3a83",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Identifier": {
+        "bold": false,
+        "foreground": "#ffbfbfff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Illegal Char": {
+        "bold": false,
+        "foreground": "#fff44747",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Indent Guide Line": {
+        "bold": false,
+        "foreground": "#ffc0c0c0",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Local Variable": {
+        "bold": false,
+        "foreground": "#ff9cdcfe",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Number": {
+        "bold": false,
+        "foreground": "#ffff3a83",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Octal": {
+        "bold": false,
+        "foreground": "#ffff3a83",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Preprocessor": {
+        "bold": false,
+        "foreground": "#ffffaa00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Reserved Word": {
+        "bold": false,
+        "foreground": "#fff6f080",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Selected text": {
+        "background": "#ff000000",
+        "bold": false,
+        "foreground": "#ff00ffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Space": {
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "String": {
+        "bold": false,
+        "foreground": "#ff888888",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Symbol": {
+        "bold": false,
+        "foreground": "#ffffaa00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Variable": {
+        "bold": false,
+        "foreground": "#ff9cdcfe",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Warning": {
+        "bold": false,
+        "foreground": "#ffffaa00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 1": {
+        "bold": false,
+        "foreground": "#fff6f080",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 2": {
+        "bold": false,
+        "foreground": "#ffffaa00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 3": {
+        "bold": false,
+        "foreground": "#ff55e439",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 4": {
+        "bold": false,
+        "foreground": "#ffbfbfff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    }
 }
diff --git a/RedPandaIDE/colorschemes/Twilight.scheme b/RedPandaIDE/colorschemes/Twilight.scheme
index ef3a29a3..2553042b 100644
--- a/RedPandaIDE/colorschemes/Twilight.scheme
+++ b/RedPandaIDE/colorschemes/Twilight.scheme
@@ -1,188 +1,258 @@
 {
-	"Assembler" : {
-		"foreground" : "#00FF00",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Character" : {
-		"foreground" : "#FFFF00",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Class" : {
-		"foreground" : "#008000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Comment" : {
-		"foreground" : "#C0C0C0",
-		"bold" : false,
-		"italic" : true,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Escape sequences" : {
-		"foreground" : "#FF00FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Float" : {
-		"foreground" : "#FF00FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Function" : {
-		"foreground" : "#FFFFFF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Global variable" : {
-		"foreground" : "#FFFFFF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Hexadecimal" : {
-		"foreground" : "#FF00FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Identifier" : {
-		"foreground" : "#FFFFFF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Illegal Char" : {
-		"foreground" : "#F44747",
-		"background" : "#800000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Local Variable" : {
-		"foreground" : "#FFFFFF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Number" : {
-		"foreground" : "#FF00FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Octal" : {
-		"foreground" : "#FF00FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Preprocessor" : {
-		"foreground" : "#008000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Reserved Word" : {
-		"foreground" : "#00FFFF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Space" : {
-		"foreground" : "#505050",
-		"background" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"String" : {
-		"foreground" : "#FFFF00",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Symbol" : {
-		"foreground" : "#00FFFF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Variable" : {
-		"foreground" : "#FFFFFF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Selected text" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#000080"
-	},
-	"Gutter" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#000000"
-	},
-	"Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#FF0000"
-	},
-	"Error" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#800000"
-	},
-	"Active Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#0000FF"
-	},
-	"Fold Line" : {
-		"foreground" : "#FFFFFF"
-	},
-	"Active Line" : {
-		"background" : "#221111"
-	},
-	"Warning" : {
-		"foreground" : "#FFAA00"
-	},
-	"Indent Guide Line" : {
-		"foreground" : "#C0C0C0"
-	},
-	"brace/parenthesis/bracket level 1" : {
-		"foreground" : "#00FFFF"
-	},
-	"brace/parenthesis/bracket level 2" : {
-		"foreground" : "#00FFFF"
-	},
-	"brace/parenthesis/bracket level 3" : {
-		"foreground" : "#FFFF00"
-	},
-	"brace/parenthesis/bracket level 4" : {
-		"foreground" : "#FFFFFF"
-	}
+    "Active Breakpoint": {
+        "background": "#ff0000ff",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Active Line": {
+        "background": "#ff221111",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Assembler": {
+        "bold": false,
+        "foreground": "#ff00ff00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Breakpoint": {
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Character": {
+        "bold": false,
+        "foreground": "#ffffff00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Class": {
+        "bold": false,
+        "foreground": "#ff008000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Comment": {
+        "bold": false,
+        "foreground": "#ffc0c0c0",
+        "italic": true,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Current Highlighted Word": {
+        "background": "#50ffaaff",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Editor Text": {
+        "background": "#ff000000",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Error": {
+        "background": "#ff800000",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Escape sequences": {
+        "bold": false,
+        "foreground": "#ffff00ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Float": {
+        "bold": false,
+        "foreground": "#ffff00ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Fold Line": {
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Function": {
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Global variable": {
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Gutter": {
+        "background": "#ff000000",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Gutter Active Line": {
+        "bold": false,
+        "foreground": "#ffaaaaff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Hexadecimal": {
+        "bold": false,
+        "foreground": "#ffff00ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Identifier": {
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Illegal Char": {
+        "background": "#ff800000",
+        "bold": false,
+        "foreground": "#fff44747",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Indent Guide Line": {
+        "bold": false,
+        "foreground": "#ffc0c0c0",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Local Variable": {
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Number": {
+        "bold": false,
+        "foreground": "#ffff00ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Octal": {
+        "bold": false,
+        "foreground": "#ffff00ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Preprocessor": {
+        "bold": false,
+        "foreground": "#ff008000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Reserved Word": {
+        "bold": false,
+        "foreground": "#ff00ffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Selected text": {
+        "background": "#ff000080",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Space": {
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "String": {
+        "bold": false,
+        "foreground": "#ffffff00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Symbol": {
+        "bold": false,
+        "foreground": "#ff00ffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Variable": {
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Warning": {
+        "bold": false,
+        "foreground": "#ffffaa00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 1": {
+        "bold": false,
+        "foreground": "#ff00ffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 2": {
+        "bold": false,
+        "foreground": "#ff00ffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 3": {
+        "bold": false,
+        "foreground": "#ffffff00",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 4": {
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    }
 }
diff --git a/RedPandaIDE/colorschemes/VS_Code.scheme b/RedPandaIDE/colorschemes/VS_Code.scheme
index ba6bf41d..d7298b79 100644
--- a/RedPandaIDE/colorschemes/VS_Code.scheme
+++ b/RedPandaIDE/colorschemes/VS_Code.scheme
@@ -154,7 +154,7 @@
 		"background" : "#1E1E1E"
 	},
 	"Gutter Active Line" : {
-		"foreground" : "#C0C0C0"
+		"foreground" : "#ffffffff"
 	},
 	"Breakpoint" : {
 	},
diff --git a/RedPandaIDE/colorschemes/Visual_Studio.scheme b/RedPandaIDE/colorschemes/Visual_Studio.scheme
index ce5b86c3..dbc92446 100644
--- a/RedPandaIDE/colorschemes/Visual_Studio.scheme
+++ b/RedPandaIDE/colorschemes/Visual_Studio.scheme
@@ -1,184 +1,254 @@
 {
-	"Assembler" : {
-		"foreground" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Character" : {
-		"foreground" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Class" : {
-		"foreground" : "#0000FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Comment" : {
-		"foreground" : "#008000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Escape sequences" : {
-		"foreground" : "#0000FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Float" : {
-		"foreground" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Function" : {
-		"foreground" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Global variable" : {
-		"foreground" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Hexadecimal" : {
-		"foreground" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Identifier" : {
-		"foreground" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Illegal Char" : {
-		"foreground" : "#FF0000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Local Variable" : {
-		"foreground" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Number" : {
-		"foreground" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Octal" : {
-		"foreground" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Preprocessor" : {
-		"foreground" : "#0000FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Reserved Word" : {
-		"foreground" : "#0000FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Space" : {
-		"foreground" : "#C0C0C0",
-		"background" : "#FFFFFF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"String" : {
-		"foreground" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Symbol" : {
-		"foreground" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Variable" : {
-		"foreground" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Selected text" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#000080"
-	},
-	"Gutter" : {
-		"background" : "#FFFFFF"
-	},
-	"Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#FF0000"
-	},
-	"Error" : {
-		"foreground" : "#FF0000"
-	},
-	"Active Breakpoint" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#0000FF"
-	},
-	"Fold Line" : {
-	},
-	"Active Line" : {
-		"background" : "#CCFFFF"
-	},
-	"Warning" : {
-		"foreground" : "#AA7300"
-	},
-	"Indent Guide Line" : {
-		"foreground" : "#C0C0C0"
-	},
-	"brace/parenthesis/bracket level 1" : {
-		"foreground" : "#0000FF"
-	},
-	"brace/parenthesis/bracket level 2" : {
-		"foreground" : "#000000"
-	},
-	"brace/parenthesis/bracket level 3" : {
-		"foreground" : "#000000"
-	},
-	"brace/parenthesis/bracket level 4" : {
-		"foreground" : "#000000"
-	}
+    "Active Breakpoint": {
+        "background": "#ff0000ff",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Active Line": {
+        "background": "#ffccffff",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Assembler": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Breakpoint": {
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Character": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Class": {
+        "bold": false,
+        "foreground": "#ff0000ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Comment": {
+        "bold": false,
+        "foreground": "#ff008000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Current Highlighted Word": {
+        "background": "#6400aaff",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Editor Text": {
+        "background": "#ffffffff",
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Error": {
+        "bold": false,
+        "foreground": "#ffff0000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Escape sequences": {
+        "bold": false,
+        "foreground": "#ff0000ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Float": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Fold Line": {
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Function": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Global variable": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Gutter": {
+        "background": "#ffffffff",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Gutter Active Line": {
+        "bold": false,
+        "foreground": "#ff0000ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Hexadecimal": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Identifier": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Illegal Char": {
+        "bold": false,
+        "foreground": "#ffff0000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Indent Guide Line": {
+        "bold": false,
+        "foreground": "#ffc0c0c0",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Local Variable": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Number": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Octal": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Preprocessor": {
+        "bold": false,
+        "foreground": "#ff0000ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Reserved Word": {
+        "bold": false,
+        "foreground": "#ff0000ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Selected text": {
+        "background": "#ff000080",
+        "bold": false,
+        "foreground": "#ffffffff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Space": {
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "String": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Symbol": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Variable": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Warning": {
+        "bold": false,
+        "foreground": "#ffaa7300",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 1": {
+        "bold": false,
+        "foreground": "#ff0000ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 2": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 3": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 4": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    }
 }
diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp
index 0a48a97e..20be2e7f 100644
--- a/RedPandaIDE/editor.cpp
+++ b/RedPandaIDE/editor.cpp
@@ -829,15 +829,14 @@ void Editor::onGetEditingAreas(int Line, SynEditingAreaList &areaList)
 bool Editor::onGetSpecialLineColors(int Line, QColor &foreground, QColor &backgroundColor)
 {
     if (Line == mActiveBreakpointLine &&
-            mActiveBreakpointForegroundColor.isValid()
-            && mActiveBreakpointBackgroundColor.isValid()) {
-        foreground = mActiveBreakpointForegroundColor;
+        mActiveBreakpointBackgroundColor.isValid()) {
+        if (mActiveBreakpointForegroundColor.isValid())
+            foreground = mActiveBreakpointForegroundColor;
         backgroundColor = mActiveBreakpointBackgroundColor;
         return true;
-    } else if (hasBreakpoint(Line)  &&
-               mBreakpointForegroundColor.isValid()
-               && mBreakpointBackgroundColor.isValid()) {
-        foreground = mBreakpointForegroundColor;
+    } else if (hasBreakpoint(Line) && mBreakpointBackgroundColor.isValid()) {
+        if (mBreakpointForegroundColor.isValid())
+            foreground = mBreakpointForegroundColor;
         backgroundColor = mBreakpointBackgroundColor;
         return true;
     }
@@ -857,7 +856,7 @@ void Editor::onPreparePaintHighlightToken(int line, int aChar, const QString &to
         return;
 
 //    qDebug()<<token<<"-"<<attr->name()<<" - "<<line<<" : "<<aChar;
-    if (mParser && (attr == highlighter()->identifierAttribute())) {
+    if (mParser && highlighter() && (attr == highlighter()->identifierAttribute())) {
         BufferCoord p{aChar,line};
         BufferCoord pBeginPos,pEndPos;
         QString s= getWordAtPosition(this,p, pBeginPos,pEndPos, WordPurpose::wpInformation);
@@ -890,35 +889,35 @@ void Editor::onPreparePaintHighlightToken(int line, int aChar, const QString &to
     }
 
     //selection
-    if (highlighter()) {
-        if ((
-          (attr == highlighter()->identifierAttribute())
-          || (attr == highlighter()->keywordAttribute())
-          || (attr->name() == SYNS_AttrPreprocessor)
-          )
-          && (token == mCurrentHighlightedWord)) {
+    if (highlighter() && attr) {
+        if (((attr == highlighter()->identifierAttribute())
+                || (attr == highlighter()->keywordAttribute())
+                || (attr->name() == SYNS_AttrPreprocessor)
+                )
+            && (token == mCurrentHighlightedWord)) {
             if (mCurrentHighlighWordForeground.isValid())
                 foreground = mCurrentHighlighWordForeground;
             if (mCurrentHighlighWordBackground.isValid())
                 background = mCurrentHighlighWordBackground;
+        } else if (!selAvail() && attr->name() == SYNS_AttrSymbol) {
+            //        qDebug()<<line<<":"<<aChar<<" - "<<mHighlightCharPos1.Line<<":"<<mHighlightCharPos1.Char<<" - "<<mHighlightCharPos2.Line<<":"<<mHighlightCharPos2.Char;
+            if ( (line == mHighlightCharPos1.Line)
+                    && (aChar == mHighlightCharPos1.Char)) {
+                if (mCurrentHighlighWordForeground.isValid())
+                    foreground = mCurrentHighlighWordForeground;
+                if (mCurrentHighlighWordBackground.isValid())
+                    background = mCurrentHighlighWordBackground;
+            }
+            if ((line == mHighlightCharPos2.Line)
+                    && (aChar == mHighlightCharPos2.Char)) {
+                if (mCurrentHighlighWordForeground.isValid())
+                    foreground = mCurrentHighlighWordForeground;
+                if (mCurrentHighlighWordBackground.isValid())
+                    background = mCurrentHighlighWordBackground;
+            }
         }
-    } else if (token == mCurrentHighlightedWord) {
-        if (mCurrentHighlighWordForeground.isValid())
-            foreground = mCurrentHighlighWordForeground;
-        if (mCurrentHighlighWordBackground.isValid())
-            background = mCurrentHighlighWordBackground;
-    } else if (!selAvail() && attr->name() == SYNS_AttrSymbol) {
-//        qDebug()<<line<<":"<<aChar<<" - "<<mHighlightCharPos1.Line<<":"<<mHighlightCharPos1.Char<<" - "<<mHighlightCharPos2.Line<<":"<<mHighlightCharPos2.Char;
-
-        if ( (line == mHighlightCharPos1.Line)
-                && (aChar == mHighlightCharPos1.Char)) {
-            if (mCurrentHighlighWordForeground.isValid())
-                foreground = mCurrentHighlighWordForeground;
-            if (mCurrentHighlighWordBackground.isValid())
-                background = mCurrentHighlighWordBackground;
-        }
-        if ((line == mHighlightCharPos2.Line)
-                && (aChar == mHighlightCharPos2.Char)) {
+    } else {
+        if (token == mCurrentHighlightedWord) {
             if (mCurrentHighlighWordForeground.isValid())
                 foreground = mCurrentHighlighWordForeground;
             if (mCurrentHighlighWordBackground.isValid())
@@ -1441,7 +1440,11 @@ void Editor::onStatusChanged(SynStatusChanges changes)
 
     // scSelection includes anything caret related
     if (changes.testFlag(SynStatusChange::scSelection)) {
-        mCurrentHighlightedWord = wordAtCursor();
+        if (!selAvail()) {
+            mCurrentHighlightedWord = wordAtCursor();
+        } else {
+            mCurrentHighlightedWord = "";
+        }
 //        mSelectionWord="";
 //        if (selAvail()) {
 //            BufferCoord wordBegin,wordEnd,bb,be;
diff --git a/RedPandaIDE/qsynedit/SynEdit.h b/RedPandaIDE/qsynedit/SynEdit.h
index 51541591..c7f42fef 100644
--- a/RedPandaIDE/qsynedit/SynEdit.h
+++ b/RedPandaIDE/qsynedit/SynEdit.h
@@ -80,7 +80,7 @@ enum SynEditorOption {
   eoScrollPastEof =     0x00002000, //Allows the cursor to go past the end of file marker
   eoScrollPastEol =     0x00004000, //Allows the cursor to go past the last character into the white space at the end of a line
   eoShowSpecialChars =  0x00008000, //Shows the special Characters
-  eoSpecialLineDefaultFg = 0x00010000, //disables the foreground text color override when using the OnSpecialLineColor event
+//  eoSpecialLineDefaultFg = 0x00010000, //disables the foreground text color override when using the OnSpecialLineColor event
   eoTabIndent =         0x00020000, //When active <Tab> and <Shift><Tab> act as block indent, unindent when text is selected
   eoTabsToSpaces =      0x00040000, //Converts a tab character to a specified number of space characters
   eoShowRainbowColor =  0x00080000,
diff --git a/RedPandaIDE/qsynedit/TextPainter.cpp b/RedPandaIDE/qsynedit/TextPainter.cpp
index fd573b84..a524d119 100644
--- a/RedPandaIDE/qsynedit/TextPainter.cpp
+++ b/RedPandaIDE/qsynedit/TextPainter.cpp
@@ -486,13 +486,17 @@ void SynEditTextPainter::PaintHighlightToken(bool bFillToEOL)
     // Any token chars accumulated?
     if (TokenAccu.Columns > 0) {
         // Initialize the colors and the font style.
-        if (!bSpecialLine) {
-          colBG = TokenAccu.BG;
-          colFG = TokenAccu.FG;
+        colBG = TokenAccu.BG;
+        colFG = TokenAccu.FG;
+        if (bSpecialLine) {
+            if (colSpFG.isValid())
+                colFG = colSpFG;
+            if (colSpBG.isValid())
+                colBG = colSpBG;
         }
 
-        if (bSpecialLine && edit->mOptions.testFlag(eoSpecialLineDefaultFg))
-            colFG = TokenAccu.FG;
+//        if (bSpecialLine && edit->mOptions.testFlag(eoSpecialLineDefaultFg))
+//            colFG = TokenAccu.FG;
         QFont font = edit->font();
         font.setBold(TokenAccu.Style & SynFontStyle::fsBold);
         font.setItalic(TokenAccu.Style & SynFontStyle::fsItalic);
@@ -528,7 +532,9 @@ void SynEditTextPainter::PaintHighlightToken(bool bFillToEOL)
 
     // Fill the background to the end of this line if necessary.
     if (bFillToEOL && rcToken.left() < rcLine.right()) {
-        if (!bSpecialLine)
+        if (bSpecialLine && colSpBG.isValid())
+            colBG = colSpBG;
+        else
             colBG = colEditorBG();
         if (bComplexLine) {
             nX1 = ColumnToXValue(nLineSelStart);
@@ -599,7 +605,10 @@ void SynEditTextPainter::AddHighlightToken(const QString &Token, int ColumnsBefo
         Style = getFontStyles(edit->font());
     }
 
-    if (!Background.isValid() || (edit->mActiveLineColor.isValid() && bCurrentLine)) {
+//    if (!Background.isValid() || (edit->mActiveLineColor.isValid() && bCurrentLine)) {
+//        Background = colEditorBG();
+//    }
+    if (!Background.isValid() ) {
         Background = colEditorBG();
     }
     if (!Foreground.isValid()) {
@@ -616,8 +625,7 @@ void SynEditTextPainter::AddHighlightToken(const QString &Token, int ColumnsBefo
         // font style must be the same or token is only spaces
         if (TokenAccu.Style == Style ||  ( (Style & SynFontStyle::fsUnderline) == (TokenAccu.Style & fsUnderline)
                                            && TokenIsSpaces(bSpacesTest,Token,bIsSpaces)) ) {
-            // either special colors or same colors
-            if ((bSpecialLine && !(edit->mOptions.testFlag(SynEditorOption::eoSpecialLineDefaultFg)))  ||
+            if (
               // background color must be the same and
             ((TokenAccu.BG == Background) &&
               // foreground color must be the same or token is only spaces
@@ -814,9 +822,11 @@ void SynEditTextPainter::PaintLines()
         }
         // Initialize the text and background colors, maybe the line should
         // use special values for them.
-        colFG = edit->palette().color(QPalette::Text);
+        colFG = edit->mForegroundColor;
         colBG = colEditorBG();
-        bSpecialLine = edit->onGetSpecialLineColors(vLine, colFG, colBG);
+        colSpFG = QColor();
+        colSpBG = QColor();
+        bSpecialLine = edit->onGetSpecialLineColors(vLine, colSpFG, colSpBG);
 
         colSelFG = edit->mSelectedForeground;
         colSelBG = edit->mSelectedBackground;
@@ -1023,7 +1033,6 @@ void SynEditTextPainter::PaintLines()
             // of the invalid area with the correct colors.
             PaintHighlightToken(true);
 
-
             //Paint editingAreaBorders
             foreach (const PSynEditingArea& area, areaList) {
                 if (bCurrentLine && edit->mInputPreeditString.length()>0) {
diff --git a/RedPandaIDE/qsynedit/TextPainter.h b/RedPandaIDE/qsynedit/TextPainter.h
index 93fca6e1..07c897b3 100644
--- a/RedPandaIDE/qsynedit/TextPainter.h
+++ b/RedPandaIDE/qsynedit/TextPainter.h
@@ -58,6 +58,7 @@ private:
     bool bSpecialLine, bLineSelected, bCurrentLine;
     QColor colFG, colBG;
     QColor colSelFG, colSelBG;
+    QColor colSpFG, colSpBG;
     // info about selection of the current line
     int nLineSelStart, nLineSelEnd;
     bool bComplexLine;
diff --git a/RedPandaIDE/utils.cpp b/RedPandaIDE/utils.cpp
index cf4ac521..b472845c 100644
--- a/RedPandaIDE/utils.cpp
+++ b/RedPandaIDE/utils.cpp
@@ -15,6 +15,7 @@
 #include <windows.h>
 #include <QStyleFactory>
 #include <QDateTime>
+#include <QColor>
 #include "parser/cppparser.h"
 #include "settings.h"
 #include "mainwindow.h"
@@ -854,7 +855,7 @@ QByteArray getHTTPBody(const QByteArray& content) {
 }
 
 bool haveGoodContrast(const QColor& c1, const QColor &c2) {
-    int lightness1 = c1.lightness();
-    int lightness2 = c2.lightness();
-    return std::abs(lightness1 - lightness2)>=80;
+    int lightness1 = qGray(c1.rgb());
+    int lightness2 = qGray(c2.rgb());
+    return std::abs(lightness1 - lightness2)>=100;
 }
diff --git a/RedPandaIDE/widgets/classbrowser.cpp b/RedPandaIDE/widgets/classbrowser.cpp
index 80c019f8..0811705e 100644
--- a/RedPandaIDE/widgets/classbrowser.cpp
+++ b/RedPandaIDE/widgets/classbrowser.cpp
@@ -144,7 +144,7 @@ QVariant ClassBrowserModel::data(const QModelIndex &index, int role) const
             if (item && haveGoodContrast(item->foreground(), pMainWindow->palette().color(QPalette::Base))) {
                 return item->foreground();
             } else {
-                return QVariant();
+                return pMainWindow->palette().color(QPalette::Text);
             }
         }
         return pMainWindow->palette().color(QPalette::Text);
diff --git a/RedPandaIDE/widgets/coloredit.cpp b/RedPandaIDE/widgets/coloredit.cpp
index 24c8ece6..1a50a276 100644
--- a/RedPandaIDE/widgets/coloredit.cpp
+++ b/RedPandaIDE/widgets/coloredit.cpp
@@ -52,7 +52,7 @@ QSize ColorEdit::sizeHint() const
 {
     QRect rect;
     if (mColor.isValid() )
-        rect = fontMetrics().boundingRect(mColor.name());
+        rect = fontMetrics().boundingRect(mColor.name(QColor::HexArgb));
     else
         rect = fontMetrics().boundingRect(tr("NONE"));
     return QSize{rect.width()+ 10,