Index: src/sdk/resources/lexers/lexer_python.xml
===================================================================
--- src/sdk/resources/lexers/lexer_python.xml	(revision 2143)
+++ src/sdk/resources/lexers/lexer_python.xml	(working copy)
@@ -17,20 +17,20 @@
                 <Style name="Number"
                         index="2"
                         fg="240,0,240"/>
-                <Style name="Double Quote String"
+                <Style name="Double quote string"
                         index="3"
                         fg="0,0,255"/>
-                <Style name="Single Quote String"
+                <Style name="Single quote string"
                         index="4"
                         fg="224,160,0"/>
                 <Style name="Keyword"
                         index="5"
                         fg="0,0,160"
                         bold="1"/>
-                <Style name="Triple Single Quote String"
+                <Style name="Triple single quote string"
                         index="6"
                         fg="128,0,0"/>
-                <Style name="Triple Double Quote String"
+                <Style name="Triple double quote string"
                         index="7"
                         fg="128,0,128"/>
                 <Style name="Class name"
@@ -51,100 +51,100 @@
                         bold="1"/>
                 <Style name="String EOL"
                         index="13"/>
-                <Style name="User Keyword"
+                <Style name="User keyword"
                         index="14"/>
                 <Style name="Decorator"
                         index="15"
                         fg="0,128,128"/>
                 <Keywords>
-                        <Language index="0"
-                                value="and assert break class continue def del elif else except
-                                       exec finally for from global if import in is lambda None
-                                       not or pass print raise return try while yield
+                        <!-- Keywords -->
+                        <Set index="0"
+                            value="and assert break class continue def del elif else except
+                                   exec finally for from global if import in is lambda None
+                                   not or pass print raise return try while yield
 
-                                       __import__ abs basestring bool callable chr classmethod
-                                       cmp compile complex delattr dict dir divmod enumerate
-                                       eval execfile file filter float frozenset getattr globals
-                                       hasattr hash help hex id input int isinstance issubclass
-                                       iter len list locals long map max min object oct open
-                                       ord pow property range raw_input reduce reload repr
-                                       reversed round set setattr slice sorted staticmethod
-                                       str sum super tuple type type unichr unicode vars xrange
-                                       zip
+                                   __import__ abs basestring bool callable chr classmethod
+                                   cmp compile complex delattr dict dir divmod enumerate
+                                   eval execfile file filter float frozenset getattr globals
+                                   hasattr hash help hex id input int isinstance issubclass
+                                   iter len list locals long map max min object oct open
+                                   ord pow property range raw_input reduce reload repr
+                                   reversed round set setattr slice sorted staticmethod
+                                   str sum super tuple type type unichr unicode vars xrange
+                                   zip
 
-                                       apply buffer coerce intern
+                                   apply buffer coerce intern
 
-                                       __dict__ Ellipsis False True NotImplemented
-                                       __class__ __bases__ __name__
+                                   __dict__ Ellipsis False True NotImplemented
+                                   __class__ __bases__ __name__
 
-                                       exception Exception StandardError ArithmeticError
-                                       LookupError EnvironmentError AssertionError
-                                       AttributeError EOFError FloatingPointError IOError
-                                       ImportError IndexError KeyError KeyboardInterrupt
-                                       MemoryError NameError NotImplementedError OSError
-                                       OverflowError ReferenceError RuntimeError
-                                       StopIteration SyntaxError SystemError SystemExit
-                                       TypeError UnboundLocalError UnicodeError
-                                       UnicodeEncodeError UnicodeDecodeError
-                                       UnicodeTranslateError ValueError WindowsError
-                                       ZeroDivisionError Warning UserWarning
-                                       DeprecationWarning PendingDeprecationWarning
-                                       SyntaxWarning RuntimeWarning FutureWarning"/>
-                        <User index="1"
-                                value="sys gc weakref fpectl atexit types UserDict UserList UserString
-                                       operator inspect traceback linecache pickle cPickle copy_reg
-                                       shelve copy marshal warnings imp zipimport pkgutil modulefinder
-                                       code codeop pprint repr new site user __builtin__ __main__
-                                       __future__
+                                   exception Exception StandardError ArithmeticError
+                                   LookupError EnvironmentError AssertionError
+                                   AttributeError EOFError FloatingPointError IOError
+                                   ImportError IndexError KeyError KeyboardInterrupt
+                                   MemoryError NameError NotImplementedError OSError
+                                   OverflowError ReferenceError RuntimeError
+                                   StopIteration SyntaxError SystemError SystemExit
+                                   TypeError UnboundLocalError UnicodeError
+                                   UnicodeEncodeError UnicodeDecodeError
+                                   UnicodeTranslateError ValueError WindowsError
+                                   ZeroDivisionError Warning UserWarning
+                                   DeprecationWarning PendingDeprecationWarning
+                                   SyntaxWarning RuntimeWarning FutureWarning"/>
+                        <!-- Highlighted identifiers -->
+                        <Set index="1"
+                            value="sys gc weakref fpectl atexit types UserDict UserList UserString
+                                   operator inspect traceback linecache pickle cPickle copy_reg
+                                   shelve copy marshal warnings imp zipimport pkgutil modulefinder
+                                   code codeop pprint repr new site user __builtin__ __main__
+                                   __future__
 
-                                       string re struct difflib fpformat StringIO cStringIO textwrap
-                                       codecs encodings.idna unicodedata stringprep
+                                   string re struct difflib fpformat StringIO cStringIO textwrap
+                                   codecs encodings.idna unicodedata stringprep
 
-                                       pydoc doctest unittest test test.test_support decimal math
-                                       cmath random whrandom bisect collections heapq array sets
-                                       itertools ConfigParser fileinput calendar cmd shlex
+                                   pydoc doctest unittest test test.test_support decimal math
+                                   cmath random whrandom bisect collections heapq array sets
+                                   itertools ConfigParser fileinput calendar cmd shlex
 
-                                       os os.path dircache stat statcache statvfs filecmp subprocess
-                                       popen2 datetime time sched mutex getpass curses curses.textpad
-                                       curses.wrapper curses.ascii curses.panel getopt optparse tempfile
-                                       errno glob fnmatch shutil locale gettext logging platform
+                                   os os.path dircache stat statcache statvfs filecmp subprocess
+                                   popen2 datetime time sched mutex getpass curses curses.textpad
+                                   curses.wrapper curses.ascii curses.panel getopt optparse tempfile
+                                   errno glob fnmatch shutil locale gettext logging platform
 
-                                       signal socket select thread threading dummy_thread dummy_threading
-                                       Queue mmap anydbm dbhash whichdb bsddb dumbdbm zlib gzip bz2
-                                       zipfile tarfile readline rlcompleter
+                                   signal socket select thread threading dummy_thread dummy_threading
+                                   Queue mmap anydbm dbhash whichdb bsddb dumbdbm zlib gzip bz2
+                                   zipfile tarfile readline rlcompleter
 
-                                       posix pwd grp crypt dl dbm gdbm termios tty pty fcntl pipes
-                                       posixfile resource nis syslog commands
+                                   posix pwd grp crypt dl dbm gdbm termios tty pty fcntl pipes
+                                   posixfile resource nis syslog commands
 
-                                       hotshot timeit
+                                   hotshot timeit
 
-                                       webbrowser cgi cgitb urllib urllib2 httplib ftplib gopherlib
-                                       poplib imaplib nntplib smtplib smtpd telnetlib urlparse
-                                       SocketServer BaseHTTPServer SimpleHTTPServer CGIHTTPServer
-                                       cookielib Cookie xmlrpclib SimpleXMLRPCServer DocXMLRPCServer
-                                       asyncore asynchat
+                                   webbrowser cgi cgitb urllib urllib2 httplib ftplib gopherlib
+                                   poplib imaplib nntplib smtplib smtpd telnetlib urlparse
+                                   SocketServer BaseHTTPServer SimpleHTTPServer CGIHTTPServer
+                                   cookielib Cookie xmlrpclib SimpleXMLRPCServer DocXMLRPCServer
+                                   asyncore asynchat
 
-                                       formatter email email.Message email.Parser email.Generator
-                                       email.Header email.Charset email.Encoders email.Errors
-                                       email.Utils email.Iterators mailcap mailbox mhlib mimetools
-                                       mimetypes MimeWriter mimify multifile rfc822 base64 binascii
-                                       binhex quopri uu xdrlib netrc robotparser csv
+                                   formatter email email.Message email.Parser email.Generator
+                                   email.Header email.Charset email.Encoders email.Errors
+                                   email.Utils email.Iterators mailcap mailbox mhlib mimetools
+                                   mimetypes MimeWriter mimify multifile rfc822 base64 binascii
+                                   binhex quopri uu xdrlib netrc robotparser csv
 
-                                       HTMLParser sgmllib htmllib htmlentitydefs xml.parsers.expat
-                                       xml.dom xml.dom.minidom xml.dom.pulldom xml.sax
-                                       xml.sax.handler xml.sax.saxutils xml.sax.xmlreader xmllib
+                                   HTMLParser sgmllib htmllib htmlentitydefs xml.parsers.expat
+                                   xml.dom xml.dom.minidom xml.dom.pulldom xml.sax
+                                   xml.sax.handler xml.sax.saxutils xml.sax.xmlreader xmllib
 
-                                       audioop imageop aifc sunau wave chunk colorsys rgbimg imghdr
-                                       sndhdr ossaudiodev
+                                   audioop imageop aifc sunau wave chunk colorsys rgbimg imghdr
+                                   sndhdr ossaudiodev
 
-                                       hmac md5 sha
+                                   hmac md5 sha
 
-                                       Tkinter Tix ScrolledText turtle
+                                   Tkinter Tix ScrolledText turtle
 
-                                       parser symbol token keyword tokenize tabnanny pyclbr
-                                       py_compile compileall dis pickletools distutils"/>
-                        <Documentation index="2"
-                                value=""/>
+                                   parser symbol token keyword tokenize tabnanny pyclbr
+                                   py_compile compileall dis pickletools distutils"/>
                 </Keywords>
                 <SampleCode value="lexer_python.sample"/>
         </Lexer>
