--- a/win32/makefile
+++ b/win32/makefile
@@ -1,7 +1,7 @@
 # Make file for SciTE on Windows
 # Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
 # The License.txt file describes the conditions under which this software may be distributed.
-# This makefile assumes the mingw32 version of GCC 3.2 or 4.x is used and changes will
+# This makefile assumes the mingw32 version of GCC 4.x is used and changes will
 # be needed to use other compilers.
 
 .SUFFIXES: .cxx .properties
@@ -55,7 +55,7 @@
 
 CXXFLAGS = $(CFLAGS) -Wno-char-subscripts -pedantic -fno-rtti -mno-cygwin
 
-LDFLAGS=-mwindows -lcomctl32 -limm32 -lole32 -luuid $(LUA_LDFLAGS) -mno-cygwin
+LDFLAGS=-mwindows -lcomctl32 -limm32 -lole32 -luuid -luxtheme $(LUA_LDFLAGS) -mno-cygwin
 
 .cxx.o:
 	$(CC) $(CXXFLAGS) -c $< -o $@
@@ -131,8 +131,9 @@
 OBJSSTATIC = Sc1.o SciTEWinBar.o SciTEWinDlg.o MultiplexExtension.o \
 	StyleWriter.o UniqueInstance.o SciTEBase.o FilePath.o SciTEBuffers.o \
 	SciTEIO.o Exporters.o PropSetFile.o StringList.o SciTEProps.o ScintillaWinL.o \
-	ScintillaBaseL.o Editor.o WindowAccessor.o DocumentAccessor.o KeyWords.o \
-	ExternalLexer.o StyleContext.o Lexers.a PropSet.o RunStyles.o \
+	ScintillaBaseL.o Editor.o Catalogue.o Accessor.o WordList.o CharacterSet.o \
+	LexerModule.o LexerSimple.o LexerBase.o \
+	ExternalLexer.o StyleContext.o Lexers.a PropSetSimple.o RunStyles.o \
 	ContractionState.o CharClassify.o Decoration.o Document.o CellBuffer.o CallTip.o Sc1Res.o PlatWin.o \
 	PositionCache.o UniConversion.o Utf8_16.o GUIWin.o KeyMap.o Indicator.o LineMarker.o RESearch.o Selection.o Style.o \
 	ViewStyle.o AutoComplete.o IFaceTable.o DirectorExtension.o MultiplexExtension.o XPM.o PerLine.o \
@@ -144,7 +145,7 @@
 # Automatically generate dependencies for most files with "make deps"
 include deps.mak
 
-Sc1.o: SciTEWin.cxx SciTEWin.h SciTE.h Accessor.h WindowAccessor.h KeyWords.h PropSet.h \
+Sc1.o: SciTEWin.cxx SciTEWin.h SciTE.h PropSetFile.h \
  SString.h Scintilla.h Extender.h FilePath.h SciTEBase.h JobQueue.h
 	$(CC) $(CXXFLAGS) -D STATIC_BUILD -c $< -o $@