diff --git a/RedPandaIDE/resources/colorschemes/Classic.scheme b/RedPandaIDE/resources/colorschemes/Classic.scheme
index a381bb2a..c7fbe227 100644
--- a/RedPandaIDE/resources/colorschemes/Classic.scheme
+++ b/RedPandaIDE/resources/colorschemes/Classic.scheme
@@ -1,192 +1,263 @@
 {
-	"Assembler" : {
-		"foreground" : "#0000FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Character" : {
-		"foreground" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Class" : {
-		"foreground" : "#008000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Comment" : {
-		"foreground" : "#0078D7",
-		"bold" : false,
-		"italic" : true,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Escape sequences" : {
-		"foreground" : "#800080",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Float" : {
-		"foreground" : "#800080",
-		"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" : "#800080",
-		"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" : "#800080",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Octal" : {
-		"foreground" : "#800080",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Preprocessor" : {
-		"foreground" : "#008000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Reserved Word" : {
-		"foreground" : "#000000",
-		"bold" : true,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Space" : {
-		"foreground": "#ffbababa",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"String" : {
-		"foreground" : "#FF0000",
-		"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" : {
-		"background" : "#64aaff7f"
-	},
-	"Gutter" : {
-		"foreground" : "#000000",
-		"background" : "#F0F0F0"
-	},
-	"Breakpoint" : {
-	},
-	"Error" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#800000"
-	},
-	"Active Breakpoint" : {
-		"background" : "#500055ff"
-	},
-	"Fold Line" : {
-		"foreground" : "#000000"
-	},
-	"Active Line" : {
-		"background" : "#CCFFFF"
-	},
-	"Warning" : {
-		"foreground" : "#9B6900"
-	},
-    "Gutter Active Line": {
-        "foreground": "#ff0000ff"
+    "Active Breakpoint": {
+        "background": "#500055ff",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Active Line": {
+        "background": "#ffccffff",
+        "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": "#ff008000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Comment": {
+        "bold": false,
+        "foreground": "#ff0078d7",
+        "italic": true,
+        "strikeout": false,
+        "underlined": false
     },
     "Current Highlighted Word": {
-        "background": "#64ffaaff"
+        "background": "#64ffaaff",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
     },
     "Editor Text": {
         "background": "#ffffffff",
-        "foreground": "#ff000000"
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
     },
-	"Indent Guide Line" : {
-		"foreground" : "#C0C0C0"
-	},
-	"brace/parenthesis/bracket level 1" : {
-		"foreground" : "#000000"
-	},
-	"brace/parenthesis/bracket level 2" : {
-		"foreground" : "#000000"
-	},
-	"brace/parenthesis/bracket level 3" : {
-		"foreground" : "#FF0000"
-	},
-	"brace/parenthesis/bracket level 4" : {
-		"foreground" : "#000000"
-	}
+    "Error": {
+        "background": "#ff800000",
+        "bold": false,
+        "foreground": "#ffff0000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Escape sequences": {
+        "bold": false,
+        "foreground": "#ff800080",
+        "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": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Global variable": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "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": "#ff0000ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Hexadecimal": {
+        "bold": false,
+        "foreground": "#ff800080",
+        "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": "#ff800080",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Octal": {
+        "bold": false,
+        "foreground": "#ff800080",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Preprocessor": {
+        "bold": false,
+        "foreground": "#ff008000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Reserve Word for Types": {
+        "bold": true,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Reserved Word": {
+        "bold": true,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Selected text": {
+        "background": "#64aaff7f",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Space": {
+        "bold": false,
+        "foreground": "#ffbababa",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "String": {
+        "bold": false,
+        "foreground": "#ffff0000",
+        "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": "#ff9b6900",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "brace/parenthesis/bracket level 1": {
+        "bold": false,
+        "foreground": "#ff000000",
+        "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": "#ffff0000",
+        "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/resources/colorschemes/Classic_Plus.scheme b/RedPandaIDE/resources/colorschemes/Classic_Plus.scheme
index d5f57513..7875c088 100644
--- a/RedPandaIDE/resources/colorschemes/Classic_Plus.scheme
+++ b/RedPandaIDE/resources/colorschemes/Classic_Plus.scheme
@@ -1,192 +1,263 @@
 {
-	"Assembler" : {
-		"foreground" : "#0000FF",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Character" : {
-		"foreground" : "#000000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Class" : {
-		"foreground" : "#008000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Comment" : {
-		"foreground" : "#0078D7",
-		"bold" : false,
-		"italic" : true,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Escape sequences" : {
-		"foreground" : "#800080",
-		"bold" : true,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Float" : {
-		"foreground" : "#800080",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Function" : {
-		"foreground" : "#008080",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Global variable" : {
-		"foreground" : "#400080",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Hexadecimal" : {
-		"foreground" : "#800080",
-		"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" : "#400080",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Number" : {
-		"foreground" : "#800080",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Octal" : {
-		"foreground" : "#800080",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Preprocessor" : {
-		"foreground" : "#008000",
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Reserved Word" : {
-		"foreground" : "#000000",
-		"bold" : true,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"Space" : {
-		"foreground": "#ffbababa",	
-		"bold" : false,
-		"italic" : false,
-		"underlined" : false,
-		"strikeout" : false
-	},
-	"String" : {
-		"foreground" : "#0000FF",
-		"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" : {
-		"background" : "#64aaff7f"
-	},
-	"Gutter" : {
-		"foreground" : "#000000",
-		"background" : "#F0F0F0"
-	},
-	"Breakpoint" : {
-	},
-	"Error" : {
-		"foreground" : "#FFFFFF",
-		"background" : "#800000"
-	},
-	"Active Breakpoint" : {
-		"background" : "#500055ff"
-	},
-	"Fold Line" : {
-		"foreground" : "#000000"
-	},
-	"Active Line" : {
-		"background" : "#CCFFFF"
-	},
-	"Warning" : {
-		"foreground" : "#9B6900"
-	},
-    "Gutter Active Line": {
-        "foreground": "#ff0000ff"
+    "Active Breakpoint": {
+        "background": "#500055ff",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Active Line": {
+        "background": "#ffccffff",
+        "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": "#ff008000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Comment": {
+        "bold": false,
+        "foreground": "#ff0078d7",
+        "italic": true,
+        "strikeout": false,
+        "underlined": false
     },
     "Current Highlighted Word": {
-        "background": "#64ffaaff"
+        "background": "#64ffaaff",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
     },
     "Editor Text": {
         "background": "#ffffffff",
-        "foreground": "#ff000000"
+        "bold": false,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
     },
-	"Indent Guide Line" : {
-		"foreground" : "#C0C0C0"
-	},
-	"brace/parenthesis/bracket level 1" : {
-		"foreground" : "#000000"
-	},
-	"brace/parenthesis/bracket level 2" : {
-		"foreground" : "#C10000"
-	},
-	"brace/parenthesis/bracket level 3" : {
-		"foreground" : "#0000FF"
-	},
-	"brace/parenthesis/bracket level 4" : {
-		"foreground" : "#000000"
-	}
+    "Error": {
+        "background": "#ff800000",
+        "bold": false,
+        "foreground": "#ffff0000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Escape sequences": {
+        "bold": true,
+        "foreground": "#ff800080",
+        "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": "#ff008080",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Global variable": {
+        "bold": false,
+        "foreground": "#ff400080",
+        "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": "#ff0000ff",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Hexadecimal": {
+        "bold": false,
+        "foreground": "#ff800080",
+        "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": "#ff400080",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Number": {
+        "bold": false,
+        "foreground": "#ff800080",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Octal": {
+        "bold": false,
+        "foreground": "#ff800080",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Preprocessor": {
+        "bold": false,
+        "foreground": "#ff008000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Reserve Word for Types": {
+        "bold": true,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Reserved Word": {
+        "bold": true,
+        "foreground": "#ff000000",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Selected text": {
+        "background": "#64aaff7f",
+        "bold": false,
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "Space": {
+        "bold": false,
+        "foreground": "#ffbababa",
+        "italic": false,
+        "strikeout": false,
+        "underlined": false
+    },
+    "String": {
+        "bold": true,
+        "foreground": "#ff0000ff",
+        "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": "#ff000000",
+        "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": "#ff0000ff",
+        "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/resources/themes/One_Dark.json b/RedPandaIDE/resources/themes/one_dark.json
similarity index 100%
rename from RedPandaIDE/resources/themes/One_Dark.json
rename to RedPandaIDE/resources/themes/one_dark.json
diff --git a/RedPandaIDE/resources/themes/One_Dark.lua b/RedPandaIDE/resources/themes/one_dark.lua
similarity index 100%
rename from RedPandaIDE/resources/themes/One_Dark.lua
rename to RedPandaIDE/resources/themes/one_dark.lua