Syntax Highlight Overhaul (#568)

* Adds new syntax groups and docs
* Large refactor of syntax highlighting files

* Changed keybindings for changing tabs.

* Improved the documentation.

* Added F3 for find to default bindings.

* Massive overhaul of the syntax files

* Phase 1 color-scheme updates.

* The new colorschemes.

* Colorscheme and syntax updates.

* Tiny fix to the cmc theme.

* Another phase of colorschemes and testing gitconfig.

* Fixed haskell error

* Fortran fix

* Delete test.txt

Heh, sorry about forgetting to do this again.

runtime/syntax/Dockerfile.micro

@@ -2,16 +2,16 @@
 syntax "dockerfile" "Dockerfile[^/]*$" "\.dockerfile$"
 
 ## Keywords
-color keyword (i) "^(FROM|MAINTAINER|RUN|CMD|LABEL|EXPOSE|ENV|ADD|COPY|ENTRYPOINT|VOLUME|USER|WORKDIR|ONBUILD|ARG|HEALTHCHECK|STOPSIGNAL|SHELL)[[:space:]]"
+color statement  "^(FROM|MAINTAINER|RUN|CMD|LABEL|EXPOSE|ENV|ADD|COPY|ENTRYPOINT|VOLUME|USER|WORKDIR|ONBUILD|ARG|HEALTHCHECK|STOPSIGNAL|SHELL)[[:space:]]"
 
 ## Brackets & parenthesis
-color statement "(\(|\)|\[|\])"
+color symbol.brackets "(\(|\)|\[|\])"
 
 ## Double ampersand
 color special "&&"
 
 ## Comments
-color comment (i) "^[[:space:]]*#.*$"
+color comment "^[[:space:]]*#.*$"
 
 ## Strings, single-quoted
 color constant.string "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"

runtime/syntax/LICENSE

@@ -1,5 +1,5 @@
     micro syntax files
-    Copyright (C) 2016+ Zachary Yedidia et al.
+    Copyright (C) 2016+ Zachary Yedidia, Collin Warren, et al.
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

runtime/syntax/README.md

@@ -11,8 +11,7 @@ Micro syntax files are almost identical to Nano's, except for some key differenc
 
 # Using with colorschemes
 
-Not all of these files have been converted to use micro's colorscheme feature. Most of them just hardcode the colors, which
-can be problematic depending on the colorscheme you use.
+Not all of these files have been converted to use micro's colorscheme feature. Most of them just hardcode the colors, which can be problematic depending on the colorscheme you use.
 
 Here is a list of the files that have been converted to properly use colorschemes:
 

runtime/syntax/apacheconf.micro

@@ -1,44 +1,44 @@
 # Apache files
 syntax "apacheconf" "httpd\.conf|mime\.types|vhosts\.d\\*|\.htaccess"
-color yellow ".+"
-color brightcyan "(AcceptMutex|AcceptPathInfo|AccessFileName|Action|AddAlt|AddAltByEncoding|AddAltByType|AddCharset|AddDefaultCharset|AddDescription|AddEncoding)"
-color brightcyan "(AddHandler|AddIcon|AddIconByEncoding|AddIconByType|AddInputFilter|AddLanguage|AddModuleInfo|AddOutputFilter|AddOutputFilterByType|AddType|Alias|AliasMatch)"
-color brightcyan "(Allow|AllowCONNECT|AllowEncodedSlashes|AllowOverride|Anonymous|Anonymous_Authoritative|Anonymous_LogEmail|Anonymous_MustGiveEmail|Anonymous_NoUserID)"
-color brightcyan "(Anonymous_VerifyEmail|AssignUserID|AuthAuthoritative|AuthDBMAuthoritative|AuthDBMGroupFile|AuthDBMType|AuthDBMUserFile|AuthDigestAlgorithm)"
-color brightcyan "(AuthDigestDomain|AuthDigestFile|AuthDigestGroupFile|AuthDigestNcCheck|AuthDigestNonceFormat|AuthDigestNonceLifetime|AuthDigestQop|AuthDigestShmemSize)"
-color brightcyan "(AuthGroupFile|AuthLDAPAuthoritative|AuthLDAPBindDN|AuthLDAPBindPassword|AuthLDAPCharsetConfig|AuthLDAPCompareDNOnServer|AuthLDAPDereferenceAliases)"
-color brightcyan "(AuthLDAPEnabled|AuthLDAPFrontPageHack|AuthLDAPGroupAttribute|AuthLDAPGroupAttributeIsDN|AuthLDAPRemoteUserIsDN|AuthLDAPUrl|AuthName|AuthType|AuthUserFile)"
-color brightcyan "(BrowserMatch|BrowserMatchNoCase|BS2000Account|BufferedLogs|CacheDefaultExpire|CacheDirLength|CacheDirLevels|CacheDisable|CacheEnable|CacheExpiryCheck)"
-color brightcyan "(CacheFile|CacheForceCompletion|CacheGcClean|CacheGcDaily|CacheGcInterval|CacheGcMemUsage|CacheGcUnused|CacheIgnoreCacheControl|CacheIgnoreHeaders)"
-color brightcyan "(CacheIgnoreNoLastMod|CacheLastModifiedFactor|CacheMaxExpire|CacheMaxFileSize|CacheMinFileSize|CacheNegotiatedDocs|CacheRoot|CacheSize|CacheTimeMargin)"
-color brightcyan "(CGIMapExtension|CharsetDefault|CharsetOptions|CharsetSourceEnc|CheckSpelling|ChildPerUserID|ContentDigest|CookieDomain|CookieExpires|CookieLog|CookieName)"
-color brightcyan "(CookieStyle|CookieTracking|CoreDumpDirectory|CustomLog|Dav|DavDepthInfinity|DavLockDB|DavMinTimeout|DefaultIcon|DefaultLanguage|DefaultType)"
-color brightcyan "(DeflateBufferSize|DeflateCompressionLevel|DeflateFilterNote|DeflateMemLevel|DeflateWindowSize|Deny|Directory|DirectoryIndex|DirectoryMatch|DirectorySlash)"
-color brightcyan "(DocumentRoot|DumpIOInput|DumpIOOutput|EnableExceptionHook|EnableMMAP|EnableSendfile|ErrorDocument|ErrorLog|Example|ExpiresActive|ExpiresByType)"
-color brightcyan "(ExpiresDefault|ExtendedStatus|ExtFilterDefine|ExtFilterOptions|FileETag|Files|FilesMatch|ForceLanguagePriority|ForceType|ForensicLog|Group|Header)"
-color brightcyan "(HeaderName|HostnameLookups|IdentityCheck|IfDefine|IfModule|IfVersion|ImapBase|ImapDefault|ImapMenu|Include|IndexIgnore|IndexOptions|IndexOrderDefault)"
-color brightcyan "(ISAPIAppendLogToErrors|ISAPIAppendLogToQuery|ISAPICacheFile|ISAPIFakeAsync|ISAPILogNotSupported|ISAPIReadAheadBuffer|KeepAlive|KeepAliveTimeout)"
-color brightcyan "(LanguagePriority|LDAPCacheEntries|LDAPCacheTTL|LDAPConnectionTimeout|LDAPOpCacheEntries|LDAPOpCacheTTL|LDAPSharedCacheFile|LDAPSharedCacheSize)"
-color brightcyan "(LDAPTrustedCA|LDAPTrustedCAType|Limit|LimitExcept|LimitInternalRecursion|LimitRequestBody|LimitRequestFields|LimitRequestFieldSize|LimitRequestLine)"
-color brightcyan "(LimitXMLRequestBody|Listen|ListenBackLog|LoadFile|LoadModule|Location|LocationMatch|LockFile|LogFormat|LogLevel|MaxClients|MaxKeepAliveRequests)"
-color brightcyan "(MaxMemFree|MaxRequestsPerChild|MaxRequestsPerThread|MaxSpareServers|MaxSpareThreads|MaxThreads|MaxThreadsPerChild|MCacheMaxObjectCount|MCacheMaxObjectSize)"
-color brightcyan "(MCacheMaxStreamingBuffer|MCacheMinObjectSize|MCacheRemovalAlgorithm|MCacheSize|MetaDir|MetaFiles|MetaSuffix|MimeMagicFile|MinSpareServers|MinSpareThreads)"
-color brightcyan "(MMapFile|ModMimeUsePathInfo|MultiviewsMatch|NameVirtualHost|NoProxy|NumServers|NWSSLTrustedCerts|NWSSLUpgradeable|Options|Order|PassEnv|PidFile)"
-color brightcyan "(ProtocolEcho|Proxy|ProxyBadHeader|ProxyBlock|ProxyDomain|ProxyErrorOverride|ProxyIOBufferSize|ProxyMatch|ProxyMaxForwards|ProxyPass|ProxyPassReverse)"
-color brightcyan "(ProxyPreserveHost|ProxyReceiveBufferSize|ProxyRemote|ProxyRemoteMatch|ProxyRequests|ProxyTimeout|ProxyVia|ReadmeName|Redirect|RedirectMatch)"
-color brightcyan "(RedirectPermanent|RedirectTemp|RemoveCharset|RemoveEncoding|RemoveHandler|RemoveInputFilter|RemoveLanguage|RemoveOutputFilter|RemoveType|RequestHeader)"
-color brightcyan "(Require|RewriteBase|RewriteCond|RewriteEngine|RewriteLock|RewriteLog|RewriteLogLevel|RewriteMap|RewriteOptions|RewriteRule|RLimitCPU|RLimitMEM|RLimitNPROC)"
-color brightcyan "(Satisfy|ScoreBoardFile|Script|ScriptAlias|ScriptAliasMatch|ScriptInterpreterSource|ScriptLog|ScriptLogBuffer|ScriptLogLength|ScriptSock|SecureListen)"
-color brightcyan "(SendBufferSize|ServerAdmin|ServerAlias|ServerLimit|ServerName|ServerPath|ServerRoot|ServerSignature|ServerTokens|SetEnv|SetEnvIf|SetEnvIfNoCase|SetHandler)"
-color brightcyan "(SetInputFilter|SetOutputFilter|SSIEndTag|SSIErrorMsg|SSIStartTag|SSITimeFormat|SSIUndefinedEcho|SSLCACertificateFile|SSLCACertificatePath)"
-color brightcyan "(SSLCARevocationFile|SSLCARevocationPath|SSLCertificateChainFile|SSLCertificateFile|SSLCertificateKeyFile|SSLCipherSuite|SSLEngine|SSLMutex|SSLOptions)"
-color brightcyan "(SSLPassPhraseDialog|SSLProtocol|SSLProxyCACertificateFile|SSLProxyCACertificatePath|SSLProxyCARevocationFile|SSLProxyCARevocationPath|SSLProxyCipherSuite)"
-color brightcyan "(SSLProxyEngine|SSLProxyMachineCertificateFile|SSLProxyMachineCertificatePath|SSLProxyProtocol|SSLProxyVerify|SSLProxyVerifyDepth|SSLRandomSeed|SSLRequire)"
-color brightcyan "(SSLRequireSSL|SSLSessionCache|SSLSessionCacheTimeout|SSLUserName|SSLVerifyClient|SSLVerifyDepth|StartServers|StartThreads|SuexecUserGroup|ThreadLimit)"
-color brightcyan "(ThreadsPerChild|ThreadStackSize|TimeOut|TraceEnable|TransferLog|TypesConfig|UnsetEnv|UseCanonicalName|User|UserDir|VirtualDocumentRoot)"
-color brightcyan "(VirtualDocumentRootIP|VirtualHost|VirtualScriptAlias|VirtualScriptAliasIP|Win32DisableAcceptEx|XBitHack)"
-color yellow "<[^>]+>"
-color brightcyan "</?[A-Za-z]+"
-color brightcyan "(<|</|>)"
-color green "\"(\\.|[^\"])*\""
-color white "#.*"
+color special     ".+"
+color identifier "(AcceptMutex|AcceptPathInfo|AccessFileName|Action|AddAlt|AddAltByEncoding|AddAltByType|AddCharset|AddDefaultCharset|AddDescription|AddEncoding)"
+color identifier "(AddHandler|AddIcon|AddIconByEncoding|AddIconByType|AddInputFilter|AddLanguage|AddModuleInfo|AddOutputFilter|AddOutputFilterByType|AddType|Alias|AliasMatch)"
+color identifier "(Allow|AllowCONNECT|AllowEncodedSlashes|AllowOverride|Anonymous|Anonymous_Authoritative|Anonymous_LogEmail|Anonymous_MustGiveEmail|Anonymous_NoUserID)"
+color identifier "(Anonymous_VerifyEmail|AssignUserID|AuthAuthoritative|AuthDBMAuthoritative|AuthDBMGroupFile|AuthDBMType|AuthDBMUserFile|AuthDigestAlgorithm)"
+color identifier "(AuthDigestDomain|AuthDigestFile|AuthDigestGroupFile|AuthDigestNcCheck|AuthDigestNonceFormat|AuthDigestNonceLifetime|AuthDigestQop|AuthDigestShmemSize)"
+color identifier "(AuthGroupFile|AuthLDAPAuthoritative|AuthLDAPBindDN|AuthLDAPBindPassword|AuthLDAPCharsetConfig|AuthLDAPCompareDNOnServer|AuthLDAPDereferenceAliases)"
+color identifier "(AuthLDAPEnabled|AuthLDAPFrontPageHack|AuthLDAPGroupAttribute|AuthLDAPGroupAttributeIsDN|AuthLDAPRemoteUserIsDN|AuthLDAPUrl|AuthName|AuthType|AuthUserFile)"
+color identifier "(BrowserMatch|BrowserMatchNoCase|BS2000Account|BufferedLogs|CacheDefaultExpire|CacheDirLength|CacheDirLevels|CacheDisable|CacheEnable|CacheExpiryCheck)"
+color identifier "(CacheFile|CacheForceCompletion|CacheGcClean|CacheGcDaily|CacheGcInterval|CacheGcMemUsage|CacheGcUnused|CacheIgnoreCacheControl|CacheIgnoreHeaders)"
+color identifier "(CacheIgnoreNoLastMod|CacheLastModifiedFactor|CacheMaxExpire|CacheMaxFileSize|CacheMinFileSize|CacheNegotiatedDocs|CacheRoot|CacheSize|CacheTimeMargin)"
+color identifier "(CGIMapExtension|CharsetDefault|CharsetOptions|CharsetSourceEnc|CheckSpelling|ChildPerUserID|ContentDigest|CookieDomain|CookieExpires|CookieLog|CookieName)"
+color identifier "(CookieStyle|CookieTracking|CoreDumpDirectory|CustomLog|Dav|DavDepthInfinity|DavLockDB|DavMinTimeout|DefaultIcon|DefaultLanguage|DefaultType)"
+color identifier "(DeflateBufferSize|DeflateCompressionLevel|DeflateFilterNote|DeflateMemLevel|DeflateWindowSize|Deny|Directory|DirectoryIndex|DirectoryMatch|DirectorySlash)"
+color identifier "(DocumentRoot|DumpIOInput|DumpIOOutput|EnableExceptionHook|EnableMMAP|EnableSendfile|ErrorDocument|ErrorLog|Example|ExpiresActive|ExpiresByType)"
+color identifier "(ExpiresDefault|ExtendedStatus|ExtFilterDefine|ExtFilterOptions|FileETag|Files|FilesMatch|ForceLanguagePriority|ForceType|ForensicLog|Group|Header)"
+color identifier "(HeaderName|HostnameLookups|IdentityCheck|IfDefine|IfModule|IfVersion|ImapBase|ImapDefault|ImapMenu|Include|IndexIgnore|IndexOptions|IndexOrderDefault)"
+color identifier "(ISAPIAppendLogToErrors|ISAPIAppendLogToQuery|ISAPICacheFile|ISAPIFakeAsync|ISAPILogNotSupported|ISAPIReadAheadBuffer|KeepAlive|KeepAliveTimeout)"
+color identifier "(LanguagePriority|LDAPCacheEntries|LDAPCacheTTL|LDAPConnectionTimeout|LDAPOpCacheEntries|LDAPOpCacheTTL|LDAPSharedCacheFile|LDAPSharedCacheSize)"
+color identifier "(LDAPTrustedCA|LDAPTrustedCAType|Limit|LimitExcept|LimitInternalRecursion|LimitRequestBody|LimitRequestFields|LimitRequestFieldSize|LimitRequestLine)"
+color identifier "(LimitXMLRequestBody|Listen|ListenBackLog|LoadFile|LoadModule|Location|LocationMatch|LockFile|LogFormat|LogLevel|MaxClients|MaxKeepAliveRequests)"
+color identifier "(MaxMemFree|MaxRequestsPerChild|MaxRequestsPerThread|MaxSpareServers|MaxSpareThreads|MaxThreads|MaxThreadsPerChild|MCacheMaxObjectCount|MCacheMaxObjectSize)"
+color identifier "(MCacheMaxStreamingBuffer|MCacheMinObjectSize|MCacheRemovalAlgorithm|MCacheSize|MetaDir|MetaFiles|MetaSuffix|MimeMagicFile|MinSpareServers|MinSpareThreads)"
+color identifier "(MMapFile|ModMimeUsePathInfo|MultiviewsMatch|NameVirtualHost|NoProxy|NumServers|NWSSLTrustedCerts|NWSSLUpgradeable|Options|Order|PassEnv|PidFile)"
+color identifier "(ProtocolEcho|Proxy|ProxyBadHeader|ProxyBlock|ProxyDomain|ProxyErrorOverride|ProxyIOBufferSize|ProxyMatch|ProxyMaxForwards|ProxyPass|ProxyPassReverse)"
+color identifier "(ProxyPreserveHost|ProxyReceiveBufferSize|ProxyRemote|ProxyRemoteMatch|ProxyRequests|ProxyTimeout|ProxyVia|ReadmeName|Redirect|RedirectMatch)"
+color identifier "(RedirectPermanent|RedirectTemp|RemoveCharset|RemoveEncoding|RemoveHandler|RemoveInputFilter|RemoveLanguage|RemoveOutputFilter|RemoveType|RequestHeader)"
+color identifier "(Require|RewriteBase|RewriteCond|RewriteEngine|RewriteLock|RewriteLog|RewriteLogLevel|RewriteMap|RewriteOptions|RewriteRule|RLimitCPU|RLimitMEM|RLimitNPROC)"
+color identifier "(Satisfy|ScoreBoardFile|Script|ScriptAlias|ScriptAliasMatch|ScriptInterpreterSource|ScriptLog|ScriptLogBuffer|ScriptLogLength|ScriptSock|SecureListen)"
+color identifier "(SendBufferSize|ServerAdmin|ServerAlias|ServerLimit|ServerName|ServerPath|ServerRoot|ServerSignature|ServerTokens|SetEnv|SetEnvIf|SetEnvIfNoCase|SetHandler)"
+color identifier "(SetInputFilter|SetOutputFilter|SSIEndTag|SSIErrorMsg|SSIStartTag|SSITimeFormat|SSIUndefinedEcho|SSLCACertificateFile|SSLCACertificatePath)"
+color identifier "(SSLCARevocationFile|SSLCARevocationPath|SSLCertificateChainFile|SSLCertificateFile|SSLCertificateKeyFile|SSLCipherSuite|SSLEngine|SSLMutex|SSLOptions)"
+color identifier "(SSLPassPhraseDialog|SSLProtocol|SSLProxyCACertificateFile|SSLProxyCACertificatePath|SSLProxyCARevocationFile|SSLProxyCARevocationPath|SSLProxyCipherSuite)"
+color identifier "(SSLProxyEngine|SSLProxyMachineCertificateFile|SSLProxyMachineCertificatePath|SSLProxyProtocol|SSLProxyVerify|SSLProxyVerifyDepth|SSLRandomSeed|SSLRequire)"
+color identifier "(SSLRequireSSL|SSLSessionCache|SSLSessionCacheTimeout|SSLUserName|SSLVerifyClient|SSLVerifyDepth|StartServers|StartThreads|SuexecUserGroup|ThreadLimit)"
+color identifier "(ThreadsPerChild|ThreadStackSize|TimeOut|TraceEnable|TransferLog|TypesConfig|UnsetEnv|UseCanonicalName|User|UserDir|VirtualDocumentRoot)"
+color identifier "(VirtualDocumentRootIP|VirtualHost|VirtualScriptAlias|VirtualScriptAliasIP|Win32DisableAcceptEx|XBitHack)"
+color symbol.tag "<[^>]+>"
+color identifier "</?[A-Za-z]+"
+color identifier "(<|</|>)"
+color constant.string "\"(\\.|[^\"])*\""
+color comment "#.*"

runtime/syntax/arduino.micro

@@ -29,88 +29,88 @@
 syntax "ino"  "\.?ino$"
 
 ## 
-color brightred "\<[A-Z_][0-9A-Z_]+\>" 
+color identifier.macro "\b[A-Z_][0-9A-Z_]+\b" 
 
 ## 
-color green "\<((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\>"
+color type "\b((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\b"
 
 ## Constants
-green (i) "\<(HIGH|LOW|INPUT|OUTPUT)\>"
+color constant "\b(HIGH|LOW|INPUT|OUTPUT)\b"
 
 ## Serial Print
-red (i) "\<(DEC|BIN|HEX|OCT|BYTE)\>"
+color identifier.macro "\b(DEC|BIN|HEX|OCT|BYTE)\b"
 
 ## PI Constants
-green (i) "\<(PI|HALF_PI|TWO_PI)\>"
+color constant "\b(PI|HALF_PI|TWO_PI)\b"
 
 ## ShiftOut
-green (i) "\<(LSBFIRST|MSBFIRST)\>"
+color constant "\b(LSBFIRST|MSBFIRST)\b"
 
 ## Attach Interrupt
-green (i) "\<(CHANGE|FALLING|RISING)\>"
+color constant  "\b(CHANGE|FALLING|RISING)\b"
 
 ## Analog Reference
-green (i) "\<(DEFAULT|EXTERNAL|INTERNAL|INTERNAL1V1|INTERNAL2V56)\>"
+color constant  "\b(DEFAULT|EXTERNAL|INTERNAL|INTERNAL1V1|INTERNAL2V56)\b"
 
 ## === FUNCTIONS === ##
 
 ## Data Types
-color green "\<(boolean|byte|char|float|int|long|word)\>"
+color type "\b(boolean|byte|char|float|int|long|word)\b"
 
 ## Control Structions
-color brightyellow "\<(case|class|default|do|double|else|false|for|if|new|null|private|protected|public|short|signed|static|String|switch|this|throw|try|true|unsigned|void|while)\>" 
-color magenta "\<(goto|continue|break|return)\>"
+color statement "\b(case|class|default|do|double|else|false|for|if|new|null|private|protected|public|short|signed|static|String|switch|this|throw|try|true|unsigned|void|while)\b" 
+color special "\b(goto|continue|break|return)\b"
 
 ## Math
-color brightyellow "\<(abs|acos|asin|atan|atan2|ceil|constrain|cos|degrees|exp|floor|log|map|max|min|radians|random|randomSeed|round|sin|sq|sqrt|tan)\>"
+color statement "\b(abs|acos|asin|atan|atan2|ceil|constrain|cos|degrees|exp|floor|log|map|max|min|radians|random|randomSeed|round|sin|sq|sqrt|tan)\b"
 
 ## Bits & Bytes
-color brightyellow "\<(bitRead|bitWrite|bitSet|bitClear|bit|highByte|lowByte)\>"
+color statement "\b(bitRead|bitWrite|bitSet|bitClear|bit|highByte|lowByte)\b"
 
 ## Analog I/O
-color brightyellow "\<(analogReference|analogRead|analogWrite)\>"
+color statement "\b(analogReference|analogRead|analogWrite)\b"
 
 ## External Interrupts
-color brightyellow "\<(attachInterrupt|detachInterrupt)\>"
+color statement "\b(attachInterrupt|detachInterrupt)\b"
 
 ## Time
-color brightyellow "\<(delay|delayMicroseconds|millis|micros)\>"
+color statement "\b(delay|delayMicroseconds|millis|micros)\b"
 
 ## Digital I/O
-color brightyellow "\<(pinMode|digitalWrite|digitalRead)\>"
+color statement "\b(pinMode|digitalWrite|digitalRead)\b"
 
 ## Interrupts
-color brightyellow "\<(interrupts|noInterrupts)\>"
+color statement "\b(interrupts|noInterrupts)\b"
 
 ## Advanced I/O
-color brightyellow "\<(noTone|pulseIn|shiftIn|shiftOut|tone)\>"
+color statement "\b(noTone|pulseIn|shiftIn|shiftOut|tone)\b"
 
 ## Serial
-color magenta "\<(Serial|Serial1|Serial2|Serial3|begin|end|peek|read|print|println|available|flush)\>"
+color special "b<(Serial|Serial1|Serial2|Serial3|begin|end|peek|read|print|println|available|flush)\b"
 
 ## Structure
-color brightyellow "\<(setup|loop)\>"
+color statement "\b(setup|loop)\b"
 
 ## 
-color brightcyan "^[[:space:]]*#[[:space:]]*(define|include(_next)?|(un|ifn?)def|endif|el(if|se)|if|warning|error|pragma)"
+color preproc "^[[:space:]]*#[[:space:]]*(define|include(_next)?|(un|ifn?)def|endif|el(if|se)|if|warning|error|pragma)"
 
 ## 
-color brightmagenta "'([^']|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
+color constant.specialChar "'([^']|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
 
 ## GCC builtins
-color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
+color preproc "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
 
 ## String highlighting.  You will in general want your comments and
 ## strings to come last, because syntax highlighting rules will be
 ## applied in the order they are read in.
-color brightyellow "<[^=    ]*>" ""(\\.|[^"])*""
+color constant.string "<[^=    ]*>" ""(\\.|[^"])*""
 
 ## This string is VERY resource intensive!
-color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+color constant.string start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
 
 ## Comments
-color brightblue "//.*"
-color brightblue start="/\*" end="\*/"
+color comment "//.*"
+color comment start="/\*" end="\*/"
 
 ## Trailing whitespace
-color ,green "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"

runtime/syntax/asciidoc.micro

@@ -1,47 +1,47 @@
 syntax "asciidoc" "\.(asc|asciidoc|adoc)$"
 
 # main header
-color red "^====+$"
+color preproc "^====+$"
 # h1
-color red "^==[[:space:]].*$"
-color red "^----+$"
+color statement "^==[[:space:]].*$"
+color statement "^----+$"
 # h2
-color magenta "^===[[:space:]].*$"
-color magenta "^~~~~+$"
+color symbol "^===[[:space:]].*$"
+color symbol "^~~~~+$"
 # h4
-color green "^====[[:space:]].*$"
-color green "^\^\^\^\^+$"
+color type "^====[[:space:]].*$"
+color type "^\^\^\^\^+$"
 # h5
-color brightblue "^=====[[:space:]].*$"
-color brightblue "^\+\+\+\++$"
+color constant "^=====[[:space:]].*$"
+color constant "^\+\+\+\++$"
 
 # attributes
-color brightgreen ":.*:"
-color brightred "\{[a-z0-9]*\}"
-color red "\\\{[a-z0-9]*\}"
-color red "\+\+\+\{[a-z0-9]*\}\+\+\+"
+color type.keyword ":.*:"
+color identifier.macro "\{[a-z0-9]*\}"
+color identifier "\\\{[a-z0-9]*\}"
+color identifier "\+\+\+\{[a-z0-9]*\}\+\+\+"
 
 # Paragraph Title
-color yellow "^\..*$"
+color statement "^\..*$"
 
 # source 
-color magenta "^\[(source,.+|NOTE|TIP|IMPORTANT|WARNING|CAUTION)\]"
+color identifier "^\[(source,.+|NOTE|TIP|IMPORTANT|WARNING|CAUTION)\]"
 
 # Other markup
-color yellow ".*[[:space:]]\+$"
-color yellow "_[^_]+_"
-color yellow "\*[^\*]+\*"
-color yellow "\+[^\+]+\+"
-color yellow "`[^`]+`"
-color yellow "\^[^\^]+\^"
-color yellow "~[^~]+~"
-color yellow "'[^']+'"
+color constant.string ".*[[:space:]]\+$"
+color constant.string "_[^_]+_"
+color constant.string "\*[^\*]+\*"
+color constant.string "\+[^\+]+\+"
+color constant.string "`[^`]+`"
+color constant.string "\^[^\^]+\^"
+color constant.string "~[^~]+~"
+color constant.string "'[^']+'"
 
-color cyan "`{1,2}[^']+'{1,2}"
+color constant "`{1,2}[^']+'{1,2}"
 
 # bullets
-color brightmagenta "^[[:space:]]*[\*\.-]{1,5}[[:space:]]"
+color symbol "^[[:space:]]*[\*\.-]{1,5}[[:space:]]"
 
 # anchors
-color brightwhite "\[\[.*\]\]"
-color brightwhite "<<.*>>"
+color bold default "\[\[.*\]\]"
+color bold default "<<.*>>"

runtime/syntax/awk.micro

@@ -1,25 +1,25 @@
 syntax "awk" "\.awk$"
 header "^#!.*bin/(env +)?awk( |$)"
 
-color brightyellow "\$[A-Za-z0-9_!@#$*?-]+"
-color brightyellow "\<(ARGC|ARGIND|ARGV|BINMODE|CONVFMT|ENVIRON|ERRNO|FIELDWIDTHS)\>"
-color brightyellow "\<(FILENAME|FNR|FS|IGNORECASE|LINT|NF|NR|OFMT|OFS|ORS)\>"
-color brightyellow "\<(PROCINFO|RS|RT|RSTART|RLENGTH|SUBSEP|TEXTDOMAIN)\>"
-color brightblue "\<(function|extension|BEGIN|END)\>"
-color red "[-+*/%^|!=&<>?;:]|\\|\[|\]"
-color cyan  "\<(for|if|while|do|else|in|delete|exit)\>"
-color cyan  "\<(break|continue|return)\>"
-color brightblue "\<(close|getline|next|nextfile|print|printf|system|fflush)\>"
-color brightblue "\<(atan2|cos|exp|int|log|rand|sin|sqrt|srand)\>"
-color brightblue "\<(asort|asorti|gensub|gsub|index|length|match)\>"
-color brightblue "\<(split|sprintf|strtonum|sub|substr|tolower|toupper)\>"
-color brightblue "\<(mktime|strftime|systime)\>"
-color brightblue "\<(and|compl|lshift|or|rshift|xor)\>"
-color brightblue "\<(bindtextdomain|dcgettext|dcngettext)\>"
-color magenta   "/.*[^\\]/"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color magenta   "\\."
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color brightwhite,cyan "TODO:?"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color preproc "\$[A-Za-z0-9_!@#$*?-]+"
+color preproc "\b(ARGC|ARGIND|ARGV|BINMODE|CONVFMT|ENVIRON|ERRNO|FIELDWIDTHS)\b"
+color preproc "\b(FILENAME|FNR|FS|IGNORECASE|LINT|NF|NR|OFMT|OFS|ORS)\b"
+color preproc "\b(PROCINFO|RS|RT|RSTART|RLENGTH|SUBSEP|TEXTDOMAIN)\b"
+color identifier.class "\b(function|extension|BEGIN|END)\b"
+color symbol.operator "[-+*/%^|!=&<>?;:]|\\|\[|\]"
+color statement  "\b(for|if|while|do|else|in|delete|exit)\b"
+color special  "\b(break|continue|return)\b"
+color statement "\b(close|getline|next|nextfile|print|printf|system|fflush)\b"
+color statement "\b(atan2|cos|exp|int|log|rand|sin|sqrt|srand)\b"
+color statement "\b(asort|asorti|gensub|gsub|index|length|match)\b"
+color statement "\b(split|sprintf|strtonum|sub|substr|tolower|toupper)\b"
+color statement "\b(mktime|strftime|systime)\b"
+color statement "\b(and|compl|lshift|or|rshift|xor)\b"
+color statement "\b(bindtextdomain|dcgettext|dcngettext)\b"
+color special   "/.*[^\\]/"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant.specialChar   "\\."
+color comment "(^|[[:space:]])#([^{].*)?$"
+color todo "TODO:?"
+color indent-char. "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/c++.micro

@@ -16,13 +16,13 @@ color constant "'([^'\\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0
 color statement "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
 
 #Operator Color
-color statement "[.:;,+*|=!\%]" "<" ">" "/" "-" "&" 
+color symbol.operator "[.:;,+*|=!\%]" "<" ">" "/" "-" "&" 
 
 #Parenthetical Color
-# color magenta "[(){}]" "\[" "\]"
+color symbol.brackets "[(){}]" "\[" "\]"
 
 color constant.number "\b[0-9]+\b" "\b0x[0-9A-Fa-f]+\b"
-color constant.number "\b(true|false)\b" "NULL"
+color constant.bool "\b(true|false)\b" "NULL"
 
 ##
 ## String highlighting.  You will in general want your brightblacks and
@@ -38,4 +38,4 @@ color comment "//.*"
 color comment start="/\*" end="\*/"
 
 ## Trailing whitespace
-#color ,green "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"

runtime/syntax/c.micro

@@ -4,10 +4,11 @@ syntax "c" "\.(c|C)$" "\.(h|H)$" "\.ii?$" "\.(def)$"
 color identifier "\b[A-Z_][0-9A-Z_]+\b" 
 color type "\b(float|double|char|int|short|long|sizeof|enum|void|static|const|struct|union|typedef|extern|(un)?signed|inline)\b"
 color type "\b((s?size)|((u_?)?int(8|16|32|64|ptr)))_t\b"
+color type.extended "\b(bool)\b"
 color statement "\b(typename|mutable|volatile|register|explicit)\b"
 color statement "\b(for|if|while|do|else|case|default|switch)\b"
 color statement "\b(try|throw|catch|operator|new|delete)\b"
-color statement "\b(goto|continue|break|return)\b"
+color special "\b(goto|continue|break|return)\b"
 color preproc "^[[:space:]]*#[[:space:]]*(define|pragma|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
 color constant "'([^'\\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
 
@@ -16,11 +17,14 @@ color constant "'([^'\\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0
 color statement "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidden|inline|packed|restrict|section|typeof|weak)__"
 
 #Operator Color
-color statement "[.:;,+*|=!\%]" "<" ">" "/" "-" "&" 
+color symbol.operator "[.:;,+*|=!\%]" "<" ">" "/" "-" "&" 
 
 #Parenthetical Color
-# color magenta "[(){}]" "\[" "\]"
+color symbol.brackets "[(){}]" "\[" "\]"
 
+#Includes
+color constant.string "<.+?>"
+#Integers
 color constant.number "\b[0-9]+\b" "\b0x[0-9A-Fa-f]+\b"
 color constant.number "NULL"
 
@@ -38,4 +42,4 @@ color comment "//.*"
 color comment start="/\*" end="\*/"
 
 ## Trailing whitespace
-#color ,green "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"

runtime/syntax/caddyfile.micro

@@ -9,5 +9,5 @@ color preproc "\{(\w+|\$\w+|%\w+%)\}"
 color comment "#.*"
 
 # extra and trailing spaces
-color ,red "([[:space:]]{2,}|\t){$"
-color ,red "[[:space:]]+$"
+color indent-char "([[:space:]]{2,}|\t){$"
+color indent-char "[[:space:]]+$"

runtime/syntax/cmake.micro

@@ -2,22 +2,22 @@
 ##
 syntax "cmake" "(CMakeLists\.txt|\.cmake)$"
 
-green (i) "^[[:space:]]*[A-Z0-9_]+"
-brightyellow (i) "^[[:space:]]*(include|include_directories|include_external_msproject)\>"
+color identifier.var "^[[:space:]]*[A-Z0-9_]+"
+color preproc "^[[:space:]]*(include|include_directories|include_external_msproject)\>"
 
-brightgreen (i) "^[[:space:]]*\<((else|end)?if|else|(end)?while|(end)?foreach|break)\>"
-color brightgreen "\<(COPY|NOT|COMMAND|PROPERTY|POLICY|TARGET|EXISTS|IS_(DIRECTORY|ABSOLUTE)|DEFINED)\>[[:space:]]"
-color brightgreen "[[:space:]]\<(OR|AND|IS_NEWER_THAN|MATCHES|(STR|VERSION_)?(LESS|GREATER|EQUAL))\>[[:space:]]"
+color statement "^[[:space:]]*\<((else|end)?if|else|(end)?while|(end)?foreach|break)\>"
+color statement "\<(COPY|NOT|COMMAND|PROPERTY|POLICY|TARGET|EXISTS|IS_(DIRECTORY|ABSOLUTE)|DEFINED)\>[[:space:]]"
+color statement "[[:space:]]\<(OR|AND|IS_NEWER_THAN|MATCHES|(STR|VERSION_)?(LESS|GREATER|EQUAL))\>[[:space:]]"
 
-brightred (i) "^[[:space:]]*\<((end)?(function|macro)|return)"
+color special "^[[:space:]]*\<((end)?(function|macro)|return)"
 
 #String Color
-color cyan "['][^']*[^\\][']" "[']{3}.*[^\\][']{3}"
-color cyan "["][^"]*[^\\]["]" "["]{3}.*[^\\]["]{3}"
+color constant.string "['][^']*[^\\][']" "[']{3}.*[^\\][']{3}"
+color constant.string "["][^"]*[^\\]["]" "["]{3}.*[^\\]["]{3}"
 
-brightred (i) start="\$(\{|ENV\{)" end="\}"
-color magenta "\<(APPLE|UNIX|WIN32|CYGWIN|BORLAND|MINGW|MSVC(_IDE|60|71|80|90)?)\>"
+color preproc start="\$(\{|ENV\{)" end="\}"
+color identifier.macro "\<(APPLE|UNIX|WIN32|CYGWIN|BORLAND|MINGW|MSVC(_IDE|60|71|80|90)?)\>"
 
-brightblue (i) "^([[:space:]]*)?#.*"
-brightblue (i) "[[:space:]]#.*"
+color comment "^([[:space:]]*)?#.*"
+color comment "[[:space:]]#.*"
 

runtime/syntax/coffeescript.micro

@@ -1,16 +1,16 @@
 syntax "coffeescript" "\.coffee$"
 header "^#!.*/(env +)?coffee"
 
-color red "[!&|=/*+-<>]|\<(and|or|is|isnt|not)\>"
-color brightblue "[A-Za-z_][A-Za-z0-9_]*:[[:space:]]*(->|\()" "->"
-color brightblue "[()]"
-color cyan  "\<(for|of|continue|break|isnt|null|unless|this|else|if|return)\>"
-color cyan  "\<(try|catch|finally|throw|new|delete|typeof|in|instanceof)\>"
-color cyan  "\<(debugger|switch|while|do|class|extends|super)\>"
-color cyan  "\<(undefined|then|unless|until|loop|of|by|when)\>"
-color brightcyan  "\<(true|false|yes|no|on|off)\>"
-color brightyellow "@[A-Za-z0-9_]*"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color symbol.operator "[!&|=/*+-<>]|\<(and|or|is|isnt|not)\>"
+color identifier.class "[A-Za-z_][A-Za-z0-9_]*:[[:space:]]*(->|\()" "->"
+color symbol.brackets "[()]"
+color statement  "\<(for|of|continue|break|isnt|null|unless|this|else|if|return)\>"
+color statement  "\<(try|catch|finally|throw|new|delete|typeof|in|instanceof)\>"
+color statement  "\<(debugger|switch|while|do|class|extends|super)\>"
+color statement  "\<(undefined|then|unless|until|loop|of|by|when)\>"
+color constant.bool  "\<(true|false|yes|no|on|off)\>"
+color identifier "@[A-Za-z0-9_]*"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color comment "(^|[[:space:]])#([^{].*)?$"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/conf.micro

@@ -1,10 +1,12 @@
 ## Here is an example for nanorc files.
 ##
+#Needs cleanup/extension?
+
 syntax "conf" "\.c[o]?nf$"
 ## Possible errors and parameters
 ## Strings
-color constant.string (i) ""(\\.|[^"])*""
+color constant.string ""(\\.|[^"])*""
 ## Comments
-color comment (i) "^[[:space:]]*#.*$"
-color comment (i) "^[[:space:]]*##.*$"
+color comment "^[[:space:]]*#.*$"
+color comment "^[[:space:]]*##.*$"
 

runtime/syntax/conky.micro

@@ -5,14 +5,14 @@
 syntax "conky" "(\.*conkyrc.*$|conky.conf)"
 
 ## Configuration items
-color green "\<(alignment|append_file|background|border_inner_margin|border_outer_margin|border_width|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|colorN|cpu_avg_samples|default_bar_height|default_bar_width|default_color|default_gauge_height|default_gauge_width|default_graph_height|default_graph_width|default_outline_color|default_shade_color|diskio_avg_samples|display|double_buffer|draw_borders|draw_graph_borders|draw_outline|draw_shades|extra_newline|font|format_human_readable|gap_x|gap_y|http_refresh|if_up_strictness|imap|imlib_cache_flush_interval|imlib_cache_size|lua_draw_hook_post|lua_draw_hook_pre|lua_load|lua_shutdown_hook|lua_startup_hook|mail_spool|max_port_monitor_connections|max_text_width|max_user_text|maximum_width|minimum_height|minimum_width|mpd_host|mpd_password|mpd_port|music_player_interval|mysql_host|mysql_port|mysql_user|mysql_password|mysql_db|net_avg_samples|no_buffers|nvidia_display|out_to_console|out_to_http|out_to_ncurses|out_to_stderr|out_to_x|override_utf8_locale|overwrite_file|own_window|own_window_class|own_window_colour|own_window_hints|own_window_title|own_window_transparent|own_window_type|pad_percents|pop3|sensor_device|short_units|show_graph_range|show_graph_scale|stippled_borders|temperature_unit|template|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|text|text_buffer_size|times_in_seconds|top_cpu_separate|top_name_width|total_run_times|update_interval|update_interval_on_battery|uppercase|use_spacer|use_xft|xftalpha|xftfont)\>"
+color type "\b(alignment|append_file|background|border_inner_margin|border_outer_margin|border_width|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|colorN|cpu_avg_samples|default_bar_height|default_bar_width|default_color|default_gauge_height|default_gauge_width|default_graph_height|default_graph_width|default_outline_color|default_shade_color|diskio_avg_samples|display|double_buffer|draw_borders|draw_graph_borders|draw_outline|draw_shades|extra_newline|font|format_human_readable|gap_x|gap_y|http_refresh|if_up_strictness|imap|imlib_cache_flush_interval|imlib_cache_size|lua_draw_hook_post|lua_draw_hook_pre|lua_load|lua_shutdown_hook|lua_startup_hook|mail_spool|max_port_monitor_connections|max_text_width|max_user_text|maximum_width|minimum_height|minimum_width|mpd_host|mpd_password|mpd_port|music_player_interval|mysql_host|mysql_port|mysql_user|mysql_password|mysql_db|net_avg_samples|no_buffers|nvidia_display|out_to_console|out_to_http|out_to_ncurses|out_to_stderr|out_to_x|override_utf8_locale|overwrite_file|own_window|own_window_class|own_window_colour|own_window_hints|own_window_title|own_window_transparent|own_window_type|pad_percents|pop3|sensor_device|short_units|show_graph_range|show_graph_scale|stippled_borders|temperature_unit|template|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|text|text_buffer_size|times_in_seconds|top_cpu_separate|top_name_width|total_run_times|update_interval|update_interval_on_battery|uppercase|use_spacer|use_xft|xftalpha|xftfont)\b"
 
 ## Configuration item constants
-color yellow "\<(above|below|bottom_left|bottom_right|bottom_middle|desktop|dock|no|none|normal|override|skip_pager|skip_taskbar|sticky|top_left|top_right|top_middle|middle_left|middle_right|middle_middle|undecorated|yes)\>"
+color statement "\b(above|below|bottom_left|bottom_right|bottom_middle|desktop|dock|no|none|normal|override|skip_pager|skip_taskbar|sticky|top_left|top_right|top_middle|middle_left|middle_right|middle_middle|undecorated|yes)\b"
 
 ## Variables
-color brightblue "\<(acpiacadapter|acpifan|acpitemp|addr|addrs|alignc|alignr|apcupsd|apcupsd_cable|apcupsd_charge|apcupsd_lastxfer|apcupsd_linev|apcupsd_load|apcupsd_loadbar|apcupsd_loadgauge|apcupsd_loadgraph|apcupsd_model|apcupsd_name|apcupsd_status|apcupsd_temp|apcupsd_timeleft|apcupsd_upsmode|apm_adapter|apm_battery_life|apm_battery_time|audacious_bar|audacious_bitrate|audacious_channels|audacious_filename|audacious_frequency|audacious_length|audacious_length_seconds|audacious_main_volume|audacious_playlist_length|audacious_playlist_position|audacious_position|audacious_position_seconds|audacious_status|audacious_title|battery|battery_bar|battery_percent|battery_short|battery_time|blink|bmpx_album|bmpx_artist|bmpx_bitrate|bmpx_title|bmpx_track|bmpx_uri|buffers|cached|cmdline_to_pid|color|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|combine|conky_build_arch|conky_build_date|conky_version|cpu|cpubar|cpugauge|cpugraph|curl|desktop|desktop_name|desktop_number|disk_protect|diskio|diskio_read|diskio_write|diskiograph|diskiograph_read|diskiograph_write|distribution|downspeed|downspeedf|downspeedgraph|draft_mails|else|endif|entropy_avail|entropy_bar|entropy_perc|entropy_poolsize|eval|eve|exec|execbar|execgauge|execgraph|execi|execibar|execigauge|execigraph|execp|execpi|flagged_mails|font|format_time|forwarded_mails|freq|freq_g|fs_bar|fs_bar_free|fs_free|fs_free_perc|fs_size|fs_type|fs_used|fs_used_perc|goto|gw_iface|gw_ip|hddtemp|head|hr|hwmon|i2c|i8k_ac_status|i8k_bios|i8k_buttons_status|i8k_cpu_temp|i8k_left_fan_rpm|i8k_left_fan_status|i8k_right_fan_rpm|i8k_right_fan_status|i8k_serial|i8k_version|ibm_brightness|ibm_fan|ibm_temps|ibm_volume|ical|iconv_start|iconv_stop|if_empty|if_existing|if_gw|if_match|if_mixer_mute|if_mounted|if_mpd_playing|if_running|if_smapi_bat_installed|if_up|if_updatenr|if_xmms2_connected|image|imap_messages|imap_unseen|ioscheduler|irc|kernel|laptop_mode|lines|loadavg|loadgraph|lua|lua_bar|lua_gauge|lua_graph|lua_parse|machine|mails|mboxscan|mem|memwithbuffers|membar|memwithbuffersbar|memeasyfree|memfree|memgauge|memgraph|memmax|memperc|mixer|mixerbar|mixerl|mixerlbar|mixerr|mixerrbar|moc_album|moc_artist|moc_bitrate|moc_curtime|moc_file|moc_rate|moc_song|moc_state|moc_timeleft|moc_title|moc_totaltime|monitor|monitor_number|mpd_album|mpd_artist|mpd_bar|mpd_bitrate|mpd_elapsed|mpd_file|mpd_length|mpd_name|mpd_percent|mpd_random|mpd_repeat|mpd_smart|mpd_status|mpd_title|mpd_track|mpd_vol|mysql|nameserver|new_mails|nodename|nodename_short|no_update|nvidia|obsd_product|obsd_sensors_fan|obsd_sensors_temp|obsd_sensors_volt|obsd_vendor|offset|outlinecolor|pb_battery|pid_chroot|pid_cmdline|pid_cwd|pid_environ|pid_environ_list|pid_exe|pid_nice|pid_openfiles|pid_parent|pid_priority|pid_state|pid_state_short|pid_stderr|pid_stdin|pid_stdout|pid_threads|pid_thread_list|pid_time_kernelmode|pid_time_usermode|pid_time|pid_uid|pid_euid|pid_suid|pid_fsuid|pid_gid|pid_egid|pid_sgid|pid_fsgid|pid_read|pid_vmpeak|pid_vmsize|pid_vmlck|pid_vmhwm|pid_vmrss|pid_vmdata|pid_vmstk|pid_vmexe|pid_vmlib|pid_vmpte|pid_write|platform|pop3_unseen|pop3_used|processes|read_tcp|read_udp|replied_mails|rss|running_processes|running_threads|scroll|seen_mails|shadecolor|smapi|smapi_bat_bar|smapi_bat_perc|smapi_bat_power|smapi_bat_temp|sony_fanspeed|stippled_hr|stock|swap|swapbar|swapfree|swapmax|swapperc|sysname|tab|tail|tcp_ping|tcp_portmon|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|texeci|texecpi|threads|time|to_bytes|top|top_io|top_mem|top_time|totaldown|totalup|trashed_mails|tztime|gid_name|uid_name|unflagged_mails|unforwarded_mails|unreplied_mails|unseen_mails|updates|upspeed|upspeedf|upspeedgraph|uptime|uptime_short|user_names|user_number|user_terms|user_times|user_time|utime|voffset|voltage_mv|voltage_v|weather|wireless_ap|wireless_bitrate|wireless_essid|wireless_link_bar|wireless_link_qual|wireless_link_qual_max|wireless_link_qual_perc|wireless_mode|words|xmms2_album|xmms2_artist|xmms2_bar|xmms2_bitrate|xmms2_comment|xmms2_date|xmms2_duration|xmms2_elapsed|xmms2_genre|xmms2_id|xmms2_percent|xmms2_playlist|xmms2_size|xmms2_smart|xmms2_status|xmms2_timesplayed|xmms2_title|xmms2_tracknr|xmms2_url)\>"
+color preproc "\b(acpiacadapter|acpifan|acpitemp|addr|addrs|alignc|alignr|apcupsd|apcupsd_cable|apcupsd_charge|apcupsd_lastxfer|apcupsd_linev|apcupsd_load|apcupsd_loadbar|apcupsd_loadgauge|apcupsd_loadgraph|apcupsd_model|apcupsd_name|apcupsd_status|apcupsd_temp|apcupsd_timeleft|apcupsd_upsmode|apm_adapter|apm_battery_life|apm_battery_time|audacious_bar|audacious_bitrate|audacious_channels|audacious_filename|audacious_frequency|audacious_length|audacious_length_seconds|audacious_main_volume|audacious_playlist_length|audacious_playlist_position|audacious_position|audacious_position_seconds|audacious_status|audacious_title|battery|battery_bar|battery_percent|battery_short|battery_time|blink|bmpx_album|bmpx_artist|bmpx_bitrate|bmpx_title|bmpx_track|bmpx_uri|buffers|cached|cmdline_to_pid|color|color0|color1|color2|color3|color4|color5|color6|color7|color8|color9|combine|conky_build_arch|conky_build_date|conky_version|cpu|cpubar|cpugauge|cpugraph|curl|desktop|desktop_name|desktop_number|disk_protect|diskio|diskio_read|diskio_write|diskiograph|diskiograph_read|diskiograph_write|distribution|downspeed|downspeedf|downspeedgraph|draft_mails|else|endif|entropy_avail|entropy_bar|entropy_perc|entropy_poolsize|eval|eve|exec|execbar|execgauge|execgraph|execi|execibar|execigauge|execigraph|execp|execpi|flagged_mails|font|format_time|forwarded_mails|freq|freq_g|fs_bar|fs_bar_free|fs_free|fs_free_perc|fs_size|fs_type|fs_used|fs_used_perc|goto|gw_iface|gw_ip|hddtemp|head|hr|hwmon|i2c|i8k_ac_status|i8k_bios|i8k_buttons_status|i8k_cpu_temp|i8k_left_fan_rpm|i8k_left_fan_status|i8k_right_fan_rpm|i8k_right_fan_status|i8k_serial|i8k_version|ibm_brightness|ibm_fan|ibm_temps|ibm_volume|ical|iconv_start|iconv_stop|if_empty|if_existing|if_gw|if_match|if_mixer_mute|if_mounted|if_mpd_playing|if_running|if_smapi_bat_installed|if_up|if_updatenr|if_xmms2_connected|image|imap_messages|imap_unseen|ioscheduler|irc|kernel|laptop_mode|lines|loadavg|loadgraph|lua|lua_bar|lua_gauge|lua_graph|lua_parse|machine|mails|mboxscan|mem|memwithbuffers|membar|memwithbuffersbar|memeasyfree|memfree|memgauge|memgraph|memmax|memperc|mixer|mixerbar|mixerl|mixerlbar|mixerr|mixerrbar|moc_album|moc_artist|moc_bitrate|moc_curtime|moc_file|moc_rate|moc_song|moc_state|moc_timeleft|moc_title|moc_totaltime|monitor|monitor_number|mpd_album|mpd_artist|mpd_bar|mpd_bitrate|mpd_elapsed|mpd_file|mpd_length|mpd_name|mpd_percent|mpd_random|mpd_repeat|mpd_smart|mpd_status|mpd_title|mpd_track|mpd_vol|mysql|nameserver|new_mails|nodename|nodename_short|no_update|nvidia|obsd_product|obsd_sensors_fan|obsd_sensors_temp|obsd_sensors_volt|obsd_vendor|offset|outlinecolor|pb_battery|pid_chroot|pid_cmdline|pid_cwd|pid_environ|pid_environ_list|pid_exe|pid_nice|pid_openfiles|pid_parent|pid_priority|pid_state|pid_state_short|pid_stderr|pid_stdin|pid_stdout|pid_threads|pid_thread_list|pid_time_kernelmode|pid_time_usermode|pid_time|pid_uid|pid_euid|pid_suid|pid_fsuid|pid_gid|pid_egid|pid_sgid|pid_fsgid|pid_read|pid_vmpeak|pid_vmsize|pid_vmlck|pid_vmhwm|pid_vmrss|pid_vmdata|pid_vmstk|pid_vmexe|pid_vmlib|pid_vmpte|pid_write|platform|pop3_unseen|pop3_used|processes|read_tcp|read_udp|replied_mails|rss|running_processes|running_threads|scroll|seen_mails|shadecolor|smapi|smapi_bat_bar|smapi_bat_perc|smapi_bat_power|smapi_bat_temp|sony_fanspeed|stippled_hr|stock|swap|swapbar|swapfree|swapmax|swapperc|sysname|tab|tail|tcp_ping|tcp_portmon|template0|template1|template2|template3|template4|template5|template6|template7|template8|template9|texeci|texecpi|threads|time|to_bytes|top|top_io|top_mem|top_time|totaldown|totalup|trashed_mails|tztime|gid_name|uid_name|unflagged_mails|unforwarded_mails|unreplied_mails|unseen_mails|updates|upspeed|upspeedf|upspeedgraph|uptime|uptime_short|user_names|user_number|user_terms|user_times|user_time|utime|voffset|voltage_mv|voltage_v|weather|wireless_ap|wireless_bitrate|wireless_essid|wireless_link_bar|wireless_link_qual|wireless_link_qual_max|wireless_link_qual_perc|wireless_mode|words|xmms2_album|xmms2_artist|xmms2_bar|xmms2_bitrate|xmms2_comment|xmms2_date|xmms2_duration|xmms2_elapsed|xmms2_genre|xmms2_id|xmms2_percent|xmms2_playlist|xmms2_size|xmms2_smart|xmms2_status|xmms2_timesplayed|xmms2_title|xmms2_tracknr|xmms2_url)\b"
 
-color brightblue "\$\{?[0-9A-Z_!@#$*?-]+\}?"
-color cyan "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
-color brightred "^TEXT$"
+color identifier.var "\$\{?[0-9A-Z_!@#$*?-]+\}?"
+color symbol.operator "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color constant.macro "^TEXT$"

runtime/syntax/crystal.micro

@@ -9,7 +9,7 @@ color statement "\b(BEGIN|END|abstract|alias|and|begin|break|case|class|def|defi
 color constant "(\$|@|@@)?\b[A-Z]+[0-9A-Z_a-z]*"
 color constant.number "\b[0-9]+\b"
 ## Crystal "symbols"
-color constant (i) "([ 	]|^):[0-9A-Z_]+\b"
+color constant  "([ 	]|^):[0-9A-Z_]+\b"
 ## Some unique things we want to stand out
 color constant "\b(__FILE__|__LINE__)\b"
 ## Regular expressions

runtime/syntax/csharp.micro

@@ -1,26 +1,26 @@
 syntax "c#" "\.cs$"
 
 # Class
-color brightmagenta  "class +[A-Za-z0-9]+ *((:) +[A-Za-z0-9.]+)?"
+color identifier.class  "class +[A-Za-z0-9]+ *((:) +[A-Za-z0-9.]+)?"
 
 # Annotation
-color magenta   "@[A-Za-z]+"
+color identifier.var   "@[A-Za-z]+"
 
-color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
-color green     "\<(bool|byte|sbyte|char|decimal|double|float|IntPtr|int|uint|long|ulong|object|short|ushort|string|base|this|var|void)\>"
-color cyan  "\<(alias|as|case|catch|checked|default|do|dynamic|else|finally|fixed|for|foreach|goto|if|is|lock|new|null|return|switch|throw|try|unchecked|while)\>"
-color cyan  "\<(abstract|async|class|const|delegate|enum|event|explicit|extern|get|implicit|in|internal|interface|namespace|operator|out|override|params|partial|private|protected|public|readonly|ref|sealed|set|sizeof|stackalloc|static|struct|typeof|unsafe|using|value|virtual|volatile|yield)\>"
+color identifier "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
+color type     "\<(bool|byte|sbyte|char|decimal|double|float|IntPtr|int|uint|long|ulong|object|short|ushort|string|base|this|var|void)\>"
+color statement  "\<(alias|as|case|catch|checked|default|do|dynamic|else|finally|fixed|for|foreach|goto|if|is|lock|new|null|return|switch|throw|try|unchecked|while)\>"
+color statement  "\<(abstract|async|class|const|delegate|enum|event|explicit|extern|get|implicit|in|internal|interface|namespace|operator|out|override|params|partial|private|protected|public|readonly|ref|sealed|set|sizeof|stackalloc|static|struct|typeof|unsafe|using|value|virtual|volatile|yield)\>"
 # LINQ-only keywords (ones that cannot be used outside of a LINQ query - lots others can)
-color cyan  "\<(from|where|select|group|info|orderby|join|let|in|on|equals|by|ascending|descending)\>"
-color brightred     "\<(break|continue)\>"
-color brightcyan "\<(true|false)\>"
-color red "[-+/*=<>?:!~%&|]"
-color blue   "\<([0-9._]+|0x[A-Fa-f0-9_]+|0b[0-1_]+)[FL]?\>"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color magenta   "\\([btnfr]|'|\"|\\)"
-color magenta   "\\u[A-Fa-f0-9]{4}"
-color brightblack "(^|[[:space:]])//.*"
-color brightblack start="/\*" end="\*/"
-color brightwhite,cyan "TODO:?"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color statement  "\<(from|where|select|group|info|orderby|join|let|in|on|equals|by|ascending|descending)\>"
+color special     "\<(break|continue)\>"
+color constant "\<(true|false)\>"
+color symbol "[-+/*=<>?:!~%&|]"
+color constant.number   "\<([0-9._]+|0x[A-Fa-f0-9_]+|0b[0-1_]+)[FL]?\>"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant.specialChar   "\\([btnfr]|'|\"|\\)"
+color constant.specialChar   "\\u[A-Fa-f0-9]{4}"
+color comment "(^|[[:space:]])//.*"
+color comment start="/\*" end="\*/"
+color todo "TODO:?"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/cython.micro

@@ -1,30 +1,30 @@
 ## Cython nanorc, based off of Python nanorc.
 ##
 syntax "cython" "\.pyx$" "\.pxd$" "\.pyi$"
-brightred (i) "def [ 0-9A-Z_]+"
-brightred (i) "cpdef [0-9A-Z_]+\(.*\):"
-brightred (i) "cdef cppclass [ 0-9A-Z_]+\(.*\):"
+color preproc "def [ 0-9A-Z_]+"
+color preproc "cpdef [0-9A-Z_]+\(.*\):"
+color preproc "cdef cppclass [ 0-9A-Z_]+\(.*\):"
 
 
 
 # Python Keyword Color
-color green "\<(and|as|assert|class|def|DEF|del|elif|ELIF|else|ELSE|except|exec|finally|for|from|global|if|IF|import|in|is|lambda|map|not|or|pass|print|raise|try|while|with|yield)\>"
-color brightmagenta "\<(continue|break|return)\>"
+color statement "\<(and|as|assert|class|def|DEF|del|elif|ELIF|else|ELSE|except|exec|finally|for|from|global|if|IF|import|in|is|lambda|map|not|or|pass|print|raise|try|while|with|yield)\>"
+color special "\<(continue|break|return)\>"
 
 # Cython Keyword Color
-color green "\<(cdef|cimport|cpdef|cppclass|ctypedef|extern|include|namespace|property|struct)\>"
-color red "\<(bint|char|double|int|public|void|unsigned)\>"
+color identifier.macro "\<(cdef|cimport|cpdef|cppclass|ctypedef|extern|include|namespace|property|struct)\>"
+color type "\<(bint|char|double|int|public|void|unsigned)\>"
 
 #Operator Color
-color yellow "[.:;,+*|=!\%]" "<" ">" "/" "-" "&"
+color symbol "[.:;,+*|=!\%]" "<" ">" "/" "-" "&"
 
 #Parenthetical Color
-color magenta "[(){}]" "\[" "\]"
+color symbol.brackets "[(){}]" "\[" "\]"
 
 #String Color
-color cyan "['][^']*[^\\][']" "[']{3}.*[^\\][']{3}"
-color cyan "["][^"]*[^\\]["]" "["]{3}.*[^\\]["]{3}"
-color cyan start=""""[^"]" end=""""" start="'''[^']" end="'''"
+color constant.string "['][^']*[^\\][']" "[']{3}.*[^\\][']{3}"
+color constant.string "["][^"]*[^\\]["]" "["]{3}.*[^\\]["]{3}"
+color constant.string start=""""[^"]" end=""""" start="'''[^']" end="'''"
 
 # Comment Color
-color brightblue "#.*$"
+color comment "#.*$"

runtime/syntax/dart.micro

@@ -7,10 +7,10 @@ color identifier "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]"
 color statement  "\b(break|case|catch|continue|default|else|finally)\b"
 color statement  "\b(for|function|get|if|in|as|is|new|return|set|switch|final|await|async|sync)\b"
 color statement  "\b(switch|this|throw|try|var|void|while|with|import|library|part|const|export)\b"
-color constant "\b(true|false|null)\b"
+color constant.bool "\b(true|false|null)\b"
 color type     "\b(List|String)\b"
 color type     "\b(int|num|double|bool)\b"
-color statement "[-+/*=<>!~%?:&|]"
+color symbol.operator "[-+/*=<>!~%?:&|]"
 color constant   "/[^*]([^/]|(\\/))*[^\\]/[gim]*"
 color constant   "\\[0-7][0-7]?[0-7]?|\\x[0-9a-fA-F]+|\\[bfnrt'"\?\\]"
 color comment "(^|[[:space:]])//.*"

runtime/syntax/dot.micro

@@ -1,8 +1,8 @@
 syntax "dot" "\.(dot|gv)$"
 
-color cyan   "\<(digraph|edge|graph|node|subgraph)\>"
-color magenta "\<(arrowhead|arrowsize|arrowtail|bgcolor|center|color|constraint|decorateP|dir|distortion|fillcolor|fontcolor|fontname|fontsize|headclip|headlabel|height|labelangle|labeldistance|labelfontcolor|labelfontname|labelfontsize|label|layers|layer|margin|mclimit|minlen|name|nodesep|nslimit|ordering|orientation|pagedir|page|peripheries|port_label_distance|rankdir|ranksep|rank|ratio|regular|rotate|samehead|sametail|shapefile|shape|sides|size|skew|style|tailclip|taillabel|URL|weight|width)\>"
-color red  "=|->|--"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightblack "(^|[[:space:]])//.*"
-color brightblack start="/\*" end="\*/"
+color type   "\<(digraph|edge|graph|node|subgraph)\>"
+color statement "\<(arrowhead|arrowsize|arrowtail|bgcolor|center|color|constraint|decorateP|dir|distortion|fillcolor|fontcolor|fontname|fontsize|headclip|headlabel|height|labelangle|labeldistance|labelfontcolor|labelfontname|labelfontsize|label|layers|layer|margin|mclimit|minlen|name|nodesep|nslimit|ordering|orientation|pagedir|page|peripheries|port_label_distance|rankdir|ranksep|rank|ratio|regular|rotate|samehead|sametail|shapefile|shape|sides|size|skew|style|tailclip|taillabel|URL|weight|width)\>"
+color symbol  "=|->|--"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color comment "(^|[[:space:]])//.*"
+color comment start="/\*" end="\*/"

runtime/syntax/erb.micro

@@ -5,20 +5,20 @@
 ## https://github.com/geomic/ERB-And-More-Code-Highlighting-for-nano
 
 syntax "erb" "\.erb$" "\.rhtml$"
-color blue start="<" end=">"
-color white start="<%" end="%>"
+color symbol.brackets start="<" end=">"
+color default start="<%" end="%>"
 color red "&[^;[[:space:]]]*;"
-color yellow "\<(BEGIN|END|alias|and|begin|break|case|class|def|defined\?|do|else|elsif|end|ensure|false|for|if|in|module|next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\>"
-color brightblue "(\$|@|@@)?\<[A-Z]+[0-9A-Z_a-z]*"
-magenta (i) "([  ]|^):[0-9A-Z_]+\>"
-color brightyellow "\<(__FILE__|__LINE__)\>"
+color statement "\<(BEGIN|END|alias|and|begin|break|case|class|def|defined\?|do|else|elsif|end|ensure|false|for|if|in|module|next|nil|not|or|redo|rescue|retry|return|self|super|then|true|undef|unless|until|when|while|yield)\>"
+color identifier.var "(\$|@|@@)?\<[A-Z]+[0-9A-Z_a-z]*"
+color magenta  "(?i)([  ]|^):[0-9A-Z_]+\>"
+color identifier.macro "\<(__FILE__|__LINE__)\>"
 color brightmagenta "!/([^/]|(\\/))*/[iomx]*" "%r\{([^}]|(\\}))*\}[iomx]*"
 color brightblue "`[^`]*`" "%x\{[^}]*\}"
-color green ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!"
+color constant.string ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!"
 color brightgreen "#\{[^}]*\}"
 color green "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
-color cyan "#[^{].*$" "#$"
-color brightcyan "##[^{].*$" "##$"
-color green start="<<-?'?EOT'?" end="^EOT"
-color brightcyan "(XXX|TODO|FIXME|\?\?\?)"
+color comment "#[^{].*$" "#$"
+color comment.bright "##[^{].*$" "##$"
+color identifier.macro start="<<-?'?EOT'?" end="^EOT"
+color todo "(XXX|TODO|FIXME|\?\?\?)"
 

runtime/syntax/fish.micro

@@ -2,11 +2,11 @@ syntax "fish" "\.fish$"
 header "^#!.*/(env +)?fish( |$)"
 
 # Numbers
-color constant "\b[0-9]+\b"
+color constant.number "\b[0-9]+\b"
 
 # Conditionals and control flow
 color statement "\b(and|begin|break|case|continue|else|end|for|function|if|in|not|or|return|select|shift|switch|while)\b"
-color special "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|^|!|=|&|\|)"
+color symbol "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|^|!|=|&|\|)"
 
 # Fish commands
 color type "\b(bg|bind|block|breakpoint|builtin|cd|count|command|commandline|complete|dirh|dirs|echo|emit|eval|exec|exit|fg|fish|fish_config|fish_ident|fish_pager|fish_prompt|fish_right_prompt|fish_update_completions|fishd|funced|funcsave|functions|help|history|jobs|math|mimedb|nextd|open|popd|prevd|psub|pushd|pwd|random|read|set|set_color|source|status|string|trap|type|ulimit|umask|vared)\b"
@@ -24,11 +24,11 @@ color statement "\ -[a-z]+"
 # Strings
 color constant.string ""(\\.|[^"])*""
 color constant.string "'(\\.|[^'])*'"
-color special """
-color special "'"
+color constant.specialChar """
+color constant.specialChar "'"
 
 # Variables
-color identifier (i) "\$\{?[0-9A-Z_!@#$*?-]+\}?"
+color identifier "\$\{?[0-9A-Za-z_!@#$*?-]+\}?"
 
 # Comments & TODOs
 color comment "(^|[[:space:]])#.*$"

runtime/syntax/fortran.micro

@@ -2,50 +2,50 @@
 
 syntax "fortran" "\.([Ff]|[Ff]90|[Ff]95|[Ff][Oo][Rr])$"
 
-#color red "\<[A-Z_]a[0-9A-Z_]+\>" 
-color red "\<[0-9]+\>" 
+#color red "\b[A-Z_]a[0-9A-Z_]+\b" 
+color constant.number "\b[0-9]+\b" 
 
-green (i) "\<(action|advance|all|allocatable|allocated|any|apostrophe)\>"
-green (i) "\<(append|asis|assign|assignment|associated|character|common)\>"
-green (i) "\<(complex|data|default|delim|dimension|double precision)\>"
-green (i) "\<(elemental|epsilon|external|file|fmt|form|format|huge)\>"
-green (i) "\<(implicit|include|index|inquire|integer|intent|interface)\>"
-green (i) "\<(intrinsic|iostat|kind|logical|module|none|null|only)\>"
-green (i) "\<(operator|optional|pack|parameter|pointer|position|private)\>"
-green (i) "\<(program|public|real|recl|recursive|selected_int_kind)\>"
-green (i) "\<(selected_real_kind|subroutine|status)\>"
+color type  "(?i)\b(action|advance|all|allocatable|allocated|any|apostrophe)\b"
+color type  "(?i)\b(append|asis|assign|assignment|associated|character|common)\b"
+color type  "(?i)\b(complex|data|default|delim|dimension|double precision)\b"
+color type  "(?i)\b(elemental|epsilon|external|file|fmt|form|format|huge)\b"
+color type  "(?i)\b(implicit|include|index|inquire|integer|intent|interface)\b"
+color type  "(?i)\b(intrinsic|iostat|kind|logical|module|none|null|only)\\b"
+color type  "(?i)\b(operator|optional|pack|parameter|pointer|position|private)\b"
+color type  "(?i)\b(program|public|real|recl|recursive|selected_int_kind)\b"
+color type  "(?i)\b(selected_real_kind|subroutine|status)\b"
 
-cyan (i) "\<(abs|achar|adjustl|adjustr|allocate|bit_size|call|char)\>" 
-cyan (i) "\<(close|contains|count|cpu_time|cshift|date_and_time)\>" 
-cyan (i) "\<(deallocate|digits|dot_product|eor|eoshift|function|iachar)\>" 
-cyan (i) "\<(iand|ibclr|ibits|ibset|ichar|ieor|iolength|ior|ishft|ishftc)\>" 
-cyan (i) "\<(lbound|len|len_trim|matmul|maxexponent|maxloc|maxval|merge)\>" 
-cyan (i) "\<(minexponent|minloc|minval|mvbits|namelist|nearest|nullify)\>" 
-cyan (i) "\<(open|pad|present|print|product|pure|quote|radix)\>" 
-cyan (i) "\<(random_number|random_seed|range|read|readwrite|replace)\>" 
-cyan (i) "\<(reshape|rewind|save|scan|sequence|shape|sign|size|spacing)\>" 
-cyan (i) "\<(spread|sum|system_clock|target|transfer|transpose|trim)\>" 
-cyan (i) "\<(ubound|unpack|verify|write|tiny|type|use|yes)\>"
+color constant  "(?i)\b(abs|achar|adjustl|adjustr|allocate|bit_size|call|char)\b" 
+color constant  "(?i)\b(close|contains|count|cpu_time|cshift|date_and_time)\b" 
+color constant  "(?i)\b(deallocate|digits|dot_product|eor|eoshift|function|iachar)\b" 
+color constant  "(?i)\b(iand|ibclr|ibits|ibset|ichar|ieor|iolength|ior|ishft|ishftc)\b" 
+color constant  "(?i)\b(lbound|len|len_trim|matmul|maxexponent|maxloc|maxval|merge)\b" 
+color constant  "(?i)\b(minexponent|minloc|minval|mvbits|namelist|nearest|nullify)\b" 
+color constant  "(?i)\b(open|pad|present|print|product|pure|quote|radix)\b" 
+color constant  "(?i)\b(random_number|random_seed|range|read|readwrite|replace)\b" 
+color constant  "(?i)\b(reshape|rewind|save|scan|sequence|shape|sign|size|spacing)\b" 
+color constant  "(?i)\b(spread|sum|system_clock|target|transfer|transpose|trim)\b" 
+color constant  "(?i)\b(ubound|unpack|verify|write|tiny|type|use|yes)\b"
 
-yellow (i) "\<(.and.|case|do|else|else?if|else?where|end|end?do|end?if)\>"
-yellow (i) "\<(end?select|.eqv.|forall|if|lge|lgt|lle|llt|.neqv.|.not.)\>"
-yellow (i) "\<(.or.|repeat|select case|then|where|while)\>"
+color statement "(?i)\b(.and.|case|do|else|else?if|else?where|end|end?do|end?if)\b"
+color statement "(?i)\b(end?select|.eqv.|forall|if|lge|lgt|lle|llt|.neqv.|.not.)\b"
+color statement "(?i)\b(.or.|repeat|select case|then|where|while)\b"
 
-magenta (i) "\<(continue|cycle|exit|go?to|result|return)\>"
+color special "(?i)\b(continue|cycle|exit|go?to|result|return)\b"
 
 #Operator Color
-color yellow "[.:;,+*|=!\%]" "<" ">" "/" "-" "&"
+color symbol.operator "[.:;,+*|=!\%]" "\b" "\b" "/" "-" "&"
 
 #Parenthetical Color
-color magenta "[(){}]" "\[" "\]"
+color symbol.bracket "[(){}]" "\[" "\]"
 
 # Add preprocessor commands.
-color brightcyan "^[[:space:]]*#[[:space:]]*(define|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
+color preproc "^[[:space:]]*#[[:space:]]*(define|include|(un|ifn?)def|endif|el(if|se)|if|warning|error)"
 
 ## String highlighting.  
-cyan (i) "<[^=     ]*>" ""(\\.|[^"])*""
-cyan (i) "<[^=     ]*>" "'(\\.|[^"])*'"
+color constant.string "\b[^=     ]*\b" ""(\\.|[^"])*""
+color constant.string "\b[^=     ]*\b" "'(\\.|[^"])*'"
 
 ## Comment highlighting
-brightred (i) "!.*$" "(^[Cc]| [Cc]) .*$"
+color comment "!.*$" "(^[Cc]| [Cc]) .*$"
 

runtime/syntax/gdscript.micro

@@ -18,7 +18,7 @@ color identifier "func [a-zA-Z_0-9]+"
 color statement "\b(and|as|assert|break|breakpoint|class|const|continue|elif|else|export|extends|for|func|if|in|map|not|onready|or|pass|return|signal|var|while|yield)\b" 
 
 ## decorators
-color brightgreen "@.*[(]"
+color special "@.*[(]"
 
 ## operators
 color statement "[.:;,+*|=!\%@]" "<" ">" "/" "-" "&"

runtime/syntax/gentoo-etc-portage.micro

@@ -2,18 +2,18 @@
 ##
 syntax "etc-portage" "\.(keywords|mask|unmask|use)$"
 ## Base text:
-color green "^.+$"
+color default "^.+$"
 ## Use flags:
-color brightred "[[:space:]]+\+?[a-zA-Z0-9_-]+"
-color brightblue "[[:space:]]+-[a-zA-Z0-9_-]+"
+color constant.bool.false "[[:space:]]+\+?[a-zA-Z0-9_-]+"
+color constant.bool.true "[[:space:]]+-[a-zA-Z0-9_-]+"
 ## Likely version numbers:
-color magenta "-[[:digit:]].*([[:space:]]|$)"
+color special "-[[:digit:]].*([[:space:]]|$)"
 ## Accepted arches:
-color white "[~-]?\<(alpha|amd64|arm|hppa|ia64|mips|ppc|ppc64|s390|sh|sparc|x86|x86-fbsd)\>"
-color white "[[:space:]][~-]?\*"
+color identifier.class "[~-]?\b(alpha|amd64|arm|hppa|ia64|mips|ppc|ppc64|s390|sh|sparc|x86|x86-fbsd)\b"
+color identifier.class "[[:space:]][~-]?\*"
 ## Categories:
-color cyan "^[[:space:]]*.*/"
+color statement "^[[:space:]]*.*/"
 ## Masking regulators:
-color brightmagenta "^[[:space:]]*(=|~|<|<=|=<|>|>=|=>)"
+color symbol "^[[:space:]]*(=|~|<|<=|=<|>|>=|=>)"
 ## Comments:
-color yellow "#.*$"
+color comment "#.*$"

runtime/syntax/git-commit.micro

@@ -14,20 +14,20 @@ color ignore ".*"
 color comment "^#.*"
 
 # Files changes
-color keyword       "#[[:space:]](deleted|modified|new file|renamed):[[:space:]].*"
-color keyword         "#[[:space:]]deleted:"
-color keyword       "#[[:space:]]modified:"
-color keyword "#[[:space:]]new file:"
-color keyword  "#[[:space:]]renamed:"
+color statement       "#[[:space:]](deleted|modified|new file|renamed):[[:space:]].*"
+color statement         "#[[:space:]]deleted:"
+color statement       "#[[:space:]]modified:"
+color statement "#[[:space:]]new file:"
+color statement  "#[[:space:]]renamed:"
 
 # Untracked filenames
 color error "^#	[^/?*:;{}\\]+\.[^/?*:;{}\\]+$"
 
-color keyword "^#[[:space:]]Changes.*[:]"
-color keyword "^#[[:space:]]Your branch and '[^']+"
-color keyword "^#[[:space:]]Your branch and '"
-color keyword "^#[[:space:]]On branch [^ ]+"
-color keyword "^#[[:space:]]On branch"
+color statement "^#[[:space:]]Changes.*[:]"
+color statement "^#[[:space:]]Your branch and '[^']+"
+color statement "^#[[:space:]]Your branch and '"
+color statement "^#[[:space:]]On branch [^ ]+"
+color statement "^#[[:space:]]On branch"
 
 # Recolor hash symbols
 

runtime/syntax/git-config.micro

@@ -1,7 +1,7 @@
 syntax "git-config" "git(config|modules)$|\.git/config$"
 
-color constant "\<(true|false)\>"
-color keyword "^[[:space:]]*[^=]*="
+color constant.bool "\<(true|false)\>"
+color statement "^[[:space:]]*[^=]*="
 color constant "^[[:space:]]*\[.*\]$"
-color constant ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color comment "(^|[[:space:]])#([^{].*)?$"

runtime/syntax/git-rebase-todo.micro

@@ -8,18 +8,18 @@ color ignore ".*"
 color comment "^#.*"
 
 # Rebase commands
-color keyword       "^(e|edit) [0-9a-f]{7,40}"
-color keyword       "^#  (e, edit)"
-color keyword "^(f|fixup) [0-9a-f]{7,40}"
-color keyword "^#  (f, fixup)"
-color keyword "^(p|pick) [0-9a-f]{7,40}"
-color keyword "^#  (p, pick)"
-color keyword        "^(r|reword) [0-9a-f]{7,40}"
-color keyword        "^#  (r, reword)"
-color keyword   "^(s|squash) [0-9a-f]{7,40}"
-color keyword   "^#  (s, squash)"
-color keyword      "^(x|exec) [^ ]+ [0-9a-f]{7,40}"
-color keyword      "^#  (x, exec)"
+color statement       "^(e|edit) [0-9a-f]{7,40}"
+color statement       "^#  (e, edit)"
+color statement "^(f|fixup) [0-9a-f]{7,40}"
+color statement "^#  (f, fixup)"
+color statement "^(p|pick) [0-9a-f]{7,40}"
+color statement "^#  (p, pick)"
+color statement        "^(r|reword) [0-9a-f]{7,40}"
+color statement        "^#  (r, reword)"
+color statement   "^(s|squash) [0-9a-f]{7,40}"
+color statement   "^#  (s, squash)"
+color statement      "^(x|exec) [^ ]+ [0-9a-f]{7,40}"
+color statement      "^#  (x, exec)"
 
 # Recolor hash symbols
 color special "#"

runtime/syntax/glsl.micro

@@ -1,15 +1,15 @@
 syntax "glsl" "\.(frag|vert|fp|vp|glsl)$"
 
-color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
-color green     "\<(void|bool|bvec2|bvec3|bvec4|int|ivec2|ivec3|ivec4|float|vec2|vec3|vec4|mat2|mat3|mat4|struct|sampler1D|sampler2D|sampler3D|samplerCUBE|sampler1DShadow|sampler2DShadow)\>"
-color green     "\<gl_(DepthRangeParameters|PointParameters|MaterialParameters|LightSourceParameters|LightModelParameters|LightModelProducts|LightProducts|FogParameters)\>"
-color cyan  "\<(const|attribute|varying|uniform|in|out|inout|if|else|return|discard|while|for|do)\>"
-color brightred     "\<(break|continue)\>"
-color brightcyan "\<(true|false)\>"
-color red "[-+/*=<>?:!~%&|^]"
-color blue   "\<([0-9]+|0x[0-9a-fA-F]*)\>"
-color brightblack "(^|[[:space:]])//.*"
-color brightblack start="/\*" end="\*/"
-color brightwhite,cyan "TODO:?"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color identifier.class "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
+color type     "\<(void|bool|bvec2|bvec3|bvec4|int|ivec2|ivec3|ivec4|float|vec2|vec3|vec4|mat2|mat3|mat4|struct|sampler1D|sampler2D|sampler3D|samplerCUBE|sampler1DShadow|sampler2DShadow)\>"
+color identifier     "\<gl_(DepthRangeParameters|PointParameters|MaterialParameters|LightSourceParameters|LightModelParameters|LightModelProducts|LightProducts|FogParameters)\>"
+color statement  "\<(const|attribute|varying|uniform|in|out|inout|if|else|return|discard|while|for|do)\>"
+color special     "\<(break|continue)\>"
+color constant.bool "\<(true|false)\>"
+color symbol.operator "[-+/*=<>?:!~%&|^]"
+color constant.number   "\<([0-9]+|0x[0-9a-fA-F]*)\>"
+color comment "(^|[[:space:]])//.*"
+color comment start="/\*" end="\*/"
+color todo "TODO:?"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/go.micro

@@ -1,23 +1,29 @@
 syntax "go" "\.go$"
 
+##This file may need cleanup.
+
 # Conditionals and control flow
-color statement "\b(break|case|continue|default|else|for|go|goto|if|range|return|switch)\b"
-color statement "\b(package|import|const|var|type|struct|func|go|defer|iota)\b"
-color statement "[-+/*=<>!~%&|^]|:="
+color special "\b(break|case|continue|default|go|goto|range|return)\b"
+color statement "\b(else|for|if|switch)\b"
+color preproc "\b(package|import|const|var|type|struct|func|go|defer|iota)\b"
+color symbol.operator "[-+/*=<>!~%&|^]|:="
 
 # Types
 color special "[a-zA-Z0-9]*\("
-color brightyellow "(,|\.)"
+color symbol "(,|\.)"
 color type "\b(u?int(8|16|32|64)?|float(32|64)|complex(64|128))\b"
 color type "\b(uintptr|byte|rune|string|interface|bool|map|chan|error)\b"
-color constant "\b(true|false|nil)\b"
+##I'm... not sure, but aren't structs a type?
+color type "\b(struct)\b"
+color constant.bool "\b(true|false|nil)\b"
 
 # Brackets
-color statement "(\{|\})"
-color statement "(\(|\))"
-color statement "(\[|\])"
-color statement "!"
-color statement ","
+color symbol.brackets "(\{|\})"
+color symbol.brackets "(\(|\))"
+color symbol.brackets "(\[|\])"
+##Redundant??
+#color symbol.operator "!"
+#color symbol.operator ","
 
 # Numbers and strings
 color constant.number "\b([0-9]+|0x[0-9a-fA-F]*)\b|'.'"

runtime/syntax/golo.micro

@@ -5,40 +5,40 @@ color type "\b(struct|DynamicObject|union|AdapterFabric|Adapter|DynamicVariable|
 color type "\b(list|set|array|vector|tuple|map)\b"
 color type "\b(Ok|Error|Empty|None|Some|Option|Result|Result.ok|Result.fail|Result.error|Result.empty|Optional.empty|Optional.of)\b"
 
-color statement "\b(augment|pimp)\b"
-color statement "\b(interfaces|implements|extends|overrides|maker|newInstance)\b"
-color statement "\b(isEmpty|isNone|isPresent|isSome|iterator|flattened|toList|flatMap|`and|orElseGet|`or|toResult|apply|either)\b"
-color statement "\b(result|option|trying|raising|nullify|catching)\b"
-color statement "\b(promise|setFuture|failedFuture|all|any)\b"
-color statement "\b(initialize|initializeWithinThread|start|future|fallbackTo|onSet|onFail|cancel|enqueue)\b"
-color statement "\b(println|print|raise|readln|readPassword|secureReadPassword|requireNotNull|require|newTypedArray|range|reversedRange|mapEntry|asInterfaceInstance|asFunctionalInterface|isClosure|fileToText|textToFile|fileExists|currentDir|sleep|uuid|isArray|arrayTypeOf|charValue|intValue|longValue|doubleValue|floatValue|removeByIndex|box)\b"
-color statement "\b(likelySupported|reset|bold|underscore|blink|reverse_video|concealed|fg_black|fg_red|fg_green|fg_yellow|fg_blue|fg_magenta|fg_cyan|fg_white|bg_black|bg_red|bg_green|bg_yellow|bg_blue|bg_magenta|bg_cyan|bg_white|cursor_position|cursor_save_position|cursor_restore_position|cursor_up|cursor_down|cursor_forward|cursor_backward|erase_display|erase_line)\b"
-color statement "\b(emptyList|cons|lazyList|fromIter|generator|repeat|iterate)\b"
-color statement "\b(asLazyList|foldl|foldr|take|takeWhile|drop|dropWhile|subList)\b"
-color statement "\b(import)\b"
-color statement "\b(module)\b"
-color statement "\b(JSON)\b"
-color statement "\b(stringify|parse|toJSON|toDynamicObject|updateFromJSON)\b"
-color statement "\b(newInstance|define|getKey|getValue|properties|fallback)\b"
-color statement "\b(times|upTo|downTo)\b"
-color statement "\b(format|toInt|toInteger|toDouble|toFloat|toLong)\b"
-color statement "\b(head|tail|isEmpty|reduce|each|count|exists)\b"
-color statement "\b(newWithSameType|destruct|append|add|addIfAbsent|prepend|insert|last|unmodifiableView|find|filter|map|join|reverse|reversed|order|ordered|removeAt|include|exclude|remove|delete|has|contains|getOrElse|toArray)\b"
-color statement "\b(add|addTo|succ|pred|mul|neg|sub|rsub|div|rdiv|mod|rmod|pow|rpow|str|lt|gt|eq|ne|ge|le|`and|`or|`not|xor|even|odd|contains|isEmpty|`is|`isnt|`oftype|`orIfNull|fst|snd|getitem|setitem|getter|id|const|False|True|Null|curry|uncurry|unary|spreader|varargs|swapArgs|swapCurry|swapCouple|swap|invokeWith|pipe|compose|io|andThen|until|recur|cond)\b"
-color statement "\b(toUpperCase|equals|startsWith)\b"
+color identifier.class "\b(augment|pimp)\b"
+color identifier.class "\b(interfaces|implements|extends|overrides|maker|newInstance)\b"
+color identifier.class "\b(isEmpty|isNone|isPresent|isSome|iterator|flattened|toList|flatMap|`and|orElseGet|`or|toResult|apply|either)\b"
+color identifier.class "\b(result|option|trying|raising|nullify|catching)\b"
+color identifier.class "\b(promise|setFuture|failedFuture|all|any)\b"
+color identifier.class "\b(initialize|initializeWithinThread|start|future|fallbackTo|onSet|onFail|cancel|enqueue)\b"
+color identifier.class "\b(println|print|raise|readln|readPassword|secureReadPassword|requireNotNull|require|newTypedArray|range|reversedRange|mapEntry|asInterfaceInstance|asFunctionalInterface|isClosure|fileToText|textToFile|fileExists|currentDir|sleep|uuid|isArray|arrayTypeOf|charValue|intValue|longValue|doubleValue|floatValue|removeByIndex|box)\b"
+color identifier.class "\b(likelySupported|reset|bold|underscore|blink|reverse_video|concealed|fg_black|fg_red|fg_green|fg_yellow|fg_blue|fg_magenta|fg_cyan|fg_white|bg_black|bg_red|bg_green|bg_yellow|bg_blue|bg_magenta|bg_cyan|bg_white|cursor_position|cursor_save_position|cursor_restore_position|cursor_up|cursor_down|cursor_forward|cursor_backward|erase_display|erase_line)\b"
+color identifier.class "\b(emptyList|cons|lazyList|fromIter|generator|repeat|iterate)\b"
+color identifier.class "\b(asLazyList|foldl|foldr|take|takeWhile|drop|dropWhile|subList)\b"
+color identifier.class "\b(import)\b"
+color identifier.class "\b(module)\b"
+color identifier.class "\b(JSON)\b"
+color identifier.class "\b(stringify|parse|toJSON|toDynamicObject|updateFromJSON)\b"
+color identifier.class "\b(newInstance|define|getKey|getValue|properties|fallback)\b"
+color identifier.class "\b(times|upTo|downTo)\b"
+color identifier.class "\b(format|toInt|toInteger|toDouble|toFloat|toLong)\b"
+color identifier.class "\b(head|tail|isEmpty|reduce|each|count|exists)\b"
+color identifier.class "\b(newWithSameType|destruct|append|add|addIfAbsent|prepend|insert|last|unmodifiableView|find|filter|map|join|reverse|reversed|order|ordered|removeAt|include|exclude|remove|delete|has|contains|getOrElse|toArray)\b"
+color identifier.class "\b(add|addTo|succ|pred|mul|neg|sub|rsub|div|rdiv|mod|rmod|pow|rpow|str|lt|gt|eq|ne|ge|le|`and|`or|`not|xor|even|odd|contains|isEmpty|`is|`isnt|`oftype|`orIfNull|fst|snd|getitem|setitem|getter|id|const|False|True|Null|curry|uncurry|unary|spreader|varargs|swapArgs|swapCurry|swapCouple|swap|invokeWith|pipe|compose|io|andThen|until|recur|cond)\b"
+color identifier.class "\b(toUpperCase|equals|startsWith)\b"
 
-color preproc "\b(if|else|then|when|case|match|otherwise)\b"
-color preproc "\b(with|break|continue|return)\b"
+color statement "\b(if|else|then|when|case|match|otherwise)\b"
+color special "\b(with|break|continue|return)\b"
 color error "\b(try|catch|finally|throw)\b"
 color identifier "\b(super|this|let|var|local)\b"
-color special "[(){}]" "\[" "\]"
-color preproc "\b(for|while|foreach|in)\b"
+color symbol.brackets "[(){}]" "\[" "\]"
+color statement "\b(for|while|foreach|in)\b"
 color constant "\b(and|in|is|not|or|isnt|orIfNull)\b"
 
-color constant "\b(true|false)\b"
+color constant.bool "\b(true|false)\b"
 color constant  "\b(null|undefined)\b"
 
-color statement "[-+/*=<>!~%&|^]|:="
+color symbol.brackets "[-+/*=<>!~%&|^]|:="
 color constant.number   "\b([0-9]+|0x[0-9a-fA-F]*)\b|'.'"
 color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
 

runtime/syntax/groff.micro

@@ -2,23 +2,23 @@
 ##
 syntax "groff" "\.m[ems]$" "\.rof" "\.tmac$" "^tmac."
 ## The argument of .ds or .nr
-color cyan "^\.(ds|nr) [^[[:space:]]]*"
+color statement "^\.(ds|nr) [^[[:space:]]]*"
 ## Single character escapes
-color brightmagenta "\\."
+color constant.specialChar "\\."
 ## Highlight the argument of \f or \s in the same color
-color brightmagenta "\\f." "\\f\(.." "\\s(\+|\-)?[0-9]"
+color constant.specialChar "\\f." "\\f\(.." "\\s(\+|\-)?[0-9]"
 ## Newlines
-color cyan "(\\|\\\\)n(.|\(..)"
-color cyan start="(\\|\\\\)n\[" end="]"
+color constant "(\\|\\\\)n(.|\(..)"
+color constant start="(\\|\\\\)n\[" end="]"
 ## Requests
-color brightgreen "^\.[[:space:]]*[^[[:space:]]]*"
+color type "^\.[[:space:]]*[^[[:space:]]]*"
 ## Comments
-color yellow "^\.\\".*$"
+color comment "^\.\\".*$"
 ## Strings
-color green "(\\|\\\\)\*(.|\(..)"
-color green start="(\\|\\\\)\*\[" end="]"
+color constant.string "(\\|\\\\)\*(.|\(..)"
+color constant.string start="(\\|\\\\)\*\[" end="]"
 ## Characters
-color brightred "\\\(.."
-color brightred start="\\\[" end="]"
+color constant.specialChar "\\\(.."
+color constant.specialChar start="\\\[" end="]"
 ## Macro arguments
-color brightcyan "\\\\\$[1-9]"
+color identifier.macro "\\\\\$[1-9]"

runtime/syntax/haml.micro

@@ -1,16 +1,16 @@
 syntax "haml" "\.haml$"
 
-color cyan   "-|="
-color white "->|=>"
-cyan (i) "([  ]|^)%[0-9A-Z_]+\>"
-magenta (i) ":[0-9A-Z_]+\>"
-yellow (i) "\.[A-Z_]+\>"
+color symbol   "-|="
+color default "->|=>"
+color constant  "([  ]|^)%[0-9A-Za-z_]+>"
+color special ":[0-9A-Za-z_]+>"
+color type "\.[A-Za-z_]+>"
 ## Double quote & single quote
-color green ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!"
-color green "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
+color constant.string ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!"
+color constant.string "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
 ## Vars
-color brightgreen  "#\{[^}]*\}"
-color brightblue "(@|@@)[0-9A-Z_a-z]+"
+color identifier  "#\{[^}]*\}"
+color identifier.var "(@|@@)[0-9A-Z_a-z]+"
 ## Comments
-color brightcyan "#[^{].*$" "#$"
+color comment "#[^{].*$" "#$"
 

runtime/syntax/haskell.micro

@@ -1,31 +1,32 @@
 syntax "haskell" "\.hs$"
 
 ## Keywords
-color red "[ ](as|case|of|class|data|default|deriving|do|forall|foreign|hiding|if|then|else|import|infix|infixl|infixr|instance|let|in|mdo|module|newtype|qualified|type|where)[ ]"
-color red "(^data|^foreign|^import|^infix|^infixl|^infixr|^instance|^module|^newtype|^type)[ ]"
-color red "[ ](as$|case$|of$|class$|data$|default$|deriving$|do$|forall$|foreign$|hiding$|if$|then$|else$|import$|infix$|infixl$|infixr$|instance$|let$|in$|mdo$|module$|newtype$|qualified$|type$|where$)"
+color statement "[ ](as|case|of|class|data|default|deriving|do|forall|foreign|hiding|if|then|else|import|infix|infixl|infixr|instance|let|in|mdo|module|newtype|qualified|type|where)[ ]"
+color statement "(^data|^foreign|^import|^infix|^infixl|^infixr|^instance|^module|^newtype|^type)[ ]"
+color statement "[ ](as$|case$|of$|class$|data$|default$|deriving$|do$|forall$|foreign$|hiding$|if$|then$|else$|import$|infix$|infixl$|infixr$|instance$|let$|in$|mdo$|module$|newtype$|qualified$|type$|where$)"
 
 ## Various symbols
-color cyan "(\||@|!|:|_|~|=|\\|;|\(\)|,|\[|\]|\{|\})"
+color symbol "(\||@|!|:|_|~|=|\\|;|\(\)|,|\[|\]|\{|\})"
 
 ## Operators
-color magenta "(==|/=|&&|\|\||<|>|<=|>=)"
+color symbol.operator "(==|/=|&&|\|\||<|>|<=|>=)"
 
 ## Various symbols
-color cyan "(->|<-)"
-color magenta "\.|\$"
+color special "(->|<-)"
+color symbol "\.|\$"
 
 ## Data constructors
-color magenta "(True|False|Nothing|Just|Left|Right|LT|EQ|GT)"
+color constant.bool "\b(True|False)\b"
+color constant "(Nothing|Just|Left|Right|LT|EQ|GT)"
 
 ## Data classes
-color magenta "[ ](Read|Show|Enum|Eq|Ord|Data|Bounded|Typeable|Num|Real|Fractional|Integral|RealFrac|Floating|RealFloat|Monad|MonadPlus|Functor)"
+color identifier.class "[ ](Read|Show|Enum|Eq|Ord|Data|Bounded|Typeable|Num|Real|Fractional|Integral|RealFrac|Floating|RealFloat|Monad|MonadPlus|Functor)"
 
 ## Strings
-color yellow ""[^\"]*""
+color constant.string ""[^\"]*""
 
 ## Comments
-color green "--.*"
-color green start="\{-" end="-\}"
+color comment "--.*"
+color comment start="\{-" end="-\}"
 
-color brightred "undefined"
+color identifier.micro "undefined"

runtime/syntax/html.micro

@@ -1,7 +1,14 @@
 ## Here is a short improved example for HTML.
-##
+## 
 syntax "html" "\.htm[l]?$"
-color identifier "<.*?>"
+color symbol "<|>"
+color symbol.tag "<[^!].*?>"
+color symbol "[:=]"
 color special "&[^;[[:space:]]]*;"
-color constant ""[^"]*"|qq\|.*\|"
+color constant.string ""[^"]*"|qq\|.*\|"
 color statement "(alt|bgcolor|height|href|label|longdesc|name|onclick|onfocus|onload|onmouseover|size|span|src|style|target|type|value|width)="
+color constant.string.url "(ft(p|ps)|htt(p|ps)|git|chrome)://[^ 	]+"
+color comment "<!--.+?-->"
+color preproc "<!DOCTYPE.+?>"
+# Bad possible work around for region-less regions. 
+#color default start=">" end="<"

runtime/syntax/inputrc.micro

@@ -1,10 +1,10 @@
 syntax "inputrc" "inputrc$"
 
-color red   "\<(off|none)\>"
-color green "\<on\>"
-color brightblue   "\<set|\$include\>"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color magenta     "\\.?"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color constant.bool.false   "\<(off|none)\>"
+color constant.bool.true "\<on\>"
+color preproc   "\<set|\$include\>"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant.specialChar     "\\.?"
+color comment "(^|[[:space:]])#([^{].*)?$"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/java.micro

@@ -5,7 +5,7 @@ color type "\b(boolean|byte|char|double|float|int|long|new|short|this|transient|
 color statement "\b(break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)\b"
 color type "\b(abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile)\b"
 color constant.string ""[^"]*""
-color constant "\b(true|false|null)\b"
+color constant.bool "\b(true|false|null)\b"
 color constant.number "\b[0-9]+\b"
 color comment "//.*"
 color comment start="/\*" end="\*/"

runtime/syntax/javascript.micro

@@ -7,11 +7,11 @@ color identifier "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]"
 color statement  "\b(break|case|catch|continue|default|delete|do|else|finally)\b"
 color statement  "\b(for|function|get|if|in|instanceof|new|return|set|switch)\b"
 color statement  "\b(switch|this|throw|try|typeof|var|void|while|with)\b"
-color constant  "\b(null|undefined|NaN)\b"
-color constant "\b(true|false)\b"
+color constant.bool  "\b(null|undefined|NaN)\b"
+color constant.bool "\b(true|false)\b"
 color type     "\b(Array|Boolean|Date|Enumerator|Error|Function|Math)\b"
 color type     "\b(Number|Object|RegExp|String)\b"
-color statement "[-+/*=<>!~%?:&|]"
+color symbol.operator "[-+/*=<>!~%?:&|]"
 color constant   "/[^*]([^/]|(\\/))*[^\\]/[gim]*"
 color constant   "\\[0-7][0-7]?[0-7]?|\\x[0-9a-fA-F]+|\\[bfnrt'"\?\\]"
 color comment "(^|[[:space:]])//.*"

runtime/syntax/json.micro

@@ -4,10 +4,11 @@ header "^\{$"
 color constant.number   "\b[-+]?([1-9][0-9]*|0[0-7]*|0x[0-9a-fA-F]+)([uU][lL]?|[lL][uU]?)?\b"
 color constant.number   "\b[-+]?([0-9]+\.[0-9]*|[0-9]*\.[0-9]+)([EePp][+-]?[0-9]+)?[fFlL]?"
 color constant.number   "\b[-+]?([0-9]+[EePp][+-]?[0-9]+)[fFlL]?"
-color constant  "\b(null)\b"
-color constant "\b(true|false)\b"
+color constant.bool  "\b(null)\b"
+color constant.bool.true "\b(true)\b"
+color constant.bool.false "\b(false)\b"
 color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color statement "\"(\\"|[^"])*\"[[:space:]]*:"  "'(\'|[^'])*'[[:space:]]*:"
 color constant   "\\u[0-9a-fA-F]{4}|\\[bfnrt'"/\\]"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/keymap.micro

@@ -1,10 +1,10 @@
 syntax "keymap" "\.(k|key)?map$|Xmodmap$"
 
-color cyan  "\<(add|clear|compose|keycode|keymaps|keysym|remove|string)\>"
-color cyan  "\<(control|alt|shift)\>"
-color blue   "\<[0-9]+\>"
-color red "="
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightblack  "^!.*$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color statement  "\<(add|clear|compose|keycode|keymaps|keysym|remove|string)\>"
+color statement  "\<(control|alt|shift)\>"
+color constant.number   "\<[0-9]+\>"
+color symbol "="
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color comment  "^!.*$"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/kickstart.micro

@@ -1,15 +1,15 @@
 syntax "kickstart" "\.ks$" "\.kickstart$"
 
-color brightmagenta  "%[a-z]+"
-color cyan  "^[[:space:]]*(install|cdrom|text|graphical|volgroup|logvol|reboot|timezone|lang|keyboard|authconfig|firstboot|rootpw|user|firewall|selinux|repo|part|partition|clearpart|bootloader)"
-color cyan  "--(name|mirrorlist|baseurl|utc)(=|\>)"
-color brightyellow "\$(releasever|basearch)\>"
+color special  "%[a-z]+"
+color statement  "^[[:space:]]*(install|cdrom|text|graphical|volgroup|logvol|reboot|timezone|lang|keyboard|authconfig|firstboot|rootpw|user|firewall|selinux|repo|part|partition|clearpart|bootloader)"
+color constant  "--(name|mirrorlist|baseurl|utc)(=|\>)"
+color statement "\$(releasever|basearch)\>"
 
 # Packages and groups
 color brightblack "^@[A-Za-z][A-Za-z-]*"
 color brightred   "^-@[a-zA-Z0-9*-]+"
 color red         "^-[a-zA-Z0-9*-]+"
 
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color comment "(^|[[:space:]])#([^{].*)?$"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/ledger.micro

@@ -1,10 +1,10 @@
 syntax "ledger" "(^|\.|/)ledger|ldgr|beancount|bnct$"
 
-color brightmagenta  "^([0-9]{4}(/|-)[0-9]{2}(/|-)[0-9]{2}|[=~]) .*"
-color blue   "^[0-9]{4}(/|-)[0-9]{2}(/|-)[0-9]{2}"
-color brightyellow "^~ .*"
-color brightblue "^= .*"
-color cyan  "^[[:space:]]+(![[:space:]]+)?\(?[A-Za-z ]+(:[A-Za-z ]+)*\)?"
-color cyan  "^[[:space:]]+(![[:space:]]+)?\(?[A-Za-z_-]+(:[A-Za-z_-]+)*\)?"
-color red "[*!]"
-color brightblack  "^[[:space:]]*;.*"
+color special  "^([0-9]{4}(/|-)[0-9]{2}(/|-)[0-9]{2}|[=~]) .*"
+color constant   "^[0-9]{4}(/|-)[0-9]{2}(/|-)[0-9]{2}"
+color statement "^~ .*"
+color identifier.var "^= .*"
+color identifier  "^[[:space:]]+(![[:space:]]+)?\(?[A-Za-z ]+(:[A-Za-z ]+)*\)?"
+color identifier  "^[[:space:]]+(![[:space:]]+)?\(?[A-Za-z_-]+(:[A-Za-z_-]+)*\)?"
+color symbol "[*!]"
+color comment  "^[[:space:]]*;.*"

runtime/syntax/lfe.micro

@@ -9,7 +9,7 @@ color type "defun|define-syntax|define|defmacro|defmodule|export"
 
 # Dirty base cases stolen from the generic lisp syntax
 color constant "\ [A-Za-z][A-Za-z0-9_-]+\ "
-color statement "\(([-+*/<>]|<=|>=)|'"
+color symbol.operator "\(([-+*/<>]|<=|>=)|'"
 color constant.number "\<[0-9]+\>"
 color constant.string "\"(\\.|[^"])*\""
 color special "['|`][A-Za-z][A-Za-z0-9_-]+"
@@ -17,5 +17,5 @@ color constant.string "\\.?"
 color comment "(^|[[:space:]]);.*"
 
 # Some warning colors because our indents are wrong.
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/lilypond.micro

@@ -4,7 +4,7 @@ color constant.number "\d+"
 color identifier "[[:space:]](staff|spacing|signature|routine|notes|handler|corrected|beams|arpeggios|Volta_engraver|Voice|Vertical_align_engraver|Vaticana_ligature_engraver|VaticanaVoice|VaticanaStaff|Tweak_engraver|Tuplet_engraver|Trill_spanner_engraver|Timing_translator|Time_signature_performer|Time_signature_engraver|Tie_performer|Tie_engraver|Text_spanner_engraver|Text_engraver|Tempo_performer|Tab_tie_follow_engraver|Tab_staff_symbol_engraver|Tab_note_heads_engraver|TabVoice|TabStaff|System_start_delimiter_engraver|Stem_engraver|Stanza_number_engraver|Stanza_number_align_engraver|Staff_symbol_engraver|Staff_performer|Staff_collecting_engraver|StaffGroup|Staff|Spanner_break_forbid_engraver|Span_bar_stub_engraver|Span_bar_engraver|Span_arpeggio_engraver|Spacing_engraver|Slur_performer|Slur_engraver|Slash_repeat_engraver|Separating_line_group_engraver|Script_row_engraver|Script_engraver|Script_column_engraver|Score|Rhythmic_column_engraver|RhythmicStaff|Rest_engraver|Rest_collision_engraver|Repeat_tie_engraver|Repeat_acknowledge_engraver|Pure_from_neighbor_engraver|Pitched_trill_engraver|Pitch_squash_engraver|Piano_pedal_performer|Piano_pedal_engraver|Piano_pedal_align_engraver|PianoStaff|Phrasing_slur_engraver|PetrucciVoice|PetrucciStaff|Percent_repeat_engraver|Part_combine_engraver|Parenthesis_engraver|Paper_column_engraver|Output_property_engraver|Ottava_spanner_engraver|OneStaff|NullVoice|Note_spacing_engraver|Note_performer|Note_name_engraver|Note_heads_engraver|Note_head_line_engraver|NoteName\|NoteHead|New_fingering_engraver|Multi_measure_rest_engraver|Midi_control_function_performer|Metronome_mark_engraver|Mensural_ligature_engraver|MensuralVoice|MensuralStaff|Mark_engraver|Lyrics|Lyric_performer|Lyric_engraver|Ligature_bracket_engraver|Ledger_line_engraver|Laissez_vibrer_engraver|Kievan_ligature_engraver|KievanVoice|KievanStaff|Key_performer|Key_engraver|Keep_alive_together_engraver|Instrument_switch_engraver|Instrument_name_engraver|Hyphen_engraver|Grob_pq_engraver|GregorianTranscriptionVoice|GregorianTranscriptionStaff|GrandStaff|Grace_spacing_engraver|Grace_engraver|Grace_beam_engraver|Grace_auto_beam_engraver|Global|Glissando_engraver|Fretboard_engraver|FretBoards|Forbid_line_break_engraver|Footnote_engraver|Font_size_engraver|Fingering_engraver|Fingering_column_engraver|Figured_bass_position_engraver|Figured_bass_engraver|FiguredBass|Extender_engraver|Episema_engraver|Dynamics|Dynamic_performer|Dynamic_engraver|Dynamic_align_engraver|Drum_notes_engraver|Drum_note_performer|DrumVoice|DrumStaff|Double_percent_repeat_engraver|Dots_engraver|Dot_column_engraver|Devnull|Default_bar_line_engraver|Custos_engraver|Cue_clef_engraver|CueVoice|Control_track_performer|Concurrent_hairpin_engraver|Collision_engraver|Cluster_spanner_engraver|Clef_engraver|Chord_tremolo_engraver|Chord_name_engraver|ChordNames|ChoirStaff|Breathing_sign_engraver|Break_align_engraver|Bend_engraver|Beam_performer|Beam_engraver|Beam_collision_engraver|Bar_number_engraver|Bar_engraver|Axis_group_engraver|Auto_beam_engraver|Arpeggio_engraver|Accidental_engraver|Score)[[:space:]]"
 color statement "[-_^]?\\[-A-Za-z_]+"
 color preproc "\b(((gisis|gis|geses|ges|g|fisis|fis|feses|fes|f|eisis|eis|eeses|ees|e|disis|dis|deses|des|d|cisis|cis|ceses|ces|c|bisis|bis|beses|bes|b|aisis|ais|aeses|aes|a)[,']*[?!]?)|s|r|R|q)(128|64|32|16|8|4|2|1|\\breve|\\longa|\\maxima)?([^\\\w]|_|\b)"
-color special "[(){}<>]" "\[" "\]"
+color symbol.brackets "[(){}<>]" "\[" "\]"
 color constant.string "\".*\""
 color comment start="%{" end="%}"
 color comment "%.*$"

runtime/syntax/lisp.micro

@@ -1,13 +1,13 @@
 syntax "lisp" "(emacs|zile)$" "\.(el|li?sp|scm|ss)$"
 
-color brightblue "\([a-z-]+"
-color red "\(([-+*/<>]|<=|>=)|'"
-color blue   "\<[0-9]+\>"
-cyan (i) "\<nil\>"
-color brightcyan  "\<[tT]\>"
-color yellow   "\"(\\.|[^"])*\""
-color magenta   "'[A-Za-z][A-Za-z0-9_-]+"
-color magenta   "\\.?"
-color brightblack  "(^|[[:space:]]);.*"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color default "\([a-z-]+"
+color symbol "\(([-+*/<>]|<=|>=)|'"
+color constant.number   "\b[0-9]+b>"
+color special  "\bnil\b"
+color brightcyan  "\b[tT]b>"
+color constant.string   "\"(\\.|[^"])*\""
+color constant.specialChar   "'[A-Za-z][A-Za-z0-9_-]+"
+color constant.specialChar   "\\.?"
+color comment  "(^|[[:space:]]);.*"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/lua.micro

@@ -40,7 +40,7 @@ color identifier "bit32\.\b(arshift|band|bnot|bor|btest|bxor|extract|replace|lro
 color identifier "\:\b(close|flush|lines|read|seek|setvbuf|write)\b"
 
 # false, nil, true
-color constant "\b(false|nil|true)\b"
+color constant.bool "\b(false|nil|true)\b"
 
 # External files
 color statement "(\b(dofile|require|include)|%q|%!|%Q|%r|%x)\b"

runtime/syntax/mail.micro

@@ -1,7 +1,7 @@
 syntax "mail" "(.*/mutt-.*|\.eml)$"
 header "^From .* \d+:\d+:\d+ \d+"
 
-color yellow          "^From .*"
+color constant          "^From .*"
 color identifier      "^[^[:space:]]+:"
 color preproc         "^List-(Id|Archive|Subscribe|Unsubscribe|Post|Help):"
 color constant        "^(To|From):"

runtime/syntax/makefile.micro

@@ -2,9 +2,9 @@ syntax "makefile" "([Mm]akefile|\.ma?k)$"
 header "^#!.*/(env +)?[bg]?make( |$)"
 
 color preproc  "\<(ifeq|ifdef|ifneq|ifndef|else|endif)\>"
-color statement  "^(export|include|override)\>"
-color operator  "^[^:=	]+:"
-color operator "[=,%]" "\+=|\?=|:=|&&|\|\|"
+color preproc  "^(export|include|override)\>"
+color symbol.operator  "^[^:=	]+:"
+color symbol.operator "[=,%]" "\+=|\?=|:=|&&|\|\|"
 color statement "\$\((abspath|addprefix|addsuffix|and|basename|call|dir)[[:space:]]"
 color statement "\$\((error|eval|filter|filter-out|findstring|firstword)[[:space:]]"
 color statement "\$\((flavor|foreach|if|info|join|lastword|notdir|or)[[:space:]]"
@@ -12,7 +12,7 @@ color statement "\$\((origin|patsubst|realpath|shell|sort|strip|suffix)[[:space:
 color statement "\$\((value|warning|wildcard|word|wordlist|words)[[:space:]]"
 color identifier "^.+:"
 color identifier    "[()$]"
-color constant ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color identifier "\$+(\{[^} ]+\}|\([^) ]+\))"
 color identifier "\$[@^<*?%|+]|\$\([@^<*?%+-][DF]\)"
 color identifier   "\$\$|\\.?"

runtime/syntax/markdown.micro

@@ -1,31 +1,31 @@
 syntax "markdown" "\.(md|mkd|mkdn|markdown)$"
 
 # Tables (Github extension)
-color type ".*[ :]\|[ :].*"
+color preproc ".*[ :]\|[ :].*"
 
 # quotes
-color statement  "^>.*"
+color constant.string  "^>.*"
 
 # Emphasis
 color type "(^|[[:space:]])(_[^ ][^_]*_|\*[^ ][^*]*\*)"
 
 # Strong emphasis
-color type "(^|[[:space:]])(__[^ ][^_]*__|\*\*[^ ][^*]*\*\*)"
+color type.keyword "(^|[[:space:]])(__[^ ][^_]*__|\*\*[^ ][^*]*\*\*)"
 
 # strike-through
 color type "(^|[[:space:]])~~[^ ][^~]*~~"
 
 # horizontal rules
-color special "^(---+|===+|___+|\*\*\*+)\s*$"
+color symbol "^(---+|\+---+|===+|\+===+|___+|\*\*\*+|\+\*\*\*+)\s*$"
 
 # headlines
-color special  "^#{1,6}.*"
+color statement  "^#{1,6}.*"
 
 # lists
 color identifier   "^[[:space:]]*[\*+-] |^[[:space:]]*[0-9]+\. "
 
 # misc
-color preproc   "\(([CcRr]|[Tt][Mm])\)" "\.{3}" "(^|[[:space:]])\-\-($|[[:space:]])"
+color preproc   "\b([CcRr]|[Tt][Mm])\b" "\.{3}" "(^|[[:space:]])\-\-($|[[:space:]])"
 
 # links
 color constant "\[[^]]+\]"
@@ -35,10 +35,10 @@ color constant "\[([^][]|\[[^]]*\])*\]\([^)]+\)"
 color underlined "!\[[^][]*\](\([^)]+\)|\[[^]]+\])"
 
 # urls
-color underlined "https?://[^ )>]+"
+color underlined.url "https?://[^ )>]+"
 
 # code
 color special   "`.*?`|^ {4}[^-+*].*"
 # code blocks
-color special "^```$"
+color symbol "^```$"
 

runtime/syntax/micro.micro

@@ -3,11 +3,11 @@ syntax "micro" "\.(micro)$"
 
 color statement "\b(syntax|color(-link)?)\b"
 color statement "\b(start=|end=)\b"
-color identifier "\b(default|comment|symbol|identifier|constant(.string(.char)?|.number)?|statement|preproc|type|special|underlined|error|todo|statusline|indent-char|(current-)?line-number|gutter-error|gutter-warning|cursor-line|color-column)\b"
+color identifier "\b(default|comment|symbol|identifier|constant(.string(.char)?|.specialChar|.number)?|statement|preproc|type|special|underlined|error|todo|statusline|indent-char|(current-)?line-number|gutter-error|gutter-warning|cursor-line|color-column|tabbar)\b"
 color constant.number "\b(|h|A|0x)+[0-9]+(|h|A)+\b"
 color constant.number "\b0x[0-9 a-f A-F]+\b"
 
 color comment "#.*$"
 
 color constant.string ""(\\.|[^"])*""
-color constant.number "#[0-9 A-F a-f]+"
+color constant.number "#[0-9 A-F a-f]{1,6}"

runtime/syntax/mpdconf.micro

@@ -1,9 +1,9 @@
 syntax "mpd" "mpd\.conf$"
 
-color cyan "\<(user|group|bind_to_address|host|port|plugin|name|type)\>"
-color cyan "\<((music|playlist)_directory|(db|log|state|pid|sticker)_file)\>"
-color brightmagenta "^(input|audio_output|decoder)[[:space:]]*\{|\}"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color statement "\<(user|group|bind_to_address|host|port|plugin|name|type)\>"
+color statement "\<((music|playlist)_directory|(db|log|state|pid|sticker)_file)\>"
+color special "^(input|audio_output|decoder)[[:space:]]*\{|\}"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color comment "(^|[[:space:]])#([^{].*)?$"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/nanorc.micro

@@ -2,16 +2,18 @@
 ##
 syntax "nanorc" "\.?nanorc$"
 ## Possible errors and parameters
-brightwhite (i) "^[[:space:]]*((un)?set|include|syntax|i?color).*$"
+color default "(?i)^[[:space:]]*((un)?set|include|syntax|i?color).*$"
 ## Keywords
-brightgreen (i) "^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|speller|suspend|tabsize|tabstospaces|tempfile|undo|view|whitespace|wordbounds)\>"
-green (i) "^[[:space:]]*(set|unset|include|syntax|header)\>"
+color type "(?i)^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|speller|suspend|tabsize|tabstospaces|tempfile|undo|view|whitespace|wordbounds)\b"
+color preproc "(?i)^[[:space:]]*(set|unset|include|syntax|header)\b"
+color constant.bool.true "(?i)(set)\b"
+color constant.bool.false "(?i)(unset)\b"
 ## Colors
-yellow (i) "^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
-magenta (i) "^[[:space:]]*i?color\>" "\<(start|end)="
+color identifier "(?i)^[[:space:]]*(i)?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\b"
+color special "(?i)^[[:space:]]*(i)?color\b" "\b(start|end)="
 ## Strings
-white (i) ""(\\.|[^"])*""
+color constant.string ""(\\.|[^"])*""
 ## Comments
-brightblue (i) "^[[:space:]]*#.*$"
-cyan (i) "^[[:space:]]*##.*$"
+color comment "^[[:space:]]*#.*$"
+color comment.bright "^[[:space:]]*##.*$"
 

runtime/syntax/nginx.micro

@@ -1,13 +1,13 @@
 syntax "nginx" "nginx.*\.conf$" "\.nginx$"
 header "^(server|upstream)[a-z ]*\{$"
 
-color brightmagenta  "\<(events|server|http|location|upstream)[[:space:]]*\{"
-color cyan  "(^|[[:space:]{;])(access_log|add_after_body|add_before_body|add_header|addition_types|aio|alias|allow|ancient_browser|ancient_browser_value|auth_basic|auth_basic_user_file|autoindex|autoindex_exact_size|autoindex_localtime|break|charset|charset_map|charset_types|chunked_transfer_encoding|client_body_buffer_size|client_body_in_file_only|client_body_in_single_buffer|client_body_temp_path|client_body_timeout|client_header_buffer_size|client_header_timeout|client_max_body_size|connection_pool_size|create_full_put_path|daemon|dav_access|dav_methods|default_type|deny|directio|directio_alignment|disable_symlinks|empty_gif|env|error_log|error_page|expires|fastcgi_buffer_size|fastcgi_buffers|fastcgi_busy_buffers_size|fastcgi_cache|fastcgi_cache_bypass|fastcgi_cache_key|fastcgi_cache_lock|fastcgi_cache_lock_timeout|fastcgi_cache_min_uses|fastcgi_cache_path|fastcgi_cache_use_stale|fastcgi_cache_valid|fastcgi_connect_timeout|fastcgi_hide_header|fastcgi_ignore_client_abort|fastcgi_ignore_headers|fastcgi_index|fastcgi_intercept_errors|fastcgi_keep_conn|fastcgi_max_temp_file_size|fastcgi_next_upstream|fastcgi_no_cache|fastcgi_param|fastcgi_pass|fastcgi_pass_header|fastcgi_read_timeout|fastcgi_send_timeout|fastcgi_split_path_info|fastcgi_store|fastcgi_store_access|fastcgi_temp_file_write_size|fastcgi_temp_path|flv|geo|geoip_city|geoip_country|gzip|gzip_buffers|gzip_comp_level|gzip_disable|gzip_http_version|gzip_min_length|gzip_proxied|gzip_static|gzip_types|gzip_vary|if|if_modified_since|ignore_invalid_headers|image_filter|image_filter_buffer|image_filter_jpeg_quality|image_filter_sharpen|image_filter_transparency|include|index|internal|ip_hash|keepalive|keepalive_disable|keepalive_requests|keepalive_timeout|large_client_header_buffers|limit_conn|limit_conn_log_level|limit_conn_zone|limit_except|limit_rate|limit_rate_after|limit_req|limit_req_log_level|limit_req_zone|limit_zone|lingering_close|lingering_time|lingering_timeout|listen|location|log_format|log_not_found|log_subrequest|map|map_hash_bucket_size|map_hash_max_size|master_process|max_ranges|memcached_buffer_size|memcached_connect_timeout|memcached_next_upstream|memcached_pass|memcached_read_timeout|memcached_send_timeout|merge_slashes|min_delete_depth|modern_browser|modern_browser_value|mp4|mp4_buffer_size|mp4_max_buffer_size|msie_padding|msie_refresh|open_file_cache|open_file_cache_errors|open_file_cache_min_uses|open_file_cache_valid|open_log_file_cache|optimize_server_names|override_charset|pcre_jit|perl|perl_modules|perl_require|perl_set|pid|port_in_redirect|postpone_output|proxy_buffer_size|proxy_buffering|proxy_buffers|proxy_busy_buffers_size|proxy_cache|proxy_cache_bypass|proxy_cache_key|proxy_cache_lock|proxy_cache_lock_timeout|proxy_cache_min_uses|proxy_cache_path|proxy_cache_use_stale|proxy_cache_valid|proxy_connect_timeout|proxy_cookie_domain|proxy_cookie_path|proxy_hide_header|proxy_http_version|proxy_ignore_client_abort|proxy_ignore_headers|proxy_intercept_errors|proxy_max_temp_file_size|proxy_next_upstream|proxy_no_cache|proxy_pass|proxy_pass_header|proxy_read_timeout|proxy_redirect|proxy_send_timeout|proxy_set_header|proxy_ssl_session_reuse|proxy_store|proxy_store_access|proxy_temp_file_write_size|proxy_temp_path|random_index|read_ahead|real_ip_header|recursive_error_pages|request_pool_size|reset_timedout_connection|resolver|resolver_timeout|return|rewrite|root|satisfy|satisfy_any|secure_link_secret|send_lowat|send_timeout|sendfile|sendfile_max_chunk|server|server|server_name|server_name_in_redirect|server_names_hash_bucket_size|server_names_hash_max_size|server_tokens|set|set_real_ip_from|source_charset|split_clients|ssi|ssi_silent_errors|ssi_types|ssl|ssl_certificate|ssl_certificate_key|ssl_ciphers|ssl_client_certificate|ssl_crl|ssl_dhparam|ssl_engine|ssl_prefer_server_ciphers|ssl_protocols|ssl_session_cache|ssl_session_timeout|ssl_verify_client|ssl_verify_depth|sub_filter|sub_filter_once|sub_filter_types|tcp_nodelay|tcp_nopush|timer_resolution|try_files|types|types_hash_bucket_size|types_hash_max_size|underscores_in_headers|uninitialized_variable_warn|upstream|user|userid|userid_domain|userid_expires|userid_name|userid_p3p|userid_path|userid_service|valid_referers|variables_hash_bucket_size|variables_hash_max_size|worker_priority|worker_processes|worker_rlimit_core|worker_rlimit_nofile|working_directory|xml_entities|xslt_stylesheet|xslt_types)([[:space:]]|$)"
-color brightcyan  "\<(on|off)\>"
-color brightyellow "\$[A-Za-z][A-Za-z0-9_]*"
-color red "[*]"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color yellow   start="'$" end="';$"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color preproc  "\b(events|server|http|location|upstream)[[:space:]]*\{"
+color statement  "(^|[[:space:]{;])(access_log|add_after_body|add_before_body|add_header|addition_types|aio|alias|allow|ancient_browser|ancient_browser_value|auth_basic|auth_basic_user_file|autoindex|autoindex_exact_size|autoindex_localtime|break|charset|charset_map|charset_types|chunked_transfer_encoding|client_body_buffer_size|client_body_in_file_only|client_body_in_single_buffer|client_body_temp_path|client_body_timeout|client_header_buffer_size|client_header_timeout|client_max_body_size|connection_pool_size|create_full_put_path|daemon|dav_access|dav_methods|default_type|deny|directio|directio_alignment|disable_symlinks|empty_gif|env|error_log|error_page|expires|fastcgi_buffer_size|fastcgi_buffers|fastcgi_busy_buffers_size|fastcgi_cache|fastcgi_cache_bypass|fastcgi_cache_key|fastcgi_cache_lock|fastcgi_cache_lock_timeout|fastcgi_cache_min_uses|fastcgi_cache_path|fastcgi_cache_use_stale|fastcgi_cache_valid|fastcgi_connect_timeout|fastcgi_hide_header|fastcgi_ignore_client_abort|fastcgi_ignore_headers|fastcgi_index|fastcgi_intercept_errors|fastcgi_keep_conn|fastcgi_max_temp_file_size|fastcgi_next_upstream|fastcgi_no_cache|fastcgi_param|fastcgi_pass|fastcgi_pass_header|fastcgi_read_timeout|fastcgi_send_timeout|fastcgi_split_path_info|fastcgi_store|fastcgi_store_access|fastcgi_temp_file_write_size|fastcgi_temp_path|flv|geo|geoip_city|geoip_country|gzip|gzip_buffers|gzip_comp_level|gzip_disable|gzip_http_version|gzip_min_length|gzip_proxied|gzip_static|gzip_types|gzip_vary|if|if_modified_since|ignore_invalid_headers|image_filter|image_filter_buffer|image_filter_jpeg_quality|image_filter_sharpen|image_filter_transparency|include|index|internal|ip_hash|keepalive|keepalive_disable|keepalive_requests|keepalive_timeout|large_client_header_buffers|limit_conn|limit_conn_log_level|limit_conn_zone|limit_except|limit_rate|limit_rate_after|limit_req|limit_req_log_level|limit_req_zone|limit_zone|lingering_close|lingering_time|lingering_timeout|listen|location|log_format|log_not_found|log_subrequest|map|map_hash_bucket_size|map_hash_max_size|master_process|max_ranges|memcached_buffer_size|memcached_connect_timeout|memcached_next_upstream|memcached_pass|memcached_read_timeout|memcached_send_timeout|merge_slashes|min_delete_depth|modern_browser|modern_browser_value|mp4|mp4_buffer_size|mp4_max_buffer_size|msie_padding|msie_refresh|open_file_cache|open_file_cache_errors|open_file_cache_min_uses|open_file_cache_valid|open_log_file_cache|optimize_server_names|override_charset|pcre_jit|perl|perl_modules|perl_require|perl_set|pid|port_in_redirect|postpone_output|proxy_buffer_size|proxy_buffering|proxy_buffers|proxy_busy_buffers_size|proxy_cache|proxy_cache_bypass|proxy_cache_key|proxy_cache_lock|proxy_cache_lock_timeout|proxy_cache_min_uses|proxy_cache_path|proxy_cache_use_stale|proxy_cache_valid|proxy_connect_timeout|proxy_cookie_domain|proxy_cookie_path|proxy_hide_header|proxy_http_version|proxy_ignore_client_abort|proxy_ignore_headers|proxy_intercept_errors|proxy_max_temp_file_size|proxy_next_upstream|proxy_no_cache|proxy_pass|proxy_pass_header|proxy_read_timeout|proxy_redirect|proxy_send_timeout|proxy_set_header|proxy_ssl_session_reuse|proxy_store|proxy_store_access|proxy_temp_file_write_size|proxy_temp_path|random_index|read_ahead|real_ip_header|recursive_error_pages|request_pool_size|reset_timedout_connection|resolver|resolver_timeout|return|rewrite|root|satisfy|satisfy_any|secure_link_secret|send_lowat|send_timeout|sendfile|sendfile_max_chunk|server|server|server_name|server_name_in_redirect|server_names_hash_bucket_size|server_names_hash_max_size|server_tokens|set|set_real_ip_from|source_charset|split_clients|ssi|ssi_silent_errors|ssi_types|ssl|ssl_certificate|ssl_certificate_key|ssl_ciphers|ssl_client_certificate|ssl_crl|ssl_dhparam|ssl_engine|ssl_prefer_server_ciphers|ssl_protocols|ssl_session_cache|ssl_session_timeout|ssl_verify_client|ssl_verify_depth|sub_filter|sub_filter_once|sub_filter_types|tcp_nodelay|tcp_nopush|timer_resolution|try_files|types|types_hash_bucket_size|types_hash_max_size|underscores_in_headers|uninitialized_variable_warn|upstream|user|userid|userid_domain|userid_expires|userid_name|userid_p3p|userid_path|userid_service|valid_referers|variables_hash_bucket_size|variables_hash_max_size|worker_priority|worker_processes|worker_rlimit_core|worker_rlimit_nofile|working_directory|xml_entities|xslt_stylesheet|xslt_types)([[:space:]]|$)"
+color constant.bool  "\<(on|off)\>"
+color identifier "\$[A-Za-z][A-Za-z0-9_]*"
+color symbol "[*]"
+color constant-string ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant.string   start="'$" end="';$"
+color comment "(^|[[:space:]])#([^{].*)?$"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/nim.micro

@@ -4,7 +4,7 @@ color preproc "[\{\|]\b(atom|lit|sym|ident|call|lvalue|sideeffect|nosideeffect|p
 
 color statement "\b(addr|and|as|asm|atomic|bind|block|break|case|cast|concept|const|continue|converter|defer|discard|distinct|div|do|elif|else|end|enum|except|export|finally|for|from|func|generic|if|import|in|include|interface|is|isnot|iterator|let|macro|method|mixin|mod|nil|not|notin|object|of|or|out|proc|ptr|raise|ref|return|shl|shr|static|template|try|tuple|type|using|var|when|while|with|without|xor|yield)\b"
 color statement "\b(deprecated|noSideEffect|constructor|destructor|override|procvar|compileTime|noReturn|acyclic|final|shallow|pure|asmNoStackFrame|error|fatal|warning|hint|line|linearScanEnd|computedGoto|unroll|immediate|checks|boundsChecks|overflowChecks|nilChecks|assertations|warnings|hints|optimization|patterns|callconv|push|pop|global|pragma|experimental|bitsize|volatile|noDecl|header|incompleteStruct|compile|link|passC|passL|emit|importc|importcpp|importobjc|codegenDecl|injectStmt|intdefine|strdefine|varargs|exportc|extern|bycopy|byref|union|packed|unchecked|dynlib|cdecl|thread|gcsafe|threadvar|guard|locks|compileTime)\b"
-color statement "[=\+\-\*/<>@\$~&%\|!\?\^\.:\\]+"
+color symbol.operator "[=\+\-\*/<>@\$~&%\|!\?\^\.:\\]+"
 
 color special "\{\." "\.\}" "\[\." "\.\]" "\(\." "\.\)" ";" "," "`"
 

runtime/syntax/objc.micro

@@ -21,7 +21,7 @@ color preproc "__[A-Z0-9_]*__"
 
 color special "^[[:space:]]*[#|@][[:space:]]*(import|include)[[:space:]]*[\"|<].*\/?[>|\"][[:space:]]*$"
 
-color statement "[.:;,+*|=!\%\[\]]" "<" ">" "/" "-" "&" 
+color symbol.operator "[.:;,+*|=!\%\[\]]" "<" ">" "/" "-" "&" 
 
 color constant.number "\b(-?)?[0-9]+\b" "\b\[0-9]+\.[0-9]+\b" "\b0x[0-9A-F]+\b"
 color constant "@\[(\\.|[^\]])*\]" "@\{(\\.|[^\}])*\}" "@\((\\.|[^\)])*\)"

runtime/syntax/peg.micro

@@ -1,12 +1,12 @@
 syntax "peg" "\.l?peg$"
 
-color cyan  "^[[:space:]]*[A-Za-z][A-Za-z0-9_]*[[:space:]]*<-"
-color blue   "\^[+-]?[0-9]+"
-color red "[-+*?^/!&]|->|<-|=>"
-color brightyellow    "%[A-Za-z][A-Za-z0-9_]*"
-color magenta   "\[[^]]*\]"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightblack  "(^|[[:space:]])\-\-.*$"
-color brightwhite,cyan "TODO:?"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color identifier  "^[[:space:]]*[A-Za-z][A-Za-z0-9_]*[[:space:]]*<-"
+color constant.number   "\^[+-]?[0-9]+"
+color symbol.operator "[-+*?^/!&]|->|<-|=>"
+color identifier.var    "%[A-Za-z][A-Za-z0-9_]*"
+color special   "\[[^]]*\]"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color comment  "(^|[[:space:]])\-\-.*$"
+color todo "TODO:?"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/perl.micro

@@ -3,11 +3,13 @@
 syntax "perl" "\.p[lm]$"
 header "^#!.*/(env +)?perl( |$)"
 
-color red "\<(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork))\>" "\<(get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join)\>" "\<(keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek(dir)?)\>" "\<(se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr(y)?|truncate|umask)\>" "\<(un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\>"
-color magenta "\<(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\>"
-cyan (i) start="[$@%]" end="( |[^0-9A-Z_]|-)"
-color yellow "".*"|qq\|.*\|"
-color white "[sm]/.*/"
-color white start="(^use| = new)" end=";"
-color green "#.*"
-color yellow start="<< 'STOP'" end="STOP"
+color type "\<(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork))\>" "\<(get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join)\>" "\<(keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek(dir)?)\>" "\<(se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr(y)?|truncate|umask)\>" "\<(un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\>"
+color statement "\<(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\>"
+#TODO: This regex needs to be fixed.
+color identifier (i) start="[$@%]" end="( |[^0-9A-Z_]|-)"
+#ENDTODO.
+color constant.string "".*"|qq\|.*\|"
+color default "[sm]/.*/"
+color preproc start="(^use| = new)" end=";"
+color comment "#.*"
+color identifier.macro start="<< 'STOP'" end="STOP"

runtime/syntax/perl6.micro

@@ -2,15 +2,17 @@
 ## Hybrid perl5 / perl6 syntax highlighting
 ### Found in CPAN - http://cpansearch.perl.org/src/NIGE/Goo-0.09/lib/.gooskel/nanorc
 
+#This file probably needs cleanup!!
+
 syntax "perl6" "\.p6$"
-color brightblue "\<(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork)|get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join|keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek|seekdir|se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr|y|truncate|umask|un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\>"
-color brightblue "\<(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\>"
+color type "\<(accept|alarm|atan2|bin(d|mode)|c(aller|h(dir|mod|op|own|root)|lose(dir)?|onnect|os|rypt)|d(bm(close|open)|efined|elete|ie|o|ump)|e(ach|of|val|x(ec|ists|it|p))|f(cntl|ileno|lock|ork)|get(c|login|peername|pgrp|ppid|priority|pwnam|(host|net|proto|serv)byname|pwuid|grgid|(host|net)byaddr|protobynumber|servbyport)|([gs]et|end)(pw|gr|host|net|proto|serv)ent|getsock(name|opt)|gmtime|goto|grep|hex|index|int|ioctl|join|keys|kill|last|length|link|listen|local(time)?|log|lstat|m|mkdir|msg(ctl|get|snd|rcv)|next|oct|open(dir)?|ord|pack|pipe|pop|printf?|push|q|qq|qx|rand|re(ad(dir|link)?|cv|do|name|quire|set|turn|verse|winddir)|rindex|rmdir|s|scalar|seek|seekdir|se(lect|mctl|mget|mop|nd|tpgrp|tpriority|tsockopt)|shift|shm(ctl|get|read|write)|shutdown|sin|sleep|socket(pair)?|sort|spli(ce|t)|sprintf|sqrt|srand|stat|study|substr|symlink|sys(call|read|tem|write)|tell(dir)?|time|tr|y|truncate|umask|un(def|link|pack|shift)|utime|values|vec|wait(pid)?|wantarray|warn|write)\>"
+color statement "\<(continue|else|elsif|do|for|foreach|if|unless|until|while|eq|ne|lt|gt|le|ge|cmp|x|my|sub|use|package|can|isa)\>"
 
 # Perl 6 words
-color brightcyan "\<(has|is|class|role|given|when|BUILD|multi|returns|method|submethod|slurp|say|sub)\>"
-color brightmagenta start="[$@%]" end="( |\\W|-)"
-color brightred "".*"|qq\|.*\|"
-color white "[sm]/.*/"
-color brightblue start="(^use| = new)" end=";"
-color brightgreen "#.*"
-color brightred start="<<EOSQL" end="EOSQL"
+color special "\<(has|is|class|role|given|when|BUILD|multi|returns|method|submethod|slurp|say|sub)\>"
+color identifier start="[$@%]" end="( |\\W|-)"
+color constant.string "".*"|qq\|.*\|"
+color default "[sm]/.*/"
+color preproc start="(^use| = new)" end=";"
+color comment "#.*"
+color identifier.macro start="<<EOSQL" end="EOSQL"

runtime/syntax/php.micro

@@ -1,11 +1,15 @@
+#This file probably needs cleanup!!
 syntax "php" "\.php[2345s~]?$"
-color default start="<\?(php|=)?" end="\?>"
+color symbol.brackets "<.+?>"
+color preproc "<\?(php|=)?"
+color preproc "\?>"
+#color preproc start="<\?(php|=)?" end="\?>"
 
-color special "([a-zA-Z0-9_-]+)\("
+color identifier.class "([a-zA-Z0-9_-]+)\("
 
-color identifier "(var|class|goto|extends|function|echo|case|break|default|exit|switch|foreach|endforeach|while|const|static|extends|as|require|include|require_once|include_once|define|do|continue|declare|goto|print|in|trait|interface|[E|e]xception|array|int|string|bool|iterable|void)[\s|\)]"
+color type "(var|class|goto|extends|function|echo|case|break|default|exit|switch|foreach|endforeach|while|const|static|extends|as|require|include|require_once|include_once|define|do|continue|declare|goto|print|in|trait|interface|[E|e]xception|array|int|string|bool|iterable|void)[\s|\)]"
 
-color identifier "[a-zA-Z\\]+::"
+color identifier.class "[a-zA-Z\\]+::"
 
 color identifier "new\s([a-zA-Z0-9\\]+)"
 color identifier "([A-Z][a-zA-Z0-9_]+)\s"
@@ -13,16 +17,16 @@ color identifier "([A-Z0-9_]+)[;|\s|\)|,]"
 
 color statement "(implements|abstract|global|public|instanceof|private|protected|static|if|else|elseif|endif|namespace|use|as|new|throw|catch|try|return)[\s|;]"
 
-color constant "(true|false|null|TRUE|FALSE|NULL)"
+color constant.bool "(true|false|null|TRUE|FALSE|NULL)"
 
 color constant "[\s|=|>|\s|\(|/|+|-|\*|\[](\d+)"
 
 color identifier "(\$this|parent|self|\$this->)"
 
-color statement "(=>|===|!==|==|!=|&&|\|\||::|=|->|\!)"
+color symbol.operator "(=>|===|!==|==|!=|&&|\|\||::|=|->|\!)"
 
-color default "(\$[a-zA-Z0-9\-_]+)"
-color default "[\(|\)|/|+|-|\*|\[|,|;]"
+color identifier.var "(\$[a-zA-Z0-9\-_]+)"
+color symbol.operator "[\(|\)|/|+|-|\*|\[|,|;]"
 
 color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color constant.specialChar "\\[abfnrtv'\"\\]"

runtime/syntax/pkg-config.micro

@@ -1,8 +1,8 @@
 syntax "pc" "\.pc$"
 
-color cyan  "^(Name|Description|URL|Version|Conflicts|Cflags):"
-color cyan  "^(Requires|Libs)(\.private)?:"
-color red "="
-color brightyellow "\$\{[A-Za-z_][A-Za-z0-9_]*\}"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color preproc  "^(Name|Description|URL|Version|Conflicts|Cflags):"
+color preproc  "^(Requires|Libs)(\.private)?:"
+color symbol.operator "="
+color identifier.var "\$\{[A-Za-z_][A-Za-z0-9_]*\}"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/po.micro

@@ -1,8 +1,8 @@
 syntax "po" "\.pot?$"
 
-color cyan  "\<(msgid|msgstr)\>"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color magenta   "\\.?"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color preproc  "\<(msgid|msgstr)\>"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color special   "\\.?"
+color comment "(^|[[:space:]])#([^{].*)?$"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/pony.micro

@@ -13,8 +13,8 @@ color statement "\b(while|do|repeat|until|for|in)\b"
 color statement "(\?|=>)"
 color statement "(\||\&|\,|\^)"
 
-color statement "(\-|\+|\*|/|\!|%|<<|>>)"
-color statement "(==|!=|<=|>=|<|>)"
+color symbol.operator "(\-|\+|\*|/|\!|%|<<|>>)"
+color symbol.operator "(==|!=|<=|>=|<|>)"
 color statement "\b(is|isnt|not|and|or|xor)\b"
 
 color type "\b(_*[A-Z][_a-zA-Z0-9\']*)\b"

runtime/syntax/pov.micro

@@ -1,15 +1,15 @@
 ## Here is an example for POV-Ray.
 ##
 syntax "pov" "\.(pov|POV|povray|POVRAY)$"
-color brightcyan "^[[:space:]]*#[[:space:]]*(declare)"
-color brightyellow "\<(sphere|cylinder|translate|matrix|rotate|scale)\>"
-color brightyellow "\<(orthographic|location|up|right|direction|clipped_by)\>"
-color brightyellow "\<(fog_type|fog_offset|fog_alt|rgb|distance|transform)\>"
-color brightred "^\<(texture)\>"
-color brightred "\<(light_source|background)\>"
-color brightred "\<(fog|object|camera)\>"
-color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
-color brightmagenta "\<(union|group|subgroup)\>"
+color preproc "^[[:space:]]*#[[:space:]]*(declare)"
+color statement "\b(sphere|cylinder|translate|matrix|rotate|scale)\b"
+color statement "\b(orthographic|location|up|right|direction|clipped_by)\b"
+color statement "\b(fog_type|fog_offset|fog_alt|rgb|distance|transform)\b"
+color identifier "^\b(texture)\b"
+color identifier "\b(light_source|background)\b"
+color identifier "\b(fog|object|camera)\b"
+color symbol.operator "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color special "\b(union|group|subgroup)\b"
 ## Comment highlighting
-color brightblue "//.*"
-color brightblue start="/\*" end="\*/"
+color comment "//.*"
+color comment start="/\*" end="\*/"

runtime/syntax/privoxy-action.micro

@@ -1,11 +1,11 @@
 syntax "privoxy-action" "\.action$"
 
-color brightred   "[{[:space:]]\-block([[:space:]{}]|$)"
-color brightgreen "[{[:space:]]\+block([[:space:]{}]|$)"
+color constant.bool.false   "[{[:space:]]\-block([[:space:]{}]|$)"
+color constant.bool.true "[{[:space:]]\+block([[:space:]{}]|$)"
 
-color brightred   "-(add-header|change-x-forwarded-for|client-header-filter|client-header-tagger|content-type-overwrite|crunch-client-header|crunch-if-none-match|crunch-incoming-cookies|crunch-outgoing-cookies|crunch-server-header|deanimate-gifs|downgrade-http-version|fast-redirects|filter|force-text-mode|forward-override|handle-as-empty-document|handle-as-image|hide-accept-language|hide-content-disposition|hide-from-header|hide-if-modified-since|hide-referrer|hide-user-agent|limit-connect|overwrite-last-modified|prevent-compression|redirect|server-header-filter|server-header-tagger|session-cookies-only|set-image-blocker)"
-color brightgreen "\+(add-header|change-x-forwarded-for|client-header-filter|client-header-tagger|content-type-overwrite|crunch-client-header|crunch-if-none-match|crunch-incoming-cookies|crunch-outgoing-cookies|crunch-server-header|deanimate-gifs|downgrade-http-version|fast-redirects|filter|force-text-mode|forward-override|handle-as-empty-document|handle-as-image|hide-accept-language|hide-content-disposition|hide-from-header|hide-if-modified-since|hide-referrer|hide-user-agent|limit-connect|overwrite-last-modified|prevent-compression|redirect|server-header-filter|server-header-tagger|session-cookies-only|set-image-blocker)"
-color magenta           "\\.?"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color constant.bool.false   "-(add-header|change-x-forwarded-for|client-header-filter|client-header-tagger|content-type-overwrite|crunch-client-header|crunch-if-none-match|crunch-incoming-cookies|crunch-outgoing-cookies|crunch-server-header|deanimate-gifs|downgrade-http-version|fast-redirects|filter|force-text-mode|forward-override|handle-as-empty-document|handle-as-image|hide-accept-language|hide-content-disposition|hide-from-header|hide-if-modified-since|hide-referrer|hide-user-agent|limit-connect|overwrite-last-modified|prevent-compression|redirect|server-header-filter|server-header-tagger|session-cookies-only|set-image-blocker)"
+color constant.bool.true "\+(add-header|change-x-forwarded-for|client-header-filter|client-header-tagger|content-type-overwrite|crunch-client-header|crunch-if-none-match|crunch-incoming-cookies|crunch-outgoing-cookies|crunch-server-header|deanimate-gifs|downgrade-http-version|fast-redirects|filter|force-text-mode|forward-override|handle-as-empty-document|handle-as-image|hide-accept-language|hide-content-disposition|hide-from-header|hide-if-modified-since|hide-referrer|hide-user-agent|limit-connect|overwrite-last-modified|prevent-compression|redirect|server-header-filter|server-header-tagger|session-cookies-only|set-image-blocker)"
+color constant.specialChar           "\\.?"
+color comment "(^|[[:space:]])#([^{].*)?$"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/privoxy-config.micro

@@ -1,6 +1,6 @@
 syntax "privoxy-config" "privoxy/config$"
 
-color cyan "(accept-intercepted-requests|actionsfile|admin-address|allow-cgi-request-crunching|buffer-limit|compression-level|confdir|connection-sharing|debug|default-server-timeout|deny-access|enable-compression|enable-edit-actions|enable-remote-http-toggle|enable-remote-toggle|enforce-blocks|filterfile|forward|forwarded-connect-retries|forward-socks4|forward-socks4a|forward-socks5|handle-as-empty-doc-returns-ok|hostname|keep-alive-timeout|listen-address|logdir|logfile|max-client-connections|permit-access|proxy-info-url|single-threaded|socket-timeout|split-large-forms|templdir|toggle|tolerate-pipelining|trustfile|trust-info-url|user-manual)[[:space:]]"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color statement "(accept-intercepted-requests|actionsfile|admin-address|allow-cgi-request-crunching|buffer-limit|compression-level|confdir|connection-sharing|debug|default-server-timeout|deny-access|enable-compression|enable-edit-actions|enable-remote-http-toggle|enable-remote-toggle|enforce-blocks|filterfile|forward|forwarded-connect-retries|forward-socks4|forward-socks4a|forward-socks5|handle-as-empty-doc-returns-ok|hostname|keep-alive-timeout|listen-address|logdir|logfile|max-client-connections|permit-access|proxy-info-url|single-threaded|socket-timeout|split-large-forms|templdir|toggle|tolerate-pipelining|trustfile|trust-info-url|user-manual)[[:space:]]"
+color comment "(^|[[:space:]])#([^{].*)?$"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/privoxy-filter.micro

@@ -1,8 +1,10 @@
 syntax "privoxy-filter" "\.filter$"
 
-color cyan  "^(FILTER|CLIENT-HEADER-FILTER|CLIENT-HEADER-TAGGER|SERVER-HEADER-FILTER|SERVER-HEADER-TAGGER): [a-z-]+"
-color brightblue "^(FILTER|CLIENT-HEADER-FILTER|CLIENT-HEADER-TAGGER|SERVER-HEADER-FILTER|SERVER-HEADER-TAGGER):"
-color magenta   "\\.?"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color statement  "^(FILTER|CLIENT-HEADER-FILTER|CLIENT-HEADER-TAGGER|SERVER-HEADER-FILTER|SERVER-HEADER-TAGGER): [a-z-]+"
+color identifier "^(FILTER|CLIENT-HEADER-FILTER|CLIENT-HEADER-TAGGER|SERVER-HEADER-FILTER|SERVER-HEADER-TAGGER):"
+##Not sure what this does? 
+#color default "^(FILTER|CLIENT-HEADER-FILTER|CLIENT-HEADER-TAGGER|SERVER-HEADER-FILTER|SERVER-HEADER-TAGGER):"
+color constant.specialChar   "\\.?"
+color comment "(^|[[:space:]])#([^{].*)?$"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/puppet.micro

@@ -4,35 +4,35 @@ syntax "puppet" "\.pp$"
 
 #This goes first, so the normal builtins will override in some classes
 ## Paramerers
-color brightwhite "^[[:space:]]([a-z][a-z0-9_]+)"
-color brightgreen "\$[a-z:][a-z0-9_:]+"
+color default "^[[:space:]]([a-z][a-z0-9_]+)"
+color identifier.var "\$[a-z:][a-z0-9_:]+"
 
 ## List of built in types, also catches defines
-color yellow "\<(augeas|computer|cron|exec|file|filebucket|group|host|interface|k5login|macauthorization|mailalias|maillist|mcx|mount|nagios_command|nagios_contact|nagios_contactgroup|nagios_host|nagios_hostdependency|nagios_hostescalation|nagios_hostextinfo|nagios_hostgroup|nagios_service|nagios_servicedependency|nagios_serviceescalation|nagios_serviceextinfo|nagios_servicegroup|nagios_timeperiod|notify|package|resources|router|schedule|scheduled_task|selboolean|selmodule|service|ssh_authorized_key|sshkey|stage|tidy|user|vlan|yumrepo|zfs|zone|zpool|anchor)\>"
-color yellow "\<(class|define|if|else|undef|inherits)\>"
-color red "(=|-|~|>)"
+color type "\b(augeas|computer|cron|exec|file|filebucket|group|host|interface|k5login|macauthorization|mailalias|maillist|mcx|mount|nagios_command|nagios_contact|nagios_contactgroup|nagios_host|nagios_hostdependency|nagios_hostescalation|nagios_hostextinfo|nagios_hostgroup|nagios_service|nagios_servicedependency|nagios_serviceescalation|nagios_serviceextinfo|nagios_servicegroup|nagios_timeperiod|notify|package|resources|router|schedule|scheduled_task|selboolean|selmodule|service|ssh_authorized_key|sshkey|stage|tidy|user|vlan|yumrepo|zfs|zone|zpool|anchor)\b"
+color statement "\b(class|define|if|else|undef|inherits)\b"
+color symbol "(=|-|~|>)"
 
 ## Constants
-color brightblue "(\$|@|@@)?\<[A-Z]+[0-9A-Z_a-z]*"
+color identifier.var "(\$|@|@@)?\<[A-Z]+[0-9A-Z_a-z]*"
 ## Ruby "symbols"
-color magenta "([      ]|^):[0-9A-Z_]+\>"
+color symbol "([      ]|^):[0-9A-Z_]+\>"
 ## Regular expressions
-color brightmagenta "/([^/]|(\\/))*/[iomx]*" "%r\{([^}]|(\\}))*\}[iomx]*"
+color constant "/([^/]|(\\/))*/[iomx]*" "%r\{([^}]|(\\}))*\}[iomx]*"
 ## Shell command expansion is in `backticks` or like %x{this}.  These are
 ## "double-quotish" (to use a perlism).
-color brightblue "`[^`]*`" "%x\{[^}]*\}"
+color constant.string "`[^`]*`" "%x\{[^}]*\}"
 ## Strings, double-quoted
-color green ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!"
+color constant.string ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!"
 ## Expression substitution.  These go inside double-quoted strings,
 ## "like ${this}".
-color brightgreen "\$\{[^}]*\}"
+color special "\$\{[^}]*\}"
 ## Strings, single-quoted
-color green "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
+color constant.string "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
 ## Comments
-color cyan "#[^{].*$" "#$"
-color brightcyan "##[^{].*$" "##$"
+color comment "#[^{].*$" "#$"
+color comment "##[^{].*$" "##$"
 ## Some common markers
-color brightcyan "(XXX|TODO|FIXME|\?\?\?)"
+color todo "(XXX|TODO|FIXME|\?\?\?)"
 ## Trailing spaces
-color red "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"
 

runtime/syntax/python2.micro

@@ -24,13 +24,13 @@ color identifier "def [a-zA-Z_0-9]+"
 color statement "\b(and|as|assert|break|class|continue|def|del|elif|else|except|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield)\b"
 
 ## decorators
-color brightgreen "@.*[(]"
+color special "@.*[(]"
 
 ## operators
-color statement "[.:;,+*|=!\%@]" "<" ">" "/" "-" "&"
+color symbol.operator "[.:;,+*|=!\%@]" "<" ">" "/" "-" "&"
 
 ## parentheses
-color statement "[(){}]" "\[" "\]"
+color symbol.brackets "[(){}]" "\[" "\]"
 
 ## numbers
 color constant.number "\b[0-9]+\b"

runtime/syntax/python3.micro

@@ -24,7 +24,7 @@ color identifier "def [a-zA-Z_0-9]+"
 color statement "\b(and|as|assert|break|class|continue|def|del|elif|else|except|finally|for|from|global|if|import|in|is|lambda|nonlocal|not|or|pass|raise|return|try|while|with|yield)\b" 
 
 ## decorators
-color brightgreen "@.*[(]"
+color special "@.*[(]"
 
 ## operators
 color statement "[.:;,+*|=!\%@]" "<" ">" "/" "-" "&"

runtime/syntax/rpmspec.micro

@@ -1,27 +1,27 @@
 syntax "rpmspec" "\.spec$" "\.rpmspec$"
 
-color cyan  "\<(Icon|ExclusiveOs|ExcludeOs):"
-color cyan  "\<(BuildArch|BuildArchitectures|ExclusiveArch|ExcludeArch):"
-color cyan  "\<(Conflicts|Obsoletes|Provides|Requires|Requires\(.*\)|Enhances|Suggests|BuildConflicts|BuildRequires|Recommends|PreReq|Supplements):"
-color cyan  "\<(Epoch|Serial|Nosource|Nopatch):"
-color cyan  "\<(AutoReq|AutoProv|AutoReqProv):"
-color cyan  "\<(Copyright|License|Summary|Summary\(.*\)|Distribution|Vendor|Packager|Group|Source[0-9]*|Patch[0-9]*|BuildRoot|Prefix):"
-color cyan  "\<(Name|Version|Release|Url|URL):"
-color cyan  start="^(Source|Patch)" end=":"
-color cyan  "(i386|i486|i586|i686|athlon|ia64|alpha|alphaev5|alphaev56|alphapca56|alphaev6|alphaev67|sparc|sparcv9|sparc64armv3l|armv4b|armv4lm|ips|mipsel|ppc|ppc|iseries|ppcpseries|ppc64|m68k|m68kmint|Sgi|rs6000|i370|s390x|s390|noarch)"
-color cyan  "(ifarch|ifnarch|ifos|ifnos)"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightyellow    "%(if|else|endif|define|global|undefine)"
-color brightyellow    "%_?([A-Z_a-z_0-9_]*)"
-color brightyellow    start="%\{" end="\}"
-color brightyellow    start="%\{__" end="\}"
-color brightyellow "\$(RPM_BUILD_ROOT)\>"
-color brightmagenta  "^%(build$|changelog|check$|clean$|description)"
-color brightmagenta  "^%(files|install$|package|prep$)"
-color brightmagenta  "^%(pre|preun|pretrans|post|postun|posttrans)"
-color brightmagenta  "^%(trigger|triggerin|triggerpostun|triggerun|verifyscript)"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color blue   "^\*.*$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
-color brightwhite,cyan "TODO:?"
+color preproc  "\<(Icon|ExclusiveOs|ExcludeOs):"
+color preproc  "\<(BuildArch|BuildArchitectures|ExclusiveArch|ExcludeArch):"
+color preproc  "\<(Conflicts|Obsoletes|Provides|Requires|Requires\(.*\)|Enhances|Suggests|BuildConflicts|BuildRequires|Recommends|PreReq|Supplements):"
+color preproc  "\<(Epoch|Serial|Nosource|Nopatch):"
+color preproc  "\<(AutoReq|AutoProv|AutoReqProv):"
+color preproc  "\<(Copyright|License|Summary|Summary\(.*\)|Distribution|Vendor|Packager|Group|Source[0-9]*|Patch[0-9]*|BuildRoot|Prefix):"
+color preproc  "\<(Name|Version|Release|Url|URL):"
+color preproc  start="^(Source|Patch)" end=":"
+color preproc  "(i386|i486|i586|i686|athlon|ia64|alpha|alphaev5|alphaev56|alphapca56|alphaev6|alphaev67|sparc|sparcv9|sparc64armv3l|armv4b|armv4lm|ips|mipsel|ppc|ppc|iseries|ppcpseries|ppc64|m68k|m68kmint|Sgi|rs6000|i370|s390x|s390|noarch)"
+color preproc  "(ifarch|ifnarch|ifos|ifnos)"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color statement    "%(if|else|endif|define|global|undefine)"
+color statement    "%_?([A-Z_a-z_0-9_]*)"
+color statement    start="%\{" end="\}"
+color statement    start="%\{__" end="\}"
+color statement "\$(RPM_BUILD_ROOT)\>"
+color special  "^%(build$|changelog|check$|clean$|description)"
+color special  "^%(files|install$|package|prep$)"
+color special  "^%(pre|preun|pretrans|post|postun|posttrans)"
+color special  "^%(trigger|triggerin|triggerpostun|triggerun|verifyscript)"
+color comment "(^|[[:space:]])#([^{].*)?$"
+color constant   "^\*.*$"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"
+color todo "TODO:?"

runtime/syntax/ruby.micro

@@ -9,7 +9,7 @@ color statement "\b(BEGIN|END|alias|and|begin|break|case|class|def|defined\?|do|
 color constant "(\$|@|@@)?\b[A-Z]+[0-9A-Z_a-z]*"
 color constant.number "\b[0-9]+\b"
 ## Ruby "symbols"
-color constant (i) "([ 	]|^):[0-9A-Z_]+\b"
+color constant  "(i?)([ 	]|^):[0-9A-Z_]+\b"
 ## Some unique things we want to stand out
 color constant "\b(__FILE__|__LINE__)\b"
 ## Regular expressions
@@ -28,7 +28,7 @@ color constant.string "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]
 color comment "#[^{].*$" "#$"
 color comment "##[^{].*$" "##$"
 ## "Here" docs
-color constant start="<<-?'?EOT'?" end="^EOT"
+color constant.macro start="<<-?'?EOT'?" end="^EOT"
 ## Some common markers
 color todo "(XXX|TODO|FIXME|\?\?\?)"
 

runtime/syntax/rust.micro

@@ -5,13 +5,13 @@
 syntax "rust" "\.rs"
 
 # function definition
-color identifier "fn [a-z0-9_]+"
+color identifier.class "fn [a-z0-9_]+"
 
 # Reserved words
 color statement "\b(abstract|alignof|as|become|box|break|const|continue|crate|do|else|enum|extern|false|final|fn|for|if|impl|in|let|loop|macro|match|mod|move|mut|offsetof|override|priv|pub|pure|ref|return|sizeof|static|self|struct|super|true|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\b"
 
 # macros
-color special "[a-z_]+!"
+color identifier.macro "[a-z_]+!"
 
 # Constants
 color constant "[A-Z][A-Z_]+"
@@ -26,7 +26,7 @@ color type "[A-Z][a-z]+"
 color constant.string "\".*\""
 color constant.string start="\".*\\$" end=".*\""
 # NOTE: This isn't accurate but matching "#{0,} for the end of the string is too liberal
-color green start="r#+\"" end="\"#+"
+color special start="r#+\"" end="\"#+"
 
 # Comments
 color comment "//.*"

runtime/syntax/scala.micro

@@ -1,12 +1,12 @@
 ## Here is an example for Scala.
 ##
 syntax "scala" "\.scala$"
-color green "\<(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\>"
-color red "\<(match|val|var|break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)\>"
-color cyan "\<(def|object|case|trait|lazy|implicit|abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile|sealed)\>"
-color red ""[^"]*""
-color yellow "\<(true|false|null)\>"
-color blue "//.*"
-color blue start="/\*" end="\*/"
-color brightblue start="/\*\*" end="\*/"
-color ,green "[[:space:]]+$"
+color type "\<(boolean|byte|char|double|float|int|long|new|short|this|transient|void)\>"
+color statement "\<(match|val|var|break|case|catch|continue|default|do|else|finally|for|if|return|switch|throw|try|while)\>"
+color statement "\<(def|object|case|trait|lazy|implicit|abstract|class|extends|final|implements|import|instanceof|interface|native|package|private|protected|public|static|strictfp|super|synchronized|throws|volatile|sealed)\>"
+color constant.string ""[^"]*""
+color constant "\<(true|false|null)\>"
+color comment "//.*"
+color comment start="/\*" end="\*/"
+color comment.bright start="/\*\*" end="\*/"
+color indent-char.whitespace "[[:space:]]+$"

runtime/syntax/sed.micro

@@ -1,9 +1,9 @@
 syntax "sed" "\.sed$"
 header "^#!.*bin/(env +)?sed( |$)"
 
-color red "[|^$.*+]"
-color brightyellow "\{[0-9]+,?[0-9]*\}"
-color magenta   "\\."
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color symbol.operator "[|^$.*+]"
+color constant.number "\{[0-9]+,?[0-9]*\}"
+color constant.specialChar   "\\."
+color comment "(^|[[:space:]])#([^{].*)?$"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/sh.micro

@@ -6,7 +6,7 @@ color constant.number "\b[0-9]+\b"
 
 # Conditionals and control flow
 color statement "\b(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\b"
-color special "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color symbol.operator "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
 
 # Shell commands
 color type "\b(cd|echo|export|let|set|umask|unset)\b"
@@ -24,12 +24,12 @@ color statement "\ -[a-z]+"
 # Strings
 color constant.string ""(\\.|[^"])*""
 color constant.string "'(\\.|[^'])*'"
-color special """
-color special "'"
+color constant.specialChar """
+color constant.specialChar "'"
 
 # Variables
-color identifier (i) "\$\{?[0-9A-Z_!@#$*?-]+\}?"
-color identifier (i) "\$\{?[0-9A-Z_!@#$*?-]+\}?"
+color identifier.var  "\$\{?[0-9A-Za-z_!@#$*?-]+\}?"
+color identifier.var  "\$\{?[0-9A-Za-z_!@#$*?-]+\}?"
 
 # Comments & TODOs
 color comment "(^|[[:space:]])#.*$"

runtime/syntax/sls.micro

@@ -4,23 +4,23 @@
 syntax "salt" "\.sls$"
 
 # Anything ending in a colon (:), including things that start with a dash (-)
-color blue "^[^ -].*:$"
-color blue ".*:"
+color identifier.var "^[^ -].*:$"
+color identifier.var ".*:"
 # Except for salt:// URLs
-color white "salt:"
+color default "salt:"
 
 # Numbers, etc
-color red "/*[0-9]/*"
-color red "\<(True|False)\>"
+color constant.number "/*[0-9]/*"
+color constant "\<(True|False)\>"
 
 # Anything between two single quotes
-color green ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
 
 # Matching keywords
-color yellow "\<(grain|grains|compound|pcre|grain_pcre|list|pillar)\>"
+color special "\<(grain|grains|compound|pcre|grain_pcre|list|pillar)\>"
 
 # Comments
-color brightblack "^#.*"
+color comment "^#.*"
 
 # Logic keywords
-color magenta "\<(if|elif|else|or|not|and|endif|end)\>"
+color statement "\<(if|elif|else|or|not|and|endif|end)\>"

runtime/syntax/solidity.micro

@@ -22,18 +22,18 @@ color identifier "[a-zA-Z][_a-zA-Z0-9]*[[:space:]]*"
 
 color statement "\b(assembly|break|continue|do|for|function|if|else|new|return|returns|while)\b"
 color special "\b(\.send|throw)\b" # make sure they are very visible
-color keyword "\b(anonymous|constant|indexed|payable|public|private|external|internal)\b"
+color type.keyword "\b(anonymous|constant|indexed|payable|public|private|external|internal)\b"
 
 color constant "\b(block(\.(blockhash|coinbase|difficulty|gaslimit|number|timestamp))?|msg(\.(data|gas|sender|value))?|now|tx(\.(gasprice|origin))?)\b"
 color constant "\b(keccak256|sha3|sha256|ripemd160|ecrecover|addmod|mulmod|this|super|selfdestruct|\.balance)\b"
 
-color constant "\b(true|false)\b"
+color constant.bool "\b(true|false)\b"
 color constant "\b(wei|szabo|finney|ether|seconds|minutes|hours|days|weeks|years)\b"
 color type "\b(address|bool|mapping|string|var|int(\d*)|uint(\d*)|byte(\d*)|fixed(\d*)|ufixed(\d*))\b"
 
 color error "\b(abstract|after|case|catch|default|final|in|inline|interface|let|match|null|of|pure|relocatable|static|switch|try|type|typeof|view)\b"
 
-color operator "[-+/*=<>!~%?:&|]"
+color symbol.operator "[-+/*=<>!~%?:&|]"
 
 color comment "(^|[[:space:]])//.*"
 color comment "/\*.+\*/"

runtime/syntax/sql.micro

@@ -1,34 +1,34 @@
 syntax "sql" "\.sql$" "sqliterc$"
 
-cyan (i) "\<(ALL|ASC|AS|ALTER|AND|ADD|AUTO_INCREMENT)\>"
-cyan (i) "\<(BETWEEN|BINARY|BOTH|BY|BOOLEAN)\>"
-cyan (i) "\<(CHANGE|CHECK|COLUMNS|COLUMN|CROSS|CREATE)\>"
-cyan (i) "\<(DATABASES|DATABASE|DATA|DELAYED|DESCRIBE|DESC|DISTINCT|DELETE|DROP|DEFAULT)\>"
-cyan (i) "\<(ENCLOSED|ESCAPED|EXISTS|EXPLAIN)\>"
-cyan (i) "\<(FIELDS|FIELD|FLUSH|FOR|FOREIGN|FUNCTION|FROM)\>"
-cyan (i) "\<(GROUP|GRANT|HAVING)\>"
-cyan (i) "\<(IGNORE|INDEX|INFILE|INSERT|INNER|INTO|IDENTIFIED|IN|IS|IF)\>"
-cyan (i) "\<(JOIN|KEYS|KILL|KEY)\>"
-cyan (i) "\<(LEADING|LIKE|LIMIT|LINES|LOAD|LOCAL|LOCK|LOW_PRIORITY|LEFT|LANGUAGE)\>"
-cyan (i) "\<(MODIFY|NATURAL|NOT|NULL|NEXTVAL)\>"
-cyan (i) "\<(OPTIMIZE|OPTION|OPTIONALLY|ORDER|OUTFILE|OR|OUTER|ON)\>"
-cyan (i) "\<(PROCEDURE|PROCEDURAL|PRIMARY)\>"
-cyan (i) "\<(READ|REFERENCES|REGEXP|RENAME|REPLACE|RETURN|REVOKE|RLIKE|RIGHT)\>"
-cyan (i) "\<(SHOW|SONAME|STATUS|STRAIGHT_JOIN|SELECT|SETVAL|SET)\>"
-cyan (i) "\<(TABLES|TERMINATED|TO|TRAILING|TRUNCATE|TABLE|TEMPORARY|TRIGGER|TRUSTED)\>"
-cyan (i) "\<(UNIQUE|UNLOCK|USE|USING|UPDATE|VALUES|VARIABLES|VIEW)\>"
-cyan (i) "\<(WITH|WRITE|WHERE|ZEROFILL|TYPE|XOR)\>"
-color green     "\<(VARCHAR|TINYINT|TEXT|DATE|SMALLINT|MEDIUMINT|INT|INTEGER|BIGINT|FLOAT|DOUBLE|DECIMAL|DATETIME|TIMESTAMP|TIME|YEAR|UNSIGNED|CHAR|TINYBLOB|TINYTEXT|BLOB|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT|ENUM|BOOL|BINARY|VARBINARY)\>"
+color statement (i) "\b(ALL|ASC|AS|ALTER|AND|ADD|AUTO_INCREMENT)\b"
+color statement (i) "\b(BETWEEN|BINARY|BOTH|BY|BOOLEAN)\b"
+color statement (i) "\b(CHANGE|CHECK|COLUMNS|COLUMN|CROSS|CREATE)\b"
+color statement (i) "\b(DATABASES|DATABASE|DATA|DELAYED|DESCRIBE|DESC|DISTINCT|DELETE|DROP|DEFAULT)\b"
+color statement (i) "\b(ENCLOSED|ESCAPED|EXISTS|EXPLAIN)\b"
+color statement (i) "\b(FIELDS|FIELD|FLUSH|FOR|FOREIGN|FUNCTION|FROM)\b"
+color statement (i) "\b(GROUP|GRANT|HAVING)\b"
+color statement (i) "\b(IGNORE|INDEX|INFILE|INSERT|INNER|INTO|IDENTIFIED|IN|IS|IF)\b"
+color statement (i) "\b(JOIN|KEYS|KILL|KEY)\b"
+color statement (i) "\b(LEADING|LIKE|LIMIT|LINES|LOAD|LOCAL|LOCK|LOW_PRIORITY|LEFT|LANGUAGE)\b"
+color statement (i) "\b(MODIFY|NATURAL|NOT|NULL|NEXTVAL)\b"
+color statement (i) "\b(OPTIMIZE|OPTION|OPTIONALLY|ORDER|OUTFILE|OR|OUTER|ON)\b"
+color statement (i) "\b(PROCEDURE|PROCEDURAL|PRIMARY)\b"
+color statement (i) "\b(READ|REFERENCES|REGEXP|RENAME|REPLACE|RETURN|REVOKE|RLIKE|RIGHT)\b"
+color statement (i) "\b(SHOW|SONAME|STATUS|STRAIGHT_JOIN|SELECT|SETVAL|SET)\b"
+color statement (i) "\b(TABLES|TERMINATED|TO|TRAILING|TRUNCATE|TABLE|TEMPORARY|TRIGGER|TRUSTED)\b"
+color statement (i) "\b(UNIQUE|UNLOCK|USE|USING|UPDATE|VALUES|VARIABLES|VIEW)\b"
+color statement (i) "\b(WITH|WRITE|WHERE|ZEROFILL|TYPE|XOR)\b"
+color type     "\b(VARCHAR|TINYINT|TEXT|DATE|SMALLINT|MEDIUMINT|INT|INTEGER|BIGINT|FLOAT|DOUBLE|DECIMAL|DATETIME|TIMESTAMP|TIME|YEAR|UNSIGNED|CHAR|TINYBLOB|TINYTEXT|BLOB|MEDIUMBLOB|MEDIUMTEXT|LONGBLOB|LONGTEXT|ENUM|BOOL|BINARY|VARBINARY)\b"
 
 # SQLite meta commands
-cyan (i) "\.\<(databases|dump|echo|exit|explain|header(s)?|help)\>"
-cyan (i) "\.\<(import|indices|mode|nullvalue|output|prompt|quit|read)\>"
-cyan (i) "\.\<(schema|separator|show|tables|timeout|width)\>"
-color brightcyan  "\<(ON|OFF)\>"
+color preproc (i) "\.\b(databases|dump|echo|exit|explain|header(s)?|help)\b"
+color preproc (i) "\.\b(import|indices|mode|nullvalue|output|prompt|quit|read)\b"
+color preproc (i) "\.\b(schema|separator|show|tables|timeout|width)\b"
+color constant.bool  "\b(ON|OFF)\b"
 
-color blue   "\<([0-9]+)\>"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color yellow   "`(\\.|[^\\`])*`"
-color brightblack  "\-\-.*$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color constant.number   "\b([0-9]+)\b"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant.string   "`(\\.|[^\\`])*`"
+color comment  "\-\-.*$"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/swift.micro

@@ -1,11 +1,11 @@
 ##############################################################################
-# Swift syntax highlighting for Nano.
+# Swift syntax highlighting for Micro.
 ##############################################################################
 
 syntax "swift" "\.swift$"
 
 # Operators
-color statement "[.:;,+*|=!?\%]" "<" ">" "/" "-" "&"
+color symbol.operator "[.:;,+*|=!?\%]" "<" ">" "/" "-" "&"
 
 # Statements
 color statement  "(class|import|let|var|struct|enum|func|if|else|switch|case|default|for|in|internal|external|unowned|private|public|throws)\ "
@@ -20,7 +20,7 @@ color constant.number "([0-9]+)"
 
 # Standard Types
 color type "\ ((U)?Int(8|16|32|64))"
-color constant "(true|false|nil)"
+color constant.bool "(true|false|nil)"
 color type "\ (Double|String|Float|Boolean|Dictionary|Array|Int)"
 color type "\ (AnyObject)"
 

runtime/syntax/systemd.micro

@@ -1,12 +1,12 @@
 syntax "systemd" "\.(service|socket)$"
 header "^\[Unit\]$"
 
-color cyan  "^(Accept|After|Alias|AllowIsolate|Also|ANSI_COLOR|_AUDIT_LOGINUID|_AUDIT_SESSION|Backlog|Before|BindIPv6Only|BindsTo|BindToDevice|BlockIOReadBandwidth|BlockIOWeight|BlockIOWriteBandwidth|_BOOT_ID|Broadcast|BUG_REPORT_URL|BusName|Capabilities|CapabilityBoundingSet|CHASSIS|cipher|class|_CMDLINE|CODE_FILE|CODE_FUNC|CODE_LINE|_COMM|Compress|ConditionACPower|ConditionCapability|ConditionDirectoryNotEmpty|ConditionFileIsExecutable|ConditionFileNotEmpty|ConditionHost|ConditionKernelCommandLine|ConditionNull|ConditionPathExists|ConditionPathExistsGlob|ConditionPathIsDirectory|ConditionPathIsMountPoint|ConditionPathIsReadWrite|ConditionPathIsSymbolicLink|ConditionSecurity|ConditionVirtualization|Conflicts|ControlGroup|ControlGroupAttribute|ControlGroupModify|ControlGroupPersistent|controllers|Controllers|CPE_NAME|CPUAffinity|CPUSchedulingPolicy|CPUSchedulingPriority|CPUSchedulingResetOnFork|CPUShares|CrashChVT|CrashShell|__CURSOR|debug|DefaultControllers|DefaultDependencies|DefaultLimitAS|DefaultLimitCORE|DefaultLimitCPU|DefaultLimitDATA|DefaultLimitFSIZE|DefaultLimitLOCKS|DefaultLimitMEMLOCK|DefaultLimitMSGQUEUE|DefaultLimitNICE|DefaultLimitNOFILE|DefaultLimitNPROC|DefaultLimitRSS|DefaultLimitRTPRIO|DefaultLimitRTTIME|DefaultLimitSIGPENDING|DefaultLimitSTACK|DefaultStandardError|DefaultStandardOutput|Description|DeviceAllow|DeviceDeny|DirectoryMode|DirectoryNotEmpty|Documentation|DumpCore|entropy|Environment|EnvironmentFile|ERRNO|event_timeout|_EXE|ExecReload|ExecStart|ExecStartPost|ExecStartPre|ExecStop|ExecStopPost|ExecStopPre|filter|FONT|FONT_MAP|FONT_UNIMAP|ForwardToConsole|ForwardToKMsg|ForwardToSyslog|FreeBind|freq|FsckPassNo|fstab|_GID|Group|GuessMainPID|HandleHibernateKey|HandleLidSwitch|HandlePowerKey|HandleSuspendKey|hash|HibernateKeyIgnoreInhibited|HOME_URL|_HOSTNAME|ICON_NAME|ID|IdleAction|IdleActionSec|ID_LIKE|ID_MODEL|ID_MODEL_FROM_DATABASE|IgnoreOnIsolate|IgnoreOnSnapshot|IgnoreSIGPIPE|InaccessibleDirectories|InhibitDelayMaxSec|init|IOSchedulingClass|IOSchedulingPriority|IPTOS|IPTTL|JobTimeoutSec|JoinControllers|KeepAlive|KEYMAP|KEYMAP_TOGGLE|KillExcludeUsers|KillMode|KillOnlyUsers|KillSignal|KillUserProcesses|LidSwitchIgnoreInhibited|LimitAS|LimitCORE|LimitCPU|LimitDATA|LimitFSIZE|LimitLOCKS|LimitMEMLOCK|LimitMSGQUEUE|LimitNICE|LimitNOFILE|LimitNPROC|LimitRSS|LimitRTPRIO|LimitRTTIME|LimitSIGPENDING|LimitSTACK|link_priority|valueListenDatagram|ListenFIFO|ListenMessageQueue|ListenNetlink|ListenSequentialPacket|ListenSpecial|ListenStream|LogColor|LogLevel|LogLocation|LogTarget|luks|_MACHINE_ID|MakeDirectory|Mark|MaxConnections|MaxFileSec|MaxLevelConsole|MaxLevelKMsg|MaxLevelStore|MaxLevelSyslog|MaxRetentionSec|MemoryLimit|MemorySoftLimit|MESSAGE|MESSAGE_ID|MessageQueueMaxMessages|MessageQueueMessageSize|__MONOTONIC_TIMESTAMP|MountFlags|NAME|NAutoVTs|Nice|NonBlocking|NoNewPrivileges|NotifyAccess|OnActiveSec|OnBootSec|OnCalendar|OnFailure|OnFailureIsolate|OnStartupSec|OnUnitActiveSec|OnUnitInactiveSec|OOMScoreAdjust|Options|output|PAMName|PartOf|PassCredentials|PassSecurity|PathChanged|PathExists|PathExistsGlob|PathModified|PermissionsStartOnly|_PID|PIDFile|PipeSize|PowerKeyIgnoreInhibited|PRETTY_HOSTNAME|PRETTY_NAME|Priority|PRIORITY|PrivateNetwork|PrivateTmp|PropagatesReloadTo|pss|RateLimitBurst|RateLimitInterval|ReadOnlyDirectories|ReadWriteDirectories|__REALTIME_TIMESTAMP|ReceiveBuffer|RefuseManualStart|RefuseManualStop|rel|ReloadPropagatedFrom|RemainAfterExit|RequiredBy|Requires|RequiresMountsFor|RequiresOverridable|Requisite|RequisiteOverridable|ReserveVT|ResetControllers|Restart|RestartPreventExitStatus|RestartSec|RootDirectory|RootDirectoryStartOnly|RuntimeKeepFree|RuntimeMaxFileSize|RuntimeMaxUse|RuntimeWatchdogSec|samples|scale_x|scale_y|Seal|SecureBits|_SELINUX_CONTEXT|SendBuffer|SendSIGKILL|Service|ShowStatus|ShutdownWatchdogSec|size|SmackLabel|SmackLabelIPIn|SmackLabelIPOut|SocketMode|Sockets|SourcePath|_SOURCE_REALTIME_TIMESTAMP|SplitMode|StandardError|StandardInput|StandardOutput|StartLimitAction|StartLimitBurst|StartLimitInterval|static_node|StopWhenUnneeded|Storage|string_escape|none|replaceSuccessExitStatus|SupplementaryGroups|SUPPORT_URL|SuspendKeyIgnoreInhibited|SyslogFacility|SYSLOG_FACILITY|SyslogIdentifier|SYSLOG_IDENTIFIER|SyslogLevel|SyslogLevelPrefix|SYSLOG_PID|SystemCallFilter|SYSTEMD_ALIAS|_SYSTEMD_CGROUP|_SYSTEMD_OWNER_UID|SYSTEMD_READY|_SYSTEMD_SESSION|_SYSTEMD_UNIT|_SYSTEMD_USER_UNIT|SYSTEMD_WANTS|SystemKeepFree|SystemMaxFileSize|SystemMaxUse|SysVStartPriority|TCPCongestion|TCPWrapName|timeout|TimeoutSec|TimeoutStartSec|TimeoutStopSec|TimerSlackNSec|Transparent|_TRANSPORT|tries|TTYPath|TTYReset|TTYVHangup|TTYVTDisallocate|Type|_UID|UMask|Unit|User|UtmpIdentifier|VERSION|VERSION_ID|WantedBy|Wants|WatchdogSec|What|Where|WorkingDirectory)="
-color brightblue "^\.include\>"
-color red "="
-color brightmagenta  "^\[(Unit|Install|Service|Socket)\]"
-color brightyellow "\$MAINPID"
-color brightcyan "\<(true|false)\>"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color statement  "^(Accept|After|Alias|AllowIsolate|Also|ANSI_COLOR|_AUDIT_LOGINUID|_AUDIT_SESSION|Backlog|Before|BindIPv6Only|BindsTo|BindToDevice|BlockIOReadBandwidth|BlockIOWeight|BlockIOWriteBandwidth|_BOOT_ID|Broadcast|BUG_REPORT_URL|BusName|Capabilities|CapabilityBoundingSet|CHASSIS|cipher|class|_CMDLINE|CODE_FILE|CODE_FUNC|CODE_LINE|_COMM|Compress|ConditionACPower|ConditionCapability|ConditionDirectoryNotEmpty|ConditionFileIsExecutable|ConditionFileNotEmpty|ConditionHost|ConditionKernelCommandLine|ConditionNull|ConditionPathExists|ConditionPathExistsGlob|ConditionPathIsDirectory|ConditionPathIsMountPoint|ConditionPathIsReadWrite|ConditionPathIsSymbolicLink|ConditionSecurity|ConditionVirtualization|Conflicts|ControlGroup|ControlGroupAttribute|ControlGroupModify|ControlGroupPersistent|controllers|Controllers|CPE_NAME|CPUAffinity|CPUSchedulingPolicy|CPUSchedulingPriority|CPUSchedulingResetOnFork|CPUShares|CrashChVT|CrashShell|__CURSOR|debug|DefaultControllers|DefaultDependencies|DefaultLimitAS|DefaultLimitCORE|DefaultLimitCPU|DefaultLimitDATA|DefaultLimitFSIZE|DefaultLimitLOCKS|DefaultLimitMEMLOCK|DefaultLimitMSGQUEUE|DefaultLimitNICE|DefaultLimitNOFILE|DefaultLimitNPROC|DefaultLimitRSS|DefaultLimitRTPRIO|DefaultLimitRTTIME|DefaultLimitSIGPENDING|DefaultLimitSTACK|DefaultStandardError|DefaultStandardOutput|Description|DeviceAllow|DeviceDeny|DirectoryMode|DirectoryNotEmpty|Documentation|DumpCore|entropy|Environment|EnvironmentFile|ERRNO|event_timeout|_EXE|ExecReload|ExecStart|ExecStartPost|ExecStartPre|ExecStop|ExecStopPost|ExecStopPre|filter|FONT|FONT_MAP|FONT_UNIMAP|ForwardToConsole|ForwardToKMsg|ForwardToSyslog|FreeBind|freq|FsckPassNo|fstab|_GID|Group|GuessMainPID|HandleHibernateKey|HandleLidSwitch|HandlePowerKey|HandleSuspendKey|hash|HibernateKeyIgnoreInhibited|HOME_URL|_HOSTNAME|ICON_NAME|ID|IdleAction|IdleActionSec|ID_LIKE|ID_MODEL|ID_MODEL_FROM_DATABASE|IgnoreOnIsolate|IgnoreOnSnapshot|IgnoreSIGPIPE|InaccessibleDirectories|InhibitDelayMaxSec|init|IOSchedulingClass|IOSchedulingPriority|IPTOS|IPTTL|JobTimeoutSec|JoinControllers|KeepAlive|KEYMAP|KEYMAP_TOGGLE|KillExcludeUsers|KillMode|KillOnlyUsers|KillSignal|KillUserProcesses|LidSwitchIgnoreInhibited|LimitAS|LimitCORE|LimitCPU|LimitDATA|LimitFSIZE|LimitLOCKS|LimitMEMLOCK|LimitMSGQUEUE|LimitNICE|LimitNOFILE|LimitNPROC|LimitRSS|LimitRTPRIO|LimitRTTIME|LimitSIGPENDING|LimitSTACK|link_priority|valueListenDatagram|ListenFIFO|ListenMessageQueue|ListenNetlink|ListenSequentialPacket|ListenSpecial|ListenStream|LogColor|LogLevel|LogLocation|LogTarget|luks|_MACHINE_ID|MakeDirectory|Mark|MaxConnections|MaxFileSec|MaxLevelConsole|MaxLevelKMsg|MaxLevelStore|MaxLevelSyslog|MaxRetentionSec|MemoryLimit|MemorySoftLimit|MESSAGE|MESSAGE_ID|MessageQueueMaxMessages|MessageQueueMessageSize|__MONOTONIC_TIMESTAMP|MountFlags|NAME|NAutoVTs|Nice|NonBlocking|NoNewPrivileges|NotifyAccess|OnActiveSec|OnBootSec|OnCalendar|OnFailure|OnFailureIsolate|OnStartupSec|OnUnitActiveSec|OnUnitInactiveSec|OOMScoreAdjust|Options|output|PAMName|PartOf|PassCredentials|PassSecurity|PathChanged|PathExists|PathExistsGlob|PathModified|PermissionsStartOnly|_PID|PIDFile|PipeSize|PowerKeyIgnoreInhibited|PRETTY_HOSTNAME|PRETTY_NAME|Priority|PRIORITY|PrivateNetwork|PrivateTmp|PropagatesReloadTo|pss|RateLimitBurst|RateLimitInterval|ReadOnlyDirectories|ReadWriteDirectories|__REALTIME_TIMESTAMP|ReceiveBuffer|RefuseManualStart|RefuseManualStop|rel|ReloadPropagatedFrom|RemainAfterExit|RequiredBy|Requires|RequiresMountsFor|RequiresOverridable|Requisite|RequisiteOverridable|ReserveVT|ResetControllers|Restart|RestartPreventExitStatus|RestartSec|RootDirectory|RootDirectoryStartOnly|RuntimeKeepFree|RuntimeMaxFileSize|RuntimeMaxUse|RuntimeWatchdogSec|samples|scale_x|scale_y|Seal|SecureBits|_SELINUX_CONTEXT|SendBuffer|SendSIGKILL|Service|ShowStatus|ShutdownWatchdogSec|size|SmackLabel|SmackLabelIPIn|SmackLabelIPOut|SocketMode|Sockets|SourcePath|_SOURCE_REALTIME_TIMESTAMP|SplitMode|StandardError|StandardInput|StandardOutput|StartLimitAction|StartLimitBurst|StartLimitInterval|static_node|StopWhenUnneeded|Storage|string_escape|none|replaceSuccessExitStatus|SupplementaryGroups|SUPPORT_URL|SuspendKeyIgnoreInhibited|SyslogFacility|SYSLOG_FACILITY|SyslogIdentifier|SYSLOG_IDENTIFIER|SyslogLevel|SyslogLevelPrefix|SYSLOG_PID|SystemCallFilter|SYSTEMD_ALIAS|_SYSTEMD_CGROUP|_SYSTEMD_OWNER_UID|SYSTEMD_READY|_SYSTEMD_SESSION|_SYSTEMD_UNIT|_SYSTEMD_USER_UNIT|SYSTEMD_WANTS|SystemKeepFree|SystemMaxFileSize|SystemMaxUse|SysVStartPriority|TCPCongestion|TCPWrapName|timeout|TimeoutSec|TimeoutStartSec|TimeoutStopSec|TimerSlackNSec|Transparent|_TRANSPORT|tries|TTYPath|TTYReset|TTYVHangup|TTYVTDisallocate|Type|_UID|UMask|Unit|User|UtmpIdentifier|VERSION|VERSION_ID|WantedBy|Wants|WatchdogSec|What|Where|WorkingDirectory)="
+color preproc "^\.include\>"
+color symbol "="
+color special  "^\[(Unit|Install|Service|Socket)\]"
+color identifier.class "\$MAINPID"
+color constant.bool "\<(true|false)\>"
+color comment "(^|[[:space:]])#([^{].*)?$"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/tcl.micro

@@ -2,23 +2,23 @@ syntax "tcl" "\.tcl$"
 header "^#!.*/(env +)?tclsh( |$)"
 
 ## Standard Tcl [info commands]
-color cyan "\<(after|append|array|auto_execok|auto_import|auto_load|auto_load_index|auto_qualify|binary|break|case|catch|cd|clock|close|concat|continue|else|encoding|eof|error|eval|exec|exit|expr|fblocked|fconfigure|fcopy|file|fileevent|flush|for|foreach|format|gets|glob|global|history|if|incr|info|interp|join|lappend|lindex|linsert|list|llength|load|lrange|lreplace|lsearch|lset|lsort|namespace|open|package|pid|puts|pwd|read|regexp|regsub|rename|return|scan|seek|set|socket|source|split|string|subst|switch|tclLog|tell|time|trace|unknown|unset|update|uplevel|upvar|variable|vwait|while)\>"
+color statement "\<(after|append|array|auto_execok|auto_import|auto_load|auto_load_index|auto_qualify|binary|break|case|catch|cd|clock|close|concat|continue|else|encoding|eof|error|eval|exec|exit|expr|fblocked|fconfigure|fcopy|file|fileevent|flush|for|foreach|format|gets|glob|global|history|if|incr|info|interp|join|lappend|lindex|linsert|list|llength|load|lrange|lreplace|lsearch|lset|lsort|namespace|open|package|pid|puts|pwd|read|regexp|regsub|rename|return|scan|seek|set|socket|source|split|string|subst|switch|tclLog|tell|time|trace|unknown|unset|update|uplevel|upvar|variable|vwait|while)\>"
 ## Basic Tcl sub commands
-color cyan "\<(array anymore|array donesearch|array exists|array get|array names|array nextelement|array set|array size|array startsearch|array statistics|array unset)\>"
-color cyan "\<(string bytelength|string compare|string equal|string first|string index|string is|string last|string length|string map|string match|string range|string repeat|string replace|string to|string tolower|string totitle|string toupper|string trim|string trimleft|string trimright|string will|string wordend|string wordstart)\>"
+color statement "\b(array anymore|array donesearch|array exists|array get|array names|array nextelement|array set|array size|array startsearch|array statistics|array unset)\b"
+color statement "\b(string bytelength|string compare|string equal|string first|string index|string is|string last|string length|string map|string match|string range|string repeat|string replace|string to|string tolower|string totitle|string toupper|string trim|string trimleft|string trimright|string will|string wordend|string wordstart)\b"
 ## Extended TclX [info commands]
-color cyan "\<(alarm|auto_load_pkg|bsearch|catclose|catgets|catopen|ccollate|cconcat|cequal|chgrp|chmod|chown|chroot|cindex|clength|cmdtrace|commandloop|crange|csubstr|ctoken|ctype|dup|echo|execl|fcntl|flock|fork|fstat|ftruncate|funlock|host_info|id|infox|keyldel|keylget|keylkeys|keylset|kill|lassign|lcontain|lempty|lgets|link|lmatch|loadlibindex|loop|lvarcat|lvarpop|lvarpush|max|min|nice|pipe|profile|random|readdir|replicate|scancontext|scanfile|scanmatch|select|server_accept|server_create|signal|sleep|sync|system|tclx_findinit|tclx_fork|tclx_load_tndxs|tclx_sleep|tclx_system|tclx_wait|times|translit|try_eval|umask|wait)\>"
+color statement "\b(alarm|auto_load_pkg|bsearch|catclose|catgets|catopen|ccollate|cconcat|cequal|chgrp|chmod|chown|chroot|cindex|clength|cmdtrace|commandloop|crange|csubstr|ctoken|ctype|dup|echo|execl|fcntl|flock|fork|fstat|ftruncate|funlock|host_info|id|infox|keyldel|keylget|keylkeys|keylset|kill|lassign|lcontain|lempty|lgets|link|lmatch|loadlibindex|loop|lvarcat|lvarpop|lvarpush|max|min|nice|pipe|profile|random|readdir|replicate|scancontext|scanfile|scanmatch|select|server_accept|server_create|signal|sleep|sync|system|tclx_findinit|tclx_fork|tclx_load_tndxs|tclx_sleep|tclx_system|tclx_wait|times|translit|try_eval|umask|wait)\b"
 ## Function declaration
-color brightblue "proc[[:space:]]" "(\{|\})"
+color identifier.class "proc[[:space:]]" "(\{|\})"
 ## Syntax
-color green "(\(|\)|\;|`|\\|\$|<|>|!|=|&|\|)"
+color symbol.operator "(\(|\)|\;|`|\\|\$|<|>|!|=|&|\|)"
 ## Numbers
-color brightyellow "\<[0-9]+(\.[0-9]+)?\>"
+color constant.number "\b[0-9]+(\.[0-9]+)?\b"
 ## Strings
-color yellow ""(\\.|[^"])*"" "'(\\.|[^'])*'"
+color constant.string ""(\\.|[^"])*"" "'(\\.|[^'])*'"
 ## Variables
-brightred (i) "\$\{?[0-9A-Z_!@#$*?-]+\}?"
+color identifier.var "\$\{?[0-9A-Z_!@#$*?-]+\}?"
 ## Comments
-color magenta "(^|;)[[:space:]]*#.*"
+color comment "(^|;)[[:space:]]*#.*"
 ## Trailing whitespace
-color ,blue "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"

runtime/syntax/tex.micro

@@ -8,13 +8,13 @@ color identifier start="\[" end="\]"
 ## numbers
 color constant.number "\b[0-9]+(\.[0-9]+)?([[:space:]](pt|mm|cm|in|ex|em|bp|pc|dd|cc|nd|nc|sp))?\b"
 
-## let brackets have the default color again
-color default "[{}\[\]]"
+## let brackets be colored on their own.
+color symbol.brackets "[{}\[\]]"
 
 color special "[&\\]"
 
 ## macros
-color statement "\\@?[a-zA-Z_]+"
+color identifier.macro "\\@?[a-zA-Z_]+"
 
 ## commments
 color comment "%.*"

runtime/syntax/toml.micro

@@ -5,7 +5,7 @@ color statement "(.*)[[:space:]]="
 color special "="
 
 # Bracket thingies
-color special "(\[|\])"
+color symbol.brackets "(\[|\])"
 
 # Numbers and strings
 color constant.number "\b([0-9]+|0x[0-9a-fA-F]*)\b|'.'"

runtime/syntax/typescript.micro

@@ -3,17 +3,17 @@ syntax "typescript" "\.ts$"
 color constant.number   "\b[-+]?([1-9][0-9]*|0[0-7]*|0x[0-9a-fA-F]+)([uU][lL]?|[lL][uU]?)?\b"
 color constant.number   "\b[-+]?([0-9]+\.[0-9]*|[0-9]*\.[0-9]+)([EePp][+-]?[0-9]+)?[fFlL]?"
 color constant.number   "\b[-+]?([0-9]+[EePp][+-]?[0-9]+)[fFlL]?"
-color identifier "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]"
+color identifier.class "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[(]"
 color statement  "\b(abstract|as|async|await|break|case|catch|class|const|constructor|continue)\b"
 color statement  "\b(debugger|declare|default|delete|do|else|enum|export|extends|finally|for|from)\b"
 color statement  "\b(function|get|if|implements|import|in|instanceof|interface|is|let|module|namespace)\b"
 color statement  "\b(new|of|package|private|protected|public|require|return|set|static|super|switch)\b"
 color statement  "\b(this|throw|try|type|typeof|var|void|while|with|yield)\b"
-color constant  "\b(false|true|null|undefined|NaN)\b"
+color constant.bool  "\b(false|true|null|undefined|NaN)\b"
 color type     "\b(Array|Boolean|Date|Enumerator|Error|Function|Math)\b"
 color type     "\b(Number|Object|RegExp|String|Symbol)\b"
 color type     "\b(any|boolean|never|number|string|symbol)\b"
-color statement "[-+/*=<>!~%?:&|]"
+color symbol.operator "[-+/*=<>!~%?:&|]"
 color constant   "/[^*]([^/]|(\\/))*[^\\]/[gim]*"
 color constant   "\\[0-7][0-7]?[0-7]?|\\x[0-9a-fA-F]+|\\[bfnrt'"\?\\]"
 color comment "(^|[[:space:]])//.*"

runtime/syntax/vala.micro

@@ -1,18 +1,18 @@
 syntax "vala" "\.vala$"
 
-color green     "\<(float|double|bool|char|int|uint|short|long|void|(un)?signed)\>"
-color brightblue "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
-color cyan  "\<(for|if|while|do|else|case|default|switch|try|throw|catch)\>"
-color cyan  "\<(inline|typedef|struct|enum|union|extern|static|const)\>"
-color cyan  "\<(operator|new|delete|return|null)\>"
-color cyan  "\<(class|override|private|public|signal|this|weak)\>"
-color brightred     "\<(goto|break|continue)\>"
-color brightcyan "\<(true|false)\>"
-color blue   "\<([0-9]+)\>"
-color red "[-+/*=<>?:!~%&|]" "->"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightblack "(^|[[:space:]])//.*"
-color brightblack start="/\*" end="\*/"
-color brightwhite,cyan "TODO:?"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color type     "\<(float|double|bool|char|int|uint|short|long|void|(un)?signed)\>"
+color identifier.class "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
+color statement  "\<(for|if|while|do|else|case|default|switch|try|throw|catch)\>"
+color statement  "\<(inline|typedef|struct|enum|union|extern|static|const)\>"
+color statement  "\<(operator|new|delete|return|null)\>"
+color statement  "\<(class|override|private|public|signal|this|weak)\>"
+color special     "\<(goto|break|continue)\>"
+color constant.bool "\<(true|false)\>"
+color constant.number   "\<([0-9]+)\>"
+color symbol.operator "[-+/*=<>?:!~%&|]" "->"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color comment "(^|[[:space:]])//.*"
+color comment start="/\*" end="\*/"
+color todo "TODO:?"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/vhdl.micro

@@ -2,48 +2,48 @@
 syntax "vhdl" "\.vhdl?$"
 
 ## types
-color type (i) "\b(string|integer|natural|positive|(un)?signed|std_u?logic(_vector)?|bit(_vector)?|boolean|u?x01z?|array|range)\b"
+color type  "(i)\b(string|integer|natural|positive|(un)?signed|std_u?logic(_vector)?|bit(_vector)?|boolean|u?x01z?|array|range)\b"
 
 ## identifiers (component-, library-names etc.)
-color identifier (i) "library[[:space:]]+[a-zA-Z_0-9]+"
-color identifier (i) "use[[:space:]]+[a-zA-Z_0-9\.]+"
-color identifier (i) "component[[:space:]]+[a-zA-Z_0-9]+"
-color identifier (i) "(architecture|configuration)[[:space:]]+[a-zA-Z_0-9]+[[:space:]]+of[[:space:]]+[a-zA-Z_0-9]+"
-color identifier (i) "(entity|package)[[:space:]]+[a-zA-Z_0-9]+[[:space:]]+is"
-color identifier (i) "end[[:space:]]+((architecture|entity|component|process|package|generate)[[:space:]]+)?[a-zA-Z_0-9]+"
+color identifier  "(?i)library[[:space:]]+[a-zA-Z_0-9]+"
+color identifier  "(?i)use[[:space:]]+[a-zA-Z_0-9\.]+"
+color identifier  "(?i)component[[:space:]]+[a-zA-Z_0-9]+"
+color identifier  "(?i)(architecture|configuration)[[:space:]]+[a-zA-Z_0-9]+[[:space:]]+of[[:space:]]+[a-zA-Z_0-9]+"
+color identifier  "(?i)(entity|package)[[:space:]]+[a-zA-Z_0-9]+[[:space:]]+is"
+color identifier  "(?i)end[[:space:]]+((architecture|entity|component|process|package|generate)[[:space:]]+)?[a-zA-Z_0-9]+"
 
 ## reserved words
-color statement (i) "\b(abs|access|after|alias|all|and|architecture|assert|attribute)\b"
-color statement (i) "\b(begin|block|body|buffer|bus|case|component|configuration|constant)\b"
-color statement (i) "\b(disconnect|downto|else|elsif|end|entity|exit)\b"
-color statement (i) "\b(file|for|function|generate|generic|guarded)\b"
-color statement (i) "\b(if|impure|in|inertial|inout|is)\b"
-color statement (i) "\b(label|library|linkage|literal|loop|map|mod)\b"
-color statement (i) "\b(nand|new|next|nor|not|null|of|on|open|or|others|out)\b"
-color statement (i) "\b(package|port|postponed|procedure|process|pure)\b"
-color statement (i) "\b(range|record|register|reject|rem|report|return|rol|ror)\b"
-color statement (i) "\b(select|severity|shared|signal|sla|sll|sra|srl|subtype)\b"
-color statement (i) "\b(then|to|transport|type|unaffected|units|until|use)\b"
-color statement (i) "\b(variable|wait|when|while|with|xnor|xor)\b"
+color statement  "(?i)\b(abs|access|after|alias|all|and|architecture|assert|attribute)\b"
+color statement  "(?i)\b(begin|block|body|buffer|bus|case|component|configuration|constant)\b"
+color statement  "(?i)\b(disconnect|downto|else|elsif|end|entity|exit)\b"
+color statement  "(?i)\b(file|for|function|generate|generic|guarded)\b"
+color statement  "(?i)\b(if|impure|in|inertial|inout|is)\b"
+color statement  "(?i)\b(label|library|linkage|literal|loop|map|mod)\b"
+color statement  "(?i)\b(nand|new|next|nor|not|null|of|on|open|or|others|out)\b"
+color statement  "(?i)\b(package|port|postponed|procedure|process|pure)\b"
+color statement  "(?i)\b(range|record|register|reject|rem|report|return|rol|ror)\b"
+color statement  "(?i)\b(select|severity|shared|signal|sla|sll|sra|srl|subtype)\b"
+color statement  "(?i)\b(then|to|transport|type|unaffected|units|until|use)\b"
+color statement  "(?i)\b(variable|wait|when|while|with|xnor|xor)\b"
 
 ## attributes
-color statement (i) "'(base|left|right|high|low|pos|val|succ|pred|leftof|rightof|image|(last_)?value)"
-color statement (i) "'((reverse_)?range|length|ascending|event|stable)"
-color statement (i) "'(simple|path|instance)_name"
+color statement  "(?i)'(base|left|right|high|low|pos|val|succ|pred|leftof|rightof|image|(last_)?value)"
+color statement  "(?i)'((reverse_)?range|length|ascending|event|stable)"
+color statement  "(?i)'(simple|path|instance)_name"
 
 ## library functions
-color statement (i) "\b(std_match|(rising|falling)_edge|is_x)\b"
-color statement (i) "\bto_(unsigned|signed|integer|u?x01z?|stdu?logic(vector)?)\b"
+color statement  "(?i)\b(std_match|(rising|falling)_edge|is_x)\b"
+color statement  "(?i)\bto_(unsigned|signed|integer|u?x01z?|stdu?logic(vector)?)\b"
 
 ## operators
-color statement "(\+|-|\*|/|&|<|>|=|\.|:)"
+color symbol.operator "(\+|-|\*|/|&|<|>|=|\.|:)"
 
 ## constants
-color constant.number (i) "'([0-1]|u|x|z|w|l|h|-)'" "[box]?"([0-1a-fA-F]|u|x|z|w|l|h|-)+""
-color constant.number (i) "\b[0-9\._]+(e[-]?[0-9]+)?( ?[fpnum]?s)?\b"
-color constant (i) "\b(true|false)\b"
+color constant.number  "(?i)'([0-1]|u|x|z|w|l|h|-)'" "[box]?"([0-1a-fA-F]|u|x|z|w|l|h|-)+""
+color constant.number  "(?i)\b[0-9\._]+(e[-]?[0-9]+)?( ?[fpnum]?s)?\b"
+color constant.bool  "(?i)\b(true|false)\b"
 ## severity levels
-color constant (i) "\b(note|warning|error|failure)\b"
+color constant  "(?i)\b(note|warning|error|failure)\b"
 color constant.string ""[^"]*""
 
 ## Comment highlighting

runtime/syntax/vi.micro

@@ -3,7 +3,7 @@ syntax "vi" "(^|/|\.)(ex|vim)rc$|\.vim"
 color identifier "[A-Za-z_][A-Za-z0-9_]*[[:space:]]*[()]"
 color statement  "\b([nvxsoilc]?(nore|un)?map|[nvlx]n|[ico]?no|[cilovx][um]|s?unm)\b"
 color statement  "\b(snor|nun|nm|set|if|endif|let|unlet)\b"
-color statement "[!&=]"
+color symbol.operator "[!&=]"
 color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color constant.number "\b[0-9]+\b"
 color comment  "(^|[[:space:]])\"[^"]*$"

runtime/syntax/xml.micro

@@ -1,7 +1,7 @@
 ## Here is an example for xml files.
 
 syntax "xml" "\.(xml|sgml?|rng|plist)$"
-color identifier "<.*?>"
-color comment start="<!DOCTYPE" end="[/]?>"
-color comment start="<!--" end="-->"
+color symbol.tag "<.*?>"
+color preproc start="<!DOCTYPE" end="[/]?>"
+color comment "<!--.+?-->"
 color special    "&[^;]*;"

runtime/syntax/xresources.micro

@@ -1,10 +1,10 @@
 syntax "xresources" "X(defaults|resources)$"
 
-color green     "^[[:alnum:]]+\*"
-color brightyellow "\*[[:alnum:]]+\:"
-color blue   "\<[0-9]+\>"
-color red "[*:=]"
-color brightcyan "\<(true|false)\>"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color special     "^[[:alnum:]]+\*"
+color identifier.var "\*[[:alnum:]]+\:"
+color constant.number   "\<[0-9]+\>"
+color symbol.operator "[*:=]"
+color constant.bool "\<(true|false)\>"
+color comment "(^|[[:space:]])#([^{].*)?$"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/yaml.micro

@@ -2,11 +2,14 @@ syntax "yaml" "\.ya?ml$"
 header "%YAML"
 
 color type     "(^| )!!(binary|bool|float|int|map|null|omap|seq|set|str) "
-color constant  "\b(YES|yes|Y|y|ON|on|NO|no|N|n|OFF|off)\b"
-color constant "\b(true|false)\b"
-color statement "\[" "\]" ":[[:space:]]+[|>]" "^[[:space:]]*- "
+color constant.bool.true  "\b(YES|yes|Y|y|ON|on)\b"
+color constant.bool.false "\b(NO|no|N|n|OFF|off)\b"
+color constant.bool.true "\b(true)\b"
+color constant.bool.false "\b(false)\b"
+color statement ":[[:space:]]" "\[" "\]" ":[[:space:]]+[|>]" "^[[:space:]]*- "
 color identifier "[[:space:]][\*&][A-Za-z0-9]+"
 color type "([-\w\.\/]+[[:space:]]*:\s+)|([-\w\.\/]+[[:space:]]*:$)"
 color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
 color comment "(^|[[:space:]])#([^{].*)?$"
 color special  "^---" "^\.\.\." "^%YAML" "^%TAG"
+color indent-char.whitespace "  $"

runtime/syntax/yum.micro

@@ -1,8 +1,8 @@
 syntax "yum" "\.repo$|yum.*\.conf$"
 
-color cyan "^[[:space:]]*[^=]*="
-color brightmagenta "^[[:space:]]*\[.*\]$"
-color brightyellow "\$(releasever|arch|basearch|uuid|YUM[0-9])"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color identifier "^[[:space:]]*[^=]*="
+color constant.specialChar "^[[:space:]]*\[.*\]$"
+color statement "\$(releasever|arch|basearch|uuid|YUM[0-9])"
+color comment "(^|[[:space:]])#([^{].*)?$"
+color indent-char.whitespace "[[:space:]]+$"
+color indent-char "	+ +| +	+"

runtime/syntax/zsh.micro

@@ -3,40 +3,40 @@ syntax "zsh" "\.zsh$" "\.?(zshenv|zprofile|zshrc|zlogin|zlogout|zsh-theme)$"
 header "^#!.*/(env +)?zsh( |$)"
 
 ## Numbers
-color brightyellow "\b[0-9]+\b"
+color constant.number "\b[0-9]+\b"
 
 ## Conditionals and control flow
-color green "\<(always|break|bye|case|continue|disown|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\>"
+color statement "\b(always|break|bye|case|continue|disown|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\b"
 
-color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color symbol.operator "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
 ## Conditional flags
-color green "-[Ldefgruwx]\>"
-color green "-(eq|ne|gt|lt|ge|le|s|n|z)\>"
+color statement "-[Ldefgruwx]\b"
+color statement "-(eq|ne|gt|lt|ge|le|s|n|z)\b"
 
 ## Bash-inherited
-color brightblue "\<((un)?alias|bindkey|builtin|cd|declare|eval|exec|export|jobs|let|popd|pushd|set|source|typeset|umask|unset)\>"
+color preproc "\b((un)?alias|bindkey|builtin|cd|declare|eval|exec|export|jobs|let|popd|pushd|set|source|typeset|umask|unset)\b"
 ## ZSH-specific
-color brightblue "\<(add-zsh-hook|autoload|chdir|compinit|dirs|(dis|en)able|echotc|emulate|print|prompt(init)?|(un)?setopt|zle|zmodload|zstyle|whence)\>"
+color preproc "\b(add-zsh-hook|autoload|chdir|compinit|dirs|(dis|en)able|echotc|emulate|print|prompt(init)?|(un)?setopt|zle|zmodload|zstyle|whence)\b"
 
 ## Common linux commands
-color brightmagenta "\<((g|ig)?awk|find|\w{0,4}grep|kill|killall|\w{0,4}less|make|pkill|sed|tar)\>"
+color special "\b((g|ig)?awk|find|\w{0,4}grep|kill|killall|\w{0,4}less|make|pkill|sed|tar)\b"
 
 ## Coreutils commands
-color brightmagenta "\<(base64|basename|cat|chcon|chgrp|chmod|chown|chroot|cksum|comm|cp|csplit|cut|date|dd|df|dir|dircolors|dirname|du|echo|env|expand|expr|factor|false|fmt|fold|head|hostid|id|install|join|link|ln|logname|ls|md5sum|mkdir|mkfifo|mknod|mktemp|mv|nice|nl|nohup|nproc|numfmt|od|paste|pathchk|pinky|pr|printenv|printf|ptx|pwd|readlink|realpath|rm|rmdir|runcon|seq|(sha1|sha224|sha256|sha384|sha512)sum|shred|shuf|sleep|sort|split|stat|stdbuf|stty|sum|sync|tac|tail|tee|test|timeout|touch|tr|true|truncate|tsort|tty|uname|unexpand|uniq|unlink|users|vdir|wc|who|whoami|yes)\>"
+color type "\b(base64|basename|cat|chcon|chgrp|chmod|chown|chroot|cksum|comm|cp|csplit|cut|date|dd|df|dir|dircolors|dirname|du|echo|env|expand|expr|factor|false|fmt|fold|head|hostid|id|install|join|link|ln|logname|ls|md5sum|mkdir|mkfifo|mknod|mktemp|mv|nice|nl|nohup|nproc|numfmt|od|paste|pathchk|pinky|pr|printenv|printf|ptx|pwd|readlink|realpath|rm|rmdir|runcon|seq|(sha1|sha224|sha256|sha384|sha512)sum|shred|shuf|sleep|sort|split|stat|stdbuf|stty|sum|sync|tac|tail|tee|test|timeout|touch|tr|true|truncate|tsort|tty|uname|unexpand|uniq|unlink|users|vdir|wc|who|whoami|yes)\b"
 
 ## Function definition
-brightgreen (i) "^\s+(function\s+)[0-9A-Z_]+\s+\(\)"
+color identifier.class "^\s+(function\s+)[0-9A-Z_]+\s+\(\)"
 
 ## Variables
-brightred (i) "\$\{?[0-9A-Z_!@#$*?-]+\}?"
+color identifier.var "\$\{?[0-9A-Z_!@#$*?-]+\}?"
 
 ## Strings
-color yellow ""(\\.|[^"])*""
-color yellow "'(\\.|[^'])*'"
+color constant.string ""(\\.|[^"])*""
+color constant.string "'(\\.|[^'])*'"
 
 ## Comments
-color cyan "(^|[[:space:]])#.*$"
-color brightcyan "(^|[[:space:]])##.*$"
+color comment "(^|[[:space:]])#.*$"
+color comment.bright "(^|[[:space:]])##.*$"
 
 ## Trailing spaces
-color ,blue "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"