Index: src/sdk/resources/lexers/lexer_css.xml
===================================================================
--- src/sdk/resources/lexers/lexer_css.xml	(revision 2097)
+++ src/sdk/resources/lexers/lexer_css.xml	(working copy)
@@ -63,70 +63,82 @@
                         index="16"
                         fg="128,0,0"/>
                 <Keywords>
-                        <!-- These are the CSS1 and CSS2 keywords.
-                             The lexer is supposed to lex the CSS1 and CSS2
-                             keywords differently (see above) unfortunatly it
-                             doesn't :(
-                             The CSS1 keywords are first then the CSS2
-                             keywords I seperated them by a two line breaks. -->
-						<Language index="0"
-								value="color background-color background-image
-                                       background-repeat background-attachment
-                                       background-position background
-                                       font-family font-style font-variant
-                                       font-weight font-size font
-                                       word-spacing letter-spacing
-                                       text-decoration vertical-align
-                                       text-transform text-align text-indent
-                                       line-height margin-top margin-right
-                                       margin-bottom margin-left margin
-                                       padding-top padding-right padding-bottom
-                                       padding-left padding
-                                       border-top-width border-right-width
-                                       border-bottom-width border-left-width
-                                       border-width border-top border-right
-                                       border-bottom border-left border
-                                       border-color border-style width height
-                                       float clear display white-space
-                                       list-style-type list-style-image
-                                       list-style-position list-style
-
-                                       border-top-color border-right-color
-                                       border-bottom-color border-left-color
-                                       border-color border-top-style
-                                       border-right-style border-bottom-style
-                                       border-left-style border-style top right
-                                       bottom left position z-index direction
-                                       unicode-bidi min-width max-width
-                                       min-height max-height overflow clip
-                                       visibility content quotes counter-reset
-                                       counter-increment marker-offset
-                                       size marks page-break-before
-                                       page-break-after page-break-inside page
-                                       orphans widows font-stretch
-                                       font-size-adjust unicode-range
-                                       units-per-em src panose-1 stemv stemh
-                                       slope cap-height x-height ascent descent
-                                       widths bbox definition-src baseline
-                                       centerline mathline topline text-shadow
-                                       caption-side table-layout border-collapse
-                                       border-spacing empty-cells speak-header
-                                       cursor outline outline-width
-                                       outline-style outline-color volume speak
-                                       pause-before pause-after pause cue-before
-                                       cue-after cue play-during azimuth
-                                       elevation speech-rate voice-family pitch
-                                       pitch-range stress richness
-                                       speak-punctuation speak-numeral"/>
-                        <!-- These are the pseudoclass keywords.
-                             I don't know if there is a better way to
-                             declare these. -->
-                        <User index="1"
-                            value="first-letter first-line link active visited
-                                   first-child focus hover lang before after
-                                   left right first"/>
-						<Documentation index="2"
-                                    value=""/>
+                        <!-- CSS1 Keywords -->
+                        <Set index="0"
+                            value="color background-color background-image background-repeat
+                                   background-attachment background-position background
+                                   font-family font-style font-variant font-weight font-size font
+                                   word-spacing letter-spacing text-decoration vertical-align
+                                   text-transform text-align text-indent line-height margin-top
+                                   margin-right margin-bottom margin-left margin
+                                   padding-top padding-right padding-bottom padding-left padding
+                                   border-top-width border-right-width border-bottom-width
+                                   border-left-width border-width border-top border-right
+                                   border-bottom border-left border border-color border-style width
+                                   height float clear display white-space list-style-type
+                                   list-style-image list-style-position list-style"/>
+                        <!-- Pseudo classes -->
+                        <Set index="1"
+                            value="first-letter first-line link active visited first-child focus
+                                   hover lang before after left right first"/>
+                        <!-- CSS2 Keywords -->
+                        <Set index="2"
+                            value="border-top-color border-right-color border-bottom-color
+                                   border-left-color border-color border-top-style
+                                   border-right-style border-bottom-style border-left-style
+                                   border-style top right bottom left position z-index direction
+                                   unicode-bidi min-width max-width min-height max-height overflow
+                                   clip visibility content quotes counter-reset counter-increment
+                                   marker-offset size marks page-break-before page-break-after
+                                   page-break-inside page orphans widows font-stretch
+                                   font-size-adjust unicode-range units-per-em src panose-1 stemv
+                                   stemh slope cap-height x-height ascent descent widths bbox
+                                   definition-src baseline centerline mathline topline text-shadow
+                                   caption-side table-layout border-collapse border-spacing
+                                   empty-cells speak-header cursor outline outline-width
+                                   outline-style outline-color volume speak pause-before pause-after
+                                   pause cue-before cue-after cue play-during azimuth elevation
+                                   speech-rate voice-family pitch pitch-range stress richness
+                                   speak-punctuation speak-numeral"/>
+                        <!-- CSS1 Values -->
+                        <Set index="3"
+                            value="auto none normal italic oblique small-caps bold bolder lighter
+                                   xx-small x-small small medium large x-large xx-large larger
+                                   smaller transparent repeat repeat-x repeat-y no-repeat scroll
+                                   fixed top bottom left center right justify both underline overline
+                                   line-through blink baseline sub super text-top middle text-bottom
+                                   capitalize uppercase lowercase thin medium thick dotted dashed
+                                   solid double groove ridge inset outset block inline list-item pre
+                                   no-wrap inside outside disc circle square decimal lower-roman
+                                   upper-roman lower-alpha upper-alpha aqua black blue fuchsia gray
+                                   green lime maroon navy olive purple red silver
+                                   teal white yellow"/>
+                        <!-- CSS2 Values -->
+                        <Set index="4"
+                            value="inherit run-in compact marker table inline-table table-row-group
+                                   table-header-group table-footer-group table-row table-column-group
+                                   table-column table-cell table-caption static relative absolute
+                                   fixed ltr rtl embed bidi-override visible hidden scroll collapse
+                                   open-quote close-quote no-open-quote no-close-quote
+                                   decimal-leading-zero lower-greek lower-latin upper-latin hebrew
+                                   armenian georgian cjk-ideographic hiragana katakana
+                                   hiragana-iroha katakana-iroha landscape portrait crop cross always
+                                   avoid wider narrower ultra-condensed extra-condensed condensed
+                                   semi-condensed semi-expanded expanded extra-expanded
+                                   ultra-expanded caption icon menu message-box small-caption
+                                   status-bar separate show hide once crosshair default pointer
+                                   move text wait help e-resize ne-resize nw-resize n-resize
+                                   se-resize sw-resize s-resize w-resize ActiveBorder ActiveCaption
+                                   AppWorkspace Background ButtonFace ButtonHighlight ButtonShadow
+                                   InactiveCaptionText ButtonText CaptionText GrayText Highlight
+                                   HighlightText InactiveBorder InactiveCaption InfoBackground
+                                   InfoText Menu MenuText Scrollbar ThreeDDarkShadow ThreeDFace
+                                   ThreeDHighlight ThreeDLightShadow ThreeDShadow Window WindowFrame
+                                   WindowText silent x-soft soft medium loud x-loud spell-out mix
+                                   left-side far-left center-left center-right far-right
+                                   right-side behind leftwards rightwards below level above higher
+                                   lower x-slow slow medium fast x-fast faster slower male female
+                                   child x-low low high x-high code digits continous"/>
 				</Keywords>
                 <SampleCode value="lexer_css.sample"/>
         </Lexer>
