diff --git a/data/syntax/scss.xml b/data/syntax/scss.xml
index 2968868..67efb8a 100644
--- a/data/syntax/scss.xml
+++ b/data/syntax/scss.xml
@@ -1,1023 +1,1023 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd"
 [
   <!-- https://www.w3.org/TR/CSS22/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])">
 ]>
 
 <!--
 
 Kate SCSS syntax highlighting definition
 
 Changelog:
 
 - Version 7, by Jonathan Poelen
 - fix tag followed by a pseudo-class in a nested rule (@media, ...)
 - fix constraint in a rule
 - fix Kate auto-completion for properties and rules
 - fix highlighting of pseudoclass/pseudoelement in a sub-rule
 - New highlighting categories: Keyword, Operator, Separator Symbol, SpecialChar, Value Keyword, Color, Number, Unit, Selector Tag, Placeholder Selector
 
 - Version 4, by Guo Yunhe guoyunhebrave@gmail.com
 - Remake for complex SCSS syntax, avoid errors
 
 - Version 2.06, by Guo Yunhe
 - Add all W3C Work Draft properties, inherit rules from css.xml
 
 - Version 1.2.03.6, by Mte90
 - Css3 Tag
 
 - Version 1.2.03.1, by Tijn Schuurmans
 - Added basic support for "@include mixin();"
 - Clean the indentation to use 4 spaces everywhere
 
 -->
 
-<language name="SCSS" version="8" kateversion="5.52" section="Markup" extensions="*.scss" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL" priority="10">
+<language name="SCSS" version="9" kateversion="5.53" section="Markup" extensions="*.scss" indenter="cstyle" mimetype="text/css" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL" priority="10">
 
     <highlighting>
         <list name="properties">
             <include>properties##CSS</include>
         </list>
 
         <list name="sub-properties">
             <item>adjust</item>
             <item>after</item>
             <item>align-all</item>
             <item>align</item>
             <item>align-last</item>
             <item>alternates</item>
             <item>anchor</item>
             <item>area</item>
             <item>areas</item>
             <item>attachment</item>
             <item>auto-columns</item>
             <item>auto-flow</item>
             <item>auto-rows</item>
             <item>baseline</item>
             <item>basis</item>
             <item>before</item>
             <item>bidi</item>
             <item>blend-mode</item>
             <item>block-color</item>
             <item>block-end-color</item>
             <item>block-end</item>
             <item>block-end-style</item>
             <item>block-end-width</item>
             <item>block</item>
             <item>block-start-color</item>
             <item>block-start</item>
             <item>block-start-style</item>
             <item>block-start-width</item>
             <item>block-style</item>
             <item>block-width</item>
             <item>border-mode</item>
             <item>border-outset</item>
             <item>border-repeat</item>
             <item>border-slice</item>
             <item>border-source</item>
             <item>bottom-color</item>
             <item>bottom-left-radius</item>
             <item>bottom-right-radius</item>
             <item>bottom-style</item>
             <item>bottom-width</item>
             <item>boundary</item>
             <item>box</item>
             <item>break</item>
             <item>caps</item>
             <item>cells</item>
             <item>change</item>
             <item>character</item>
             <item>chars</item>
             <item>collapse</item>
             <item>column-end</item>
             <item>column</item>
             <item>column-start</item>
             <item>combine-upright</item>
             <item>composite</item>
             <item>count</item>
             <item>decoration-break</item>
             <item>decoration-color</item>
             <item>decoration</item>
             <item>decoration-line</item>
             <item>decoration-skip-ink</item>
             <item>decoration-skip</item>
             <item>decoration-style</item>
             <item>decoration-width</item>
             <item>defer</item>
             <item>delay</item>
             <item>distance</item>
             <item>down</item>
             <item>duration</item>
             <item>during</item>
             <item>east-asian</item>
             <item>emoji</item>
             <item>emphasis-color</item>
             <item>emphasis</item>
             <item>emphasis-position</item>
             <item>emphasis-skip</item>
             <item>emphasis-style</item>
             <item>end-color</item>
             <item>end</item>
             <item>end-style</item>
             <item>end-width</item>
             <item>events</item>
             <item>family</item>
             <item>feature-settings</item>
             <item>fill-mode</item>
             <item>filters</item>
             <item>fit</item>
             <item>flow</item>
             <item>fragment</item>
             <item>from</item>
             <item>function</item>
             <item>grow</item>
             <item>gutter</item>
             <item>header</item>
             <item>height-step</item>
             <item>image</item>
             <item>image-outset</item>
             <item>image-repeat</item>
             <item>image-slice</item>
             <item>image-source</item>
             <item>image-threshold</item>
             <item>image-transform</item>
             <item>image-width</item>
             <item>increment</item>
             <item>indent</item>
             <item>inline-color</item>
             <item>inline-end-color</item>
             <item>inline-end</item>
             <item>inline-end-style</item>
             <item>inline-end-width</item>
             <item>inline</item>
             <item>inline-start-color</item>
             <item>inline-start</item>
             <item>inline-start-style</item>
             <item>inline-start-width</item>
             <item>inline-style</item>
             <item>inline-width</item>
             <item>insert</item>
             <item>inside</item>
             <item>interpolation-filters</item>
             <item>into</item>
             <item>items</item>
             <item>iteration-count</item>
             <item>justify</item>
             <item>kerning</item>
             <item>knockout-left</item>
             <item>knockout-right</item>
             <item>label</item>
             <item>language-override</item>
             <item>last</item>
             <item>layout</item>
             <item>left-color</item>
             <item>left-radius</item>
             <item>left-style</item>
             <item>left-width</item>
             <item>letter-align</item>
             <item>letter</item>
             <item>letter-wrap</item>
             <item>level</item>
             <item>ligatures</item>
             <item>limit-chars</item>
             <item>limit-last</item>
             <item>limit-lines</item>
             <item>limit-zone</item>
             <item>line</item>
             <item>lines</item>
             <item>loop</item>
             <item>max-size</item>
             <item>merge</item>
             <item>mid</item>
             <item>min-size</item>
             <item>mode</item>
             <item>name</item>
             <item>numeral</item>
             <item>numeric</item>
             <item>optical-sizing</item>
             <item>orientation</item>
             <item>orientation-vertical</item>
             <item>origin</item>
             <item>outset</item>
             <item>outside</item>
             <item>override</item>
             <item>palette</item>
             <item>path</item>
             <item>pattern</item>
             <item>play-state</item>
             <item>point</item>
             <item>policy</item>
             <item>property</item>
             <item>punctuation</item>
             <item>radius</item>
             <item>range</item>
             <item>rate</item>
             <item>reference</item>
             <item>rendering</item>
             <item>repeat</item>
             <item>reset</item>
             <item>resolution</item>
             <item>right-color</item>
             <item>right-radius</item>
             <item>right-style</item>
             <item>right-width</item>
             <item>rotate</item>
             <item>round</item>
             <item>row-end</item>
             <item>row</item>
             <item>rows</item>
             <item>row-start</item>
             <item>rule-color</item>
             <item>rule</item>
             <item>rule-style</item>
             <item>rule-width</item>
             <item>segment</item>
             <item>select</item>
             <item>self</item>
             <item>set</item>
             <item>settings</item>
             <item>shadow</item>
             <item>shape</item>
             <item>shift</item>
             <item>shrink</item>
             <item>side</item>
             <item>size-adjust</item>
             <item>sizing</item>
             <item>skip-ink</item>
             <item>skip</item>
             <item>slice</item>
             <item>snap</item>
             <item>source</item>
             <item>space-collapse</item>
             <item>space</item>
             <item>space-trim</item>
             <item>spacing</item>
             <item>span</item>
             <item>speed</item>
             <item>start-color</item>
             <item>start</item>
             <item>start-style</item>
             <item>start-width</item>
             <item>state</item>
             <item>step-align</item>
             <item>step-insert</item>
             <item>step</item>
             <item>step-round</item>
             <item>step-size</item>
             <item>stretch</item>
             <item>style-image</item>
             <item>style</item>
             <item>style-position</item>
             <item>style-type</item>
             <item>synthesis</item>
             <item>template-areas</item>
             <item>template-columns</item>
             <item>template</item>
             <item>template-rows</item>
             <item>threshold</item>
             <item>through</item>
             <item>timing-function</item>
             <item>top-color</item>
             <item>top-left-radius</item>
             <item>top-right-radius</item>
             <item>top-style</item>
             <item>top-width</item>
             <item>trim</item>
             <item>type</item>
             <item>underline-offset</item>
             <item>underline-position</item>
             <item>up</item>
             <item>upright</item>
             <item>variant-alternates</item>
             <item>variant-caps</item>
             <item>variant-east-asian</item>
             <item>variant-emoji</item>
             <item>variant</item>
             <item>variant-ligatures</item>
             <item>variant-numeric</item>
             <item>variant-position</item>
             <item>variation-settings</item>
             <item>vertical</item>
             <item>weight</item>
             <item>wrap</item>
             <item>x</item>
             <item>y</item>
             <item>zone</item>
         </list>
 
         <list name="special values">
             <item>true</item>
             <item>false</item>
             <item>null</item>
         </list>
 
         <list name="value keywords">
             <include>value keywords##CSS</include>
         </list>
 
         <list name="values">
             <include>values##CSS</include>
         </list>
 
         <list name="colors">
             <include>colors##CSS</include>
         </list>
 
         <list name="functions">
             <include>functions##CSS</include>
 
             <!-- sass -->
             <item>red</item>
             <item>green</item>
             <item>blue</item>
             <item>mix</item>
             <item>hue</item>
             <item>saturation</item>
             <item>lightness</item>
             <item>adjust-hue</item>
             <item>lighten</item>
             <item>darken</item>
             <item>saturate</item>
             <item>desaturate</item>
             <item>grayscale</item>
             <item>complement</item>
             <item>invert</item>
             <item>alpha</item>
             <item>opacify</item>
             <item>transparentize</item>
             <item>adjust-color</item>
             <item>scale-color</item>
             <item>change-color</item>
             <item>ie-hex-str</item>
             <item>unquote</item>
             <item>quote</item>
             <item>str-length</item>
             <item>str-insert</item>
             <item>str-index</item>
             <item>str-slice</item>
             <item>to-upper-case</item>
             <item>to-lower-case</item>
             <item>percentage</item>
             <item>round</item>
             <item>ceil</item>
             <item>floor</item>
             <item>abs</item>
             <item>min</item>
             <item>max</item>
             <item>random</item>
             <item>length</item>
             <item>nth</item>
             <item>set-nth</item>
             <item>join</item>
             <item>append</item>
             <item>zip</item>
             <item>index</item>
             <item>list-separator</item>
             <item>is-bracketed</item>
             <item>map-get</item>
             <item>map-merge</item>
             <item>map-remove</item>
             <item>map-keys</item>
             <item>map-values</item>
             <item>map-has-key</item>
             <item>keywords</item>
             <item>selector-nest</item>
             <item>selector-append</item>
             <item>selector-extend</item>
             <item>selector-replace</item>
             <item>selector-unify</item>
             <item>is-superselector</item>
             <item>simple-selectors</item>
             <item>selector-parse</item>
             <item>feature-exists</item>
             <item>variable-exists</item>
             <item>global-variable-exists</item>
             <item>function-exists</item>
             <item>mixin-exists</item>
             <item>content-exists</item>
             <item>inspect</item>
             <item>type-of</item>
             <item>unit</item>
             <item>unitless</item>
             <item>comparable</item>
             <item>call</item>
             <item>get-function</item>
             <item>if</item>
             <item>unique-id</item>
         </list>
 
         <list name="medias">
             <include>medias##CSS</include>
         </list>
 
         <!-- prefixed by :: -->
         <list name="pseudoelements">
             <include>pseudoelements##CSS</include>
         </list>
 
         <!-- prefixed by : -->
         <list name="pseudoclasses">
             <include>pseudoclasses##CSS</include>
         </list>
 
         <list name="pseudoclass-not">
             <include>pseudoclass-not##CSS</include>
         </list>
 
         <list name="pseudoclasses-@page">
             <include>pseudoclasses-@page##CSS</include>
         </list>
 
         <list name="at-rules">
             <include>at-rules##CSS</include>
 
             <!-- scss -->
             <item>@debug</item>
             <item>@warn</item>
             <item>@error</item>
             <item>@content</item>
             <item>@return</item>
         </list>
 
         <list name="nested at-rules">
             <include>nested at-rules##CSS</include>
 
             <!-- scss -->
             <item>@at-rule</item>
             <item>@for</item>
             <item>@each</item>
             <item>@while</item>
         </list>
 
         <list name="inline and nested at-rules">
             <!-- CSS: inline -->
             <!-- SCSS: inline or block -->
             <item>@include</item>
         </list>
 
         <list name="@extend">
             <item>@extend</item>
         </list>
 
         <list name="@if">
             <item>@if</item>
         </list>
 
         <list name="@else">
             <item>@else</item>
         </list>
 
         <list name="@mixin">
             <item>@mixin</item>
             <item>@function</item>
         </list>
 
         <list name="@viewport">
             <item>@viewport</item>
         </list>
 
         <list name="within-@viewport">
             <include>within-@viewport##CSS</include>
         </list>
 
         <list name="@page">
             <item>@page</item>
         </list>
 
         <list name="within-@page">
             <include>within-@page##CSS</include>
         </list>
 
         <list name="@font-face">
             <item>@font-face</item>
         </list>
 
         <list name="within-@font-face">
             <include>within-@font-face##CSS</include>
         </list>
 
         <list name="@keyframes">
             <item>@keyframes</item>
         </list>
 
         <list name="within-@keyframes">
             <include>within-@keyframes##CSS</include>
         </list>
 
         <list name="media operators">
             <include>media operators##CSS</include>
         </list>
 
         <list name="operators">
             <item>and</item>
             <item>or</item>
             <item>not</item>
         </list>
 
         <list name="annotations">
             <item>important</item>
             <item>default</item>
             <item>global</item>
         </list>
 
         <contexts>
             <context name="Base" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <IncludeRules context="FindComments" />
                 <DetectChar attribute="Normal Text" context="RuleSet" char="{" beginRegion="ruleset" />
                 <DetectChar attribute="At Rule" context="SelectAtRule" char="@" lookAhead="true" />
                 <!-- find selectors // .class #id :hover :nth-child(2n+1) [type="search"] -->
                 <DetectChar attribute="Selector Attribute" context="SelectorAttr" char="[" />
                 <DetectChar attribute="Separator Symbol" context="IsSelectors" char="," />
                 <DetectChar attribute="Operator" context="IsSelectors" char="&amp;" />
                 <AnyChar attribute="Operator" context="IsSelectors" String="*>+~|" />
                 <RegExpr attribute="Selector Pseudo" context="SelectorPseudo" String=":(?=[a-z:])" />
                 <RegExpr attribute="Selector Id" context="IsSelectors" String="#[-]?(&nmstart;)(&nmchar;)*" />
                 <RegExpr attribute="Selector Class" context="IsSelectors" String="\.([a-zA-Z0-9\-_]|[\x80-\xFF]|\\[0-9A-Fa-f]{1,6})*" />
                 <RegExpr attribute="Placeholder Selector" context="IsSelectors" String="%[_a-zA-Z][_a-zA-Z\-]*" />
                 <RegExpr attribute="Selector Tag" context="IsSelectors" String="[-]?(&nmstart;)(&nmchar;)*(?=\s|:?[\s#.&amp;{[*>+~|,]|:[a-z:])" />
                 <RegExpr attribute="Variable" context="VariableDefine" String="\$[a-zA-Z0-9\-_]+(?=\s*:)" />
                 <RegExpr attribute="Variable" context="Interpolation" String="#\{\s*\$[a-zA-Z0-9\-_]+" />
             </context>
 
             <context name="IsSelectors" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <DetectChar attribute="Normal Text" context="#pop!RuleSet" char="{" beginRegion="ruleset" />
                 <DetectChar attribute="At Rule" context="#pop!SelectAtRule" char="@" lookAhead="true" />
                 <DetectChar attribute="Separator Symbol" context="#stay" char="," />
                 <DetectChar attribute="Error" context="#pop" char=";" />
                 <AnyChar attribute="Operator" context="#stay" String="*>+~|&amp;" />
                 <IncludeRules context="SelectorTypes" />
             </context>
 
             <context name="FindSelector" attribute="Normal Text" lineEndContext="#stay">
                 <AnyChar attribute="Error" context="#stay" String=",&amp;" />
                 <AnyChar attribute="Operator" context="#stay" String="*>+~|" />
                 <IncludeRules context="SelectorTypes" />
             </context>
 
             <context name="SelectorTypes" attribute="Normal Text" lineEndContext="#stay">
                 <!-- find selectors // .class #id :hover :nth-child(2n+1) [type="search"] -->
                 <DetectChar attribute="Selector Pseudo" context="SelectorPseudo" char=":" />
                 <DetectChar attribute="Selector Attribute" context="SelectorAttr" char="[" />
                 <IncludeRules context="FindComments" />
                 <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="Placeholder Selector" context="#stay" String="%[_a-zA-Z][_a-zA-Z\-]*" />
                 <RegExpr attribute="Selector Tag" context="#stay" String="[-]?(&nmstart;)(&nmchar;)*" />
                 <RegExpr attribute="Variable" context="Interpolation" String="#\{\s*\$[a-zA-Z0-9\-_]+" />
             </context>
 
             <context name="VariableDefine" attribute="Normal Text" lineEndContext="#stay">
                 <DetectChar attribute="Normal Text" context="RuleParameters" char=":" />
             </context>
 
             <context name="Interpolation" attribute="Variable" lineEndContext="#stay">
                 <DetectSpaces />
                 <DetectChar attribute="Variable" context="#pop" char="}" />
             </context>
 
 
             <!-- find functions // rgba(255,255,255,0.75) -->
             <context name="FindFunctions" attribute="Normal Text" lineEndContext="#stay">
                 <RegExpr attribute="Function" context="Function" String="[a-z\-]{2,}\(" lookAhead="true" />
             </context>
 
             <!-- find values //  10px 12pt 2.5em 1rem 75% #ffcc99 red solid -->
             <context name="FindValues" attribute="Normal Text" lineEndContext="#stay">
                 <DetectChar attribute="Annotation" context="Annotation" char="!" />
                 <keyword attribute="Operator" context="#stay" String="operators" />
                 <keyword attribute="Value Keyword" context="#stay" String="value keywords" />
                 <keyword attribute="Value" context="#stay" String="values" />
                 <keyword attribute="Color" context="#stay" String="colors" />
                 <RegExpr attribute="Number" context="FindUnits" String="[0-9.]+" />
                 <RegExpr attribute="Color" context="#stay" String="#([0-9A-Fa-f]{3}){1,2}\b" />
                 <RegExpr attribute="Variable" context="Interpolation" String="#\{\s*\$[a-zA-Z0-9\-_]+" />
                 <RegExpr attribute="Variable" context="#stay" String="\$[a-zA-Z0-9\-_]+" />
                 <RegExpr attribute="Normal Text" context="#stay" String="[-]?(&nmstart;)(&nmchar;)*" />
                 <AnyChar attribute="Operator" context="#stay" String="*/+%-" />
             </context>
 
             <context name="Annotation" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
                 <keyword attribute="Annotation" context="#pop" String="annotations" />
             </context>
 
             <context name="FindUnits" attribute="Normal Text" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
                 <RegExpr attribute="Unit" context="#stay" String="(%|(em|ex|ch|rem|vw|vh|vm|px|in|cm|mm|pt|pc|deg|rad|grad|turn|ms|s|Hz|kHz)\b)" />
             </context>
 
             <!-- find strings // "some words" 'some words' -->
             <context name="FindStrings" attribute="Normal Text" lineEndContext="#stay">
                 <DetectChar attribute="String" context="StringDQ" char="&quot;" />
                 <DetectChar attribute="String" context="StringSQ" char="'" />
             </context>
 
             <!-- find comments // /* comment */ -->
             <context name="FindComments" attribute="Normal Text" lineEndContext="#stay">
                 <Detect2Chars attribute="Comment" context="IsComments" char="/" char1="/" lookAhead="true"/>
                 <Detect2Chars attribute="Comment" context="IsComments" char="/" char1="*" lookAhead="true"/>
             </context>
 
             <context name="IsComments" attribute="Normal Text" lineEndContext="#stay">
                 <RegExpr attribute="Region Marker" context="#stay" String="/\*\s*BEGIN\b.*\*/|//\s*BEGIN\b.*" beginRegion="UserDefined" />
                 <RegExpr attribute="Region Marker" context="#stay" String="/\*\s*END\b.*\*/|//\s*END\b.*" endRegion="UserDefined" />
                 <Detect2Chars attribute="Comment" context="Comment" char="/" char1="*" beginRegion="comment" />
                 <Detect2Chars attribute="Comment" context="SassComment" char="/" char1="/" />
             </context>
 
             <context name="SassComment" attribute="Comment" lineEndContext="#pop#pop">
                 <DetectSpaces />
                 <IncludeRules context="##Alerts" />
                 <DetectIdentifier />
             </context>
 
             <context name="SelectAtRule" attribute="At Rule" lineEndContext="#pop">
                 <keyword attribute="At Rule" context="#pop!NestedAtRule" String="nested at-rules" />
                 <keyword attribute="At Rule" context="#pop!AtRule" String="at-rules" />
                 <keyword attribute="At Rule" context="#pop!UnknownAtRule" String="inline and nested at-rules" />
                 <keyword attribute="At Rule" context="#pop!@extend" String="@extend" />
                 <keyword attribute="At Rule" context="#pop!@mixin" String="@mixin" />
                 <keyword attribute="At Rule" context="#pop!@keyframes" String="@keyframes" />
                 <keyword attribute="At Rule" context="#pop!@viewport" String="@viewport" />
                 <keyword attribute="At Rule" context="#pop!@font-face" String="@font-face" />
                 <keyword attribute="At Rule" context="#pop!@if" String="@if" />
                 <keyword attribute="At Rule" context="#pop!@else" String="@else" />
                 <keyword attribute="At Rule" context="#pop!@page" String="@page" />
                 <RegExpr attribute="At Rule" context="#pop!UnknownAtRule" String="@[a-zA-Z0-9\-_]+\b" />
             </context>
 
             <context name="@if" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <DetectChar attribute="Normal Text" context="#pop!RuleSet" char="{" beginRegion="ruleset" />
                 <IncludeRules context="FindComments" />
                 <IncludeRules context="FindStrings" />
                 <IncludeRules context="FindFunctions" />
                 <keyword attribute="Value Keyword" context="#stay" String="special values" />
                 <IncludeRules context="FindValues" />
                 <AnyChar attribute="Operator" context="#stay" String="=!&lt;&gt;" />
                 <!-- auto-completion only -->
                 <keyword attribute="Normal Text" context="#stay" String="functions" />
             </context>
 
             <context name="@else" attribute="Error" lineEndContext="#stay">
                 <DetectSpaces attribute="Normal Text" />
                 <DetectChar attribute="Normal Text" context="#pop!RuleSet" char="{" beginRegion="ruleset" />
                 <IncludeRules context="FindComments" />
                 <WordDetect attribute="At Rule" context="#pop!@if" String="if" />
                 <DetectIdentifier attribute="Error" />
             </context>
 
             <context name="@extend" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <DetectChar attribute="Separator Symbol" context="#pop" char=";" />
                 <DetectChar attribute="Normal Text" context="#pop" char="}" endRegion="ruleset" />
                 <IncludeRules context="FindSelector" />
             </context>
 
             <context name="@mixin" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <IncludeRules context="FindComments" />
                 <RegExpr attribute="Function" context="MixinParameter" String="[a-zA-Z0-9\-_]+" />
             </context>
 
             <context name="MixinParameter" attribute="Error" lineEndContext="#stay">
                 <DetectSpaces attribute="Normal Text" />
                 <AnyChar attribute="Normal Text" context="#stay" String="()" />
                 <DetectChar attribute="Separator Symbol" context="#stay" char="," />
                 <DetectChar attribute="Normal Text" context="#pop#pop!RuleSet" char="{" beginRegion="ruleset" />
                 <IncludeRules context="FindComments" />
                 <RegExpr attribute="Variable" context="#stay" String="\$[a-zA-Z0-9\-_]+" />
             </context>
 
             <context name="@keyframes" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <IncludeRules context="FindComments" />
                 <DetectChar attribute="Normal Text" context="Within-@keyframes" char="{" beginRegion="ruleset" />
             </context>
 
             <context name="Within-@keyframes" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <IncludeRules context="FindComments" />
                 <DetectChar attribute="Normal Text" context="#pop#pop" char="}" endRegion="ruleset" />
                 <DetectChar attribute="Normal Text" context="RuleSet" char="{" beginRegion="ruleset" />
                 <keyword attribute="Value" context="#stay" String="within-@keyframes" />
                 <RegExpr attribute="Value" context="#stay" String="[-+]?[0-9.]+%" />
             </context>
 
             <context name="@viewport" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <IncludeRules context="FindComments" />
                 <DetectChar attribute="Selector Pseudo" context="SelectorPseudo" char=":" />
                 <DetectChar attribute="Normal Text" context="#pop!Within-@viewport" char="{" beginRegion="ruleset" />
             </context>
 
             <context name="Within-@viewport" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <keyword attribute="Property" context="IsProperty" String="within-@viewport" />
                 <IncludeRules context="RuleSet" />
             </context>
 
             <context name="@font-face" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <IncludeRules context="FindComments" />
                 <DetectChar attribute="Normal Text" context="#pop!Within-@font-face" char="{" beginRegion="ruleset" />
             </context>
 
             <context name="Within-@font-face" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <IncludeRules context="FindComments" />
                 <keyword attribute="Property" context="IsProperty" String="within-@font-face" />
                 <RegExpr attribute="Unknown Property" context="IsProperty" String="[A-Za-z_-]+\b" />
                 <DetectChar attribute="Normal Text" context="#pop" char="}" endRegion="ruleset" />
             </context>
 
             <context name="@page" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <IncludeRules context="FindComments" />
                 <DetectChar attribute="Selector Pseudo" context="SelectorPseudo-@page" char=":" />
                 <DetectChar attribute="Normal Text" context="#pop!Within-@page" char="{" beginRegion="ruleset" />
             </context>
 
             <context name="SelectorPseudo-@page" attribute="Selector Pseudo" lineEndContext="#pop" fallthrough="true" fallthroughContext="#pop">
                 <keyword attribute="Selector Pseudo" context="#pop" String="pseudoclasses-@page" />
                 <RegExpr attribute="Selector Pseudo" context="#pop" String="[-a-zA-Z][-a-zA-Z0-9]*" />
             </context>
 
             <context name="Within-@page" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <keyword attribute="Property" context="IsProperty" String="within-@page" />
                 <IncludeRules context="RuleSet" />
             </context>
 
             <context name="IsProperty" attribute="Error" lineEndContext="#stay">
                 <DetectSpaces attribute="Normal Text" />
                 <DetectChar attribute="Normal Text" context="RuleParameters" char=":" />
                 <IncludeRules context="FindComments" />
             </context>
 
             <context name="NestedAtRule" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <DetectChar attribute="Normal Text" context="#pop!RuleSet" char="{" beginRegion="ruleset" />
                 <IncludeRules context="AtRuleValue" />
             </context>
 
             <context name="AtRule" attribute="Normal Text" lineEndContext="#pop">
                 <DetectSpaces />
                 <DetectChar attribute="Separator Symbol" context="#pop" char=";" />
                 <DetectChar attribute="Normal Text" context="#pop" char="}" endRegion="ruleset" />
                 <IncludeRules context="AtRuleValue" />
             </context>
 
             <context name="UnknownAtRule" attribute="Normal Text" lineEndContext="#pop">
                 <DetectSpaces />
                 <DetectChar attribute="Separator Symbol" context="#pop" char=";" />
                 <DetectChar attribute="Normal Text" context="#pop!RuleSet" char="{" beginRegion="ruleset" />
                 <DetectChar attribute="Normal Text" context="#pop" char="}" endRegion="ruleset" />
                 <IncludeRules context="AtRuleValue" />
             </context>
 
             <context name="AtRuleValue" attribute="Normal Text" lineEndContext="#stay">
                 <DetectChar attribute="Operator" context="#stay" char="&amp;" />
                 <IncludeRules context="FindComments" />
                 <IncludeRules context="FindStrings" />
                 <IncludeRules context="FindFunctions" />
                 <keyword attribute="Keyword" context="#stay" String="media operators" />
                 <RegExpr attribute="Property" context="#stay" String="[A-Za-z_-]+(?=\s*:)" />
                 <keyword attribute="Value" context="#stay" String="medias" />
                 <IncludeRules context="FindValues" />
                 <!-- auto-completion only -->
                 <keyword attribute="Normal Text" context="#stay" String="functions" />
             </context>
 
             <context name="SelectorAttr" attribute="Selector Attribute" lineEndContext="#stay">
                 <DetectChar attribute="Selector Attribute" context="#pop" char="]" />
                 <IncludeRules context="FindStrings" />
                 <DetectChar   attribute="Operator" context="SelectorAttrValue" char="=" />
                 <Detect2Chars attribute="Operator" context="SelectorAttrValue" char="~" char1="=" />
                 <Detect2Chars attribute="Operator" context="SelectorAttrValue" char="^" char1="=" />
                 <Detect2Chars attribute="Operator" context="SelectorAttrValue" char="$" char1="=" />
                 <Detect2Chars attribute="Operator" context="SelectorAttrValue" char="*" char1="=" />
                 <Detect2Chars attribute="Operator" context="SelectorAttrValue" char="|" char1="=" />
                 <DetectIdentifier />
             </context>
 
             <context name="SelectorAttrValue" attribute="String" lineEndContext="#stay">
                 <DetectChar attribute="Selector Attribute" context="#pop#pop" char="]" />
                 <DetectIdentifier />
             </context>
 
             <context name="SelectorPseudo" attribute="Selector Pseudo" lineEndContext="#pop">
                 <DetectChar attribute="Selector Pseudo" context="SelectorPseudoElements" char=":" />
                 <keyword attribute="Selector Pseudo" context="SelectorPseudoValueSelector" String="pseudoclass-not" />
                 <keyword attribute="Selector Pseudo" context="SelectorPseudoValue" String="pseudoclasses" />
                 <RegExpr attribute="Selector Pseudo" context="SelectorPseudoValue" String="[-a-zA-Z][-a-zA-Z0-9]*" />
             </context>
 
             <context name="SelectorPseudoElements" attribute="Selector Pseudo" lineEndContext="#pop#pop">
                 <keyword attribute="Selector Pseudo" context="#pop!SelectorPseudoValue" String="pseudoelements" />
                 <RegExpr attribute="Selector Pseudo" context="#pop!SelectorPseudoValue" String="[-a-zA-Z][-a-zA-Z0-9]*" />
             </context>
 
             <context name="SelectorPseudoValueSelector" attribute="Selector Pseudo" lineEndContext="#pop#pop" fallthrough="true" fallthroughContext="#pop#pop">
                 <DetectChar attribute="Selector Pseudo" context="SelectorPseudoValueCloseSelector" char="(" />
             </context>
 
             <context name="SelectorPseudoValueCloseSelector" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <DetectChar attribute="Selector Pseudo" context="#pop#pop#pop" char=")" />
                 <DetectChar attribute="Error" context="#pop#pop#pop!RuleSet" char="{" beginRegion="ruleset" />
                 <IncludeRules context="FindSelector" />
             </context>
 
             <context name="SelectorPseudoValue" attribute="Selector Pseudo" lineEndContext="#pop#pop" fallthrough="true" fallthroughContext="#pop#pop">
                 <DetectChar attribute="Selector Pseudo" context="SelectorPseudoValueClose" char="(" />
             </context>
 
             <context name="SelectorPseudoValueClose" attribute="Selector Pseudo" lineEndContext="#pop#pop#pop">
                 <DetectChar attribute="Selector Pseudo" context="#pop#pop#pop" char=")" />
                 <DetectIdentifier />
             </context>
 
             <context name="Comment" attribute="Comment" lineEndContext="#stay">
                 <DetectSpaces />
                 <Detect2Chars attribute="Comment" context="#pop#pop" char="*" char1="/" endRegion="comment" />
                 <IncludeRules context="##Alerts" />
                 <DetectIdentifier />
             </context>
 
             <context name="RuleSet" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <DetectChar attribute="Normal Text" context="#pop" char="}" endRegion="ruleset" />
                 <RegExpr attribute="Property" context="Rule" String="[A-Za-z_-]+\s*:($|[/{\s0-9$&quot;'])" lookAhead="true" />
                 <IncludeRules context="Base" />
                 <!-- auto-completion only, includes by a previous rule -->
                 <keyword attribute="Normal Text" context="#stay" String="properties" />
             </context>
 
             <context name="Rule" attribute="Normal Text" lineEndContext="#stay">
                 <DetectChar attribute="Normal Text" context="RuleParameters" char=":" />
                 <Detect2Chars attribute="Variable" context="IsVariable" char="-" char1="-" />
                 <keyword attribute="Property" context="#stay" String="properties" />
                 <RegExpr attribute="Unknown Property" context="#stay" String="[^:]+" />
             </context>
 
             <context name="IsVariable" attribute="Normal Text" lineEndContext="#pop">
                 <DetectChar attribute="Normal Text" context="#pop!RuleParameters" char=":" />
                 <RegExpr attribute="Variable" context="#stay" String="[^:]+" />
             </context>
 
             <context name="RuleParameters" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <!-- Jump out conditions -->
                 <DetectChar attribute="Separator Symbol" context="#pop#pop" char=";" />
                 <DetectChar attribute="Separator Symbol" context="#stay" char="," />
                 <DetectChar attribute="Normal Text" context="#pop#pop#pop" char="}" endRegion="ruleset" />
                 <DetectChar attribute="Normal Text" context="SubRule" char="{" beginRegion="ruleset" />
                 <IncludeRules context="FindComments" />
                 <IncludeRules context="FindStrings" />
                 <IncludeRules context="FindFunctions" />
                 <IncludeRules context="FindValues" />
                 <!-- auto-completion only -->
                 <keyword attribute="Normal Text" context="#stay" String="functions" />
             </context>
 
             <context name="SubRule" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <IncludeRules context="FindComments" />
                 <DetectChar attribute="Normal Text" context="#pop#pop#pop" char="}" endRegion="ruleset" />
                 <RegExpr attribute="Property" context="IsProperty" String="[A-Za-z_-]+(?=\s*:)" />
                 <RegExpr attribute="Variable" context="VariableDefine" String="\$[a-zA-Z0-9\-_]+(?=\s*:)" />
                 <RegExpr attribute="Variable" context="Interpolation" String="#\{\s*\$[a-zA-Z0-9\-_]+" />
                 <DetectIdentifier />
                 <AnyChar attribute="Error" context="#stay" String="*>+~|.#" />
                 <!-- auto-completion only, includes by previous rule -->
                 <keyword attribute="Normal Text" context="#stay" String="properties" />
                 <keyword attribute="Normal Text" context="#stay" String="sub-properties" />
             </context>
 
             <context name="Function" attribute="Normal Text" lineEndContext="#stay">
                 <DetectChar attribute="Function" context="FunctionParameters" char="(" />
                 <StringDetect attribute="Function" context="FunctionVar" String="var(" />
                 <StringDetect attribute="Function" context="FunctionUrl" String="url(" />
                 <StringDetect attribute="Function" context="FunctionCalc" String="calc(" />
                 <keyword attribute="Function" context="#stay" String="functions" />
                 <RegExpr attribute="Function" context="#stay" String="[-a-zA-Z][-a-zA-Z0-9]*" />
             </context>
 
             <context name="FunctionVar" attribute="Variable" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop!FunctionParameters">
                 <DetectSpaces />
                 <IncludeRules context="FindComments" />
                 <RegExpr attribute="Variable" context="#pop!FunctionParameters" String="--[^ \t\),]+" />
             </context>
 
             <context name="FunctionCalc" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <DetectChar attribute="Function" context="#pop#pop" char=")" />
                 <IncludeRules context="Calc" />
             </context>
 
             <context name="NestedCalc" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <DetectChar attribute="Normal Text" context="#pop" char=")" />
                 <IncludeRules context="Calc" />
             </context>
 
             <context name="Calc" attribute="Normal Text" lineEndContext="#stay">
                 <DetectChar attribute="Separator Symbol" context="#stay" char="," />
                 <DetectChar attribute="Normal Text" context="NestedCalc" char="(" />
                 <IncludeRules context="FindComments" />
                 <IncludeRules context="FindStrings" />
                 <IncludeRules context="FindFunctions" />
                 <IncludeRules context="FindValues" />
                 <RegExpr attribute="Operator" context="#stay" String="[-](?=$|[ \t(,;])|[+](?=$|[^0-9)])|[/*]" />
                 <!-- auto-completion only -->
                 <keyword attribute="Normal Text" context="#stay" String="functions" />
             </context>
 
             <context name="FunctionUrl" attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="UrlValue">
                 <DetectSpaces />
                 <IncludeRules context="FindStrings" />
                 <DetectChar attribute="Function" context="#pop#pop" char=")" />
             </context>
 
             <context name="UrlValue" attribute="String" lineEndContext="#stay">
                 <DetectChar attribute="Function" context="#pop#pop#pop" char=")" />
             </context>
 
             <context name="FunctionParameters" attribute="Normal Text" lineEndContext="#stay">
                 <DetectSpaces />
                 <DetectChar attribute="Function" context="#pop#pop" char=")" />
                 <IncludeRules context="FindComments" />
                 <IncludeRules context="FindStrings" />
                 <IncludeRules context="FindValues" />
                 <DetectChar attribute="Separator Symbol" context="#stay" char="," />
             </context>
 
             <!-- string contexts -->
             <context name="StringDQ" attribute="String" lineEndContext="#stay">
                 <DetectChar attribute="String" context="#pop" char="&quot;" />
                 <IncludeRules context="InsideString" />
             </context>
 
             <context name="StringSQ" attribute="String" lineEndContext="#stay">
                 <DetectChar attribute="String" context="#pop" char="'" />
                 <IncludeRules context="InsideString" />
             </context>
 
             <context name="InsideString" attribute="String" lineEndContext="#stay">
                 <Detect2Chars attribute="SpecialChar" context="InterpolationString" char="#" char1="{" />
                 <RegExpr attribute="SpecialChar" context="#stay" String="\\([0-9A-Fa-f]{1,6}|.?)" />
                 <RegExpr attribute="String" context="#stay" String="\\?[^&quot;'\\]+" />
             </context>
 
             <context name="InterpolationString" attribute="String" lineEndContext="#stay">
                 <DetectChar attribute="SpecialChar" context="#pop" char="}" />
                 <IncludeRules context="FindStrings" />
                 <IncludeRules context="FindFunctions" />
                 <IncludeRules context="FindValues" />
                 <!-- auto-completion only -->
                 <keyword attribute="Normal Text" context="#stay" String="functions" />
             </context>
 
         </contexts>
 
         <itemDatas>
             <itemData name="Normal Text" defStyleNum="dsNormal" spellChecking="false"/>
             <itemData name="At Rule" defStyleNum="dsImport" spellChecking="false"/>
             <itemData name="Keyword" defStyleNum="dsKeyword" spellChecking="false"/>
             <itemData name="Property" defStyleNum="dsKeyword" spellChecking="false"/>
             <itemData name="Unknown Property" defStyleNum="dsNormal" spellChecking="false"/>
             <itemData name="String" defStyleNum="dsString"/>
             <itemData name="SpecialChar" defStyleNum="dsSpecialChar" spellChecking="false"/>
             <itemData name="Operator" defStyleNum="dsOperator" spellChecking="false"/>
             <itemData name="Separator Symbol" defStyleNum="dsOperator" spellChecking="false"/>
             <itemData name="Value" defStyleNum="dsDecVal" spellChecking="false"/>
             <itemData name="Number" defStyleNum="dsDecVal" spellChecking="false"/>
             <itemData name="Value Keyword" defStyleNum="dsBuiltIn" spellChecking="false"/>
             <itemData name="Color" defStyleNum="dsConstant" spellChecking="false"/>
             <itemData name="Unit" defStyleNum="dsDataType" spellChecking="false"/>
             <itemData name="Variable" defStyleNum="dsVariable" spellChecking="false"/>
             <itemData name="Function" defStyleNum="dsFunction" spellChecking="false"/>
             <itemData name="Annotation" defStyleNum="dsAttribute" spellChecking="false"/>
             <itemData name="Selector Id" defStyleNum="dsPreprocessor" bold="1" spellChecking="false"/>
             <itemData name="Selector Class" defStyleNum="dsFunction" spellChecking="false"/>
             <itemData name="Selector Attribute" defStyleNum="dsExtension" spellChecking="false"/>
             <itemData name="Selector Pseudo" defStyleNum="dsInformation" italic="1" spellChecking="false"/>
             <itemData name="Selector Tag" defStyleNum="dsNormal" spellChecking="false"/>
             <itemData name="Placeholder Selector" defStyleNum="dsBuiltIn" spellChecking="false"/>
             <itemData name="Comment" defStyleNum="dsComment" />
             <itemData name="Region Marker" defStyleNum="dsRegionMarker" spellChecking="false"/>
             <itemData name="Error" defStyleNum="dsError" spellChecking="false"/>
         </itemDatas>
     </highlighting>
 
     <general>
         <keywords casesensitive="0" weakDeliminator="-%@" />
         <comments>
             <comment name="multiLine" start="/*" end="*/" />
         </comments>
     </general>
 
 </language>
diff --git a/src/lib/definition.cpp b/src/lib/definition.cpp
index ac08a10..114d155 100644
--- a/src/lib/definition.cpp
+++ b/src/lib/definition.cpp
@@ -1,832 +1,833 @@
 /*
     Copyright (C) 2016 Volker Krause <vkrause@kde.org>
     Copyright (C) 2018 Dominik Haumann <dhaumann@kde.org>
     Copyright (C) 2018 Christoph Cullmann <cullmann@kde.org>
 
     Permission is hereby granted, free of charge, to any person obtaining
     a copy of this software and associated documentation files (the
     "Software"), to deal in the Software without restriction, including
     without limitation the rights to use, copy, modify, merge, publish,
     distribute, sublicense, and/or sell copies of the Software, and to
     permit persons to whom the Software is furnished to do so, subject to
     the following conditions:
 
     The above copyright notice and this permission notice shall be included
     in all copies or substantial portions of the Software.
 
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 
 #include "definition.h"
 #include "definition_p.h"
 #include "definitionref_p.h"
 
 #include "context_p.h"
 #include "format.h"
 #include "format_p.h"
 #include "repository.h"
 #include "repository_p.h"
 #include "rule_p.h"
 #include "ksyntaxhighlighting_logging.h"
 #include "ksyntaxhighlighting_version.h"
 #include "xml_p.h"
 
 #include <QCoreApplication>
 #include <QDebug>
 #include <QFile>
 #include <QHash>
 #include <QJsonObject>
 #include <QStringList>
 #include <QVector>
 #include <QXmlStreamReader>
 
 #include <algorithm>
 
 using namespace KSyntaxHighlighting;
 
 DefinitionData::DefinitionData()
     : wordDelimiters(QStringLiteral("\t !%&()*+,-./:;<=>?[\\]^{|}~")) // must be sorted!
     , wordWrapDelimiters(wordDelimiters)
 {
 }
 
 DefinitionData::~DefinitionData()
 {
     qDeleteAll(contexts);
 }
 
 DefinitionData* DefinitionData::get(const Definition &def)
 {
     return def.d.get();
 }
 
 Definition::Definition() :
     d(new DefinitionData)
 {
 }
 
 Definition::Definition(const Definition &other) :
     d(other.d)
 {
     d->q = *this;
 }
 
 Definition::Definition(const std::shared_ptr<DefinitionData> &dd) :
     d(dd)
 {
 }
 
 Definition::~Definition()
 {
 }
 
 Definition& Definition::operator=(const Definition &rhs)
 {
     d = rhs.d;
     return *this;
 }
 
 bool Definition::operator==(const Definition &other) const
 {
     return d->fileName == other.d->fileName;
 }
 
 bool Definition::operator!=(const Definition& other) const
 {
     return d->fileName != other.d->fileName;
 }
 
 bool Definition::isValid() const
 {
     return d->repo && !d->fileName.isEmpty() && !d->name.isEmpty();
 }
 
 QString Definition::filePath() const
 {
     return d->fileName;
 }
 
 QString Definition::name() const
 {
     return d->name;
 }
 
 QString Definition::translatedName() const
 {
     return QCoreApplication::instance()->translate("Language", d->name.toUtf8().constData());
 }
 
 QString Definition::section() const
 {
     return d->section;
 }
 
 QString Definition::translatedSection() const
 {
     return QCoreApplication::instance()->translate("Language Section", d->section.toUtf8().constData());
 }
 
 QVector<QString> Definition::mimeTypes() const
 {
     return d->mimetypes;
 }
 
 QVector<QString> Definition::extensions() const
 {
     return d->extensions;
 }
 
 int Definition::version() const
 {
     return d->version;
 }
 
 int Definition::priority() const
 {
     return d->priority;
 }
 
 bool Definition::isHidden() const
 {
     return d->hidden;
 }
 
 QString Definition::style() const
 {
     return d->style;
 }
 
 QString Definition::indenter() const
 {
     return d->indenter;
 }
 
 QString Definition::author() const
 {
     return d->author;
 }
 
 QString Definition::license() const
 {
     return d->license;
 }
 
 bool Definition::isWordDelimiter(QChar c) const
 {
     d->load();
     return d->isWordDelimiter(c);
 }
 
 bool Definition::isWordWrapDelimiter(QChar c) const
 {
     d->load();
     return std::binary_search(d->wordWrapDelimiters.constBegin(), d->wordWrapDelimiters.constEnd(), c);
 }
 
 bool Definition::foldingEnabled() const
 {
     d->load();
     if (d->hasFoldingRegions || indentationBasedFoldingEnabled()) {
         return true;
     }
 
     // check included definitions
     const auto defs = includedDefinitions();
     for (const auto &def : defs) {
         if (def.foldingEnabled()) {
             d->hasFoldingRegions = true;
             break;
         }
     }
 
     return d->hasFoldingRegions;
 }
 
 bool Definition::indentationBasedFoldingEnabled() const
 {
     d->load();
     return d->indentationBasedFolding;
 }
 
 QStringList Definition::foldingIgnoreList() const
 {
     d->load();
     return d->foldingIgnoreList;
 }
 
 QStringList Definition::keywordLists() const
 {
     d->load(DefinitionData::OnlyKeywords(true));
     return d->keywordLists.keys();
 }
 
 QStringList Definition::keywordList(const QString& name) const
 {
     d->load(DefinitionData::OnlyKeywords(true));
     const auto list = d->keywordList(name);
     return list ? list->keywords() : QStringList();
 }
 
 QVector<Format> Definition::formats() const
 {
     d->load();
 
     // sort formats so that the order matches the order of the itemDatas in the xml files.
     auto formatList = QVector<Format>::fromList(d->formats.values());
     std::sort(formatList.begin(), formatList.end(), [](const KSyntaxHighlighting::Format & lhs, const KSyntaxHighlighting::Format & rhs){
         return lhs.id() < rhs.id();
     });
 
     return formatList;
 }
 
 QVector<Definition> Definition::includedDefinitions() const
 {
     d->load();
 
     // init worklist and result used as guard with this definition
     QVector<Definition> queue{*this};
     QVector<Definition> definitions{*this};
     while (!queue.isEmpty()) {
         // Iterate all context rules to find associated Definitions. This will
         // automatically catch other Definitions referenced with IncludeRuldes or ContextSwitch.
         const auto definition = queue.takeLast();
         for (const auto & context : qAsConst(definition.d->contexts)) {
             // handle context switch attributes of this context itself
             for (const auto switchContext : {context->lineEndContext().context(), context->lineEmptyContext().context(), context->fallthroughContext().context()}) {
                 if (switchContext) {
                     if (!definitions.contains(switchContext->definition())) {
                         queue.push_back(switchContext->definition());
                         definitions.push_back(switchContext->definition());
                     }
                 }
             }
 
             // handle the embedded rules
             for (const auto &rule : context->rules()) {
                 // handle include rules like inclusion
                 if (!definitions.contains(rule->definition())) {
                     queue.push_back(rule->definition());
                     definitions.push_back(rule->definition());
                 }
 
                 // handle context switch context inclusion
                 if (auto switchContext = rule->context().context()) {
                     if (!definitions.contains(switchContext->definition())) {
                         queue.push_back(switchContext->definition());
                         definitions.push_back(switchContext->definition());
                     }
                 }
             }
         }
     }
 
     // remove the 1st entry, since it is this Definition
     definitions.pop_front();
 
     return definitions;
 }
 
 QString Definition::singleLineCommentMarker() const
 {
     d->load();
     return d->singleLineCommentMarker;
 }
 
 CommentPosition Definition::singleLineCommentPosition() const
 {
     d->load();
     return d->singleLineCommentPosition;
 }
 
 QPair<QString, QString> Definition::multiLineCommentMarker() const
 {
     d->load();
     return { d->multiLineCommentStartMarker, d->multiLineCommentEndMarker };
 }
 
 QVector<QPair<QChar, QString>> Definition::characterEncodings() const
 {
     d->load();
     return d->characterEncodings;
 }
 
 Context* DefinitionData::initialContext() const
 {
     Q_ASSERT(!contexts.isEmpty());
     return contexts.first();
 }
 
 Context* DefinitionData::contextByName(const QString& name) const
 {
     foreach (auto context, contexts) {
         if (context->name() == name)
             return context;
     }
     return nullptr;
 }
 
 KeywordList *DefinitionData::keywordList(const QString& name)
 {
     auto it = keywordLists.find(name);
     return (it == keywordLists.end()) ? nullptr : &it.value();
 }
 
 bool DefinitionData::isWordDelimiter(QChar c) const
 {
     return std::binary_search(wordDelimiters.constBegin(), wordDelimiters.constEnd(), c);
 }
 
 Format DefinitionData::formatByName(const QString& name) const
 {
     const auto it = formats.constFind(name);
     if (it != formats.constEnd())
         return it.value();
 
     return Format();
 }
 
 bool DefinitionData::isLoaded() const
 {
     return !contexts.isEmpty();
 }
 
 bool DefinitionData::load(OnlyKeywords onlyKeywords)
 {
     if (fileName.isEmpty())
         return false;
 
     if (isLoaded())
         return true;
 
     if (bool(onlyKeywords) && keywordIsLoaded)
         return true;
 
     QFile file(fileName);
     if (!file.open(QFile::ReadOnly))
         return false;
 
     QXmlStreamReader reader(&file);
     while (!reader.atEnd()) {
         const auto token = reader.readNext();
         if (token != QXmlStreamReader::StartElement)
             continue;
 
         if (reader.name() == QLatin1String("highlighting")) {
             loadHighlighting(reader, onlyKeywords);
             if (bool(onlyKeywords)) {
                 return true;
             }
         }
 
         else if (reader.name() == QLatin1String("general"))
             loadGeneral(reader);
     }
 
     for (auto it = keywordLists.begin(); it != keywordLists.end(); ++it) {
         it->setCaseSensitivity(caseSensitive);
     }
 
     foreach (auto context, contexts) {
         context->resolveContexts();
         context->resolveIncludes();
         context->resolveAttributeFormat();
     }
 
     Q_ASSERT(std::is_sorted(wordDelimiters.constBegin(), wordDelimiters.constEnd()));
     return true;
 }
 
 void DefinitionData::clear()
 {
     // keep only name and repo, so we can re-lookup to make references persist over repo reloads
     keywordLists.clear();
     qDeleteAll(contexts);
     contexts.clear();
     formats.clear();
 
     fileName.clear();
     section.clear();
     style.clear();
     indenter.clear();
     author.clear();
     license.clear();
     mimetypes.clear();
     extensions.clear();
     wordDelimiters = QStringLiteral("\t !%&()*+,-./:;<=>?[\\]^{|}~"); // must be sorted!
     wordWrapDelimiters = wordDelimiters;
     caseSensitive = Qt::CaseSensitive;
     version = 0.0f;
     priority = 0;
     hidden = false;
 }
 
 bool DefinitionData::loadMetaData(const QString& definitionFileName)
 {
     fileName = definitionFileName;
 
     QFile file(definitionFileName);
     if (!file.open(QFile::ReadOnly))
         return false;
 
     QXmlStreamReader reader(&file);
     while (!reader.atEnd()) {
         const auto token = reader.readNext();
         if (token != QXmlStreamReader::StartElement)
             continue;
         if (reader.name() == QLatin1String("language")) {
             return loadLanguage(reader);
         }
     }
 
     return false;
 }
 
 bool DefinitionData::loadMetaData(const QString &file, const QJsonObject &obj)
 {
     name     = obj.value(QLatin1String("name")).toString();
     section  = obj.value(QLatin1String("section")).toString();
     version  = obj.value(QLatin1String("version")).toInt();
     priority = obj.value(QLatin1String("priority")).toInt();
     style    = obj.value(QLatin1String("style")).toString();
     author   = obj.value(QLatin1String("author")).toString();
     license  = obj.value(QLatin1String("license")).toString();
     indenter = obj.value(QLatin1String("indenter")).toString();
     hidden   = obj.value(QLatin1String("hidden")).toBool();
     fileName = file;
 
     const auto exts = obj.value(QLatin1String("extensions")).toString();
     foreach (const auto &ext, exts.split(QLatin1Char(';'), QString::SkipEmptyParts))
         extensions.push_back(ext);
     const auto mts = obj.value(QLatin1String("mimetype")).toString();
     foreach (const auto &mt, mts.split(QLatin1Char(';'), QString::SkipEmptyParts))
         mimetypes.push_back(mt);
 
     return true;
 }
 
 bool DefinitionData::loadLanguage(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("language"));
     Q_ASSERT(reader.tokenType() == QXmlStreamReader::StartElement);
 
     if (!checkKateVersion(reader.attributes().value(QStringLiteral("kateversion"))))
         return false;
 
     name = reader.attributes().value(QStringLiteral("name")).toString();
     section = reader.attributes().value(QStringLiteral("section")).toString();
     // toFloat instead of toInt for backward compatibility with old Kate files
     version = reader.attributes().value(QStringLiteral("version")).toFloat();
     priority = reader.attributes().value(QStringLiteral("priority")).toInt();
     hidden = Xml::attrToBool(reader.attributes().value(QStringLiteral("hidden")));
     style = reader.attributes().value(QStringLiteral("style")).toString();
     indenter = reader.attributes().value(QStringLiteral("indenter")).toString();
     author = reader.attributes().value(QStringLiteral("author")).toString();
     license = reader.attributes().value(QStringLiteral("license")).toString();
     const auto exts = reader.attributes().value(QStringLiteral("extensions")).toString();
     foreach (const auto &ext, exts.split(QLatin1Char(';'), QString::SkipEmptyParts))
         extensions.push_back(ext);
     const auto mts = reader.attributes().value(QStringLiteral("mimetype")).toString();
     foreach (const auto &mt, mts.split(QLatin1Char(';'), QString::SkipEmptyParts))
         mimetypes.push_back(mt);
     if (reader.attributes().hasAttribute(QStringLiteral("casesensitive")))
         caseSensitive = Xml::attrToBool(reader.attributes().value(QStringLiteral("casesensitive"))) ? Qt::CaseSensitive : Qt::CaseInsensitive;
     return true;
 }
 
 void DefinitionData::loadHighlighting(QXmlStreamReader& reader, OnlyKeywords onlyKeywords)
 {
     Q_ASSERT(reader.name() == QLatin1String("highlighting"));
     Q_ASSERT(reader.tokenType() == QXmlStreamReader::StartElement);
 
     // skip highlighting
     reader.readNext();
 
     while (!reader.atEnd()) {
         switch (reader.tokenType()) {
             case QXmlStreamReader::StartElement:
                 if (reader.name() == QLatin1String("list")) {
                     if (!keywordIsLoaded) {
                         KeywordList keywords;
                         keywords.load(reader);
                         keywordLists.insert(keywords.name(), keywords);
                     }
                     else {
                         reader.skipCurrentElement();
+                        reader.readNext(); // Skip </list>
                     }
                 } else if (bool(onlyKeywords)) {
                     resolveIncludeKeywords();
                     return;
                 } else if (reader.name() == QLatin1String("contexts")) {
                     resolveIncludeKeywords();
                     loadContexts(reader);
                     reader.readNext();
                 } else if (reader.name() == QLatin1String("itemDatas")) {
                     loadItemData(reader);
                 } else {
                     reader.readNext();
                 }
                 break;
             case QXmlStreamReader::EndElement:
                 return;
             default:
                 reader.readNext();
                 break;
         }
     }
 }
 
 void DefinitionData::resolveIncludeKeywords()
 {
     if (keywordIsLoaded) {
         return;
     }
 
     keywordIsLoaded = true;
 
     for (auto it = keywordLists.begin(); it != keywordLists.end(); ++it) {
         it->resolveIncludeKeywords(*this);
     }
 }
 
 void DefinitionData::loadContexts(QXmlStreamReader& reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("contexts"));
     Q_ASSERT(reader.tokenType() == QXmlStreamReader::StartElement);
 
     while (!reader.atEnd()) {
         switch (reader.tokenType()) {
             case QXmlStreamReader::StartElement:
                 if (reader.name() == QLatin1String("context")) {
                     auto context = new Context;
                     context->setDefinition(q);
                     context->load(reader);
                     contexts.push_back(context);
                 }
                 reader.readNext();
                 break;
             case QXmlStreamReader::EndElement:
                 return;
             default:
                 reader.readNext();
                 break;
         }
     }
 }
 
 void DefinitionData::loadItemData(QXmlStreamReader& reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("itemDatas"));
     Q_ASSERT(reader.tokenType() == QXmlStreamReader::StartElement);
 
     while (!reader.atEnd()) {
         switch (reader.tokenType()) {
             case QXmlStreamReader::StartElement:
                 if (reader.name() == QLatin1String("itemData")) {
                     Format f;
                     auto formatData = FormatPrivate::detachAndGet(f);
                     formatData->definition = q;
                     formatData->load(reader);
                     formatData->id = RepositoryPrivate::get(repo)->nextFormatId();
                     formats.insert(f.name(), f);
                     reader.readNext();
                 }
                 reader.readNext();
                 break;
             case QXmlStreamReader::EndElement:
                 return;
             default:
                 reader.readNext();
                 break;
         }
     }
 }
 
 void DefinitionData::loadGeneral(QXmlStreamReader& reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("general"));
     Q_ASSERT(reader.tokenType() == QXmlStreamReader::StartElement);
     reader.readNext();
 
     // reference counter to count XML child elements, to not return too early
     int elementRefCounter = 1;
 
     while (!reader.atEnd()) {
         switch (reader.tokenType()) {
             case QXmlStreamReader::StartElement:
                 ++elementRefCounter;
 
                 if (reader.name() == QLatin1String("keywords")) {
                     if (reader.attributes().hasAttribute(QStringLiteral("casesensitive")))
                         caseSensitive = Xml::attrToBool(reader.attributes().value(QStringLiteral("casesensitive"))) ? Qt::CaseSensitive : Qt::CaseInsensitive;
 
                     // adapt sorted wordDelimiters
                     wordDelimiters += reader.attributes().value(QStringLiteral("additionalDeliminator"));
                     std::sort(wordDelimiters.begin(), wordDelimiters.end());
                     auto it = std::unique(wordDelimiters.begin(), wordDelimiters.end());
                     wordDelimiters.truncate(std::distance(wordDelimiters.begin(), it));
                     foreach (const auto c, reader.attributes().value(QLatin1String("weakDeliminator")))
                         wordDelimiters.remove(c);
 
                     // adaptWordWrapDelimiters, and sort
                     wordWrapDelimiters = reader.attributes().value(QStringLiteral("wordWrapDeliminator")).toString();
                     std::sort(wordWrapDelimiters.begin(), wordWrapDelimiters.end());
                     if (wordWrapDelimiters.isEmpty())
                         wordWrapDelimiters = wordDelimiters;
                 } else if (reader.name() == QLatin1String("folding")) {
                     if (reader.attributes().hasAttribute(QStringLiteral("indentationsensitive")))
                         indentationBasedFolding = Xml::attrToBool(reader.attributes().value(QStringLiteral("indentationsensitive")));
                 } else if (reader.name() == QLatin1String("emptyLines")) {
                     loadFoldingIgnoreList(reader);
                 } else if (reader.name() == QLatin1String("comments")) {
                     loadComments(reader);
                 } else if (reader.name() == QLatin1String("spellchecking")) {
                     loadSpellchecking(reader);
                 } else {
                     reader.skipCurrentElement();
                 }
                 reader.readNext();
                 break;
             case QXmlStreamReader::EndElement:
                 --elementRefCounter;
                 if (elementRefCounter == 0)
                     return;
                 reader.readNext();
                 break;
             default:
                 reader.readNext();
                 break;
         }
     }
 }
 
 void DefinitionData::loadComments(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("comments"));
     Q_ASSERT(reader.tokenType() == QXmlStreamReader::StartElement);
     reader.readNext();
 
     // reference counter to count XML child elements, to not return too early
     int elementRefCounter = 1;
 
     while (!reader.atEnd()) {
         switch (reader.tokenType()) {
             case QXmlStreamReader::StartElement:
                 ++elementRefCounter;
                 if (reader.name() == QLatin1String("comment")) {
                     const bool isSingleLine = reader.attributes().value(QStringLiteral("name")) == QStringLiteral("singleLine");
                     if (isSingleLine) {
                         singleLineCommentMarker = reader.attributes().value(QStringLiteral("start")).toString();
                         const bool afterWhiteSpace = reader.attributes().value(QStringLiteral("position")).toString() == QStringLiteral("afterwhitespace");
                         singleLineCommentPosition = afterWhiteSpace ? CommentPosition::AfterWhitespace : CommentPosition::StartOfLine;
                     } else {
                         multiLineCommentStartMarker = reader.attributes().value(QStringLiteral("start")).toString();
                         multiLineCommentEndMarker = reader.attributes().value(QStringLiteral("end")).toString();
                     }
                 }
                 reader.readNext();
                 break;
             case QXmlStreamReader::EndElement:
                 --elementRefCounter;
                 if (elementRefCounter == 0)
                     return;
                 reader.readNext();
                 break;
             default:
                 reader.readNext();
                 break;
         }
     }
 }
 
 void DefinitionData::loadFoldingIgnoreList(QXmlStreamReader& reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("emptyLines"));
     Q_ASSERT(reader.tokenType() == QXmlStreamReader::StartElement);
     reader.readNext();
 
     // reference counter to count XML child elements, to not return too early
     int elementRefCounter = 1;
 
     while (!reader.atEnd()) {
         switch (reader.tokenType()) {
             case QXmlStreamReader::StartElement:
                 ++elementRefCounter;
                 if (reader.name() == QLatin1String("emptyLine")) {
                     foldingIgnoreList << reader.attributes().value(QStringLiteral("regexpr")).toString();
                 }
                 reader.readNext();
                 break;
             case QXmlStreamReader::EndElement:
                 --elementRefCounter;
                 if (elementRefCounter == 0)
                     return;
                 reader.readNext();
                 break;
             default:
                 reader.readNext();
                 break;
         }
     }
 }
 
 void DefinitionData::loadSpellchecking(QXmlStreamReader &reader)
 {
     Q_ASSERT(reader.name() == QLatin1String("spellchecking"));
     Q_ASSERT(reader.tokenType() == QXmlStreamReader::StartElement);
     reader.readNext();
 
     // reference counter to count XML child elements, to not return too early
     int elementRefCounter = 1;
 
     while (!reader.atEnd()) {
         switch (reader.tokenType()) {
             case QXmlStreamReader::StartElement:
                 ++elementRefCounter;
                 if (reader.name() == QLatin1String("encoding")) {
                     const auto charRef = reader.attributes().value(QStringLiteral("char"));
                     if (!charRef.isEmpty()) {
                         const auto str = reader.attributes().value(QStringLiteral("string")).toString();
                         characterEncodings.push_back({ charRef[0], str });
                     }
                 }
                 reader.readNext();
                 break;
             case QXmlStreamReader::EndElement:
                 --elementRefCounter;
                 if (elementRefCounter == 0)
                     return;
                 reader.readNext();
                 break;
             default:
                 reader.readNext();
                 break;
         }
     }
 }
 
 bool DefinitionData::checkKateVersion(const QStringRef& verStr)
 {
     const auto idx = verStr.indexOf(QLatin1Char('.'));
     if (idx <= 0) {
         qCWarning(Log) << "Skipping" << fileName << "due to having no valid kateversion attribute:" << verStr;
         return false;
     }
     const auto major = verStr.left(idx).toInt();
     const auto minor = verStr.mid(idx + 1).toInt();
 
     if (major > SyntaxHighlighting_VERSION_MAJOR || (major == SyntaxHighlighting_VERSION_MAJOR && minor > SyntaxHighlighting_VERSION_MINOR)) {
         qCWarning(Log) << "Skipping" << fileName << "due to being too new, version:" << verStr;
         return false;
     }
 
     return true;
 }
 
 quint16 DefinitionData::foldingRegionId(const QString &foldName)
 {
     hasFoldingRegions = true;
     return RepositoryPrivate::get(repo)->foldingRegionId(name, foldName);
 }
 
 DefinitionRef::DefinitionRef()
 {
 }
 
 DefinitionRef::DefinitionRef(const Definition &def) :
     d(def.d)
 {
 }
 
 DefinitionRef::~DefinitionRef()
 {
 }
 
 DefinitionRef& DefinitionRef::operator=(const Definition &def)
 {
     d = def.d;
     return *this;
 }
 
 Definition DefinitionRef::definition() const
 {
     if (!d.expired())
         return Definition(d.lock());
     return Definition();
 }
 
 bool DefinitionRef::operator==(const DefinitionRef &other) const
 {
     if (d.expired() != other.d.expired()) {
         return false;
     }
 
     return d.expired() || d.lock().get() == other.d.lock().get();
 }