  
  	FilePath homepath = GetSciteDefaultHome();
  	props.Set("SciteDefaultHome", homepath.AsFileSystem());
-@@ -1211,25 +1175,55 @@
- 	SetOneStyle(wEditor, STYLE_DEFAULT, sval.c_str());
- 	SetOneStyle(wOutput, STYLE_DEFAULT, sval.c_str());
+@@ -1197,12 +1161,13 @@
+ }
+ 
+ void SciTEBase::ReadFontProperties() {
+-	char key[200];
++	// char key[200]; modified by Mitchell
+ 	SString sval;
+ 
+ 	// Set styles
+ 	// For each window set the global default style, then the language default style, then the other global styles, then the other language styles
  
 +#if 0 // added by Mitchell
- 	sprintf(key, "style.%s.%0d", language.c_str(), STYLE_DEFAULT);
- 	sval = props.GetNewExpand(key);
- 	SetOneStyle(wEditor, STYLE_DEFAULT, sval.c_str());
+ 	SendEditor(SCI_STYLERESETDEFAULT, 0, 0);
+ 	SendOutput(SCI_STYLERESETDEFAULT, 0, 0);
+ 
+@@ -1230,6 +1195,23 @@
+ 
+ 	SetStyleFor(wOutput, "*");
+ 	SetStyleFor(wOutput, "errorlist");
 +#endif // added by Mitchell
- 
- 	SendEditor(SCI_STYLECLEARALL, 0, 0);
- 
-+#if 0 // added by Mitchell
- 	SetStyleFor(wEditor, "*");
- 	SetStyleFor(wEditor, language.c_str());
-+#endif // added by Mitchell
- 
- 	SendOutput(SCI_STYLECLEARALL, 0, 0);
- 
-+#if 0 // added by Mitchell
- 	sprintf(key, "style.%s.%0d", "errorlist", STYLE_DEFAULT);
- 	sval = props.GetNewExpand(key);
- 	SetOneStyle(wOutput, STYLE_DEFAULT, sval.c_str());
- 
- 	SendOutput(SCI_STYLECLEARALL, 0, 0);
-+#endif // added by Mitchell
-+
-+	// added by Mitchell
++
++	// added by Mitchell from ReadProperties()
 +	SString fileNameForExtension = ExtensionFileName();
 +
 +	SString modulePath = props.GetNewExpand("lexerpath.",
 +	    fileNameForExtension.c_str());
 +	if (modulePath.length())
 +	    SendEditorString(SCI_LOADLEXERLIBRARY, 0, modulePath.c_str());
-+	// language = props.GetNewExpand("lexer.", fileNameForExtension.c_str()); // modified by Mitchell
++	language = props.GetNewExpand("lexer.", fileNameForExtension.c_str());
 +	if (language.length())
 +	    SendEditorString(SCI_SETLEXERLANGUAGE, 0, language.c_str());
 +	else
-+	    SendEditorString(SCI_SETLEXERLANGUAGE, 0, "container");
++	    SendEditorString(SCI_SETLEXERLANGUAGE, 0, "container"); // modified by Mitchell
 +
 +	lexLanguage = SendEditor(SCI_GETLEXER);
-+
-+	SendEditor(SCI_SETSTYLEBITS, SendEditor(SCI_GETSTYLEBITSNEEDED));
-+
-+	SendOutputString(SCI_SETLEXERLANGUAGE, 0, "errorlist"); // modified by Mitchell
-+
-+	SetOneStyle(wEditor, STYLE_DEFAULT, "");
-+	SetStyleFor(wEditor, "*");
-+	SetOneStyle(wOutput, STYLE_DEFAULT, "");
-+	// end added by Mitchell
- 
- 	SetStyleFor(wOutput, "*");
--	SetStyleFor(wOutput, "errorlist");
-+	// SetStyleFor(wOutput, "errorlist"); // modified by Mitchell
++  // end added by Mitchell
  
  	if (CurrentBuffer()->useMonoFont) {
  		sval = props.GetExpanded("font.monospace");

 if PLAT_WIN
 	position.left=0
--- scite-latest/scite/src/SciTEProps.cxx	2009-08-06 23:46:52.000000000 +0000
+++ scintillua/scite/src/SciTEProps.cxx	2010-01-07 02:35:09.000000000 +0000
@@ -538,50 +538,12 @@
 static const char *propertiesToForward[] = {
 //++Autogenerated -- run src/LexGen.py to regenerate

 
 //--Autogenerated -- end of automatically generated section
 
@@ -693,6 +655,7 @@
 
 	SString fileNameForExtension = ExtensionFileName();
 
+#if 0 // added by Mitchell
 	SString modulePath = props.GetNewExpand("lexerpath.",
 	    fileNameForExtension.c_str());
 	if (modulePath.length())
@@ -701,7 +664,7 @@
 	if (language.length())
 	    SendEditorString(SCI_SETLEXERLANGUAGE, 0, language.c_str());
 	else
-	    SendEditorString(SCI_SETLEXER, 0, SCLEX_CONTAINER);
+	    SendEditorString(SCI_SETLEXERLANGUAGE, 0, "container"); // modified by Mitchell
 
 	lexLanguage = SendEditor(SCI_GETLEXER);
 
@@ -719,6 +682,7 @@
 		SString kw = props.GetNewExpand(kwk.c_str(), fileNameForExtension.c_str());
 		SendEditorString(SCI_SETKEYWORDS, wl, kw.c_str());
