diff --git a/autotests/input/highlight.less b/autotests/input/highlight.less
new file mode 100644
index 0000000..e178263
--- /dev/null
+++ b/autotests/input/highlight.less
@@ -0,0 +1,701 @@
+/**
+ * Less syntax highlighting test file
+ *
+ * Based on the Less documentation ((c) 2017 Alexis Sellier, the Less Core Team, Contributors, The MIT License)
+ *
+ * @see http://lesscss.org/features/
+ */
+
+.mixin(@color; @padding; @margin: 2) {
+  colorr: @color;
+  padding-3: @padding;
+  margin: @margin @margin @margin @margin;
+}
+
+@my-ruleset: {
+  .my-selector {
+    background-color: black;
+  }
+};
+
+@bacon: red;
+@beacon: background-color;
+@baecon: @{w} + @w;
+
+.noStar:extend(.class #sh:extend(#hhh) ) {}
+.noStar:nth-child(w: red) {}
+
+@media (max-width: @width2) and handheld {
+  height: auto;
+}
+
+.test when (@color = blue) .ffff {color: red;}
+
+.foo (@bg: #f5f5f5, @color: #900) {
+  background: @bg;
+  color: @color;
+
+  .x {
+    x: @nn;
+    a: white @{nn@{ww}};
+    background: red;
+  }
+}
+
+// Variables
+
+@link-color:        #428bca; // sea blue
+@link-color-hover:  darken(@link-color, 10%);
+
+a, .link {
+  color: @link-color;
+}
+
+a:hover {
+  color: @link-color-hover;
+}
+
+.widget {
+  color: #fff;
+  background: @link-color;
+}
+
+// Variable interpolation
+
+@my-selector: banner;
+
+.@{my-selector} when (@s = calc("s"); @{s} = calc("dddd")) {
+  font-weight: bold;
+  line-height+: 40px;
+  margin: 0 auto;
+}
+
+@images: "../img";
+
+body {
+  color: #444;
+  background: url("@{images}/white-sand.png");
+}
+
+@themes: "../../src/themes";
+
+@import "@{themes}/tidal-wave.less";
+
+@property: color;
+
+.widget {
+  @{property}: #0ee;
+  background-@{property}: #999;
+}
+
+// Variable names
+
+@fnord:  "I am fnord.";
+@var:    "fnord";
+
+.variable-names-example {
+  content: @@var;
+}
+
+// Lazy Evaluation
+
+.lazy-eval {
+  width: @var;
+}
+
+@var: @a;
+@a: 9%;
+
+@var: 0;
+.class {
+  @var: 1;
+  .brass {
+    @var: 2;
+    three: @var;
+    @var: 3;
+  }
+  one: @var;
+}
+
+// Default Variables
+
+@base-color: green;
+@dark-color: darken(@base-color, 10%);
+
+@import "library.less";
+@base-color: red;
+
+// Extend
+
+nav ul {
+  &:extend(.inline);
+  background: blue;
+}
+.inline {
+  color: red;
+}
+
+// Extend Syntax
+
+.e:extend(.f) {}
+.e:extend(.g) {}
+
+.e:extend(.f, .g) {}
+
+// Extend Attached to Selector
+
+.big-division,
+.big-bag:extend(.bag),
+.big-bucket:extend(.bucket) {
+}
+
+// Extend Inside Ruleset
+
+pre:hover,
+.some-class {
+  &:extend(div pre);
+}
+
+pre:hover:extend(div pre),
+.some-class:extend(div pre) {}
+
+// Extending Nested Selectors
+
+.bucket {
+  tr {
+    color: blue;
+  }
+}
+.some-class:extend(.bucket tr) {}
+
+// Exact Matching with Extend
+
+*.class {
+  color: blue;
+}
+.noStar:extend(.class) {}
+
+link:hover:visited {
+  color: blue;
+}
+.selector:extend(link:visited:hover) {}
+
+// nth Expression
+
+:nth-child(1n+3) {
+  color: blue;
+}
+.child:extend(:nth-child(n+3)) {}
+
+[title=identifier] {
+  color: blue;
+}
+[title='identifier'] {
+  color: blue;
+}
+[title="identifier"] {
+  color: blue;
+}
+
+.noQuote:extend([title=identifier]) {}
+.singleQuote:extend([title='identifier']) {}
+.doubleQuote:extend([title="identifier"]) {}
+
+// Extend "all"
+
+.a.b.test,
+.test.c {
+  color: orange;
+}
+.test {
+  &:hover {
+    color: green;
+  }
+}
+
+.replacement:extend(.test all) {}
+
+// Selector Interpolation with Extend
+
+.bucket {
+  color: blue;
+}
+@{variable}:extend(.bucket) {}
+@variable: .selector;
+
+// Scoping / Extend Inside @media
+
+@media print {
+  .screenClass:extend(.selector) {}
+  .selector {
+    color: black;
+  }
+}
+.selector {
+  color: red;
+}
+@media screen {
+  .selector {
+    color: blue;
+  }
+}
+
+// Use Cases for Extend
+
+.animal {
+  background-color: black;
+  color: white;
+}
+.bear {
+  &:extend(.animal);
+  background-color: brown;
+}
+
+.my-inline-block {
+  display: inline-block;
+  font-size: 0;
+}
+.thing1 {
+  &:extend(.my-inline-block);
+}
+.thing2 {
+  &:extend(.my-inline-block);
+}
+
+// Mixins
+
+.a, #b {
+  color: red;
+}
+.mixin-class {
+  .a();
+}
+.mixin-id {
+  #b();
+}
+
+// Not Outputting the Mixin
+
+.my-mixin {
+  color: black;
+}
+.my-other-mixin() {
+  background: white;
+}
+.class {
+  .my-mixin;
+  .my-other-mixin;
+}
+
+// Selectors in Mixins
+
+.my-hover-mixin() {
+  &:hover {
+    border: 1px solid red;
+  }
+}
+button {
+  .my-hover-mixin();
+}
+
+// Namespaces
+
+#outer {
+  .inner {
+    color: red;
+  }
+}
+
+.c {
+  #outer > .inner;
+}
+
+.d {
+  #outer > .inner;
+  #outer > .inner();
+  #outer .inner;
+  #outer .inner();
+  #outer.inner;
+  #outer.inner();
+}
+
+// Guarded Namespaces
+
+#namespace when (@mode=huge) {
+  .mixin() { /* */ }
+}
+
+#namespace {
+  .mixin() when (@mode=huge) { /* */ }
+}
+
+#sp_1 when (default()) {
+  #sp_2 when (default()) {
+    .mixin() when not(default()) { /* */ }
+  }
+}
+
+// The !important keyword
+
+.foo (@bg: #f5f5f5, @color: #900) {
+  background: @bg;
+  color: @color !important;
+}
+.unimportant {
+  .foo();
+}
+.important {
+  .foo() !important;
+}
+
+// Parametric Mixins
+
+.border-radius(@radius) {
+  -webkit-border-radius: @radius;
+     -moz-border-radius: @radius;
+          border-radius: @radius;
+}
+
+#header {
+  .border-radius(4px);
+}
+.button {
+  .border-radius(6px);
+}
+
+.border-radius(@radius: 5px) {
+  -webkit-border-radius: @radius;
+     -moz-border-radius: @radius;
+          border-radius: @radius;
+}
+
+.wrap() {
+  text-wrap: wrap;
+  white-space: -moz-pre-wrap;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+}
+
+pre { .wrap }
+
+// Mixins with Multiple Parameters
+
+.mixin(@color) {
+  color-1: @color;
+}
+.mixin(@color; @padding: 2) {
+  color-2: @color;
+  padding-2: @padding;
+}
+.mixin(@color; @padding; @margin: 2) {
+  color-3: @color;
+  padding-3: @padding;
+  margin: @margin @margin @margin @margin;
+}
+.some .selector div {
+  .mixin(#008000);
+}
+
+// Named parameters
+
+.mixin(@color: black; @margin: 10px; @padding: 20px) {
+  color: @color;
+  margin: @margin;
+  padding: @padding;
+}
+.class1 {
+  .mixin(@margin: 20px; @color: #33acfe);
+}
+.class2 {
+  .mixin(#efca44; @padding: 40px);
+}
+
+// The @arguments Variable
+
+.box-shadow(@x: 0; @y: 0; @blur: 1px; @color: #000) {
+  -webkit-box-shadow: @arguments;
+     -moz-box-shadow: @arguments;
+          box-shadow: @arguments;
+}
+.big-block {
+  .box-shadow(2px; 5px);
+}
+
+// Advanced Arguments and the @rest Variable
+
+.mixin(...) {}        // matches 0-N arguments
+.mixin() {}           // matches exactly 0 arguments
+.mixin(@a: 1) {}      // matches 0-1 arguments
+.mixin(@a: 1; ...) {} // matches 0-N arguments
+.mixin(@a; ...) {}    // matches 1-N arguments
+
+.mixin(@a; @rest...) {
+   // @rest is bound to arguments after @a
+   // @arguments is bound to all arguments
+}
+
+// Pattern-matching
+
+.mixin(@s; @color) { ... }
+
+.class {
+  .mixin(@switch; #888);
+}
+
+.mixin(dark; @color) {
+  color: darken(@color, 10%);
+}
+.mixin(light; @color) {
+  color: lighten(@color, 10%);
+}
+.mixin(@_; @color) {
+  display: block;
+}
+
+@switch: light;
+
+.class {
+  .mixin(@switch; #888);
+}
+
+// Mixins as Functions
+
+.average(@x, @y) {
+  @average: ((@x + @y) / 2);
+}
+
+div {
+  .average(16px, 50px); // "call" the mixin
+  padding: @average;    // use its "return" value
+}
+
+// Passing Rulesets to Mixins
+
+// declare detached ruleset
+@detached-ruleset: { background: red; };
+
+// use detached ruleset
+.top {
+    @detached-ruleset();
+}
+
+.desktop-and-old-ie(@rules) {
+  @media screen and (min-width: 1200px) { @rules(); }
+  html.lt-ie9 &                         { @rules(); }
+}
+
+header {
+  background-color: blue;
+
+  .desktop-and-old-ie({
+    background-color: red;
+  });
+}
+
+@my-ruleset: {
+  .my-selector {
+    background-color: black;
+  }
+};
+
+@my-ruleset: {
+    .my-selector {
+      @media tv {
+        background-color: black;
+      }
+    }
+  };
+@media (orientation:portrait) {
+    @my-ruleset();
+}
+
+// Scoping
+
+@detached-ruleset: {
+  caller-variable: @caller-variable; // variable is undefined here
+  .caller-mixin(); // mixin is undefined here
+};
+
+selector {
+  // use detached ruleset
+  @detached-ruleset();
+
+  // define variable and mixin needed inside the detached ruleset
+  @caller-variable: value;
+  .caller-mixin() {
+    variable: declaration;
+  }
+}
+
+/*
+ * reference: use a Less file but do not output it
+inline: include the source file in the output but do not process it
+less: treat the file as a Less file, no matter what the file extension
+css: treat the file as a CSS file, no matter what the file extension
+once: only include the file once (this is default behavior)
+multiple: include the file multiple times
+optional: continue compiling when file is not found
+ */
+
+@import (optional, reference) "foo.less";
+
+// Mixin Guards
+
+.mixin (@a) when (lightness(@a) >= 50%) {
+  background-color: black;
+}
+.mixin (@a) when (lightness(@a) < 50%) {
+  background-color: white;
+}
+.mixin (@a) {
+  color: @a;
+}
+
+// Guard Comparison Operators
+
+.truth (@a) when (@a) { }
+.truth (@a) when (@a = true) { }
+
+// FIXME: @media as variable
+@media: mobile;
+
+.mixin (@a) when (@media = mobile) { }
+.mixin (@a) when (@media = desktop) { }
+
+.max (@a; @b) when (@a > @b) { width: @a }
+.max (@a; @b) when (@a < @b) { width: @b }
+
+// Guard Logical Operators
+
+.mixin (@a) when (isnumber(@a)) and (@a > 0) {  }
+.mixin (@a) when (@a > 10), (@a < -10) {  }
+.mixin (@b) when not (@b > 0) { }
+
+// Type Checking Functions
+
+.mixin (@a; @b: 0) when (isnumber(@b)) { }
+.mixin (@a; @b: black) when (iscolor(@b)) {}
+
+button when (@my-option = true) {
+  color: white;
+
+  & when (@my-option = true) {
+  button {
+    color: white;
+  }
+  a {
+    color: blue;
+  }
+}
+}
+
+// Loops
+
+.loop(@counter) when (@counter > 0) {
+  .loop((@counter - 1));    // next iteration
+  width: (10px * @counter); // code for each iteration
+}
+
+div {
+  .loop(5); // launch the loop
+}
+
+// Merge
+
+.mixin() {
+  box-shadow+: inset 0 0 10px #555;
+}
+.myclass {
+  .mixin();
+  box-shadow+: 0 0 20px black;
+}
+
+// Space
+
+.mixin() {
+  transform+_: scale(2);
+}
+.myclass {
+  .mixin();
+  transform+_: rotate(15deg);
+}
+
+// Parent Selectors
+
+a {
+  color: blue;
+  &:hover {
+    color: green;
+  }
+}
+
+.button {
+  &-ok {
+    background-image: url("ok.png");
+  }
+  &-cancel {
+    background-image: url("cancel.png");
+  }
+
+  &-custom {
+    background-image: url("custom.png");
+  }
+}
+
+.link {
+  & + & {
+    color: red;
+  }
+
+  & & {
+    color: green;
+  }
+
+  && {
+    color: blue;
+  }
+
+  &, &ish {
+    color: cyan;
+  }
+}
+
+.grand {
+  .parent {
+    & > & {
+      color: red;
+    }
+
+    & & {
+      color: green;
+    }
+
+    && {
+      color: blue;
+    }
+
+    &, &ish {
+      color: cyan;
+    }
+  }
+}
+
+// Changing Selector Order
+
+.header {
+  .menu {
+    border-radius: 5px;
+    .no-borderradius & {
+      background-image: url('images/button-background.png');
+    }
+  }
+}
+
+// Combinatorial Explosion
+
+p, a, ul, li {
+  border-top: 2px dotted #366;
+  & + & {
+    border-top: 0;
+  }
+}
diff --git a/data/syntax/less.xml b/data/syntax/less.xml
index dc36d86..bbf7bed 100644
--- a/data/syntax/less.xml
+++ b/data/syntax/less.xml
@@ -1,1101 +1,1469 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
-<language name="LESSCSS" version="2" kateversion="3.4" section="Markup" extensions="*.less" mimetype="text/css" author="from CCS:Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+  <!-- http://www.w3.org/TR/CSS21/syndata.html#tokenization -->
+  <!ENTITY nmstart "[_a-zA-Z]|(\\[0-9a-fA-F]{1,6})|(\\[^\n\r\f0-9a-fA-F])">
+  <!ENTITY nmchar  "[_a-zA-Z0-9-]|(\\[0-9a-fA-F]{1,6})|(\\[^\n\r\f0-9a-fA-F])">
+]>
+<language name="LESSCSS" version="3" kateversion="5.0" section="Markup" extensions="*.less" mimetype="text/css"
+          author="from CCS:Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
+    <!--
+    Version 3 (2017-05-10):
+    - rebased on SCSS syntax version 4 (by Guo Yunhe guoyunhebrave@gmail.com)
+    - added some CSS colours and properties
+    -->
 
     <highlighting>
         <list name="properties">
             <!-- W3C > Work Draft, from https://www.w3.org/Style/CSS/all-properties -->
-            <item>azimuth</item>
             <item>align-content</item>
             <item>align-items</item>
             <item>align-self</item>
             <item>alignment-baseline</item>
             <item>all</item>
-            <item>animation-name</item>
+            <item>animation</item>
+            <item>animation-delay</item>
+            <item>animation-direction</item>
             <item>animation-duration</item>
+            <item>animation-fill-mode</item>
             <item>animation-iteration-count</item>
-            <item>animation-direction</item>
-            <item>animation-delay</item>
+            <item>animation-name</item>
             <item>animation-play-state</item>
-            <item>animation-fill-mode</item>
             <item>animation-timing-function</item>
+            <item>appearance</item>
+            <item>azimuth</item>
             <item>backface-visibility</item>
             <item>background</item>
             <item>background-attachment</item>
             <item>background-blend-mode</item>
             <item>background-break</item>
             <item>background-clip</item>
             <item>background-color</item>
             <item>background-image</item>
             <item>background-origin</item>
             <item>background-position</item>
             <item>background-repeat</item>
             <item>background-size</item>
             <item>baseline-shift</item>
+            <item>block-step</item>
+            <item>block-step-align</item>
+            <item>block-step-insert</item>
+            <item>block-step-round</item>
+            <item>block-step-size</item>
             <item>bookmark-label</item>
             <item>bookmark-level</item>
-            <item>bookmark-level</item>
+            <item>bookmark-state</item>
             <item>border</item>
             <item>border-bottom</item>
             <item>border-bottom-color</item>
             <item>border-bottom-image</item>
-            <item>border-bottom-style</item>
-            <item>border-bottom-width</item>
             <item>border-bottom-left-image</item>
             <item>border-bottom-left-radius</item>
             <item>border-bottom-right-image</item>
             <item>border-bottom-right-radius</item>
+            <item>border-bottom-style</item>
+            <item>border-bottom-width</item>
             <item>border-boundary</item>
             <item>border-collapse</item>
             <item>border-color</item>
             <item>border-corner-image</item>
             <item>border-image</item>
             <item>border-image-outset</item>
             <item>border-image-repeat</item>
             <item>border-image-slice</item>
             <item>border-image-source</item>
             <item>border-image-width</item>
             <item>border-left</item>
             <item>border-left-color</item>
             <item>border-left-image</item>
             <item>border-left-style</item>
             <item>border-left-width</item>
             <item>border-radius</item>
             <item>border-right</item>
             <item>border-right-color</item>
             <item>border-right-image</item>
             <item>border-right-style</item>
             <item>border-right-width</item>
             <item>border-spacing</item>
             <item>border-style</item>
             <item>border-top</item>
             <item>border-top-color</item>
             <item>border-top-image</item>
-            <item>border-top-style</item>
-            <item>border-top-width</item>
             <item>border-top-left-image</item>
             <item>border-top-left-radius</item>
             <item>border-top-right-image</item>
             <item>border-top-right-radius</item>
+            <item>border-top-style</item>
+            <item>border-top-width</item>
             <item>border-width</item>
             <item>bottom</item>
             <item>box-align</item>
             <item>box-decoration-break</item>
             <item>box-direction</item>
             <item>box-flex</item>
             <item>box-shadow</item>
             <item>box-sizing</item>
             <item>box-snap</item>
             <item>box-suppress</item>
             <item>break-after</item>
             <item>break-before</item>
             <item>break-inside</item>
-            <item>caret-color</item>
             <item>caption-side</item>
+            <item>caret</item>
+            <item>caret-animation</item>
+            <item>caret-color</item>
+            <item>caret-shape</item>
             <item>chains</item>
             <item>clear</item>
             <item>clip</item>
             <item>clip-path</item>
             <item>clip-rule</item>
             <item>color</item>
+            <item>color-adjust</item>
             <item>color-interpolation-filters</item>
             <item>column-count</item>
             <item>column-fill</item>
             <item>column-gap</item>
             <item>column-rule</item>
             <item>column-rule-color</item>
             <item>column-rule-style</item>
             <item>column-rule-width</item>
             <item>column-span</item>
             <item>column-width</item>
             <item>columns</item>
+            <item>contain</item>
             <item>content</item>
             <item>counter-increment</item>
             <item>counter-reset</item>
             <item>counter-set</item>
             <item>cue</item>
             <item>cue-after</item>
             <item>cue-before</item>
             <item>cursor</item>
             <item>direction</item>
             <item>display</item>
             <item>dominant-baseline</item>
             <item>elevation</item>
             <item>empty-cells</item>
+            <item>fill</item>
+            <item>fill-break</item>
+            <item>fill-color</item>
+            <item>fill-image</item>
+            <item>fill-opacity</item>
+            <item>fill-origin</item>
+            <item>fill-position</item>
+            <item>fill-repeat</item>
+            <item>fill-rule</item>
+            <item>fill-size</item>
             <item>filter</item>
             <item>flex</item>
             <item>flex-basis</item>
             <item>flex-direction</item>
             <item>flex-flow</item>
             <item>flex-grow</item>
             <item>flex-shrink</item>
             <item>flex-wrap</item>
             <item>float</item>
+            <item>float-defer</item>
+            <item>float-offset</item>
+            <item>float-reference</item>
             <item>flood-color</item>
             <item>flood-opacity</item>
             <item>flow</item>
             <item>flow-from</item>
             <item>flow-into</item>
             <item>font</item>
             <item>font-family</item>
+            <item>font-feature-settings</item>
+            <item>font-kerning</item>
+            <item>font-language-override</item>
             <item>font-size</item>
             <item>font-size-adjust</item>
             <item>font-stretch</item>
             <item>font-style</item>
-            <item>font-variant</item>
-            <item>font-weight</item>
-            <item>font-stretch</item>
-            <item>font-feature-settings</item>
-            <item>font-kerning</item>
-            <item>font-language-override</item>
             <item>font-synthesis</item>
+            <item>font-variant</item>
             <item>font-variant-alternates</item>
             <item>font-variant-caps</item>
             <item>font-variant-east-asian</item>
             <item>font-variant-ligatures</item>
             <item>font-variant-numeric</item>
             <item>font-variant-position</item>
+            <item>font-weight</item>
             <item>footnote-display</item>
             <item>footnote-policy</item>
             <item>glyph-orientation-vertical</item>
             <item>grid</item>
             <item>grid-area</item>
             <item>grid-auto-columns</item>
             <item>grid-auto-flow</item>
             <item>grid-auto-rows</item>
             <item>grid-column</item>
             <item>grid-column-end</item>
             <item>grid-column-gap</item>
             <item>grid-column-start</item>
             <item>grid-gap</item>
             <item>grid-row</item>
             <item>grid-row-end</item>
             <item>grid-row-gap</item>
             <item>grid-row-start</item>
             <item>grid-template</item>
             <item>grid-template-areas</item>
             <item>grid-template-columns</item>
             <item>grid-template-rows</item>
             <item>hanging-punctuation</item>
             <item>height</item>
+            <item>hyphenate-character</item>
+            <item>hyphenate-limit-chars</item>
+            <item>hyphenate-limit-last</item>
+            <item>hyphenate-limit-lines</item>
+            <item>hyphenate-limit-zone</item>
             <item>hyphens</item>
             <item>image-orientation</item>
             <item>image-rendering</item>
             <item>image-resolution</item>
             <item>initial-letter</item>
             <item>initial-letter-align</item>
             <item>initial-letter-wrap</item>
             <item>isolation</item>
             <item>justify-content</item>
             <item>justify-items</item>
             <item>justify-self</item>
             <item>left</item>
             <item>letter-spacing</item>
             <item>lighting-color</item>
-            <item>linear-gradient</item>
+            <item>line-break</item>
             <item>line-grid</item>
             <item>line-height</item>
+            <item>line-height-step</item>
             <item>line-snap</item>
+            <item>linear-gradient</item>
             <item>list-style</item>
             <item>list-style-image</item>
             <item>list-style-keyword</item>
             <item>list-style-position</item>
             <item>list-style-type</item>
             <item>margin</item>
             <item>margin-bottom</item>
             <item>margin-left</item>
             <item>margin-right</item>
             <item>margin-top</item>
+            <item>marker</item>
+            <item>marker-end</item>
+            <item>marker-knockout-left</item>
+            <item>marker-knockout-right</item>
+            <item>marker-mid</item>
             <item>marker-offset</item>
+            <item>marker-pattern</item>
+            <item>marker-segment</item>
             <item>marker-side</item>
+            <item>marker-start</item>
             <item>marquee-direction</item>
             <item>marquee-loop</item>
             <item>marquee-speed</item>
             <item>marquee-style</item>
             <item>mask</item>
             <item>mask-border</item>
             <item>mask-border-mode</item>
             <item>mask-border-outset</item>
             <item>mask-border-repeat</item>
             <item>mask-border-slice</item>
             <item>mask-border-source</item>
             <item>mask-border-width</item>
             <item>mask-clip</item>
             <item>mask-composite</item>
             <item>mask-image</item>
             <item>mask-mode</item>
             <item>mask-origin</item>
             <item>mask-position</item>
             <item>mask-repeat</item>
             <item>mask-size</item>
             <item>mask-type</item>
             <item>max-height</item>
             <item>max-lines</item>
             <item>max-width</item>
             <item>min-height</item>
             <item>min-width</item>
             <item>mix-blend-mode</item>
+            <item>motion</item>
+            <item>motion-offset</item>
+            <item>motion-path</item>
+            <item>motion-rotation</item>
             <item>nav-down</item>
             <item>nav-left</item>
             <item>nav-right</item>
             <item>nav-up</item>
             <item>object-fit</item>
             <item>object-position</item>
             <item>offset-after</item>
             <item>offset-before</item>
             <item>offset-end</item>
             <item>offset-start</item>
             <item>opacity</item>
             <item>order</item>
             <item>orphans</item>
             <item>outline</item>
             <item>outline-color</item>
             <item>outline-offset</item>
             <item>outline-style</item>
             <item>outline-width</item>
             <item>overflow</item>
             <item>overflow-style</item>
             <item>overflow-wrap</item>
             <item>overflow-x</item>
             <item>overflow-y</item>
             <item>padding</item>
             <item>padding-bottom</item>
             <item>padding-left</item>
             <item>padding-right</item>
             <item>padding-top</item>
             <item>page</item>
             <item>page-break-after</item>
             <item>page-break-before</item>
             <item>page-break-inside</item>
             <item>pause</item>
             <item>pause-after</item>
             <item>pause-before</item>
             <item>perspective</item>
             <item>perspective-origin</item>
             <item>pitch</item>
             <item>pitch-range</item>
+            <item>place-content</item>
+            <item>place-items</item>
+            <item>place-self</item>
             <item>play-during</item>
             <item>pointer-events</item>
             <item>polar-anchor</item>
             <item>polar-angle</item>
             <item>polar-distance</item>
             <item>polar-origin</item>
             <item>position</item>
             <item>presentation-level</item>
             <item>quotes</item>
+            <item>region-fragment</item>
             <item>resize</item>
             <item>rest</item>
             <item>rest-after</item>
             <item>rest-before</item>
             <item>richness</item>
             <item>right</item>
             <item>rotation</item>
             <item>rotation-point</item>
             <item>ruby-align</item>
             <item>ruby-merge</item>
             <item>ruby-position</item>
             <item>running</item>
             <item>scroll-behavior</item>
+            <item>scroll-padding</item>
+            <item>scroll-padding-block</item>
+            <item>scroll-padding-block-end</item>
+            <item>scroll-padding-block-start</item>
+            <item>scroll-padding-bottom</item>
+            <item>scroll-padding-inline</item>
+            <item>scroll-padding-inline-end</item>
+            <item>scroll-padding-inline-start</item>
+            <item>scroll-padding-left</item>
+            <item>scroll-padding-right</item>
+            <item>scroll-padding-top</item>
             <item>scroll-snap-align</item>
             <item>scroll-snap-margin</item>
             <item>scroll-snap-margin-block</item>
             <item>scroll-snap-margin-block-end</item>
             <item>scroll-snap-margin-block-start</item>
             <item>scroll-snap-margin-bottom</item>
             <item>scroll-snap-margin-inline</item>
             <item>scroll-snap-margin-inline-end</item>
             <item>scroll-snap-margin-inline-start</item>
             <item>scroll-snap-margin-left</item>
             <item>scroll-snap-margin-right</item>
             <item>scroll-snap-margin-top</item>
-            <item>scroll-snap-padding</item>
-            <item>scroll-snap-padding-block</item>
-            <item>scroll-snap-padding-block-end</item>
-            <item>scroll-snap-padding-block-start</item>
-            <item>scroll-snap-padding-bottom</item>
-            <item>scroll-snap-padding-inline</item>
-            <item>scroll-snap-padding-inline-end</item>
-            <item>scroll-snap-padding-inline-start</item>
-            <item>scroll-snap-padding-left</item>
-            <item>scroll-snap-padding-right</item>
-            <item>scroll-snap-padding-top</item>
             <item>scroll-snap-stop</item>
             <item>scroll-snap-type</item>
             <item>shape-image-threshold</item>
             <item>shape-inside</item>
             <item>shape-margin</item>
             <item>shape-outside</item>
             <item>size</item>
             <item>speak</item>
             <item>speak-as</item>
             <item>speak-header</item>
             <item>speak-numeral</item>
             <item>speak-punctuation</item>
             <item>speech-rate</item>
             <item>stress</item>
             <item>string-set</item>
+            <item>stroke</item>
+            <item>stroke-align</item>
+            <item>stroke-alignment</item>
+            <item>stroke-break</item>
+            <item>stroke-color</item>
+            <item>stroke-dash-corner</item>
+            <item>stroke-dash-justify</item>
+            <item>stroke-dashadjust</item>
+            <item>stroke-dasharray</item>
+            <item>stroke-dashcorner</item>
+            <item>stroke-dashoffset</item>
+            <item>stroke-image</item>
+            <item>stroke-linecap</item>
+            <item>stroke-linejoin</item>
+            <item>stroke-miterlimit</item>
+            <item>stroke-opacity</item>
+            <item>stroke-origin</item>
+            <item>stroke-position</item>
+            <item>stroke-repeat</item>
+            <item>stroke-size</item>
+            <item>stroke-width</item>
             <item>tab-size</item>
             <item>table-layout</item>
             <item>text-align</item>
             <item>text-align-last</item>
             <item>text-combine-upright</item>
             <item>text-decoration</item>
             <item>text-decoration-color</item>
             <item>text-decoration-line</item>
             <item>text-decoration-skip</item>
             <item>text-decoration-style</item>
             <item>text-emphasis</item>
             <item>text-emphasis-color</item>
             <item>text-emphasis-position</item>
             <item>text-emphasis-style</item>
             <item>text-indent</item>
             <item>text-justify</item>
             <item>text-orientation</item>
             <item>text-overflow</item>
             <item>text-shadow</item>
+            <item>test-space-collapse</item>
+            <item>test-space-trim</item>
+            <item>test-spacing</item>
             <item>text-transform</item>
             <item>text-underline-position</item>
             <item>text-wrap</item>
             <item>top</item>
             <item>transform</item>
             <item>transform-origin</item>
             <item>transform-style</item>
             <item>transition</item>
             <item>transition-delay</item>
-            <item>transition-property</item>
             <item>transition-duration</item>
+            <item>transition-property</item>
             <item>transition-timing-function</item>
             <item>unicode-bidi</item>
+            <item>user-select</item>
             <item>vertical-align</item>
             <item>visibility</item>
             <item>voice-balance</item>
             <item>voice-duration</item>
             <item>voice-family</item>
             <item>voice-pitch</item>
             <item>voice-range</item>
             <item>voice-rate</item>
             <item>voice-stress</item>
             <item>voice-volume</item>
             <item>volume</item>
             <item>white-space</item>
             <item>widows</item>
             <item>width</item>
             <item>will-change</item>
             <item>word-break</item>
             <item>word-spacing</item>
             <item>word-wrap</item>
+            <item>wrap-after</item>
+            <item>wrap-before</item>
             <item>wrap-flow</item>
+            <item>wrap-inside</item>
             <item>wrap-through</item>
             <item>writing-mode</item>
             <item>z-index</item>
 
             <!-- Gecko rendering engine CSS property extensions -->
             <item>-moz-animation-name</item>
             <item>-moz-animation-duration</item>
             <item>-moz-animation-iteration</item>
             <item>-moz-animation-direction</item>
             <item>-moz-animation-delay</item>
             <item>-moz-animation-play-state</item>
             <item>-moz-animation-fill-mode</item>
             <item>-moz-background-size</item>
             <item>-moz-border-image</item>
             <item>-moz-border-bottom-colors</item>
             <item>-moz-border-left-colors</item>
             <item>-moz-border-radius</item>
             <item>-moz-border-radius-topleft</item>
             <item>-moz-border-radius-topright</item>
             <item>-moz-border-radius-bottomleft</item>
             <item>-moz-border-radius-bottomright</item>
             <item>-moz-border-right-colors</item>
             <item>-moz-border-top-colors</item>
             <item>-moz-box</item>
             <item>-moz-box-flex</item>
             <item>-moz-box-shadow</item>
             <item>-moz-box-sizing</item>
             <item>-moz-column-count</item>
             <item>-moz-column-gap</item>
             <item>-moz-hyphens</item>
             <item>-moz-linear-gradient</item>
             <item>-moz-opacity</item>
             <item>-moz-outline-style</item>
             <item>-moz-perspective</item>
             <item>-moz-radial-gradient</item>
             <item>-moz-resize</item>
             <item>-moz-transform</item>
             <item>-moz-transform-origin</item>
             <item>-moz-transform-style</item>
             <item>-moz-transition</item>
             <item>-moz-transition-property</item>
             <item>-moz-transition-duration</item>
 
             <!-- Opera rendering engine CSS property extensions -->
             <item>-o-background-size</item>
             <item>-o-linear-gradient</item>
             <item>-o-text-overflow</item>
             <item>-o-transition</item>
             <item>-o-transform-origin</item>
 
             <!-- konq specific -->
             <item>konq_bgpos_x</item>
             <item>konq_bgpos_y</item>
             <item>-khtml-background-size</item>
             <item>-khtml-border-top-left-radius</item>
             <item>-khtml-border-top-right-radius</item>
             <item>-khtml-border-bottom-left-radius</item>
             <item>-khtml-border-bottom-right-radius</item>
             <item>-khtml-border-radius</item>
             <item>-khtml-box-shadow</item>
             <item>-khtml-opacity</item>
 
             <!-- Webkit rendering engine CSS property extensions -->
             <item>-webkit-appearance</item>
             <item>-webkit-animation-name</item>
             <item>-webkit-animation-duration</item>
             <item>-webkit-animation-iteration</item>
             <item>-webkit-animation-direction</item>
             <item>-webkit-animation-delay</item>
             <item>-webkit-animation-play-state</item>
             <item>-webkit-animation-fill-mode</item>
             <item>-webkit-background-size</item>
             <item>-webkit-border-image</item>
             <item>-webkit-border-bottom-colors</item>
             <item>-webkit-border-left-colors</item>
             <item>-webkit-border-radius</item>
             <item>-webkit-border-right-colors</item>
             <item>-webkit-border-top-colors</item>
             <item>-webkit-border-top-left-radius</item>
             <item>-webkit-border-top-right-radius</item>
             <item>-webkit-border-bottom-left-radius</item>
             <item>-webkit-border-bottom-right-radius</item>
             <item>-webkit-border-radius-bottomleft</item>
             <item>-webkit-border-radius-bottomright</item>
             <item>-webkit-box-flex</item>
             <item>-webkit-box-reflect</item>
             <item>-webkit-box-shadow</item>
             <item>-webkit-box-sizing</item>
             <item>-webkit-column-count</item>
             <item>-webkit-column-gap</item>
             <item>-webkit-hyphens</item>
             <item>-webkit-linear-gradient</item>
             <item>-webkit-gradient</item>
             <item>-webkit-perspective</item>
             <item>-webkit-text-fill-color</item>
             <item>-webkit-text-stroke-color</item>
             <item>-webkit-text-stroke-width</item>
             <item>-webkit-text-size-adjust</item>
             <item>-webkit-transform</item>
             <item>-webkit-transform-origin</item>
             <item>-webkit-transform-style</item>
             <item>-webkit-transition</item>
             <item>-webkit-transition-property</item>
             <item>-webkit-transition-duration</item>
 
             <!-- Trident (a.k.a., MSHTML) CSS property extensions -->
             <item>zoom</item>
             <item>-ms-animation-name</item>
             <item>-ms-animation-duration</item>
             <item>-ms-animation-iteration</item>
             <item>-ms-animation-direction</item>
             <item>-ms-animation-delay</item>
             <item>-ms-animation-play-state</item>
             <item>-ms-animation-fill-mode</item>
             <item>-ms-box-sizing</item>
             <item>-ms-filter</item>
             <item>-ms-interpolation-mode</item>
             <item>-ms-linear-gradient</item>
             <item>-ms-text-size-adjust</item>
             <item>-ms-transform</item>
             <item>-ms-transition</item>
 
             <!-- font properties in @font-face -->
             <item>font-family</item>
             <item>font-size</item>
             <item>font-stretch</item>
             <item>font-style</item>
             <item>font-variant</item>
             <item>font-weight</item>
             <item>unicode-range</item>
             <item>units-per-em</item>
             <item>src</item>
             <item>panose-1</item>
             <item>stemv</item>
             <item>stemh</item>
             <item>slope</item>
             <item>cap-height</item>
             <item>x-height</item>
             <item>ascent</item>
             <item>descent</item>
             <item>widths</item>
             <item>bbox</item>
             <item>definition-src</item>
             <item>baseline</item>
             <item>centerline</item>
             <item>mathline</item>
             <item>topline</item>
         </list>
 
-        <list name="types">
+        <list name="values">
             <item>inherit</item>
             <item>none</item>
             <item>hidden</item>
             <item>dotted</item>
             <item>dashed</item>
             <item>solid</item>
             <item>double</item>
             <item>groove</item>
             <item>ridge</item>
             <item>inset</item>
             <item>outset</item>
             <item>xx-small</item>
             <item>x-small</item>
             <item>small</item>
             <item>medium</item>
             <item>large</item>
             <item>x-large</item>
             <item>xx-large</item>
             <item>smaller</item>
             <item>larger</item>
             <item>italic</item>
             <item>oblique</item>
             <item>small-caps</item>
             <item>normal</item>
             <item>bold</item>
             <item>bolder</item>
             <item>lighter</item>
             <item>light</item>
             <item>100</item>
             <item>200</item>
             <item>300</item>
             <item>400</item>
             <item>500</item>
             <item>600</item>
             <item>700</item>
             <item>800</item>
             <item>900</item>
             <item>transparent</item>
             <item>repeat</item>
             <item>repeat-x</item>
             <item>repeat-y</item>
             <item>no-repeat</item>
             <item>baseline</item>
             <item>sub</item>
             <item>super</item>
             <item>top</item>
             <item>text-top</item>
             <item>middle</item>
             <item>bottom</item>
             <item>text-bottom</item>
             <item>left</item>
             <item>right</item>
             <item>center</item>
             <item>justify</item>
             <item>konq-center</item>
             <item>disc</item>
             <item>circle</item>
             <item>square</item>
             <item>box</item>
             <item>decimal</item>
             <item>decimal-leading-zero</item>
             <item>lower-roman</item>
             <item>upper-roman</item>
             <item>lower-greek</item>
             <item>lower-alpha</item>
             <item>lower-latin</item>
             <item>upper-alpha</item>
             <item>upper-latin</item>
             <item>hebrew</item>
             <item>armenian</item>
             <item>georgian</item>
             <item>cjk-ideographic</item>
             <item>hiragana</item>
             <item>katakana</item>
             <item>hiragana-iroha</item>
             <item>katakana-iroha</item>
             <item>inline</item>
             <item>inline-block</item>
             <item>block</item>
             <item>list-item</item>
             <item>run-in</item>
             <item>compact</item>
             <item>marker</item>
             <item>table</item>
             <item>inline-table</item>
             <item>table-row-group</item>
             <item>table-header-group</item>
             <item>table-footer-group</item>
             <item>table-row</item>
             <item>table-column-group</item>
             <item>table-column</item>
             <item>table-cell</item>
             <item>table-caption</item>
             <item>auto</item>
             <item>crosshair</item>
             <item>default</item>
             <item>pointer</item>
             <item>move</item>
             <item>e-resize</item>
             <item>ne-resize</item>
             <item>nw-resize</item>
             <item>n-resize</item>
             <item>se-resize</item>
             <item>sw-resize</item>
             <item>s-resize</item>
             <item>w-resize</item>
             <item>text</item>
             <item>wait</item>
             <item>help</item>
             <item>above</item>
             <item>absolute</item>
             <item>always</item>
             <item>avoid</item>
             <item>below</item>
             <item>bidi-override</item>
             <item>blink</item>
             <item>both</item>
             <item>capitalize</item>
             <item>caption</item>
             <item>clip</item>
             <item>close-quote</item>
             <item>collapse</item>
             <item>condensed</item>
             <item>crop</item>
             <item>cross</item>
             <item>ellipsis</item>
             <item>ellipsis-word</item>
             <item>embed</item>
             <item>expanded</item>
             <item>extra-condensed</item>
             <item>extra-expanded</item>
             <item>fixed</item>
             <item>hand</item>
             <item>hide</item>
             <item>higher</item>
             <item>icon</item>
             <item>inside</item>
             <item>invert</item>
             <item>landscape</item>
             <item>level</item>
             <item>line-through</item>
             <item>loud</item>
             <item>lower</item>
             <item>lowercase</item>
             <item>ltr</item>
             <item>menu</item>
             <item>message-box</item>
             <item>mix</item>
             <item>narrower</item>
             <item>no-close-quote</item>
             <item>no-open-quote</item>
             <item>nowrap</item>
             <item>open-quote</item>
             <item>outside</item>
             <item>overline</item>
             <item>portrait</item>
             <item>pre</item>
             <item>pre-line</item>
             <item>pre-wrap</item>
             <item>relative</item>
             <item>rtl</item>
             <item>scroll</item>
             <item>semi-condensed</item>
             <item>semi-expanded</item>
             <item>separate</item>
             <item>show</item>
             <item>small-caption</item>
             <item>static</item>
             <item>static-position</item>
             <item>status-bar</item>
             <item>thick</item>
             <item>thin</item>
             <item>ultra-condensed</item>
             <item>ultra-expanded</item>
             <item>underline</item>
             <item>uppercase</item>
             <item>visible</item>
             <item>wider</item>
             <item>break</item>
             <item>serif</item>
             <item>sans-serif</item>
             <item>cursive</item>
             <item>fantasy</item>
             <item>monospace</item>
             <item>border-box</item>
             <item>content-box</item>
             <item>-epub-hyphens</item>
         </list>
 
         <list name="colors">
+            <!--
+                Extended color keywords
+                @see https://drafts.csswg.org/css-color-3/#svg-color
+            -->
+
+            <item>aliceblue</item>
+            <item>antiquewhite</item>
             <item>aqua</item>
+            <item>aquamarine</item>
+            <item>azure</item>
+            <item>beige</item>
+            <item>bisque</item>
             <item>black</item>
+            <item>blanchedalmond</item>
             <item>blue</item>
+            <item>blueviolet</item>
+            <item>brown</item>
+            <item>burlywood</item>
+            <item>cadetblue</item>
+            <item>chartreuse</item>
+            <item>chocolate</item>
+            <item>coral</item>
+            <item>cornflowerblue</item>
+            <item>cornsilk</item>
+            <item>crimson</item>
             <item>cyan</item>
+            <item>darkblue</item>
+            <item>darkcyan</item>
+            <item>darkgoldenrod</item>
+            <item>darkgray</item>
+            <item>darkgreen</item>
+            <item>darkgrey</item>
+            <item>darkkhaki</item>
+            <item>darkmagenta</item>
+            <item>darkolivegreen</item>
+            <item>darkorange</item>
+            <item>darkorchid</item>
+            <item>darkred</item>
+            <item>darksalmon</item>
+            <item>darkseagreen</item>
+            <item>darkslateblue</item>
+            <item>darkslategray</item>
+            <item>darkslategrey</item>
+            <item>darkturquoise</item>
+            <item>darkviolet</item>
+            <item>deeppink</item>
+            <item>deepskyblue</item>
+            <item>dimgray</item>
+            <item>dimgrey</item>
+            <item>dodgerblue</item>
+            <item>firebrick</item>
+            <item>floralwhite</item>
+            <item>forestgreen</item>
             <item>fuchsia</item>
+            <item>gainsboro</item>
+            <item>ghostwhite</item>
+            <item>gold</item>
+            <item>goldenrod</item>
             <item>gray</item>
             <item>green</item>
+            <item>greenyellow</item>
+            <item>grey</item>
+            <item>honeydew</item>
+            <item>hotpink</item>
+            <item>indianred</item>
+            <item>indigo</item>
+            <item>ivory</item>
+            <item>khaki</item>
+            <item>lavender</item>
+            <item>lavenderblush</item>
+            <item>lawngreen</item>
+            <item>lemonchiffon</item>
+            <item>lightblue</item>
+            <item>lightcoral</item>
+            <item>lightcyan</item>
+            <item>lightgoldenrodyellow</item>
+            <item>lightgray</item>
+            <item>lightgreen</item>
+            <item>lightgrey</item>
+            <item>lightpink</item>
+            <item>lightsalmon</item>
+            <item>lightseagreen</item>
+            <item>lightskyblue</item>
+            <item>lightslategray</item>
+            <item>lightslategrey</item>
+            <item>lightsteelblue</item>
+            <item>lightyellow</item>
             <item>lime</item>
+            <item>limegreen</item>
+            <item>linen</item>
+            <item>magenta</item>
             <item>maroon</item>
+            <item>mediumaquamarine</item>
+            <item>mediumblue</item>
+            <item>mediumorchid</item>
+            <item>mediumpurple</item>
+            <item>mediumseagreen</item>
+            <item>mediumslateblue</item>
+            <item>mediumspringgreen</item>
+            <item>mediumturquoise</item>
+            <item>mediumvioletred</item>
+            <item>midnightblue</item>
+            <item>mintcream</item>
+            <item>mistyrose</item>
+            <item>moccasin</item>
+            <item>navajowhite</item>
             <item>navy</item>
+            <item>oldlace</item>
             <item>olive</item>
+            <item>olivedrab</item>
+            <item>orange</item>
+            <item>orangered</item>
+            <item>orchid</item>
+            <item>palegoldenrod</item>
+            <item>palegreen</item>
+            <item>paleturquoise</item>
+            <item>palevioletred</item>
+            <item>papayawhip</item>
+            <item>peachpuff</item>
+            <item>peru</item>
+            <item>pink</item>
+            <item>plum</item>
+            <item>powderblue</item>
             <item>purple</item>
             <item>red</item>
+            <item>rosybrown</item>
+            <item>royalblue</item>
+            <item>saddlebrown</item>
+            <item>salmon</item>
+            <item>sandybrown</item>
+            <item>seagreen</item>
+            <item>seashell</item>
+            <item>sienna</item>
             <item>silver</item>
+            <item>skyblue</item>
+            <item>slateblue</item>
+            <item>slategray</item>
+            <item>slategrey</item>
+            <item>snow</item>
+            <item>springgreen</item>
+            <item>steelblue</item>
+            <item>tan</item>
             <item>teal</item>
+            <item>thistle</item>
+            <item>tomato</item>
+            <item>turquoise</item>
+            <item>violet</item>
+            <item>wheat</item>
             <item>white</item>
+            <item>whitesmoke</item>
             <item>yellow</item>
+            <item>yellowgreen</item>
+
+            <!--
+                CSS 2 system colors (deprecated)
+                @see https://drafts.csswg.org/css-color-3/#css-system
+            -->
+
             <item>ActiveBorder</item>
             <item>ActiveCaption</item>
             <item>AppWorkspace</item>
             <item>Background</item>
             <item>ButtonFace</item>
             <item>ButtonHighlight</item>
             <item>ButtonShadow</item>
             <item>ButtonText</item>
             <item>CaptionText</item>
             <item>GrayText</item>
             <item>Highlight</item>
             <item>HighlightText</item>
             <item>InactiveBorder</item>
             <item>InactiveCaption</item>
             <item>InactiveCaptionText</item>
             <item>InfoBackground</item>
             <item>InfoText</item>
             <item>Menu</item>
             <item>MenuText</item>
             <item>Scrollbar</item>
             <item>ThreeDDarkShadow</item>
             <item>ThreeDFace</item>
             <item>ThreeDHighlight</item>
             <item>ThreeDLightShadow</item>
             <item>ThreeDShadow</item>
             <item>Window</item>
             <item>WindowFrame</item>
             <item>WindowText</item>
         </list>
 
-        <list name="paren">
-            <item>url</item>
+        <list name="functions">
+            <!-- CSS functions -->
             <item>attr</item>
+            <item>calc</item>
+            <item>counter</item>
+            <item>counters</item>
+            <item>format</item>
+            <item>hsl</item>
+            <item>hsla</item>
+            <item>image</item>
+            <item>linear-gradient</item>
+            <item>local</item>
+            <item>radial-gradient</item>
             <item>rect</item>
+            <item>repeating-linear-gradient</item>
+            <item>repeating-radial-gradient</item>
             <item>rgb</item>
             <item>rgba</item>
+            <item>toggle</item>
+            <item>url</item>
+
+            <!-- Trident (a.k.a., MSHTML) rendering engine functional notation extensions -->
+            <item>expression</item>
+
+            <!-- Less functions, @see http://lesscss.org/functions/ -->
+
+            <!-- Misc Functions -->
+            <item>color</item>
+            <item>convert</item>
+            <item>data-uri</item>
+            <item>default</item>
+            <item>get-unit</item>
+            <item>image-height</item>
+            <item>image-size</item>
+            <item>image-width</item>
+            <item>svg-gradient</item>
+            <item>unit</item>
+
+            <!-- String Functions -->
+            <item>%</item>
+            <item>e</item>
+            <item>escape</item>
+            <item>replace</item>
+
+            <!-- List Functions -->
+            <item>extract</item>
+            <item>length</item>
+
+            <!-- Math Functions -->
+            <item>abs</item>
+            <item>acos</item>
+            <item>asin</item>
+            <item>atan</item>
+            <item>ceil</item>
+            <item>cos</item>
+            <item>floor</item>
+            <item>max</item>
+            <item>min</item>
+            <item>mod</item>
+            <item>percentage</item>
+            <item>pi</item>
+            <item>pow</item>
+            <item>round</item>
+            <item>sin</item>
+            <item>sqrt</item>
+            <item>tan</item>
+
+            <!-- Type Functions -->
+            <item>iscolor</item>
+            <item>isem</item>
+            <item>iskeyword</item>
+            <item>isnumber</item>
+            <item>ispercentage</item>
+            <item>ispixel</item>
+            <item>isruleset</item>
+            <item>isstring</item>
+            <item>isunit</item>
+            <item>isurl</item>
+
+            <!-- Color Definition Functions -->
+            <item>argb</item>
             <item>hsl</item>
             <item>hsla</item>
-            <item>counter</item>
-            <item>counters</item>
+            <item>hsv</item>
+            <item>hsva</item>
+            <item>rgb</item>
+            <item>rgba</item>
 
-            <!-- in @font-face -->
-            <item>local</item>
-            <item>format</item>
+            <!-- Color Channel Functions -->
+            <item>alpha</item>
+            <item>blue</item>
+            <item>green</item>
+            <item>hsvhue</item>
+            <item>hsvsaturation</item>
+            <item>hsvvalue</item>
+            <item>hue</item>
+            <item>lightness</item>
+            <item>luma</item>
+            <item>luminance</item>
+            <item>red</item>
+            <item>saturation</item>
 
-            <!-- Trident (a.k.a., MSHTML) rendering engine functional notation extensions -->
-            <item>expression</item>
+            <!-- Color Operation Functions -->
+            <item>contrast</item>
+            <item>darken</item>
+            <item>desaturate</item>
+            <item>fade</item>
+            <item>fadein</item>
+            <item>fadeout</item>
+            <item>greyscale</item>
+            <item>lighten</item>
+            <item>mix</item>
+            <item>saturate</item>
+            <item>shade</item>
+            <item>spin</item>
+            <item>tint</item>
 
+            <!-- Color Blending Functions -->
+            <item>average</item>
+            <item>difference</item>
+            <item>exclusion</item>
+            <item>hardlight</item>
+            <item>multiply</item>
+            <item>negation</item>
+            <item>overlay</item>
+            <item>screen</item>
+            <item>softlight</item>
         </list>
 
         <list name="mediatypes">
             <item>all</item>
             <item>aural</item>
             <item>braille</item>
             <item>embossed</item>
             <item>handheld</item>
             <item>print</item>
             <item>projection</item>
             <item>screen</item>
             <item>speech</item>
             <item>tty</item>
             <item>tv</item>
         </list>
 
         <list name="mediatypes_op">
+            <item>and</item>
             <item>not</item>
             <item>only</item>
+            <item>or</item>
         </list>
 
         <list name="media_features">
             <item>width</item>
             <item>min-width</item>
             <item>max-width</item>
             <item>height</item>
             <item>min-height</item>
             <item>max-height</item>
             <item>device-width</item>
             <item>min-device-width</item>
             <item>max-device-width</item>
             <item>device-height</item>
             <item>min-device-height</item>
             <item>max-device-height</item>
             <item>orientation</item>
             <item>aspect-ratio</item>
             <item>min-aspect-ratio</item>
             <item>max-aspect-ratio</item>
             <item>device-aspect-ratio</item>
             <item>min-device-aspect-ratio</item>
             <item>max-device-aspect-ratio</item>
             <item>color</item>
             <item>min-color</item>
             <item>max-color</item>
             <item>color-index</item>
             <item>min-color-index</item>
             <item>max-color-index</item>
             <item>monochrome</item>
             <item>min-monochrome</item>
             <item>max-monochrome</item>
             <item>resolution</item>
             <item>min-resolution</item>
             <item>max-resolution</item>
             <item>scan</item>
             <item>grid</item>
         </list>
 
         <list name="pseudoclasses">
             <item>hover</item>
             <item>link</item>
             <item>visited</item>
             <item>active</item>
             <item>focus</item>
             <item>first-child</item>
             <item>last-child</item>
             <item>only-child</item>
             <item>first-of-type</item>
             <item>last-of-type</item>
             <item>only-of-type</item>
             <item>first-letter</item>
             <item>first-line</item>
             <item>before</item>
             <item>after</item>
             <item>selection</item>
             <item>root</item>
             <item>empty</item>
             <item>target</item>
             <item>enabled</item>
             <item>disabled</item>
             <item>checked</item>
             <item>indeterminate</item>
             <item>nth-child</item>
             <item>nth-last-child</item>
             <item>nth-of-type</item>
             <item>nth-last-of-type</item>
             <item>not</item>
+
+            <!-- Less -->
+            <item>extend</item>
         </list>
 
         <contexts>
             <context attribute="Normal Text" lineEndContext="#stay" name="Base">
-                <LineContinue/>
-                <DetectSpaces/>
-                <IncludeRules context="FindRuleSets" />
+                <IncludeRules context="FindComments"/>
+
+                <DetectChar attribute="Normal Text" beginRegion="ruleset" char="{" context="RuleSet"/>
+                <RegExpr attribute="Variable" context="VariableDefine" String="\@[a-zA-Z0-9\-_]+\s*:"/>
+                <RegExpr attribute="At Rule" context="AtRule" String="@[a-zA-Z0-1\-]+\b"/>
+
+                <IncludeRules context="FindSelectors"/>
             </context>
 
-            <!-- to be included -->
-            <!-- finds rules and detects nesting -->
-            <context attribute="Normal Text" lineEndContext="#stay" name="FindRuleSets">
-                <RegExpr attribute="Media" context="Media" String="@media\b" />
-                <RegExpr attribute="At Rule" context="Import" String="@import\b" />
-                <RegExpr attribute="At Rule" context="#stay" String="@(font-face|charset)\b" />
-                <RegExpr attribute="Variable" context="#stay" String="\@[^:]*" />
-                <DetectChar attribute="Property" context="RuleSet" char="{" beginRegion="ruleset" />
-                <!--parse selectors-->
-                <DetectChar attribute="Selector Attr" context="SelAttr" char="[" />
-                <RegExpr attribute="Selector Id" context="#stay" String="#([a-zA-Z0-9\-_]|[\x80-\xFF]|\\[0-9A-Fa-f]{1,6})*" />
-                <RegExpr attribute="Selector Class" context="#stay" String="\.([a-zA-Z0-9\-_]|[\x80-\xFF]|\\[0-9A-Fa-f]{1,6})*" />
-                <RegExpr attribute="Selector Pseudo" context="#stay" String=":lang\([\w_-]+\)" />
-                <DetectChar attribute="Selector Pseudo" context="SelPseudo" char=":" />
-                <IncludeRules context="FindStrings" />
-                <IncludeRules context="FindComments" />
+            <!-- find selectors // .class #id :hover :nth-child(2n+1) [type="search"] -->
+            <context attribute="Normal Text" lineEndContext="#stay" name="FindSelectors">
+                <IncludeRules context="FindInterpolation"/>
+
+                <RegExpr attribute="Annotation" context="#stay" String="!important\b"/>
+                <DetectChar attribute="Selector Attribute" char="[" context="SelectorAttr"/>
+                <RegExpr attribute="Selector Id" context="#stay" String="#(-)?(&nmstart;)(&nmchar;)*"/>
+                <RegExpr attribute="Selector Class" context="#stay"
+                         String="\.([a-zA-Z0-9\-_]|[\x80-\xFF]|\\[0-9A-Fa-f]{1,6})*"/>
+                <RegExpr attribute="Selector Pseudo" context="#stay" String=":lang\([\w_\-]+\)"/>
+                <DetectChar attribute="Selector Pseudo" char=":" context="SelectorPseudo"/>
+                <RegExpr attribute="Control Flow" context="Condition" String="when\s*(not)?(?=\s*\()"/>
+                <DetectChar attribute="Normal Text" char="(" context="Function" lookAhead="true"/>
+
+                <IncludeRules context="FindVariables"/>
             </context>
 
-            <!-- finds arguments to properties -->
-            <context attribute="Normal Text" lineEndContext="#stay" name="FindValues">
-                <RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+(em|ex|px|in|cm|mm|pt|pc|deg|rad|grad|ms|s|Hz|kHz)\b" />
-                <RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+[%]?" />
-                <RegExpr attribute="Normal Text" context="#stay" String="[\w\-]+" />
+            <context attribute="Normal Text" lineEndContext="#stay" name="Condition">
+                <IncludeRules context="FindFunctions"/>
+                <IncludeRules context="FindVariables"/>
+                <IncludeRules context="FindValues"/>
+
+                <DetectChar attribute="Normal Text" char=")" context="#pop"/>
             </context>
 
-            <!-- finds strings -->
-            <context attribute="Normal Text" lineEndContext="#stay" name="FindStrings">
-                <DetectChar attribute="String" context="StringDQ" char="&quot;" />
-                <DetectChar attribute="String" context="StringSQ" char="'" />
+            <!-- find variables // @page-width -->
+            <context attribute="Normal Text" lineEndContext="#stay" name="FindVariables">
+                <RegExpr attribute="Variable" context="#stay" String="[\@]{1,2}[a-zA-Z0-9\-_]+"/>
             </context>
 
-            <!-- finds comments -->
-            <context attribute="Normal Text" lineEndContext="#stay" name="FindComments">
-                <RegExpr attribute="Region Marker" context="#stay" String="/\*BEGIN.*\*/" beginRegion="UserDefined" />
-                <RegExpr attribute="Region Marker" context="#stay" String="/\*END.*\*/" endRegion="UserDefined" />
-                <Detect2Chars attribute="Comment" context="Comment" char="/" char1="*" beginRegion="comment" />
-                <Detect2Chars attribute="Comment" context="lessComment" char="/" char1="/" />
+            <context attribute="Normal Text" lineEndContext="#stay" name="FindInterpolation">
+                <!-- @{variable} -->
+                <RegExpr attribute="Variable" context="Interpolation" String="\@\{\s*[a-zA-Z0-9\-_]+"/>
             </context>
 
-            <!-- other contexts -->
-            <context attribute="Normal Text" lineEndContext="#stay" name="Media">
-                <DetectChar attribute="Media" context="Media2" char="{" beginRegion="media" />
-                <DetectChar attribute="Media" context="MediaQueryExpression" char="(" />
-                <keyword attribute="Media" context="MediaQueries" String="mediatypes"/>
-                <keyword attribute="Media" context="MediaTypes" String="mediatypes_op" />
-                <DetectChar attribute="Media" context="#stay" char="," />
-                <IncludeRules context="FindComments" />
-                <RegExpr attribute="Error" context="#stay" String="\S+" />
+            <!-- find functions // rgba(255,255,255,0.75) -->
+            <context attribute="Normal Text" lineEndContext="#stay" name="FindFunctions">
+                <RegExpr attribute="Function" context="Function" String="[a-z\-]+\(" lookAhead="true"/>
             </context>
 
-            <context attribute="Media" lineEndContext="#stay" name="MediaTypes">
-                <keyword attribute="Media" context="MediaQueries" String="mediatypes"/>
-                <DetectChar attribute="Media" context="#pop" char= "{" lookAhead="true"/>
-                <DetectChar attribute="Media" context="#pop" char= "," lookAhead="true"/>
-                <DetectSpaces/>
-                <IncludeRules context="FindComments"/>
-                <RegExpr attribute="Error" context="#stay" String="\S+"/>
+            <!-- find values //  10px 12pt 2.5em 1rem 75% #ffcc99 red solid -->
+            <context attribute="Normal Text" lineEndContext="#stay" name="FindValues">
+                <RegExpr attribute="Annotation" context="#stay" String="!important\b"/>
+                <RegExpr attribute="Annotation" context="#stay" String="!default\b"/>
+
+                <IncludeRules context="FindInterpolation"/>
+                <IncludeRules context="FindVariables"/>
+
+                <keyword attribute="Value" context="#stay" String="values"/>
+                <keyword attribute="Value" context="#stay" String="colors"/>
+                <RegExpr attribute="Value" context="#stay" String="#([0-9A-Fa-f]{3}){1,4}\b"/>
+                <RegExpr attribute="Value" context="#stay"
+                         String="[-+]?[0-9.]+(em|ex|ch|rem|vw|vh|vm|px|in|cm|mm|pt|pc|deg|rad|grad|turn|ms|s|Hz|kHz)\b"
+                         />
+                <RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+[%]?"/>
+                <RegExpr attribute="Normal Text" context="#stay" String="[\w\-]+"/>
             </context>
 
-            <context attribute="Media" lineEndContext="#stay" name="MediaQueries">
-                <RegExpr attribute="Media" context="MediaQueryExpression" String="\s+and\s+\("/>
-                <DetectChar attribute="Media" context="#pop" char= "{" lookAhead="true"/>
-                <DetectChar attribute="Media" context="#pop" char= "," lookAhead="true"/>
-                <DetectSpaces/>
-                <IncludeRules context="FindComments"/>
-                <RegExpr attribute="Error" context="#stay" String="\S+"/>
+            <!-- find strings // "some words" 'some words' -->
+            <context attribute="Normal Text" lineEndContext="#stay" name="FindStrings">
+                <DetectChar attribute="String" context="StringDQ" char="&quot;"/>
+                <DetectChar attribute="String" context="StringSQ" char="'"/>
             </context>
 
-            <context attribute="Media" lineEndContext="#stay" name="MediaQueryExpression">
-                <DetectSpaces/>
-                <keyword attribute="Media" context="MQEE" String="media_features"/>
-                <IncludeRules context="FindComments"/>
-                <RegExpr attribute="Error" context="#stay" String="\S+"/>
+            <!-- find comments // /* comment */  // comment -->
+            <context attribute="Normal Text" lineEndContext="#stay" name="FindComments">
+                <RegExpr attribute="Region Marker" context="#stay" String="/\*BEGIN.*\*/" beginRegion="UserDefined"/>
+                <RegExpr attribute="Region Marker" context="#stay" String="//\s*BEGIN.*" beginRegion="UserDefined"/>
+                <RegExpr attribute="Region Marker" context="#stay" String="/\*END.*\*/" endRegion="UserDefined"/>
+                <RegExpr attribute="Region Marker" context="#stay" String="//\s*END.*" endRegion="UserDefined"/>
+                <Detect2Chars attribute="Comment" context="Comment" char="/" char1="*" beginRegion="comment"/>
+                <Detect2Chars attribute="Comment" context="LessComment" char="/" char1="/" />
             </context>
 
-            <context attribute="Media" lineEndContext="#stay" name="MQEE" fallthrough="true" fallthroughContext="#pop">
-                <DetectSpaces/>
+            <context attribute="Normal Text" lineEndContext="#pop" name="AtRule">
                 <IncludeRules context="FindComments"/>
-                <DetectChar attribute="Media" context="MQEV" char=":"/>
-                <RegExpr attribute="Media" context="#pop" String="\)\s+and\s+\("/>
-                <DetectChar attribute="Media" context="#pop#pop" char=")"/>
-            </context>
+                <IncludeRules context="FindStrings"/>
 
-            <context attribute="Media" lineEndContext="#stay" name="MQEV">
-                <!-- this should be seperate for different features, for now it is all the same -->
-                <DetectSpaces/>
-                <RegExpr attribute="Value" context="#pop" String="[1-9][0-9.]*\s*/\s*[1-9][0-9.]*" />
-                <RegExpr attribute="Value" context="#pop" String="[0-9.]+(em|ex|ch|rem|vw|vh|vm|px|in|cm|mm|pt|pc|deg|rad|grad|turn|ms|s|Hz|kHz|dpi|dpcm)\b" />
-                <RegExpr attribute="Value" context="#pop" String="[0-9.]+[%]?" />
-                <RegExpr attribute="Value" context="#pop" String="(portrait|landscape)" />
-                <RegExpr attribute="Error" context="#stay" String=".*"/>
+                <keyword attribute="Value" context="#stay" String="mediatypes"/>
+                <keyword attribute="Control Flow" context="#stay" String="mediatypes_op"/>
+                <keyword attribute="Property" context="#stay" String="media_features"/>
+                <AnyChar attribute="Normal Text" context="#pop" lookAhead="true" String=";{"/>
+
+                <IncludeRules context="FindInterpolation"/>
+                <IncludeRules context="FindVariables"/>
+                <IncludeRules context="FindValues"/>
             </context>
 
-            <context attribute="Normal Text" lineEndContext="#stay" name="Media2">
-                <DetectChar attribute="Media" context="#pop#pop" char="}" endRegion="media" />
-                <IncludeRules context="FindRuleSets" />
+            <context attribute="Normal Text" lineEndContext="#stay" name="VariableDefine">
+                <IncludeRules context="FindInterpolation"/>
+                <IncludeRules context="FindVariables"/>
+
+                <DetectChar attribute="Normal Text" beginRegion="ruleset" char="{" context="#pop!RuleSet"/>
+
+                <IncludeRules context="FindComments"/>
+                <IncludeRules context="FindStrings"/>
+                <IncludeRules context="FindFunctions"/>
+                <IncludeRules context="FindValues"/>
+
+                <DetectChar attribute="Normal Text" char=";" context="#pop"/>
             </context>
 
-            <context attribute="Selector Attr" lineEndContext="#stay" name="SelAttr">
-                <DetectChar attribute="Selector Attr" context="#pop" char="]" />
-                <IncludeRules context="FindStrings" />
+            <!-- Interpolation -->
+            <context attribute="Normal Text" lineEndContext="#stay" name="Interpolation">
+                <IncludeRules context="FindInterpolation"/>
+                <IncludeRules context="FindVariables"/>
+
+                <DetectChar attribute="Variable" char="}" context="#pop"/>
             </context>
 
-            <context attribute="Selector Pseudo" lineEndContext="#pop" name="SelPseudo" fallthrough="true" fallthroughContext="#pop">
-                <keyword attribute="Selector Pseudo" context="#pop" String="pseudoclasses" />
+            <context attribute="Selector Attribute" lineEndContext="#stay" name="SelectorAttr">
+                <DetectChar attribute="Selector Attribute" char="]" context="#pop"/>
+
+                <IncludeRules context="FindStrings"/>
             </context>
 
-            <context attribute="Normal Text" lineEndContext="#stay" name="Import">
-                <DetectChar attribute="At Rule" context="#pop" char=";" />
-                <keyword attribute="Media" context="#stay" String="mediatypes" />
-                <IncludeRules context="FindValues" />
-                <IncludeRules context="FindStrings" />
-                <IncludeRules context="FindComments" />
+            <context attribute="Selector Pseudo" fallthrough="true" fallthroughContext="#pop" lineEndContext="#pop"
+                     name="SelectorPseudo">
+                <RegExpr attribute="Selector Pseudo" context="SelectorPseudoParameters" String="extend(?=\s*\()"/>
+                <keyword attribute="Selector Pseudo" context="#pop" String="pseudoclasses"/>
             </context>
 
-            <context attribute="Comment" lineEndContext="#pop" name="lessComment">
+            <context attribute="Normal Text" lineEndContext="#stay" name="SelectorPseudoParameters">
+                <DetectChar attribute="Normal Text" char="(" context="#stay"/>
+
+                <IncludeRules context="FindSelectors"/>
+
+                <DetectChar attribute="Normal Text" char=")" context="#pop#pop"/>
             </context>
 
+            <context attribute="Comment" lineEndContext="#pop" name="LessComment"></context>
+
             <context attribute="Comment" lineEndContext="#stay" name="Comment">
-                <DetectSpaces/>
-                <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="comment" />
-                <IncludeRules context="##Alerts" />
-                <DetectIdentifier/>
+                <Detect2Chars attribute="Comment" context="#pop" char="*" char1="/" endRegion="comment"/>
+
+                <IncludeRules context="##Alerts"/>
             </context>
 
             <context attribute="Normal Text" lineEndContext="#stay" name="RuleSet">
-                <DetectChar attribute="Property" context="RuleSet" char="{" beginRegion="ruleset" />
-                <IncludeRules context="FindRuleSets" />
-                <DetectChar attribute="Property" context="#pop" char="}" endRegion="ruleset" />
-                <keyword attribute="Property" context="Rule" String="properties" />
-                <RegExpr attribute="Unknown Property" context="Rule" String="-?[A-Za-z_-]+(?=\s*:)" />
-                <IncludeRules context="FindComments" />
-                <!-- <RegExpr attribute="Error" context="#stay" String="\S" /> -->
+                <DetectChar attribute="Normal Text" char="{" context="RuleSet" beginRegion="ruleset"/>
+                <DetectChar attribute="Normal Text" char="}" context="#pop" endRegion="ruleset"/>
+                <!-- find CSS property, like border-radius with optional + or +- decorators -->
+                <RegExpr attribute="Property" context="Rule" String="-?[A-Za-z_\-]+(?=\s*(\+|\+_)?\s*:)"
+                         lookAhead="true"/>
+                <!-- as above, but include support for interpolation -->
+                <RegExpr attribute="Property" context="Rule"
+                         String="-?[A-Za-z_\-]*@{\s*[a-zA-Z0-9\-_]+}[A-Za-z_\-]*(?=\s*(\+|\+_)?\s*:)" lookAhead="true"
+                         />
+
+                <IncludeRules context="Base"/>
             </context>
 
             <context attribute="Normal Text" lineEndContext="#stay" name="Rule">
-                <DetectChar attribute="Property" context="Rule2" char=":" />
-                <RegExpr attribute="Error" context="#stay" String="\S" />
+                <IncludeRules context="FindInterpolation"/>
+
+                <RegExpr attribute="Normal Text" context="RuleParameters" String="(\+|\+_)?\s*:"/>
+                <keyword attribute="Property" context="#stay" String="properties"/>
+                <RegExpr attribute="Unknown Property" context="#stay" String="\S"/>
             </context>
 
-            <context attribute="Normal Text" lineEndContext="#stay" name="Rule2">
-                <DetectChar attribute="Property" context="#pop#pop" char=";" />
-                <DetectChar attribute="Property" context="#pop#pop#pop" char="}" endRegion="ruleset" />
-                <!-- parse property values -->
-                <keyword attribute="Value" context="#stay" String="types" />
-                <keyword attribute="Value" context="#stay" String="colors" />
-                <RegExpr attribute="Value" context="#stay" String="#([0-9A-Fa-f]{3}){1,4}\b" />
-                <keyword attribute="Value" context="PropParen" String="paren" />
-                <RegExpr attribute="Variable" context="#stay" String="\@[^;]*" />
-                <RegExpr attribute="Important" context="#stay" String="!important\b" />
-                <IncludeRules context="FindValues" />
-                <IncludeRules context="FindStrings" />
-                <IncludeRules context="FindComments" />
+            <context attribute="Normal Text" lineEndContext="#stay" name="RuleParameters">
+                <IncludeRules context="FindComments"/>
+                <IncludeRules context="FindStrings"/>
+                <IncludeRules context="FindFunctions"/>
+                <IncludeRules context="FindValues"/>
+
+                <DetectChar attribute="Normal Text" context="#pop#pop" char=";"/>
+                <DetectChar attribute="Normal Text" context="#pop#pop#pop" char="}" endRegion="ruleset"/>
             </context>
 
-            <context attribute="Normal Text" lineEndContext="#stay" name="PropParen">
-                <DetectChar attribute="Value" context="PropParen2" char="(" />
-                <IncludeRules context="FindComments" />
-                <RegExpr attribute="Error" context="#stay" String="\S" />
+            <context attribute="Normal Text" lineEndContext="#stay" name="Function">
+                <DetectChar attribute="Normal Text" char="(" context="FunctionParameters"/>
+                <keyword attribute="Function" context="#stay" String="functions"/>
             </context>
 
-            <context attribute="Normal Text" lineEndContext="#stay" name="PropParen2">
-                <DetectChar attribute="Value" context="#pop#pop" char=")" />
-                <IncludeRules context="FindValues" />
-                <IncludeRules context="FindStrings" />
-                <IncludeRules context="FindComments" />
+            <context attribute="Normal Text" lineEndContext="#stay" name="FunctionParameters">
+                <IncludeRules context="FindComments"/>
+                <IncludeRules context="FindStrings"/>
+                <IncludeRules context="FindInterpolation"/>
+                <IncludeRules context="FindVariables"/>
+                <IncludeRules context="FindFunctions"/>
+                <IncludeRules context="FindValues"/>
+
+                <DetectChar attribute="Normal Text" context="#pop#pop" char=")"/>
             </context>
 
             <!-- string contexts -->
             <context attribute="String" lineEndContext="#stay" name="StringDQ">
-                <DetectChar attribute="String" context="#pop" char="&quot;" />
-                <IncludeRules context="InsideString" />
+                <DetectChar attribute="String" char="&quot;" context="#pop"/>
+
+                <IncludeRules context="InsideString"/>
             </context>
 
             <context attribute="String" lineEndContext="#stay" name="StringSQ">
-                <DetectChar attribute="String" context="#pop" char="'" />
-                <IncludeRules context="InsideString" />
+                <DetectChar attribute="String" char="'" context="#pop"/>
+
+                <IncludeRules context="InsideString"/>
             </context>
 
             <context attribute="String" lineEndContext="#stay" name="InsideString">
-                <RegExpr attribute="String" context="#stay" String="\\[&quot;']" />
+                <RegExpr attribute="String" context="#stay" String="\\[&quot;']"/>
+
+                <IncludeRules context="FindInterpolation"/>
+
                 <DetectIdentifier/>
             </context>
-
         </contexts>
 
         <itemDatas>
-            <itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/>
-            <itemData name="Property"  defStyleNum="dsKeyword" spellChecking="false"/>
-            <itemData name="Unknown Property"  defStyleNum="dsKeyword" italic="1" spellChecking="false"/>
-            <itemData name="Media"  defStyleNum="dsDecVal" bold="1" spellChecking="false"/>
-            <itemData name="At Rule"  defStyleNum="dsDecVal" spellChecking="false"/>
-            <itemData name="String"  defStyleNum="dsString"/>
-            <itemData name="Value"  defStyleNum="dsDataType" spellChecking="false"/>
-            <itemData name="Important" defStyleNum="dsKeyword" spellChecking="false"/>
-            <itemData name="Selector Attr" defStyleNum="dsChar" spellChecking="false"/>
-            <itemData name="Selector Id"  defStyleNum="dsFloat" bold="1" spellChecking="false"/>
-            <itemData name="Selector Class"  defStyleNum="dsFloat" spellChecking="false"/>
-            <itemData name="Selector Pseudo"  defStyleNum="dsDecVal" spellChecking="false"/>
-            <itemData name="Comment" defStyleNum="dsComment" />
-            <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
-            <itemData name="Alert" defStyleNum="dsAlert" spellChecking="false"/>
-            <itemData name="Error" defStyleNum="dsError" spellChecking="false"/>
-            <itemData name="Variable" defStyleNum="dsNormal" spellChecking="false"/>
+            <itemData defStyleNum="dsNormal" name="Normal Text" spellChecking="false"/>
+            <itemData defStyleNum="dsVariable" name="Variable" spellChecking="false"/>
+            <itemData defStyleNum="dsControlFlow" name="Control Flow" spellChecking="false"/>
+            <itemData defStyleNum="dsImport" name="At Rule" spellChecking="false"/>
+            <itemData defStyleNum="dsKeyword" name="Property" spellChecking="false"/>
+            <itemData defStyleNum="dsNormal" italic="1" name="Unknown Property" spellChecking="false"/>
+            <itemData defStyleNum="dsString" name="String"/>
+            <itemData defStyleNum="dsDecVal" name="Value" spellChecking="false"/>
+            <itemData defStyleNum="dsBuiltIn" name="Function" spellChecking="false"/>
+            <itemData defStyleNum="dsAttribute" name="Annotation" spellChecking="false"/>
+            <itemData bold="1" defStyleNum="dsPreprocessor" name="Selector Id" spellChecking="false"/>
+            <itemData defStyleNum="dsFunction" name="Selector Class" spellChecking="false"/>
+            <itemData defStyleNum="dsExtension" name="Selector Attribute" spellChecking="false"/>
+            <itemData defStyleNum="dsInformation" name="Selector Pseudo" spellChecking="false"/>
+            <itemData defStyleNum="dsComment" name="Comment"/>
+            <itemData defStyleNum="dsRegionMarker" name="Region Marker" spellChecking="false"/>
+            <itemData defStyleNum="dsAlert" name="Alert" spellChecking="false"/>
+            <itemData defStyleNum="dsError" name="Error" spellChecking="false"/>
         </itemDatas>
     </highlighting>
 
     <general>
         <keywords casesensitive="0" weakDeliminator="-%"/>
         <comments>
             <comment name="multiLine" start="/*" end="*/" />
         </comments>
     </general>
 </language>