diff --git a/src/widgets/EditPane.cpp b/src/widgets/EditPane.cpp
index 4a93551..ac7b8e2 100644
--- a/src/widgets/EditPane.cpp
+++ b/src/widgets/EditPane.cpp
@@ -5,10 +5,13 @@ EditPane::EditPane(
 	const wxSize &size, long style
 ) : wxStyledTextCtrl (parent, id, pos, size, style)
 {	
-
+	config = new TyroSettings();
 }
 
-EditPane::~EditPane() {}
+EditPane::~EditPane() 
+{
+	delete config;
+}
 
 /**
  * Encapsulate lexer selection when opening a file
@@ -22,13 +25,18 @@ bool EditPane::LoadAndHighlight(wxString filePath)
 	wxFileName file(filePath);
 	wxString ext = file.GetExt();
 	
+	this->StyleClearAll();
 	this->SetLexer(wxSTC_LEX_CPP);
 	
+	// Make sure every background is the same color!
+	for(int i = 0; i <= wxSTC_STYLE_MAX; i++)
+	{
+		this->StyleSetBackground(i, wxColor(253, 246, 227));
+		this->StyleSetFaceName(i, "Anonymous Pro");
+	}
+	
 	this->StyleSetForeground (wxSTC_STYLE_DEFAULT, wxColor(101, 123, 131));
-    this->StyleSetBackground (wxSTC_STYLE_DEFAULT, wxColor(253, 246, 227));
-	this->StyleSetBackground (wxSTC_STYLE_MAX, wxColor(253, 246, 227));
-	this->StyleSetBackground (wxSTC_STYLE_CONTROLCHAR, wxColor(253, 246, 227));
-    this->StyleSetForeground(wxSTC_STYLE_INDENTGUIDE, wxColor(147, 161, 161));
+	this->StyleSetForeground(wxSTC_STYLE_INDENTGUIDE, wxColor(147, 161, 161));
 	
 	this->SetMarginWidth (MARGIN_LINE_NUMBERS, 50);
 	this->StyleSetForeground (wxSTC_STYLE_LINENUMBER, wxColor(147, 161, 161));
@@ -39,33 +47,31 @@ bool EditPane::LoadAndHighlight(wxString filePath)
 	this->SetProperty (wxT("fold.comment"), wxT("1") );
 	this->SetProperty (wxT("fold.compact"), wxT("1") );
 	
-	this->StyleSetForeground (wxSTC_C_STRING,            wxColour(150,0,0));
-	this->StyleSetBackground (wxSTC_C_STRING, wxColor(253, 246, 227));
-	this->StyleSetForeground (wxSTC_C_PREPROCESSOR,      wxColour(165,105,0));
-	this->StyleSetBackground (wxSTC_C_PREPROCESSOR, wxColor(253, 246, 227));
-	this->StyleSetForeground (wxSTC_C_IDENTIFIER,        wxColour(40,0,60));
-	this->StyleSetBackground (wxSTC_C_IDENTIFIER, wxColor(253, 246, 227));
-	this->StyleSetForeground (wxSTC_C_NUMBER,            wxColour(0,150,0));
-	this->StyleSetBackground (wxSTC_C_NUMBER, wxColor(253, 246, 227));
-	this->StyleSetForeground (wxSTC_C_CHARACTER,         wxColour(150,0,0));
-	this->StyleSetBackground (wxSTC_C_CHARACTER, wxColor(253, 246, 227));
-	this->StyleSetForeground (wxSTC_C_WORD,              wxColour(0,0,150));
-	this->StyleSetBackground (wxSTC_C_WORD, wxColor(253, 246, 227));
-	this->StyleSetForeground (wxSTC_C_WORD2,             wxColour(0,150,0));
-	this->StyleSetBackground (wxSTC_C_WORD2, wxColor(253, 246, 227));
-	this->StyleSetForeground (wxSTC_C_COMMENT,           wxColor(147, 161, 161));
-	this->StyleSetBackground (wxSTC_C_COMMENT, wxColor(253, 246, 227));
-	this->StyleSetForeground (wxSTC_C_COMMENTLINE,       wxColor(147, 161, 161));
-	this->StyleSetBackground (wxSTC_C_COMMENTLINE, wxColor(253, 246, 227));
-	this->StyleSetForeground (wxSTC_C_COMMENTDOC,        wxColor(147, 161, 161));
-	this->StyleSetBackground (wxSTC_C_COMMENTDOC, wxColor(253, 246, 227));
-	this->StyleSetForeground (wxSTC_C_COMMENTDOCKEYWORD, wxColour(0,0,200));
-	this->StyleSetBackground (wxSTC_C_COMMENTDOCKEYWORD, wxColor(253, 246, 227));
-	this->StyleSetForeground (wxSTC_C_COMMENTDOCKEYWORDERROR, wxColour(0,0,200));
-	this->StyleSetBackground (wxSTC_C_COMMENTDOCKEYWORDERROR, wxColor(253, 246, 227));
-	this->StyleSetBold(wxSTC_C_WORD, true);
+	this->StyleSetForeground(wxSTC_C_DEFAULT, wxColor(101, 123, 131));
+	this->StyleSetForeground(wxSTC_C_OPERATOR, wxColor(101, 123, 131));
+	this->StyleSetForeground(wxSTC_C_HASHQUOTEDSTRING, wxColor(181, 137, 0));
+	this->StyleSetForeground(wxSTC_C_STRING, wxColor(108, 113, 196));
+	this->StyleSetForeground(wxSTC_C_PREPROCESSOR, wxColor(181, 137,   0));
+	this->StyleSetForeground(wxSTC_C_PREPROCESSORCOMMENT, wxColor(181, 137,   0));
+	this->StyleSetForeground(wxSTC_C_IDENTIFIER, wxColor(38, 139, 210));
+	this->StyleSetForeground(wxSTC_C_NUMBER, wxColor(211, 54, 130));
+	this->StyleSetForeground(wxSTC_C_CHARACTER, wxColor(108, 113, 196));
+	this->StyleSetForeground(wxSTC_C_WORD2, wxColor(203,  75,  22));
+	this->StyleSetForeground(wxSTC_C_WORD, wxColor(220,  50,  47));
+	this->StyleSetForeground(wxSTC_C_COMMENT, wxColor(147, 161, 161));
+	this->StyleSetForeground(wxSTC_C_COMMENTLINE, wxColor(147, 161, 161));
+	this->StyleSetForeground(wxSTC_C_COMMENTLINEDOC, wxColor(147, 161, 161));
+	this->StyleSetForeground(wxSTC_C_COMMENTDOC, wxColor(147, 161, 161));
+	this->StyleSetForeground(wxSTC_C_COMMENTDOCKEYWORD, wxColor(131, 148, 150));
+	this->StyleSetForeground(wxSTC_C_COMMENTDOCKEYWORDERROR, wxColor(101, 123, 131));
+	this->StyleSetBold(wxSTC_C_WORD, false);
 	this->StyleSetBold(wxSTC_C_WORD2, true);
 	this->StyleSetBold(wxSTC_C_COMMENTDOCKEYWORD, true);
+	this->StyleSetBold(wxSTC_C_OPERATOR, true);
+	
+	this->SetKeyWords(0, "alignof and and_eq bitand bitor break case catch compl const_cast continue default delete do dynamic_cast else false for goto if namespace new not not_eq nullptr operator or or_eq reinterpret_cast return sizeof static_assert static_cast switch this throw true try typedef typeid using while xor xor_eq NULL");
+	this->SetKeyWords(1, "alignas asm auto bool char char16_t char32_t class const constexpr decltype double enum explicit export extern final float friend inline int long mutable noexcept override private protected public register short signed static struct template thread_local typename union unsigned virtual void volatile wchar_t");
+	
 
 	return this->LoadFile(filePath);
 }
diff --git a/src/widgets/EditPane.h b/src/widgets/EditPane.h
index 19762a6..457b62a 100644
--- a/src/widgets/EditPane.h
+++ b/src/widgets/EditPane.h
@@ -24,6 +24,7 @@ public:
 	wxString fileName;
 	bool LoadAndHighlight(wxString filePath);
 private:
+	TyroSettings *config;
 	enum
 	{
 		MARGIN_LINE_NUMBERS,