  	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());
--	if (language.length() && !language.startswith("script_"))
-+	if (language.length())
- 	    SendEditorString(SCI_SETLEXERLANGUAGE, 0, language.c_str());
- 	else
--	    SendEditorString(SCI_SETLEXER, 0, SCLEX_CONTAINER);
--
--	props.Set("Language", language.c_str());
-+	    SendEditorString(SCI_SETLEXERLANGUAGE, 0, "container"); // modified by Mitchell
- 
- 	lexLanguage = SendEditor(SCI_GETLEXER);
- 
-@@ -726,6 +684,7 @@
+@@ -726,6 +686,7 @@
  		SString kw = props.GetNewExpand(kwk.c_str(), fileNameForExtension.c_str());
  		SendEditorString(SCI_SETKEYWORDS, wl, kw.c_str());
  	}

 
 	FilePath homepath = GetSciteDefaultHome();
 	props.Set("SciteDefaultHome", homepath.AsFileSystem());
@@ -1209,12 +1168,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
 	SendEditor(SCI_STYLERESETDEFAULT, 0, 0);
 	SendOutput(SCI_STYLERESETDEFAULT, 0, 0);
 
@@ -1242,6 +1202,27 @@
 
 	SetStyleFor(wOutput, "*");
 	SetStyleFor(wOutput, "errorlist");
+#endif // 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());
+	if (language.length())
+	    SendEditorString(SCI_SETLEXERLANGUAGE, 0, language.c_str());
+	else
+	    SendEditorString(SCI_SETLEXERLANGUAGE, 0, "container"); // modified by Mitchell
+
+	lexLanguage = SendEditor(SCI_GETLEXER);
+
+	SendEditor(SCI_SETSTYLEBITS, SendEditor(SCI_GETSTYLEBITSNEEDED));
+
+	SendOutputString(SCI_SETLEXERLANGUAGE, 0, "errorlist");
+  // end added by Mitchell
 
 	if (CurrentBuffer()->useMonoFont) {
 		sval = props.GetExpanded("font.monospace");

 if PLAT_WIN
 	position.left=0
--- scite-latest/scite/src/SciTEProps.cxx	2010-02-12 06:18:54.000000000 -0500
+++ scintillua/scite/src/SciTEProps.cxx	2010-02-22 20:30:43.000000000 -0500
@@ -540,53 +540,12 @@
 static const char *propertiesToForward[] = {
 //++Autogenerated -- run src/LexGen.py to regenerate
