Index: src/sdk/resources/lexers/lexer_batch.xml
===================================================================
--- src/sdk/resources/lexers/lexer_batch.xml	(revision 7948)
+++ src/sdk/resources/lexers/lexer_batch.xml	(working copy)
@@ -2,45 +2,72 @@
 <!DOCTYPE CodeBlocks_lexer_properties>
 <CodeBlocks_lexer_properties>
         <Lexer name="Batch"
-				index="12"
-				filemasks="*.bat,*.cmd,*.nt">
-				<Style name="Default"
-						index="0"
-						fg="0,0,0"
-						bg="255,255,255"
-						bold="0"
-						italics="0"
-						underlined="0"/>
+               index="12"
+               filemasks="*.bat,*.cmd,*.nt">
+                <Style name="Default"
+                       index="0"
+                       fg="0,0,0"
+                       bg="255,255,255"
+                       bold="0"
+                       italics="0"
+                       underlined="0"/>
                 <Style name="Comment"
-						index="1"
-						fg="128,128,128"/>
+                       index="1"
+                       fg="128,128,128"/>
                 <Style name="Keyword"
-						index="2"
-						fg="0,0,160"
-						bold="1"/>
+                       index="2"
+                       fg="0,0,160"
+                       bold="1"/>
                 <Style name="Label"
-						index="3"
-						fg="224,160,0"
-						bold="1"/>
+                       index="3"
+                       fg="224,160,0"
+                       bold="1"/>
                 <Style name="Hide command character"
-						index="4"
-						fg="128,128,0"/>
+                       index="4"
+                       fg="128,128,0"/>
                 <Style name="External command"
-						index="5"
-						fg="0,128,128"
-						bold="1"/>
+                       index="5"
+                       fg="0,128,128"
+                       bold="1"/>
                 <Style name="Variable: %%"
-						index="6"
-						fg="128,0,128"/>
+                       index="6"
+                       fg="128,0,128"/>
                 <Style name="Operator"
-						index="7"
-						fg="255,0,0"/>
+                       index="7"
+                       fg="255,0,0"/>
                 <Keywords>
                         <Set index="0"
-                            value="rem set if exist errorlevel for in do break call chcp cd chdir
-                                   choice cls country ctty date del erase dir echo exit goto
-                                   loadfix loadhigh mkdir md move path pause prompt rename ren
-                                   rmdir rd shift time type ver verify vol com con lpt nul"/>
+                            value="defined if else equ geq gtr leq lss neq not exist
+
+                                   delims do eol for in skip tokens usebackq
+
+                                   assoc break call cd chdir cls color con copy date del dir echo
+                                   endlocal erase exit ftype goto mkdir md move nul path pause
+                                   popd prompt pushd rd rem ren rename rmdir set setlocal shift
+                                   start time title type ver verify vol
+
+                                   arp at atmadm attrib bootcfg cacls chcp chkdsk chkntfs cipher
+                                   cmd cmstp comp compact convert cprofile defrag diskcomp
+                                   diskcopy diskpart doskey driverquery eventcreate eventquery
+                                   eventtriggers expand fc find findstr format fsutil ftp getmac
+                                   gpresult gpupdate graftabl help ipconfig ipxroute label lodctr
+                                   logman lpq lpr mode more mountvol msiexec nbtstat netsh
+                                   netstat ntbackup openfiles pathping ping print rasdial rcp
+                                   recover reg regsvr32 relog replace rexec robocopy route runas
+                                   sc schtasks shutdown sort subst systeminfo sfc taskkill
+                                   tasklist telnet tftp tracerpt tracert tree typeperf unlodctr
+                                   vssadmin w32tm xcopy
+
+                                   AllUsersProfile AppData ClientName CmdCmdLine CmdExtVersion
+                                   ComSpec CommonProgramFiles ComputerName ErrorLevel HomeDrive
+                                   HomePath LocalAppData LogonServer Number_Of_Processors OS
+                                   PathExt Processor_Architecture Processor_Identifier
+                                   Processor_Level Processor_Revision ProgramFiles Random
+                                   SessionName SystemDrive SystemRoot Temp Tmp UserDnsDomain
+                                   UserDomain UserName UserProfile WinDir
+
+                                   append debug edit edlin exe2bin fastopen forcedos graphics lh
+                                   loadfix loadhigh mem nlsfunc setver share"/>
                 </Keywords>
                 <SampleCode value="lexer_batch.sample"/>
                 <LanguageAttributes
Index: src/sdk/resources/lexers/lexer_cpp.xml
===================================================================
--- src/sdk/resources/lexers/lexer_cpp.xml	(revision 7948)
+++ src/sdk/resources/lexers/lexer_cpp.xml	(working copy)
@@ -3,7 +3,7 @@
 <CodeBlocks_lexer_properties>
         <Lexer name="C/C++"
                 index="3"
-                filemasks="*.c,*.cpp,*.cc,*.cxx,*.h,*.hpp,*.hh,*.hxx,*.inl">
+                filemasks="*.c,*.cpp,*.cc,*.cxx,*.h,*.hpp,*.hh,*.hxx,*.inl,*.ipp">
                 <Style name="Default"
                         index="0"
                         fg="0,0,0"
Index: src/sdk/resources/lexers/lexer_properties.xml
===================================================================
--- src/sdk/resources/lexers/lexer_properties.xml	(revision 7948)
+++ src/sdk/resources/lexers/lexer_properties.xml	(working copy)
@@ -2,15 +2,15 @@
 <!DOCTYPE CodeBlocks_lexer_properties>
 <CodeBlocks_lexer_properties>
         <Lexer name="Properties"
-				index="9"
-				filemasks="*.properties,*.ini,*.inf,*.reg,*.url,*.cfg,*.cnf,*.aut">
-				<Style name="Default"
-						index="0"
-						fg="0,0,0"
-						bg="255,255,255"
-						bold="0"
-						italics="0"
-						underlined="0"/>
+                index="9"
+                filemasks="*.properties,*.ini,*.inf,*.reg,*.url,*.cfg,*.cnf,*.aut,*.doxy,*Doxyfile">
+                <Style name="Default"
+                        index="0"
+                        fg="0,0,0"
+                        bg="255,255,255"
+                        bold="0"
+                        italics="0"
+                        underlined="0"/>
                 <Style name="Comment"
                         index="1"
                         fg="160,160,160"/>
Index: src/sdk/resources/lexers/lexer_html.xml
===================================================================
--- src/sdk/resources/lexers/lexer_html.xml	(revision 7948)
+++ src/sdk/resources/lexers/lexer_html.xml	(working copy)
@@ -3,7 +3,7 @@
 <CodeBlocks_lexer_properties>
         <Lexer name="HTML/PHP/ASP/JS"
                 index="4"
-                filemasks="*.htm,*.html,*.xhtml,*.php,*.php3,*.phtml">
+                filemasks="*.htm,*.html,*.xhtml,*.php,*.php3,*.phtml,*.hta">
                 <Style name="HTML Default"
                         index="0"
                         fg="0,0,0"
Index: src/sdk/resources/lexers/lexer_bash.xml
===================================================================
--- src/sdk/resources/lexers/lexer_bash.xml	(revision 7948)
+++ src/sdk/resources/lexers/lexer_bash.xml	(working copy)
@@ -3,7 +3,7 @@
 <CodeBlocks_lexer_properties>
         <Lexer name="Bash"
                 index="62"
-                filemasks="*.sh">
+                filemasks="*.sh,*bootstrap,*configure">
                 <Style name="Default"
                         index="0"
                         fg="128,128,128"
Index: src/sdk/resources/lexers/lexer_lua.xml
===================================================================
--- src/sdk/resources/lexers/lexer_lua.xml	(revision 7948)
+++ src/sdk/resources/lexers/lexer_lua.xml	(working copy)
@@ -1,56 +1,103 @@
 <?xml version="1.0"?>
 <!DOCTYPE CodeBlocks_lexer_properties>
 <CodeBlocks_lexer_properties>
-		<Lexer name="Lua"
-				index="15"
-				filemasks="*.lua">
-				<Style name="Default"
-						index="0"
-						fg="0,0,0"
-						bg="255,255,255"
-						bold="0"
-						italics="0"
-						underlined="0"/>
-				<Style name="Comment"
-						index="1,2,3"
-						fg="160,160,160"/>
-				<Style name="Number"
-						index="4"
-						fg="240,0,240"/>
-				<Style name="Keyword"
-						index="5,13,14,15,16,17,18,19"
-						fg="0,0,160"
-						bold="1"/>
-				<Style name="String"
-						index="6,8,12"
-						fg="0,0,255"/>
-				<Style name="Operator"
-						index="10"
-						fg="255,0,0"/>
-				<Style name="Selection"
-						index="-99"
-						bg="192,192,192"/>
-				<Style name="Active line"
-						index="-98"
-						bg="255,255,160"/>
-				<Style name="Compiler error line"
-						index="-4"
-						bg="255,128,0"/>
-				<Style name="Matching brace highlight"
-						index="34"
-						fg="255,0,0"
-						bold="1"
-						underlined="1"/>
-				<Style name="No matching brace highlight"
-						index="35"
-						bg="255,0,0"/>
-				<Keywords>
+        <Lexer name="Lua"
+               index="15"
+               filemasks="*.lua">
+                <Style name="Default"
+                       index="0"
+                       fg="0,0,0"
+                       bg="255,255,255"
+                       bold="0"
+                       italics="0"
+                       underlined="0"/>
+                <Style name="Comment"
+                       index="1,2,3"
+                       fg="160,160,160"/>
+                <Style name="Number"
+                       index="4"
+                       fg="240,0,240"/>
+                <Style name="Keyword"
+                       index="5,13,14,15,16,17,18,19"
+                       fg="0,0,160"
+                       bold="1"/>
+                <Style name="String"
+                       index="6,8,12"
+                       fg="0,0,255"/>
+                <Style name="Operator"
+                       index="10"
+                       fg="255,0,0"/>
+                <Style name="Selection"
+                       index="-99"
+                       bg="192,192,192"/>
+                <Style name="Active line"
+                       index="-98"
+                       bg="255,255,160"/>
+                <Style name="Compiler error line"
+                       index="-4"
+                       bg="255,128,0"/>
+                <Style name="Matching brace highlight"
+                       index="34"
+                       fg="255,0,0"
+                       bold="1"
+                       underlined="1"/>
+                <Style name="No matching brace highlight"
+                       index="35"
+                       bg="255,0,0"/>
+                <Keywords>
+                        <!-- Keywords -->
                         <Set index="0"
                             value="if elseif else then end do while nil true false
                                    in for and or function local not repeat return until"/>
-				</Keywords>
-				<SampleCode value="lexer_lua.sample"
-						error_line="9"/>
+                        <!-- Basic functions -->
+                        <Set index="1"
+                            value="assert collectgarbage dofile error _G getmetatable
+                                   ipairs load loadfile next pairs pcall print rawequal
+                                   rawget rawlen rawset select setmetatable tonumber
+                                   tostring type _VERSION xpcall
+
+                                   bit32 coroutine debug io math os package string
+                                   table"/>
+                        <!-- Bitwise, mathematical, string, and table functions -->
+                        <Set index="2"
+                            value="bit32.arshift bit32.band bit32.bnot bit32.bor
+                                   bit32.btest bit32.bxor bit32.extract bit32.replace
+                                   bit32.lrotate bit32.lshift bit32.rrotate bit32.rshift
+                                   math.abs math.acos math.asin math.atan math.atan2
+                                   math.ceil math.cos math.cosh math.deg math.exp
+                                   math.floor math.fmod math.frexp math.huge math.ldexp
+                                   math.log math.max math.min math.modf math.pimath.pow
+                                   math.rad math.random math.randomseed math.sin
+                                   math.sinh math.sqrt math.tan math.tanh
+                                   string.byte string.char string.dump string.find
+                                   string.format string.gmatch string.gsub string.len
+                                   string.lower string.match string.rep string.reverse
+                                   string.sub string.upper
+                                   table.concat table.insert table.pack table.remove
+                                   table.sort table.unpack"/>
+                        <!-- Coroutine, input/output, system, and package facilities -->
+                        <Set index="3"
+                            value="coroutine.create coroutine.resume coroutine.running
+                                   coroutine.status coroutine.wrap coroutine.yield
+                                   io.close io.flush io.input io.lines io.open
+                                   io.output io.popen io.read io.tmpfile io.type
+                                   io.write
+                                   os.clock os.date os.difftime os.execute os.exit
+                                   os.getenv os.remove os.rename os.setlocale os.time
+                                   os.tmpname
+                                   require package.config package.cpath package.loaded
+                                   package.loadlib package.path package.preload
+                                   package.searchers package.searchpath"/>
+                        <!-- Debug functions -->
+                        <Set index="4"
+                            value="debug.debug debug.gethook debug.getinfo debug.getlocal
+                                   debug.getmetatable debug.getregistry debug.getupvalue
+                                   debug.getuservalue debug.sethook debug.setlocal
+                                   debug.setmetatable debug.setupvalue debug.setuservalue
+                                   debug.traceback debug.upvalueid debug.upvaluejoin"/>
+                </Keywords>
+                <SampleCode value="lexer_lua.sample"
+                        error_line="9"/>
                 <LanguageAttributes
                     LineComment="--"
                     StreamCommentStart="/*"
@@ -59,5 +106,5 @@
                     BoxCommentMid=" * "
                     BoxCommentEnd=" */"
                     CaseSensitive="1"/>
-		</Lexer>
+        </Lexer>
 </CodeBlocks_lexer_properties>
Index: src/sdk/resources/lexers/lexer_css.xml
===================================================================
--- src/sdk/resources/lexers/lexer_css.xml	(revision 7948)
+++ src/sdk/resources/lexers/lexer_css.xml	(working copy)
@@ -5,12 +5,12 @@
                 index="38"
                 filemasks="*.css">
                 <Style name="Default"
-						index="0"
-						fg="0,0,0"
-						bg="255,255,255"
-						bold="0"
-						italics="0"
-						underlined="0"/>
+                        index="0"
+                        fg="0,0,0"
+                        bg="255,255,255"
+                        bold="0"
+                        italics="0"
+                        underlined="0"/>
                 <Style name="Tag"
                         index="1"
                         fg="0,0,128"
Index: src/sdk/resources/lexers/lexer_python.xml
===================================================================
--- src/sdk/resources/lexers/lexer_python.xml	(revision 7948)
+++ src/sdk/resources/lexers/lexer_python.xml	(working copy)
@@ -3,7 +3,7 @@
 <CodeBlocks_lexer_properties>
         <Lexer name="Python"
                 index="2"
-                filemasks="*.py,*SConstruct,*SConscript">
+                filemasks="*.py,*.pyw,*.pyx,*SConstruct,*SConscript">
                 <Style name="Default"
                         index="0"
                         fg="0,0,0"
Index: src/sdk/resources/lexers/lexer_haskell.xml
===================================================================
--- src/sdk/resources/lexers/lexer_haskell.xml	(revision 7948)
+++ src/sdk/resources/lexers/lexer_haskell.xml	(working copy)
@@ -1,99 +1,99 @@
 <?xml version="1.0"?>
 <!DOCTYPE CodeBlocks_lexer_properties>
 <CodeBlocks_lexer_properties>
-		<Lexer name="Haskell"
-				index="68"
-				filemasks="*.hs,*.lhs,*.as,*.las">
+        <Lexer name="Haskell"
+               index="68"
+               filemasks="*.hs,*.lhs,*.las">
                 <Style name="Default"
-						index="0"
-						fg="0,0,0"
-						bg="255,255,255"
-						bold="0"
-						italics="0"
-						underlined="0"/>
+                        index="0"
+                        fg="0,0,0"
+                        bg="255,255,255"
+                        bold="0"
+                        italics="0"
+                        underlined="0"/>
                 <Style name="Identifier"
                         index="1"
-						fg="255,255,255"/>
-				<Style name="Keyword"
-						index="2"
-						fg="0,0,160"
-						bold="1"/>
-				<Style name="Number"
-						index="3"
-						fg="160,882,45"/>
+                        fg="255,255,255"/>
+                <Style name="Keyword"
+                        index="2"
+                        fg="0,0,160"
+                        bold="1"/>
+                <Style name="Number"
+                        index="3"
+                        fg="160,882,45"/>
                 <Style name="String"
-						index="4"
-						fg="0,0,255"/>
+                        index="4"
+                        fg="0,0,255"/>
                 <Style name="Character"
-						index="5"
-						fg="224,160,0"/>
+                        index="5"
+                        fg="224,160,0"/>
                 <Style name="Class"
-						index="6"
-						fg="0,0,0"/>
-				<Style name="Module"
-						index="7"
-						fg="0,160,0"/>
-				<Style name="Capital"
-						index="8"
-						fg="255,0,0"/>
-				<Style name="Data"
-						index="9"
-						fg="0,160,0"
-						bold="1"/>
+                        index="6"
+                        fg="0,0,0"/>
+                <Style name="Module"
+                        index="7"
+                        fg="0,160,0"/>
+                <Style name="Capital"
+                        index="8"
+                        fg="255,0,0"/>
+                <Style name="Data"
+                        index="9"
+                        fg="0,160,0"
+                        bold="1"/>
                 <Style name="Import"
                         index="10"
                         fg="95,159,159"/>
                 <Style name="Operator"
-						index="11"
-						fg="0,0,128"
-						bold="1"/>
+                        index="11"
+                        fg="0,0,128"
+                        bold="1"/>
                 <Style name="Instance"
                         index="12"
                         fg="255,0,255"/>
-				<Style name="Comment"
-						index="13"
-						fg="160,160,160"/>
-				<Style name="Comment Block 1"
-						index="14"
-						fg="128,128,255"/>
+                <Style name="Comment"
+                        index="13"
+                        fg="160,160,160"/>
+                <Style name="Comment Block 1"
+                        index="14"
+                        fg="128,128,255"/>
                 <Style name="Comment Block 2"
-						index="15"
-						fg="128,128,255"/>
-				<Style name="Comment Block 3"
-						index="16"
-						fg="128,128,255"/>
-				<Style name="Active line"
-						index="-98"
-						bg="255,255,160"/>
-				<Style name="Breakpoint line"
-						index="-2"
-						bg="255,160,160"/>
-				<Style name="Debugger active line"
-						index="-3"
-						bg="160,160,255"/>
-				<Style name="Compiler error line"
-						index="-4"
-						bg="255,128,0"/>
-				<Style name="Matching brace highlight"
-						index="34"
-						bg="128,255,255"
-						bold="1"/>
-				<Style name="No matching brace highlight"
-						index="35"
-						fg="255,255,255"
-						bg="255,0,0"
-						bold="1"/>
-				<Keywords>
+                        index="15"
+                        fg="128,128,255"/>
+                <Style name="Comment Block 3"
+                        index="16"
+                        fg="128,128,255"/>
+                <Style name="Active line"
+                        index="-98"
+                        bg="255,255,160"/>
+                <Style name="Breakpoint line"
+                        index="-2"
+                        bg="255,160,160"/>
+                <Style name="Debugger active line"
+                        index="-3"
+                        bg="160,160,255"/>
+                <Style name="Compiler error line"
+                        index="-4"
+                        bg="255,128,0"/>
+                <Style name="Matching brace highlight"
+                        index="34"
+                        bg="128,255,255"
+                        bold="1"/>
+                <Style name="No matching brace highlight"
+                        index="35"
+                        fg="255,255,255"
+                        bg="255,0,0"
+                        bold="1"/>
+                <Keywords>
                         <!-- Primary keywords and identifiers -->
                         <Set index="0"
                             value="as case class data default deriving do else hiding if
                             import in infix infixl infixr instance let module newtype of
                             proc qualified rec then type where _"/>
-				</Keywords>
-				<SampleCode value="lexer_haskell.sample"
-						breakpoint_line="32"
-						debug_line="35"
-						error_line="37"/>
+                </Keywords>
+                <SampleCode value="lexer_haskell.sample"
+                        breakpoint_line="32"
+                        debug_line="35"
+                        error_line="37"/>
                 <LanguageAttributes
                     LineComment="--"
                     StreamCommentStart=""
@@ -102,5 +102,5 @@
                     BoxCommentMid=""
                     BoxCommentEnd=""
                     CaseSensitive="0"/>
-		</Lexer>
+        </Lexer>
 </CodeBlocks_lexer_properties>
Index: src/sdk/resources/lexers/lexer_xml.xml
===================================================================
--- src/sdk/resources/lexers/lexer_xml.xml	(revision 7948)
+++ src/sdk/resources/lexers/lexer_xml.xml	(working copy)
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <!DOCTYPE CodeBlocks_lexer_properties>
 <CodeBlocks_lexer_properties>
-		<Lexer name="XML"
-				index="5"
-				filemasks="*.xml,*.xsd,*.xsl,*.xrc">
-				<Style name="Default"
-						index="0"
-						fg="0,0,0"
-						bg="255,255,255"
-						bold="0"
-						italics="0"
-						underlined="0"/>
+        <Lexer name="XML"
+               index="5"
+               filemasks="*.xml,*.xsd,*.xsl,*.xrc,*.xcu,*.bkl,*.bkgen,*.font,*.imageset,*.layout,*.looknfeel,*.scheme,*.wnd">
+                <Style name="Default"
+                        index="0"
+                        fg="0,0,0"
+                        bg="255,255,255"
+                        bold="0"
+                        italics="0"
+                        underlined="0"/>
                 <Style name="Tag"
                         index="1,2"
                         fg="128,0,128"
