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.

cmd/micro/bindings.go

@@ -414,8 +414,8 @@ func DefaultBindings() map[string]string {
 		"CtrlV":          "Paste",
 		"CtrlA":          "SelectAll",
 		"CtrlT":          "AddTab",
-		"CtrlRightSq":    "PreviousTab",
+		"Alt,":           "PreviousTab",
-		"CtrlBackslash":  "NextTab",
+		"Alt.":           "NextTab",
 		"Home":           "StartOfLine",
 		"End":            "EndOfLine",
 		"CtrlHome":       "CursorStart",
@@ -444,6 +444,7 @@ func DefaultBindings() map[string]string {
 		// Integration with file managers
 		"F1":  "ToggleHelp",
 		"F2":  "Save",
+		"F3":  "Find",
 		"F4":  "Quit",
 		"F7":  "Find",
 		"F10": "Quit",

runtime/colorschemes/atom-dark-tc.micro

@@ -12,6 +12,7 @@ color-link underlined "#D33682,#1D1F21"
 color-link error "bold #FF4444,#1D1F21"
 color-link todo "bold #FF8844,#1D1F21"
 color-link statusline "#1D1F21,#C5C8C6"
+color-link tabbar "#1D1F21,#C5C8C6"
 color-link indent-char "#505050,#1D1F21"
 color-link line-number "#656866,#232526"
 color-link current-line-number "#656866,#1D1F21"
@@ -19,3 +20,7 @@ color-link gutter-error "#FF4444,#1D1F21"
 color-link gutter-warning "#EEEE77,#1D1F21"
 color-link cursor-line "#2D2F31"
 color-link color-column "#2D2F31"
+#No extended types (bool in C, etc.)
+color-link type.extended "default"
+#Plain brackets
+color-link symbol.brackets "default"

runtime/colorschemes/bubblegum.micro

@@ -12,10 +12,13 @@ color-link special "167,231"
 color-link error "231, 160"
 color-link underlined "underline 241,231"
 color-link todo "246,231"
-
 color-link statusline "241,254"
+color-link tabbar "241,254"
 color-link gutter-error "197,231"
 color-link gutter-warning "134,231"
 color-link line-number "246,254"
 color-link cursor-line "254"
 color-link color-column "254"
+#No extended types (bool in C, &c.) and plain brackets
+color-link type.extended "default"
+color-link symbol.brackets "default"

runtime/colorschemes/cmc-16.micro

@@ -0,0 +1,38 @@
+#CaptainMcClellan's personal color scheme.
+#16 colour version.
+color-link comment "bold black"
+color-link constant "cyan"
+color-link constant.bool "bold cyan"
+color-link constant.bool.true "bold green"
+color-link constant.bool.false "bold red"
+color-link constant.string "yellow"
+color-link constant.string.url "underline blue, white"
+#color-link constant.number "constant"
+color-link constant.specialChar "bold magenta"
+color-link identifier "bold red"
+color-link identifier.macro "bold red"
+color-link identifier.var "bold blue"
+#color-link identifier.class "bold green"
+color-link identifier.class "bold white"
+color-link statement "bold yellow"
+color-link symbol "red"
+color-link symbol.brackets "blue"
+color-link symbol.tag "bold blue"
+color-link preproc "bold cyan"
+color-link type "green"
+color-link type.keyword "bold green"
+color-link special "magenta"
+color-link ignore "default"
+color-link error "bold ,brightred"
+color-link todo "underline black,brightyellow"
+color-link indent-char ",brightgreen"
+color-link line-number "green"
+color-link line-number.scrollbar "green"
+color-link statusline "white,blue"
+color-link tabbar "white,blue"
+color-link current-line-number "red"
+color-link current-line-number.scroller "red"
+color-link gutter-error ",red"
+color-link gutter-warning "red"
+color-link color-column "cyan"
+color-link underlined.url "underline blue, white"

runtime/colorschemes/cmc-paper.micro

@@ -0,0 +1,37 @@
+#CaptainMcClellan's personal color scheme.
+#Paper version
+color-link default "black,white"
+color-link comment "bold black"
+color-link constant "cyan"
+color-link constant.bool "bold cyan"
+color-link constant.bool.true "bold green"
+color-link constant.bool.false "bold red"
+color-link constant.string "bold yellow"
+color-link constant.string.url "underline blue, white"
+color-link constant.number "constant"
+color-link constant.specialChar "bold magenta"
+color-link identifier "bold red"
+color-link identifier.macro "bold red"
+color-link identifier.var "bold blue"
+color-link identifier.class "bold green"
+color-link preproc "bold cyan"
+color-link statement "bold yellow"
+color-link symbol "red"
+color-link symbol.brackets "blue"
+color-link type "green"
+color-link type.keyword "bold green"
+color-link special "magenta"
+color-link ignore "default"
+color-link error ",brightred"
+color-link todo "black,brightyellow"
+color-link indent-char ",brightgreen"
+color-link line-number "green"
+color-link line-number.scrollbar "green"
+color-link statusline "white,blue"
+color-link tabbar "white,blue"
+color-link current-line-number "red"
+color-link current-line-number.scroller "red"
+color-link gutter-error ",red"
+color-link gutter-warning "red"
+color-link color-column "cyan"
+color-link underlined.url "underline blue, white"

runtime/colorschemes/cmc-tc.micro

@@ -0,0 +1,36 @@
+#CaptainMcClellan's personal colour scheme.
+#Full colour edition.
+color-link default "#aaaaaa,#1e2124"
+color-link comment "bold #555555"
+color-link constant "#008888"
+#color-link constant.string "#888800"
+color-link constant.string "#a85700"
+color-link constant.specialChar "bold #ccccff"
+color-link identifier "bold #e34234"
+color-link identifier.macro "bold #e34234"
+color-link identifier.var "bold #5757ff"
+color-link identifier.class "bold #ffffff"
+color-link statement "bold #ffff55"
+color-link symbol "#722f37"
+color-link symbol.brackets "#4169e1"
+color-link symbol.tag "#5757ff"
+color-link preproc "bold #55ffff"
+color-link type "#3eb489"
+color-link type.keyword "bold #bdecb6"
+color-link special "#b57edc"
+color-link ignore "default"
+color-link error "bold ,#e34234"
+color-link todo "bold underline #888888,#f26522"
+color-link indent-char ",#bdecb6"
+color-link line-number "#bdecb6,#36393e"
+color-link line-number.scrollbar "#3eb489"
+color-link statusline "#aaaaaa,#8a496b"
+color-link tabbar "#aaaaaa,#8a496b"
+color-link current-line-number "bold #e34234,#424549"
+color-link current-line-number.scroller "red"
+color-link gutter-error ",#e34234"
+color-link gutter-warning "#e34234"
+color-link color-column "#f26522"
+color-link constant.bool "bold #55ffff"
+color-link constant.bool.true "bold #85ff85"
+color-link constant.bool.false "bold #ff8585"

runtime/colorschemes/codeblocks-paper.micro

@@ -0,0 +1,25 @@
+#A colorscheme based on Code::Blocks IDE
+#but with a white background.
+color-link default "black,white"
+color-link comment "bold black"
+color-link constant "blue"
+color-link constant.number "bold magenta"
+color-link constant.string "bold blue"
+color-link identifier "black"
+color-link preproc "green"
+color-link statement "blue"
+color-link symbol "red"
+color-link symbol.brackets "blue"
+color-link type "blue"
+color-link special "magenta"
+color-link ignore "default"
+color-link error "bold white,brightred"
+color-link todo "bold black,brightyellow"
+color-link indent-char "bold black"
+color-link line-number "black,white"
+color-link statusline "white,red"
+color-link tabbar "white,red"
+color-link current-line-number "red,black"
+color-link gutter-error ",red"
+color-link gutter-warning "red"
+color-link color-column "black"

runtime/colorschemes/codeblocks.micro

@@ -0,0 +1,23 @@
+#Theme based on Code::Blocks IDE's default syntax highlighting.
+color-link comment "bold black"
+color-link constant "blue"
+color-link constant.string "bold blue"
+color-link constant.number "bold magenta"
+color-link identifier "default"
+color-link preproc "green"
+color-link statement "blue"
+color-link symbol "red"
+color-link symbol.brackets "blue"
+color-link type "blue"
+color-link special "magenta"
+color-link ignore "default"
+color-link error ",brightred"
+color-link todo "bold black,brightyellow"
+color-link indent-char "bold black"
+color-link line-number "black,white"
+color-link statusline "white,red"
+color-link tabbar "white,red"
+color-link current-line-number "red"
+color-link gutter-error ",red"
+color-link gutter-warning "red"
+color-link color-column "white"

runtime/colorschemes/default.micro

@@ -14,6 +14,7 @@ color-link underlined "#D33682,#282828"
 color-link error "bold #CB4B16,#282828"
 color-link todo "bold #D33682,#282828"
 color-link statusline "#282828,#F8F8F2"
+color-link tabbar "#282828,#f8f8f2"
 color-link indent-char "#505050,#282828"
 color-link line-number "#AAAAAA,#323232"
 color-link current-line-number "#AAAAAA,#282828"
@@ -21,3 +22,6 @@ color-link gutter-error "#CB4B16,#282828"
 color-link gutter-warning "#E6DB74,#282828"
 color-link cursor-line "#323232"
 color-link color-column "#323232"
+#No extended types; plain brackets
+color-link type.extended "default"
+color-link symbol.brackets "default"

runtime/colorschemes/flamepoint-tc.micro

@@ -0,0 +1,30 @@
+#Flamepoint theme
+#By CaptainMcClellan
+color-link default ""
+color-link comment ""
+color-link constant ""
+color-link constant.bool ""
+color-link constant.bool.true ""
+color-link constant.bool.false ""
+color-link constant.number ""
+color-link constant.specialChar ""
+color-link constant.string ""
+color-link constant.string.url "underline"
+color-link identifier ""
+color-link identifier.var ""
+color-link preproc ""
+color-link special ""
+color-link statement ""
+color-link symbol ""
+color-link symbol.brackets ""
+color-link symbol.tag ""
+color-link type ""
+color-link type.keyword ""
+color-link error ""
+color-link todo ""
+color-link cursor-line "" 
+color-link statusline ""
+color-link tabbar ""
+color-link color-column ""
+color-link gutter-error ""
+color-link gutter-warning ""

runtime/colorschemes/funky-cactus-tc.micro

@@ -0,0 +1 @@
+#Funky Cactus theme in true colour.

runtime/colorschemes/funky-cactus.micro

@@ -0,0 +1,33 @@
+#Funky Cactus theme
+color-link comment "bold black"
+color-link constant "cyan"
+color-link constant.bool "bold cyan"
+color-link constant.bool.true "bold green"
+color-link constant.bool.false "bold red"
+color-link constant.string "yellow"
+color-link constant.number "constant"
+color-link constant.specialChar "bold magenta"
+color-link identifier "bold red"
+color-link identifier.macro "bold red"
+color-link identifier.var "bold blue"
+color-link identifier.class "bold green"
+color-link preproc "bold cyan"
+color-link statement "bold yellow"
+color-link symbol "red"
+color-link symbol.brackets "blue"
+color-link type "green"
+color-link type.keyword "bold green"
+color-link special "magenta"
+color-link ignore "default"
+color-link error "bold ,brightred"
+color-link todo "underline ,brightyellow"
+color-link indent-char "bold ,brightgreen"
+color-link line-number "green"
+color-link line-number.scrollbar "green"
+color-link statusline "black,green"
+color-link tabbar "black,magenta"
+color-link current-line-number "bold magenta" 
+color-link current-line-number.scroller "red"
+color-link gutter-error ",red"
+color-link gutter-warning "red"
+color-link color-column "bold green"

runtime/colorschemes/gameboy-tc.micro

@@ -0,0 +1,23 @@
+#Gameboy theme
+color-link default "#3f3f3f,#bfc180"
+color-link comment "#7d7343"
+color-link constant "#7d7343"
+color-link identifier "#ddde7d"
+color-link preproc "#ddde7d,#7d7343"
+color-link special "#7d7343"
+color-link statement "#7d7343"
+color-link symbol "#7d7343"
+color-link type "#7d7343"
+color-link error "#ddde7d,#7d7343"
+color-link todo "#7d7343,#ddde7d"
+color-link statusline "#ddde7d,#7d7343"
+color-link tabbar "#ddde7d,#7d7343"
+color-link color-column "#7d7343"
+color-link line-number "#ddde7d,#7d7343"
+color-link current-line-number "#3f3f3f,#bfc180"
+color-link gutter-error "#ddde7d,#7d7343"
+color-link gutter-warning "default"
+#3f3f3f
+#7d7343
+#bfc180
+#ddde76

runtime/colorschemes/geany-alt-tc.micro

@@ -0,0 +1,21 @@
+#Geany Alternate theme
+color-link default "#000000,#fefefe"
+color-link comment "#808080"
+color-link constant "default"
+color-link constant.bool "#003030"
+color-link constant.number "#300008"
+color-link constant.string "#008000"
+color-link identifier "default"
+color-link preproc "#bbbb77"
+color-link special "#003030"
+color-link statement "#003030"
+color-link symbol "#300008"
+color-link symbol.tag "bold #4e9d71"
+color-link type "#003030"
+color-link error "#a52a2a"
+color-link todo "#ffa500"
+color-link line-number "#000000,#d0d0d0"
+color-link current-line-number "#000000,#d0d0d0"
+color-link color-column "#c2ebc2"
+color-link cursor-line "#f0f0f0"
+color-link type.extended "default"

runtime/colorschemes/geany.micro

@@ -0,0 +1,23 @@
+#Geany
+color-link comment "red"
+color-link constant "default"
+color-link constant.number
+color-link constant.string "bold yellow"
+color-link identifier "default"
+color-link preproc "cyan"
+color-link special "blue"
+color-link statement "blue"
+color-link symbol "default"
+color-link symbol.tag "bold blue"
+color-link type "blue"
+color-link type.extended "default"
+color-link error "red"
+color-link todo "bold cyan"
+color-link indent-char "bold black"
+color-link line-number ""
+color-link current-line-number ""
+color-link statusline "black,white"
+color-link tabbar "black,white"
+color-link color-column "bold geren"
+color-link gutter-error ",red"
+color-link gutter-warning "red"

runtime/colorschemes/github-tc.micro

@@ -0,0 +1,24 @@
+#True color theme based on Github's syntax highlighting.
+#Warning, this is based on how it rendered in my Firefox!
+#Yours may look different.
+color-link comment "bold #969896"
+color-link constant "#0086B9"
+color-link constant.number "#0086B9"
+color-link constant.specialChar "bold #1836BD"
+color-link constant.string "bold #1836BD"
+color-link constant.bool "#0086B9"
+color-link identifier "#A71D5D"
+color-link preproc "bold #A71D5D"
+color-link special "#A71D5D"
+color-link statement "#A71D5D"
+color-link symbol "default"
+color-link type "#A71D5D"
+color-link error "bold ,#E34234"
+color-link todo "white"
+color-link indent-char "default"
+color-link line-number "bold #969896"
+color-link current-line-number "bold #969896"
+color-link gutter-error "bold ,#E34234"
+color-link gutter-warning "bold #f26522"
+color-link statusline "bold #c8c9cb,#24292e"
+color-link tabbar "bold #c8c9cb,#24292e"

runtime/colorschemes/github.micro

@@ -0,0 +1,24 @@
+#Theme based on Github's syntax highlighting.
+color-link comment "bold black"
+color-link constant "cyan"
+color-link constant.number "cyan"
+color-link constant.specialChar "bold blue"
+color-link constant.string "bold blue"
+color-link constant.bool "cyan"
+color-link identifier "magenta"
+color-link preproc "bold magenta"
+color-link special "magenta"
+color-link statement "magenta"
+color-link symbol "default"
+color-link type "magenta"
+color-link error "bold ,brightred"
+color-link todo "white"
+color-link indent-char "default"
+color-link line-number "bold black"
+color-link current-line-number "bold black"
+color-link gutter-error ",red"
+color-link gutter-warning "bold yellow"
+color-link statusline "bold white,black"
+color-link tabbar "bold white,black"
+#Plain brackets.
+#color-link symbol.brackets "default"

runtime/colorschemes/gruvbox-tc.micro

@@ -17,3 +17,5 @@ color-link line-number "#665c54,#282828"
 color-link current-line-number "#665c54,#3c3836"
 color-link cursor-line "#3c3836"
 color-link color-column "#79740e"
+color-link statusline "#ebdbb2,#665c54"
+color-link tabbar "#ebdbb2,#665c54"

runtime/colorschemes/gruvbox.micro

@@ -15,3 +15,5 @@ color-link line-number "243,237"
 color-link current-line-number "172,237"
 color-link cursor-line "237"
 color-link color-column "237"
+color-link statusline "223,237"
+color-link tabbar "223,237"

runtime/colorschemes/mc.micro

@@ -0,0 +1,27 @@
+#Midnight Commander inspired theme.
+color-link default "white,blue"
+color-link comment "bold black"
+color-link constant "bold white"
+color-link constant.string "bold yellow"
+color-link identifier "bold red"
+color-link statement "bold cyan"
+color-link symbol "white"
+color-link symbol.brackets "white"
+color-link symbol.tag "bold green"
+color-link preproc "black,cyan"
+color-link type "green"
+color-link special "magenta"
+color-link ignore "default"
+color-link error ",brightred"
+color-link todo ",brightyellow"
+color-link indent-char ",cyan"
+color-link line-number "green"
+color-link line-number.scrollbar "white"
+color-link statusline "black,cyan"
+color-link tabbar "black,cyan"
+color-link current-line-number "black,cyan"
+color-link current-line-number.scroller "cyan"
+color-link cursor-line "black,cyan"
+color-link gutter-error ",red"
+color-link gutter-warning "red"
+color-link color-column "cyan"

runtime/colorschemes/monochrome-paper.micro

@@ -0,0 +1,5 @@
+#Monochrome Paper theme.
+#Edit your files on a white background without colors.
+color-link default "black,white"
+color-link statusline "white,black"
+color-link tabbar "white,black"

runtime/colorschemes/monochrome.micro

@@ -0,0 +1,3 @@
+#Monochrome
+#This makes micro use only the terminal's default
+# foreground and background colours.

runtime/colorschemes/monokai.micro

@@ -13,6 +13,7 @@ color-link underlined "#D33682,#282828"
 color-link error "bold #CB4B16,#282828"
 color-link todo "bold #D33682,#282828"
 color-link statusline "#282828,#F8F8F2"
+color-link tabbar "#282828,#F8F8F2"
 color-link indent-char "#505050,#282828"
 color-link line-number "#AAAAAA,#323232"
 color-link current-line-number "#AAAAAA,#282828"
@@ -20,3 +21,6 @@ color-link gutter-error "#CB4B16,#282828"
 color-link gutter-warning "#E6DB74,#282828"
 color-link cursor-line "#323232"
 color-link color-column "#323232"
+#No extended types; Plain brackets.
+color-link type.extended "default"
+color-link symbol.brackets "default"

runtime/colorschemes/nano.micro

@@ -0,0 +1,30 @@
+#Colorscheme styled after default Debian nano.
+color-link comment "bold blue"
+color-link comment.bright "cyan"
+color-link constant "red"
+color-link constant.bool "yellow"
+color-link constant.bool.true "bold green"
+color-link constant.bool.false "bold red"
+color-link constant.number "default"
+color-link constant.specialChar "bold magenta"
+color-link constant.string "bold yellow"
+color-link identifier "bold blue"
+color-link identifier.macro "bold red"
+color-link statement "bold green" 
+color-link symbol "green"
+#color-link symbol.tag "blue"
+color-link preproc "brightcyan"
+color-link type "green"
+color-link special "magenta"
+color-link ignore "default"
+color-link error "white,black"
+color-link todo "bold cyan"
+color-link indent-char ",green"
+color-link line-number "default"
+color-link current-line-number "default"
+color-link gutter-error ",white"
+color-link gutter-warning "white"
+color-link cursor-line "default"
+color-link color-column "white"
+#No extended types ( bool in C ); Plain brackets
+color-link type.extended "default"

runtime/colorschemes/nes-tc.micro

@@ -0,0 +1,30 @@
+#NES
+#A color theme only using NES pallette colours
+color-link default ""
+color-link comment ""
+color-link constant ""
+color-link constant.bool ""
+color-link constant.bool.true ""
+color-link constant.bool.false ""
+color-link constant.number ""
+color-link constant.specialChar ""
+color-link constant.string ""
+color-link constant.string.url "underline"
+color-link identifier ""
+color-link identifier.var ""
+color-link preproc ""
+color-link special ""
+color-link statement ""
+color-link symbol ""
+color-link symbol.brackets ""
+color-link symbol.tag ""
+color-link type ""
+color-link type.keyword ""
+color-link error ""
+color-link todo ""
+color-link cursor-line "" 
+color-link statusline ""
+color-link tabbar ""
+color-link color-column ""
+color-link gutter-error ""
+color-link gutter-warning ""

runtime/colorschemes/paper-tc.micro

@@ -0,0 +1,22 @@
+#Paper theme, true color edition
+#Edit on an *actual* white background!
+color-link default "#000000,#efefef"
+color-link comment ""
+color-link constant ""
+color-link constant.string ""
+color-link constant.string.url "underline #0000dd"
+color-link identifier "" 
+color-link identifier.var ""
+color-link special ""
+color-link statement ""
+color-link symbol ""
+color-link symbol.brackets ""
+color-link symbol.tag ""
+color-link type ""
+color-link statusline ""
+color-link tabbar ""
+color-link error ""
+color-link todo ""
+color-link color-column ""
+color-link gutter-error ""
+color-link gutter-warning ""

runtime/colorschemes/paper.micro

@@ -0,0 +1,29 @@
+#Paper theme, Edit on a white background.
+color-link default "black,white"
+color-link comment "bold black"
+color-link constant "cyan"
+color-link constant.string "bold green"
+color-link identifier "blue"
+color-link identifier.macro "bold red"
+color-link identifier.var "bold blue"
+color-link identifier.class "bold green"
+color-link statement "green"
+color-link symbol "red"
+color-link symbol.brackets "default"
+color-link symbol.tag "bold blue"
+color-link preproc "bold cyan"
+color-link type "green"
+color-link special "magenta"
+color-link ignore "default"
+color-link error ",brightred"
+color-link todo ",brightyellow"
+color-link indent-char ",brightgreen"
+color-link line-number "black"
+color-link line-number.scrollbar "green"
+color-link statusline "white,black"
+color-link tabbar "white,black"
+color-link current-line-number "blue"
+color-link current-line-number.scroller "red"
+color-link gutter-error ",red"
+color-link gutter-warning "red"
+color-link color-column "black"

runtime/colorschemes/simple.micro

@@ -14,5 +14,10 @@ color-link line-number "yellow"
 color-link current-line-number "red"
 color-link gutter-error ",red"
 color-link gutter-warning "red"
-color-link cursor-line "white"
+#Cursor line causes readability issues. Disabled for now.
+#color-link cursor-line "white,black"
 color-link color-column "white"
+#No extended types. (bool in C)
+color-link type.extended "default"
+#No bracket highlighting.
+color-link symbol.brackets "default"

runtime/colorschemes/solarized-tc.micro

@@ -11,6 +11,7 @@ color-link underlined "#D33682,#002833"
 color-link error "bold #CB4B16,#002833"
 color-link todo "bold #D33682,#002833"
 color-link statusline "#003541,#839496"
+color-link tabbar "#003541,#839496"
 color-link indent-char "#586E75,#002833"
 color-link line-number "#586E75,#003541"
 color-link current-line-number "#586E75,#002833"
@@ -18,3 +19,5 @@ color-link gutter-error "#003541,#CB4B16"
 color-link gutter-warning "#CB4B16,#002833"
 color-link cursor-line "#003541"
 color-link color-column "#003541"
+color-link type.extended "default"
+color-link symbol.brackets "default"

runtime/colorschemes/solarized.micro

@@ -1,19 +1,22 @@
-color-link comment "brightgreen"
+color-link comment "bold brightgreen"
 color-link constant "cyan"
 color-link identifier "blue"
 color-link statement "green"
 color-link symbol "green"
-color-link preproc "brightred"
+color-link preproc "bold brightred"
 color-link type "yellow"
 color-link special "red"
 color-link underlined "magenta"
 color-link error "bold brightred"
 color-link todo "bold magenta"
 color-link statusline "black,brightblue"
+color-link tabbar "black,brightblue"
 color-link indent-char "black"
-color-link line-number "brightgreen,black"
+color-link line-number "bold brightgreen,black"
-color-link current-line-number "brightgreen,default"
+color-link current-line-number "bold brightgreen,default"
 color-link gutter-error "black,brightred"
 color-link gutter-warning "brightred,default"
 color-link cursor-line "black"
 color-link color-column "black"
+color-link type.extended "default"
+color-link symbol.brackets "default"

runtime/colorschemes/symbian-tc.micro

@@ -0,0 +1,23 @@
+#Symbian
+color-link default "#000000,#ff8a00"
+color-link comment "#8c0000"
+color-link constant "#8c0000"
+color-link identifier "#ffff8c"
+color-link preproc "#ffff8c,#8c0000"
+color-link special "#8c0000"
+color-link statement "#8c0000"
+color-link symbol "#8c0000"
+color-link type "#8c0000"
+color-link error "#ffff8c,#8c0000"
+color-link todo "#8c0000,#ffff8c"
+color-link statusline "#ffff8c,#8c0000"
+color-link tabbar "#ffff8c,#8c0000"
+color-link color-column "#8c0000"
+color-link line-number "#ffff8c,#8c0000"
+color-link current-line-number "#000000,#ff8a00"
+color-link gutter-error "#ffff8c,#8c0000"
+color-link gutter-warning "default"
+#000000
+#8c0000
+#ff8a00
+#ffff8c

runtime/colorschemes/zenburn.micro

@@ -13,6 +13,7 @@ color-link underlined "188,237"
 color-link error "115,236"
 color-link todo "bold 254,237"
 color-link statusline "186,236"
+color-link tabbar "186,236"
 color-link indent-char "238,237"
 color-link line-number "248,238"
 color-link gutter-error "237,174"

runtime/help/colors.md

@@ -12,6 +12,11 @@ Micro comes with a number of colorschemes by default. Here is the list:
 * simple: this is the simplest colorscheme. It uses 16 colors which are
   set by your terminal
 
+* mc: A 16-color theme based on the look and feel of GNU Midnight Commander.
+  This will look great used in conjunction with Midnight Commander.
+  
+* nano: A 16-color theme loosely based on GNU nano's syntax highlighting.   
+  
 * monokai: this is the monokai colorscheme; you may recognize it as
   Sublime Text's default colorscheme. It requires true color to
   look perfect, but the 256 color approximation looks very good as well.
@@ -29,15 +34,47 @@ Micro comes with a number of colorschemes by default. Here is the list:
 * atom-dark-tc: this colorscheme is based off of Atom's "dark" colorscheme.
   It requires true color to look good.
 
+* cmc-16: A very nice 16-color theme. Written by contributor CaptainMcClellan
+  (Collin Warren.) Licensed under the same license as the rest of the themes.
+
+* cmc-paper: Basically cmc-16, but on a white background. ( Actually light grey on most 
+  ANSI (16-color) terminals.)
+
+* cmc-tc: A true colour variant of the cmc theme. 
+  It requires true color to look its best. Use cmc-16 if your terminal doesn't support true color.
+
+* codeblocks: A colorscheme based on the Code::Blocks IDE's default syntax highlighting.
+
+* codeblocks-paper: Same as codeblocks, but on a white background. ( Actually light grey. )
+
+* github-tc: A colorscheme based on Github's syntax highlighting. Requires true color to look its best.
+
+* paper-tc: A nice minimalist theme with a light background, good for editing documents on.
+  Requires true color to look its best. Not to be confused with `-paper` suffixed themes.
+
+* geany: Colorscheme 
+
+* geany-alt-tc: Based on an alternate theme bundled with geany. 
+
+* flamepoint-tc: A fire inspired, high intensity true color theme written by CaptainMcClellan.
+  As with all the other `-tc` suffixed themes, it looks its best on a
+
 To enable one of these colorschemes just press CtrlE in micro and type `set colorscheme solarized`.
-(or whichever one you choose).
+(or whichever one you choose). You can also use `set colorscheme monochrome` if you'd prefer
+to have just the terminal's default foreground and background colors. 
+Note: This provides no syntax highlighting!
+
+See `help gimmickcolors` for a list of some true colour themes that are more 
+just for fun than for serious use. ( Though feel free if you want! )
 
 ---
 
+### Creating a Colorscheme
+
 Micro's colorschemes are also extremely simple to create. The default ones can be found
 [here](https://github.com/zyedidia/micro/tree/master/runtime/colorschemes).
 
-They are only about 18 lines in total.
+They are only about 18-30 lines in total.
 
 Basically to create the colorscheme you need to link highlight groups with actual colors.
 This is done using the `color-link` command.
@@ -84,7 +121,8 @@ If the user's terminal supports true color, then you can also specify colors exa
 their hex codes. If the terminal is not true color but micro is told to use a true color colorscheme
 it will attempt to map the colors to the available 256 colors.
 
-Generally colorschemes which require true color terminals to look good are marked with a `-tc` suffix.
+Generally colorschemes which require true color terminals to look good are marked with a `-tc` suffix
+and colorschemes which supply a white background are marked with a `-paper` suffix.
 
 ---
 
@@ -103,6 +141,7 @@ Here is a list of the colorscheme groups that you can use:
 * error
 * todo
 * statusline (color of the statusline)
+* tabbar ( color of the tabbar that lists open files.)
 * indent-char (color of the character which indicates tabs if the option is enabled)
 * line-number
 * gutter-error
@@ -110,13 +149,57 @@ Here is a list of the colorscheme groups that you can use:
 * cursor-line
 * current-line-number
 * color-column
+* ignore
 
-Colorschemes can be placed in the `~/.config/micro/colorschemes` directory to be used.
+Colorschemes must be placed in the `~/.config/micro/colorschemes` directory to be used.
+
+---
+
+In addition to the main colorscheme groups, there are subgroups that you can
+specify by adding `.subgroup` to the group. If you're creating your own
+custom syntax files, you can make use of your own subgroups.
+
+If micro can't match the subgroup, it'll default to the root group, so 
+it's safe and recommended to use subgroups in your custom syntax files.
+
+For example if `constant.string` is found in your colorscheme, micro will
+use that for highlighting strings. If it's not found, it will use constant 
+instead. Micro tries to match the largest set of groups it can find in the
+colorscheme definitions, so if, for examle `constant.bool.true` is found then
+micro will use that. If `constant.bool.true` is not found but `constant.bool`
+is found micro will use `constant.bool`. If not, it uses `constant`. 
+
+Here's a list of subgroups used in micro's built-in syntax files.
+
+* comment.bright ( Some filetypes have distinctions between types of comments.)
+* constant.bool
+* constant.bool.true
+* constant.bool.false
+* constant.number 
+* constant.specialChar
+* constant.string
+* constant.string.url 
+* identifier.class ( Also used for functions. )
+* identifier.macro
+* identifier.var
+* symbol.brackets ( {}()[] and sometimes <> )
+* symbol.operator ( Color operator symbols differently. )
+* symbol.tag ( For html tags, among other things.)
+* type.keyword ( If you want a special highlight for keywords like `private` )
+
+In the future, plugins may also be able to use color groups for styling.
 
 ### Syntax files
 
 The syntax files specify how to highlight certain languages.
 
+Micro's builtin syntax highlighting tries very hard to be sane, sensible
+and provide ample coverage of the meaningful elements of a language. Micro has
+syntax files built int for over 100 languages now. However, there may be 
+situations where you find Micro's highlighting to be insufficient or not to
+your liking. Good news is you can create syntax files (.micro extension), place them in 
+`~/.config/micro/syntax` and Micro will use those instead.
+
 The first statement in a syntax file will probably the syntax statement. This tells micro
 what language the syntax file is for and how to detect a file in that language.
 
@@ -156,3 +239,7 @@ Note that this regex only matches the current line. Here is an example for multi
 ```
 color comment start="/\*" end="\*/"
 ```
+
+Note: The format of syntax files will be changing with the view refactor.
+If this help file still retains this note but the syntax files are yaml
+please open an issue.

runtime/help/defaultkeys.md

@@ -0,0 +1,141 @@
+#Default Keys
+
+Below are simple charts of the default hotkeys and their functions.
+For more information about binding custom hotkeys or changing
+default bindings, please run `>help keybindings`
+
+Please remember that *all* keys here are rebindable!
+If you don't like it, you can change it!
+
+(We are not responsible for you forgetting what you bind keys to.
+ Do not open an issue because you forgot your keybindings.)
+
+#Power user
++--------+---------------------------------------------------------+
+| Ctrl+E | Switch to the micro command prompt to run a command.    |
+|        | (See `>help commands` for a list of commands. )         |
++--------+---------------------------------------------------------+
+| Ctrl+B | Run shell commands in micro's current working directory.|
++--------+---------------------------------------------------------+
+
+#Navigation
+
++--------+---------------------------------------------------------+
+| Key    | Description of function                                 |
+|--------+---------------------------------------------------------+
+| Arrows | Move the cursor around your current document.           |
+|        | (Yes this is rebindable to the vim keys if you want.)   |
++--------+---------------------------------------------------------+
+| Shift+ | Move and select text.                                   |
+| Arrows |                                                         |
++--------+---------------------------------------------------------+
+| Home   | Move to the beginning of the current line. (Naturally.) |
++--------+---------------------------------------------------------+
+| End    | Move to the end of the current line.                    |
++--------+---------------------------------------------------------+
+| PageUp | Move cursor up lines quickly.                           |
++--------+---------------------------------------------------------+
+| PageDn | Move cursor down lines quickly.                         |
++--------+---------------------------------------------------------+
+| Ctrl+L | Jump to line in current file. ( Prompts for line # )    |
++--------+---------------------------------------------------------+
+| Ctrl+W | Move between splits open in current tab.                |
+|        | (See vsplit and hsplit in `>help commands`)             |
++--------+---------------------------------------------------------+
+| Ctrl+T | Open a new tab.                                         |
++--------+---------------------------------------------------------+
+| Alt+,  | Move to the previous tab in the tablist.                |
+|        | (This works like moving between file buffers in nano)   |
++--------+---------------------------------------------------------+
+| Alt+.  | Move to the next tab in the tablist.                    |
++--------+---------------------------------------------------------+
+
+#Find Operations
+
++--------+---------------------------------------------------------+
+| Ctrl+F | Find text in current file. ( Prompts for text to find.) |
++--------+---------------------------------------------------------+
+| Ctrl+N | Find next instance of current search in current file.   |
++--------+---------------------------------------------------------+
+| Ctrl+P | Find prev instance of current search in current file.   |
++--------+---------------------------------------------------------+
+
+#File Operations
+
++--------+---------------------------------------------------------+
+| Ctrl+Q | Close current file. ( Quits micro if last file open. )  |
++--------+---------------------------------------------------------+
+| Ctrl+O | Open a file. ( Prompts you to input filename. )         |
++--------+---------------------------------------------------------+
+| Ctrl+S | Save current file.                                      |
++--------+---------------------------------------------------------+
+
+#Text operations
+
++--------+---------------------------------------------------------+
+| Ctrl+A | Select all text in current file.                        |
++--------+---------------------------------------------------------+
+| Ctrl+X | Cut selected text.                                      |
++--------+---------------------------------------------------------+
+| Ctrl+C | Copy selected text.                                     |
++--------+---------------------------------------------------------+
+| Ctrl+V | Paste selected text.                                    |
++--------+---------------------------------------------------------+
+| Ctrl+K | Cut current line. ( Can then be pasted with Ctrl+V)     |
++--------+---------------------------------------------------------+
+| Ctrl+D | Duplicate current line.                                 |
++--------+---------------------------------------------------------+
+| Ctrl+Z | Undo actions.                                           |
++--------+---------------------------------------------------------+
+| Ctrl+Y | Redo actions.                                           |
++--------+---------------------------------------------------------+
+
+#Other
++--------+---------------------------------------------------------+
+| Ctrl+G | Open the help file.                                     |
++--------+---------------------------------------------------------+
+| Ctrl+H | Alternate backspace.                                    |
+|        | (Some old terminals don't support the Backspace key .)  |
++--------+---------------------------------------------------------+
+| Ctrl+R | Toggle the line number ruler. ( On the lefthand side.)  |
++--------+---------------------------------------------------------+
+
+#Emacs style actions
+
++--------+---------------------------------------------------------+
+| Alt+F  | Move to the end of the next word. (To the next space.)  |
++--------+---------------------------------------------------------+
+| Alt+B  | Move to the beginning of the previous word.             |
++--------+---------------------------------------------------------+
+| Alt+A  | Alternate Home key. ( Move to beginning of line. )      |
++--------+---------------------------------------------------------+
+| Alt+E  | Alternate End key. ( Move to the end of line.)          |
++--------+---------------------------------------------------------+
+| Alt+P  | Move cursor up. ( Same as up key. )                     |
++--------+---------------------------------------------------------+
+| Alt+N  | Move cursor down. ( Same as down key. )                 |
++--------+---------------------------------------------------------+
+
+#Function keys.
+
+Warning! The function keys may not work in all terminals! 
++--------+---------------------------------------------------------+
+| F1     | Open help.                                              |
++--------+---------------------------------------------------------+
+| F2     | Save current file.                                      |
++--------+---------------------------------------------------------+
+| F3     | Find in current file. ( Same as Ctrl+F )                |
++--------+---------------------------------------------------------+
+| F4     | Close current file. (Quit if only file.)                |
++--------+---------------------------------------------------------+
+| F7     | Find in current file. (Same as Ctrl+F)                  |
++--------+---------------------------------------------------------+
+| F10    | Close current file.                                     |
++--------+---------------------------------------------------------+
+
+#Macros
+
+Micro supports the use of keyboard macros. Simply press Ctrl+U to
+begin recording a macro and press Ctrl+U to stop recording.
+
+Press Ctrl+J to run your recorded macro. 

runtime/help/gimmickcolors.md

@@ -0,0 +1,14 @@
+# Gimmick colors
+
+We have included a few colorschemes that are for fun:
+
+* funky-cactus: I don't know why I made this. (Written by CaptainMcClellan)
+* gameboy-tc: Colorscheme based on the olive green original Gameboy!
+* nes-tc: A colorscheme and syntax highlighting using only colors in the 
+  Nintendo Entertainment System color palette.
+* symbian-tc: Colorscheme based on SymbOS's GUI.
+* matrix: Pretend it's 1981 with a colorscheme based on a monochrome
+  IBM 5151. ( Does not include the ghosting and trailing. )
+
+Check the plugin repo periodically for gimmick-color extension packs
+and genuine additional themes.

runtime/help/help.md

@@ -1,5 +1,6 @@
 # Micro help text
 
+Thank you for downloading and using micro.
 Micro is a terminal-based text editor that aims to be easy to use and intuitive, 
 while also taking advantage of the full capabilities of modern terminals.
 
@@ -14,7 +15,9 @@ and you can see which commands are available by pressing tab, or by
 viewing the help topic `> help commands`. When I write `> ...` I mean press
 CtrlE and then type whatever is there. 
 
-Move the cursor around with the mouse or the arrow keys.
+Move the cursor around with the mouse or the arrow keys. Type `>help defaultkeys` to 
+get a quick, easy overview of the default hotkeys and what they do. For more info
+on rebinding keys, see type `>help keybindings`
 
 If the colorscheme doesn't look good, you can change it with `> set colorscheme ...`.
 You can press tab to see the available colorschemes, or see more information with
@@ -34,6 +37,7 @@ Here are the possible help topics that you can read:
 
 * tutorial: A brief tutorial which gives an overview of all the other help topics
 * keybindings: Gives a full list of the default keybindings as well as how to rebind them
+* defaultkeys: Gives a more straight-forward list of the hotkey commands and what they do.
 * commands: Gives a list of all the commands and what they do
 * options: Gives a list of all the options you can customize
 * plugins: Explains how micro's plugin system works and how to create your own plugins

runtime/help/keybindings.md

@@ -1,89 +1,15 @@
 # Keybindings
 
-Here are the default keybindings in json format. You can rebind them to your liking, following the same format.
+Micro has a plethora of hotkeys that make it easy and powerful to use and all
+hotkeys are fully customizable to your liking.
+Custom keybindings are stored internally in micro if changed with the `>bind` command or
+you can also be added in the file `~/.config/micro/bindings.json` as discussed below.
+For a list of the default keybindings in the json format used by micro, please see
+the end of this file. For a more user-friendly list with explanations of what the default
+hotkeys are and what they do, please see `>help defaultkeys`
 
-```json
+If `~/.config/micro/bindings.json` does not exist, you can simply create it.
-{
+Micro will know what to do with it.
-    "Up":             "CursorUp",
-    "Down":           "CursorDown",
-    "Right":          "CursorRight",
-    "Left":           "CursorLeft",
-    "ShiftUp":        "SelectUp",
-    "ShiftDown":      "SelectDown",
-    "ShiftLeft":      "SelectLeft",
-    "ShiftRight":     "SelectRight",
-    "AltLeft":        "WordLeft",
-    "AltRight":       "WordRight",
-    "AltShiftRight":  "SelectWordRight",
-    "AltShiftLeft":   "SelectWordLeft",
-    "AltUp":          "MoveLinesUp",
-    "AltDown":        "MoveLinesDown",
-    "CtrlLeft":       "StartOfLine",
-    "CtrlRight":      "EndOfLine",
-    "CtrlShiftLeft":  "SelectToStartOfLine",
-    "CtrlShiftRight": "SelectToEndOfLine",
-    "CtrlUp":         "CursorStart",
-    "CtrlDown":       "CursorEnd",
-    "CtrlShiftUp":    "SelectToStart",
-    "CtrlShiftDown":  "SelectToEnd",
-    "Enter":          "InsertNewline",
-    "Space":          "InsertSpace",
-    "CtrlH":          "Backspace",
-    "Backspace":      "Backspace",
-    "Alt-CtrlH":      "DeleteWordLeft",
-    "Alt-Backspace":  "DeleteWordLeft",
-    "Tab":            "IndentSelection,InsertTab",
-    "Backtab":        "OutdentSelection",
-    "CtrlO":          "OpenFile",
-    "CtrlS":          "Save",
-    "CtrlF":          "Find",
-    "CtrlN":          "FindNext",
-    "CtrlP":          "FindPrevious",
-    "CtrlZ":          "Undo",
-    "CtrlY":          "Redo",
-    "CtrlC":          "Copy",
-    "CtrlX":          "Cut",
-    "CtrlK":          "CutLine",
-    "CtrlD":          "DuplicateLine",
-    "CtrlV":          "Paste",
-    "CtrlA":          "SelectAll",
-    "CtrlT":          "AddTab",
-    "CtrlRightSq":    "PreviousTab",
-    "CtrlBackslash":  "NextTab",
-    "Home":           "StartOfLine",
-    "End":            "EndOfLine",
-    "CtrlHome":       "CursorStart",
-    "CtrlEnd":        "CursorEnd",
-    "PageUp":         "CursorPageUp",
-    "PageDown":       "CursorPageDown",
-    "CtrlG":          "ToggleHelp",
-    "CtrlR":          "ToggleRuler",
-    "CtrlL":          "JumpLine",
-    "Delete":         "Delete",
-    "CtrlB":          "ShellMode",
-    "CtrlQ":          "Quit",
-    "CtrlE":          "CommandMode",
-    "CtrlW":          "NextSplit",
-    "CtrlU":          "ToggleMacro",
-    "CtrlJ":          "PlayMacro",
-
-    // Emacs-style keybindings
-    "Alt-f": "WordRight",
-    "Alt-b": "WordLeft",
-    "Alt-a": "StartOfLine",
-    "Alt-e": "EndOfLine",
-    "Alt-p": "CursorUp",
-    "Alt-n": "CursorDown",
-
-    // Integration with file managers
-    "F1":  "ToggleHelp",
-    "F2":  "Save",
-    "F4":  "Quit",
-    "F7":  "Find",
-    "F10": "Quit",
-    "Esc": "Escape",
-}
-```
 
 You can use the alt keys + arrows to move word by word.
 Ctrl left and right move the cursor to the start and end of the line, and
@@ -106,6 +32,9 @@ following in the `bindings.json` file.
 }
 ```
 
+In addition to editing your `~/.config/micro/bindings.json`, you can run
+`>bind <keycombo> <action>` For a list of bindable actions, see below.
+
 You can also chain commands when rebinding. For example, if you want Alt-s to save
 and quit you can bind it like so:
 
@@ -332,6 +261,93 @@ Escape
 Enter
 ```
 
+# Default keybinding configuration.
+
+```json
+{
+    "Up":             "CursorUp",
+    "Down":           "CursorDown",
+    "Right":          "CursorRight",
+    "Left":           "CursorLeft",
+    "ShiftUp":        "SelectUp",
+    "ShiftDown":      "SelectDown",
+    "ShiftLeft":      "SelectLeft",
+    "ShiftRight":     "SelectRight",
+    "AltLeft":        "WordLeft",
+    "AltRight":       "WordRight",
+    "AltShiftRight":  "SelectWordRight",
+    "AltShiftLeft":   "SelectWordLeft",
+    "AltUp":          "MoveLinesUp",
+    "AltDown":        "MoveLinesDown",
+    "CtrlLeft":       "StartOfLine",
+    "CtrlRight":      "EndOfLine",
+    "CtrlShiftLeft":  "SelectToStartOfLine",
+    "CtrlShiftRight": "SelectToEndOfLine",
+    "CtrlUp":         "CursorStart",
+    "CtrlDown":       "CursorEnd",
+    "CtrlShiftUp":    "SelectToStart",
+    "CtrlShiftDown":  "SelectToEnd",
+    "Enter":          "InsertNewline",
+    "Space":          "InsertSpace",
+    "CtrlH":          "Backspace",
+    "Backspace":      "Backspace",
+    "Alt-CtrlH":      "DeleteWordLeft",
+    "Alt-Backspace":  "DeleteWordLeft",
+    "Tab":            "IndentSelection,InsertTab",
+    "Backtab":        "OutdentSelection",
+    "CtrlO":          "OpenFile",
+    "CtrlS":          "Save",
+    "CtrlF":          "Find",
+    "CtrlN":          "FindNext",
+    "CtrlP":          "FindPrevious",
+    "CtrlZ":          "Undo",
+    "CtrlY":          "Redo",
+    "CtrlC":          "Copy",
+    "CtrlX":          "Cut",
+    "CtrlK":          "CutLine",
+    "CtrlD":          "DuplicateLine",
+    "CtrlV":          "Paste",
+    "CtrlA":          "SelectAll",
+    "CtrlT":          "AddTab",
+    "Alt,":           "PreviousTab",
+    "Alt.":           "NextTab",
+    "Home":           "StartOfLine",
+    "End":            "EndOfLine",
+    "CtrlHome":       "CursorStart",
+    "CtrlEnd":        "CursorEnd",
+    "PageUp":         "CursorPageUp",
+    "PageDown":       "CursorPageDown",
+    "CtrlG":          "ToggleHelp",
+    "CtrlR":          "ToggleRuler",
+    "CtrlL":          "JumpLine",
+    "Delete":         "Delete",
+    "CtrlB":          "ShellMode",
+    "CtrlQ":          "Quit",
+    "CtrlE":          "CommandMode",
+    "CtrlW":          "NextSplit",
+    "CtrlU":          "ToggleMacro",
+    "CtrlJ":          "PlayMacro",
+
+    // Emacs-style keybindings
+    "Alt-f": "WordRight",
+    "Alt-b": "WordLeft",
+    "Alt-a": "StartOfLine",
+    "Alt-e": "EndOfLine",
+    "Alt-p": "CursorUp",
+    "Alt-n": "CursorDown",
+
+    // Integration with file managers
+    "F1":  "ToggleHelp",
+    "F2":  "Save",
+    "F3":  "Find",
+    "F4":  "Quit",
+    "F7":  "Find",
+    "F10": "Quit",
+    "Esc": "Escape",
+}
+```
+
+#Final notes
 Note: On some old terminal emulators and on Windows machines, `CtrlH` should be used
 for backspace.
 

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
+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.
-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 special     ".+"
-color brightcyan "(AcceptMutex|AcceptPathInfo|AccessFileName|Action|AddAlt|AddAltByEncoding|AddAltByType|AddCharset|AddDefaultCharset|AddDescription|AddEncoding)"
+color identifier "(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 identifier "(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 identifier "(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 identifier "(Anonymous_VerifyEmail|AssignUserID|AuthAuthoritative|AuthDBMAuthoritative|AuthDBMGroupFile|AuthDBMType|AuthDBMUserFile|AuthDigestAlgorithm)"
-color brightcyan "(AuthDigestDomain|AuthDigestFile|AuthDigestGroupFile|AuthDigestNcCheck|AuthDigestNonceFormat|AuthDigestNonceLifetime|AuthDigestQop|AuthDigestShmemSize)"
+color identifier "(AuthDigestDomain|AuthDigestFile|AuthDigestGroupFile|AuthDigestNcCheck|AuthDigestNonceFormat|AuthDigestNonceLifetime|AuthDigestQop|AuthDigestShmemSize)"
-color brightcyan "(AuthGroupFile|AuthLDAPAuthoritative|AuthLDAPBindDN|AuthLDAPBindPassword|AuthLDAPCharsetConfig|AuthLDAPCompareDNOnServer|AuthLDAPDereferenceAliases)"
+color identifier "(AuthGroupFile|AuthLDAPAuthoritative|AuthLDAPBindDN|AuthLDAPBindPassword|AuthLDAPCharsetConfig|AuthLDAPCompareDNOnServer|AuthLDAPDereferenceAliases)"
-color brightcyan "(AuthLDAPEnabled|AuthLDAPFrontPageHack|AuthLDAPGroupAttribute|AuthLDAPGroupAttributeIsDN|AuthLDAPRemoteUserIsDN|AuthLDAPUrl|AuthName|AuthType|AuthUserFile)"
+color identifier "(AuthLDAPEnabled|AuthLDAPFrontPageHack|AuthLDAPGroupAttribute|AuthLDAPGroupAttributeIsDN|AuthLDAPRemoteUserIsDN|AuthLDAPUrl|AuthName|AuthType|AuthUserFile)"
-color brightcyan "(BrowserMatch|BrowserMatchNoCase|BS2000Account|BufferedLogs|CacheDefaultExpire|CacheDirLength|CacheDirLevels|CacheDisable|CacheEnable|CacheExpiryCheck)"
+color identifier "(BrowserMatch|BrowserMatchNoCase|BS2000Account|BufferedLogs|CacheDefaultExpire|CacheDirLength|CacheDirLevels|CacheDisable|CacheEnable|CacheExpiryCheck)"
-color brightcyan "(CacheFile|CacheForceCompletion|CacheGcClean|CacheGcDaily|CacheGcInterval|CacheGcMemUsage|CacheGcUnused|CacheIgnoreCacheControl|CacheIgnoreHeaders)"
+color identifier "(CacheFile|CacheForceCompletion|CacheGcClean|CacheGcDaily|CacheGcInterval|CacheGcMemUsage|CacheGcUnused|CacheIgnoreCacheControl|CacheIgnoreHeaders)"
-color brightcyan "(CacheIgnoreNoLastMod|CacheLastModifiedFactor|CacheMaxExpire|CacheMaxFileSize|CacheMinFileSize|CacheNegotiatedDocs|CacheRoot|CacheSize|CacheTimeMargin)"
+color identifier "(CacheIgnoreNoLastMod|CacheLastModifiedFactor|CacheMaxExpire|CacheMaxFileSize|CacheMinFileSize|CacheNegotiatedDocs|CacheRoot|CacheSize|CacheTimeMargin)"
-color brightcyan "(CGIMapExtension|CharsetDefault|CharsetOptions|CharsetSourceEnc|CheckSpelling|ChildPerUserID|ContentDigest|CookieDomain|CookieExpires|CookieLog|CookieName)"
+color identifier "(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 identifier "(CookieStyle|CookieTracking|CoreDumpDirectory|CustomLog|Dav|DavDepthInfinity|DavLockDB|DavMinTimeout|DefaultIcon|DefaultLanguage|DefaultType)"
-color brightcyan "(DeflateBufferSize|DeflateCompressionLevel|DeflateFilterNote|DeflateMemLevel|DeflateWindowSize|Deny|Directory|DirectoryIndex|DirectoryMatch|DirectorySlash)"
+color identifier "(DeflateBufferSize|DeflateCompressionLevel|DeflateFilterNote|DeflateMemLevel|DeflateWindowSize|Deny|Directory|DirectoryIndex|DirectoryMatch|DirectorySlash)"
-color brightcyan "(DocumentRoot|DumpIOInput|DumpIOOutput|EnableExceptionHook|EnableMMAP|EnableSendfile|ErrorDocument|ErrorLog|Example|ExpiresActive|ExpiresByType)"
+color identifier "(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 identifier "(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 identifier "(HeaderName|HostnameLookups|IdentityCheck|IfDefine|IfModule|IfVersion|ImapBase|ImapDefault|ImapMenu|Include|IndexIgnore|IndexOptions|IndexOrderDefault)"
-color brightcyan "(ISAPIAppendLogToErrors|ISAPIAppendLogToQuery|ISAPICacheFile|ISAPIFakeAsync|ISAPILogNotSupported|ISAPIReadAheadBuffer|KeepAlive|KeepAliveTimeout)"
+color identifier "(ISAPIAppendLogToErrors|ISAPIAppendLogToQuery|ISAPICacheFile|ISAPIFakeAsync|ISAPILogNotSupported|ISAPIReadAheadBuffer|KeepAlive|KeepAliveTimeout)"
-color brightcyan "(LanguagePriority|LDAPCacheEntries|LDAPCacheTTL|LDAPConnectionTimeout|LDAPOpCacheEntries|LDAPOpCacheTTL|LDAPSharedCacheFile|LDAPSharedCacheSize)"
+color identifier "(LanguagePriority|LDAPCacheEntries|LDAPCacheTTL|LDAPConnectionTimeout|LDAPOpCacheEntries|LDAPOpCacheTTL|LDAPSharedCacheFile|LDAPSharedCacheSize)"
-color brightcyan "(LDAPTrustedCA|LDAPTrustedCAType|Limit|LimitExcept|LimitInternalRecursion|LimitRequestBody|LimitRequestFields|LimitRequestFieldSize|LimitRequestLine)"
+color identifier "(LDAPTrustedCA|LDAPTrustedCAType|Limit|LimitExcept|LimitInternalRecursion|LimitRequestBody|LimitRequestFields|LimitRequestFieldSize|LimitRequestLine)"
-color brightcyan "(LimitXMLRequestBody|Listen|ListenBackLog|LoadFile|LoadModule|Location|LocationMatch|LockFile|LogFormat|LogLevel|MaxClients|MaxKeepAliveRequests)"
+color identifier "(LimitXMLRequestBody|Listen|ListenBackLog|LoadFile|LoadModule|Location|LocationMatch|LockFile|LogFormat|LogLevel|MaxClients|MaxKeepAliveRequests)"
-color brightcyan "(MaxMemFree|MaxRequestsPerChild|MaxRequestsPerThread|MaxSpareServers|MaxSpareThreads|MaxThreads|MaxThreadsPerChild|MCacheMaxObjectCount|MCacheMaxObjectSize)"
+color identifier "(MaxMemFree|MaxRequestsPerChild|MaxRequestsPerThread|MaxSpareServers|MaxSpareThreads|MaxThreads|MaxThreadsPerChild|MCacheMaxObjectCount|MCacheMaxObjectSize)"
-color brightcyan "(MCacheMaxStreamingBuffer|MCacheMinObjectSize|MCacheRemovalAlgorithm|MCacheSize|MetaDir|MetaFiles|MetaSuffix|MimeMagicFile|MinSpareServers|MinSpareThreads)"
+color identifier "(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 identifier "(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 identifier "(ProtocolEcho|Proxy|ProxyBadHeader|ProxyBlock|ProxyDomain|ProxyErrorOverride|ProxyIOBufferSize|ProxyMatch|ProxyMaxForwards|ProxyPass|ProxyPassReverse)"
-color brightcyan "(ProxyPreserveHost|ProxyReceiveBufferSize|ProxyRemote|ProxyRemoteMatch|ProxyRequests|ProxyTimeout|ProxyVia|ReadmeName|Redirect|RedirectMatch)"
+color identifier "(ProxyPreserveHost|ProxyReceiveBufferSize|ProxyRemote|ProxyRemoteMatch|ProxyRequests|ProxyTimeout|ProxyVia|ReadmeName|Redirect|RedirectMatch)"
-color brightcyan "(RedirectPermanent|RedirectTemp|RemoveCharset|RemoveEncoding|RemoveHandler|RemoveInputFilter|RemoveLanguage|RemoveOutputFilter|RemoveType|RequestHeader)"
+color identifier "(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 identifier "(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 identifier "(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 identifier "(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 identifier "(SetInputFilter|SetOutputFilter|SSIEndTag|SSIErrorMsg|SSIStartTag|SSITimeFormat|SSIUndefinedEcho|SSLCACertificateFile|SSLCACertificatePath)"
-color brightcyan "(SSLCARevocationFile|SSLCARevocationPath|SSLCertificateChainFile|SSLCertificateFile|SSLCertificateKeyFile|SSLCipherSuite|SSLEngine|SSLMutex|SSLOptions)"
+color identifier "(SSLCARevocationFile|SSLCARevocationPath|SSLCertificateChainFile|SSLCertificateFile|SSLCertificateKeyFile|SSLCipherSuite|SSLEngine|SSLMutex|SSLOptions)"
-color brightcyan "(SSLPassPhraseDialog|SSLProtocol|SSLProxyCACertificateFile|SSLProxyCACertificatePath|SSLProxyCARevocationFile|SSLProxyCARevocationPath|SSLProxyCipherSuite)"
+color identifier "(SSLPassPhraseDialog|SSLProtocol|SSLProxyCACertificateFile|SSLProxyCACertificatePath|SSLProxyCARevocationFile|SSLProxyCARevocationPath|SSLProxyCipherSuite)"
-color brightcyan "(SSLProxyEngine|SSLProxyMachineCertificateFile|SSLProxyMachineCertificatePath|SSLProxyProtocol|SSLProxyVerify|SSLProxyVerifyDepth|SSLRandomSeed|SSLRequire)"
+color identifier "(SSLProxyEngine|SSLProxyMachineCertificateFile|SSLProxyMachineCertificatePath|SSLProxyProtocol|SSLProxyVerify|SSLProxyVerifyDepth|SSLRandomSeed|SSLRequire)"
-color brightcyan "(SSLRequireSSL|SSLSessionCache|SSLSessionCacheTimeout|SSLUserName|SSLVerifyClient|SSLVerifyDepth|StartServers|StartThreads|SuexecUserGroup|ThreadLimit)"
+color identifier "(SSLRequireSSL|SSLSessionCache|SSLSessionCacheTimeout|SSLUserName|SSLVerifyClient|SSLVerifyDepth|StartServers|StartThreads|SuexecUserGroup|ThreadLimit)"
-color brightcyan "(ThreadsPerChild|ThreadStackSize|TimeOut|TraceEnable|TransferLog|TypesConfig|UnsetEnv|UseCanonicalName|User|UserDir|VirtualDocumentRoot)"
+color identifier "(ThreadsPerChild|ThreadStackSize|TimeOut|TraceEnable|TransferLog|TypesConfig|UnsetEnv|UseCanonicalName|User|UserDir|VirtualDocumentRoot)"
-color brightcyan "(VirtualDocumentRootIP|VirtualHost|VirtualScriptAlias|VirtualScriptAliasIP|Win32DisableAcceptEx|XBitHack)"
+color identifier "(VirtualDocumentRootIP|VirtualHost|VirtualScriptAlias|VirtualScriptAliasIP|Win32DisableAcceptEx|XBitHack)"
-color yellow "<[^>]+>"
+color symbol.tag "<[^>]+>"
-color brightcyan "</?[A-Za-z]+"
+color identifier "</?[A-Za-z]+"
-color brightcyan "(<|</|>)"
+color identifier "(<|</|>)"
-color green "\"(\\.|[^\"])*\""
+color constant.string "\"(\\.|[^\"])*\""
-color white "#.*"
+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 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 magenta "\<(goto|continue|break|return)\>"
+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 comment "//.*"
-color brightblue start="/\*" end="\*/"
+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 statement "^==[[:space:]].*$"
-color red "^----+$"
+color statement "^----+$"
 # h2
-color magenta "^===[[:space:]].*$"
+color symbol "^===[[:space:]].*$"
-color magenta "^~~~~+$"
+color symbol "^~~~~+$"
 # h4
-color green "^====[[:space:]].*$"
+color type "^====[[:space:]].*$"
-color green "^\^\^\^\^+$"
+color type "^\^\^\^\^+$"
 # h5
-color brightblue "^=====[[:space:]].*$"
+color constant "^=====[[:space:]].*$"
-color brightblue "^\+\+\+\++$"
+color constant "^\+\+\+\++$"
 
 # attributes
-color brightgreen ":.*:"
+color type.keyword ":.*:"
-color brightred "\{[a-z0-9]*\}"
+color identifier.macro "\{[a-z0-9]*\}"
-color red "\\\{[a-z0-9]*\}"
+color identifier "\\\{[a-z0-9]*\}"
-color red "\+\+\+\{[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 constant.string ".*[[:space:]]\+$"
-color yellow "_[^_]+_"
+color constant.string "_[^_]+_"
-color yellow "\*[^\*]+\*"
+color constant.string "\*[^\*]+\*"
-color yellow "\+[^\+]+\+"
+color constant.string "\+[^\+]+\+"
-color yellow "`[^`]+`"
+color constant.string "`[^`]+`"
-color yellow "\^[^\^]+\^"
+color constant.string "\^[^\^]+\^"
-color yellow "~[^~]+~"
+color constant.string "~[^~]+~"
-color yellow "'[^']+'"
+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 bold default "\[\[.*\]\]"
-color brightwhite "<<.*>>"
+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 preproc "\$[A-Za-z0-9_!@#$*?-]+"
-color brightyellow "\<(ARGC|ARGIND|ARGV|BINMODE|CONVFMT|ENVIRON|ERRNO|FIELDWIDTHS)\>"
+color preproc "\b(ARGC|ARGIND|ARGV|BINMODE|CONVFMT|ENVIRON|ERRNO|FIELDWIDTHS)\b"
-color brightyellow "\<(FILENAME|FNR|FS|IGNORECASE|LINT|NF|NR|OFMT|OFS|ORS)\>"
+color preproc "\b(FILENAME|FNR|FS|IGNORECASE|LINT|NF|NR|OFMT|OFS|ORS)\b"
-color brightyellow "\<(PROCINFO|RS|RT|RSTART|RLENGTH|SUBSEP|TEXTDOMAIN)\>"
+color preproc "\b(PROCINFO|RS|RT|RSTART|RLENGTH|SUBSEP|TEXTDOMAIN)\b"
-color brightblue "\<(function|extension|BEGIN|END)\>"
+color identifier.class "\b(function|extension|BEGIN|END)\b"
-color red "[-+*/%^|!=&<>?;:]|\\|\[|\]"
+color symbol.operator "[-+*/%^|!=&<>?;:]|\\|\[|\]"
-color cyan  "\<(for|if|while|do|else|in|delete|exit)\>"
+color statement  "\b(for|if|while|do|else|in|delete|exit)\b"
-color cyan  "\<(break|continue|return)\>"
+color special  "\b(break|continue|return)\b"
-color brightblue "\<(close|getline|next|nextfile|print|printf|system|fflush)\>"
+color statement "\b(close|getline|next|nextfile|print|printf|system|fflush)\b"
-color brightblue "\<(atan2|cos|exp|int|log|rand|sin|sqrt|srand)\>"
+color statement "\b(atan2|cos|exp|int|log|rand|sin|sqrt|srand)\b"
-color brightblue "\<(asort|asorti|gensub|gsub|index|length|match)\>"
+color statement "\b(asort|asorti|gensub|gsub|index|length|match)\b"
-color brightblue "\<(split|sprintf|strtonum|sub|substr|tolower|toupper)\>"
+color statement "\b(split|sprintf|strtonum|sub|substr|tolower|toupper)\b"
-color brightblue "\<(mktime|strftime|systime)\>"
+color statement "\b(mktime|strftime|systime)\b"
-color brightblue "\<(and|compl|lshift|or|rshift|xor)\>"
+color statement "\b(and|compl|lshift|or|rshift|xor)\b"
-color brightblue "\<(bindtextdomain|dcgettext|dcngettext)\>"
+color statement "\b(bindtextdomain|dcgettext|dcngettext)\b"
-color magenta   "/.*[^\\]/"
+color special   "/.*[^\\]/"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color magenta   "\\."
+color constant.specialChar   "\\."
-color brightblack "(^|[[:space:]])#([^{].*)?$"
+color comment "(^|[[:space:]])#([^{].*)?$"
-color brightwhite,cyan "TODO:?"
+color todo "TODO:?"
-color ,green "[[:space:]]+$"
+color indent-char. "[[:space:]]+$"
-color ,red "	+ +| +	+"
+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 indent-char "([[:space:]]{2,}|\t){$"
-color ,red "[[:space:]]+$"
+color indent-char "[[:space:]]+$"

runtime/syntax/cmake.micro

@@ -2,22 +2,22 @@
 ##
 syntax "cmake" "(CMakeLists\.txt|\.cmake)$"
 
-green (i) "^[[:space:]]*[A-Z0-9_]+"
+color identifier.var "^[[:space:]]*[A-Z0-9_]+"
-brightyellow (i) "^[[:space:]]*(include|include_directories|include_external_msproject)\>"
+color preproc "^[[:space:]]*(include|include_directories|include_external_msproject)\>"
 
-brightgreen (i) "^[[:space:]]*\<((else|end)?if|else|(end)?while|(end)?foreach|break)\>"
+color statement "^[[: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 statement "\<(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:]]\<(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 constant.string "['][^']*[^\\][']" "[']{3}.*[^\\][']{3}"
-color cyan "["][^"]*[^\\]["]" "["]{3}.*[^\\]["]{3}"
+color constant.string "["][^"]*[^\\]["]" "["]{3}.*[^\\]["]{3}"
 
-brightred (i) start="\$(\{|ENV\{)" end="\}"
+color preproc start="\$(\{|ENV\{)" end="\}"
-color magenta "\<(APPLE|UNIX|WIN32|CYGWIN|BORLAND|MINGW|MSVC(_IDE|60|71|80|90)?)\>"
+color identifier.macro "\<(APPLE|UNIX|WIN32|CYGWIN|BORLAND|MINGW|MSVC(_IDE|60|71|80|90)?)\>"
 
-brightblue (i) "^([[:space:]]*)?#.*"
+color comment "^([[:space:]]*)?#.*"
-brightblue (i) "[[: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 symbol.operator "[!&|=/*+-<>]|\<(and|or|is|isnt|not)\>"
-color brightblue "[A-Za-z_][A-Za-z0-9_]*:[[:space:]]*(->|\()" "->"
+color identifier.class "[A-Za-z_][A-Za-z0-9_]*:[[:space:]]*(->|\()" "->"
-color brightblue "[()]"
+color symbol.brackets "[()]"
-color cyan  "\<(for|of|continue|break|isnt|null|unless|this|else|if|return)\>"
+color statement  "\<(for|of|continue|break|isnt|null|unless|this|else|if|return)\>"
-color cyan  "\<(try|catch|finally|throw|new|delete|typeof|in|instanceof)\>"
+color statement  "\<(try|catch|finally|throw|new|delete|typeof|in|instanceof)\>"
-color cyan  "\<(debugger|switch|while|do|class|extends|super)\>"
+color statement  "\<(debugger|switch|while|do|class|extends|super)\>"
-color cyan  "\<(undefined|then|unless|until|loop|of|by|when)\>"
+color statement  "\<(undefined|then|unless|until|loop|of|by|when)\>"
-color brightcyan  "\<(true|false|yes|no|on|off)\>"
+color constant.bool  "\<(true|false|yes|no|on|off)\>"
-color brightyellow "@[A-Za-z0-9_]*"
+color identifier "@[A-Za-z0-9_]*"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
+color comment "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"
-color ,red "	+ +| +	+"
+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 "^[[:space:]]*#.*$"
-color comment (i) "^[[: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 identifier.var "\$\{?[0-9A-Z_!@#$*?-]+\}?"
-color cyan "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color symbol.operator "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
-color brightred "^TEXT$"
+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 identifier "[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 type     "\<(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 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 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 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 statement  "\<(from|where|select|group|info|orderby|join|let|in|on|equals|by|ascending|descending)\>"
-color brightred     "\<(break|continue)\>"
+color special     "\<(break|continue)\>"
-color brightcyan "\<(true|false)\>"
+color constant "\<(true|false)\>"
-color red "[-+/*=<>?:!~%&|]"
+color symbol "[-+/*=<>?:!~%&|]"
-color blue   "\<([0-9._]+|0x[A-Fa-f0-9_]+|0b[0-1_]+)[FL]?\>"
+color constant.number   "\<([0-9._]+|0x[A-Fa-f0-9_]+|0b[0-1_]+)[FL]?\>"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color magenta   "\\([btnfr]|'|\"|\\)"
+color constant.specialChar   "\\([btnfr]|'|\"|\\)"
-color magenta   "\\u[A-Fa-f0-9]{4}"
+color constant.specialChar   "\\u[A-Fa-f0-9]{4}"
-color brightblack "(^|[[:space:]])//.*"
+color comment "(^|[[:space:]])//.*"
-color brightblack start="/\*" end="\*/"
+color comment start="/\*" end="\*/"
-color brightwhite,cyan "TODO:?"
+color todo "TODO:?"
-color ,green "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"
-color ,red "	+ +| +	+"
+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_]+"
+color preproc "def [ 0-9A-Z_]+"
-brightred (i) "cpdef [0-9A-Z_]+\(.*\):"
+color preproc "cpdef [0-9A-Z_]+\(.*\):"
-brightred (i) "cdef cppclass [ 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 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 brightmagenta "\<(continue|break|return)\>"
+color special "\<(continue|break|return)\>"
 
 # Cython Keyword Color
-color green "\<(cdef|cimport|cpdef|cppclass|ctypedef|extern|include|namespace|property|struct)\>"
+color identifier.macro "\<(cdef|cimport|cpdef|cppclass|ctypedef|extern|include|namespace|property|struct)\>"
-color red "\<(bint|char|double|int|public|void|unsigned)\>"
+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 constant.string "['][^']*[^\\][']" "[']{3}.*[^\\][']{3}"
-color cyan "["][^"]*[^\\]["]" "["]{3}.*[^\\]["]{3}"
+color constant.string "["][^"]*[^\\]["]" "["]{3}.*[^\\]["]{3}"
-color cyan start=""""[^"]" end=""""" start="'''[^']" end="'''"
+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 type   "\<(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 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 red  "=|->|--"
+color symbol  "=|->|--"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightblack "(^|[[:space:]])//.*"
+color comment "(^|[[:space:]])//.*"
-color brightblack start="/\*" end="\*/"
+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 symbol.brackets start="<" end=">"
-color white 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 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 brightblue "(\$|@|@@)?\<[A-Z]+[0-9A-Z_a-z]*"
+color identifier.var "(\$|@|@@)?\<[A-Z]+[0-9A-Z_a-z]*"
-magenta (i) "([  ]|^):[0-9A-Z_]+\>"
+color magenta  "(?i)([  ]|^):[0-9A-Z_]+\>"
-color brightyellow "\<(__FILE__|__LINE__)\>"
+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 comment "#[^{].*$" "#$"
-color brightcyan "##[^{].*$" "##$"
+color comment.bright "##[^{].*$" "##$"
-color green start="<<-?'?EOT'?" end="^EOT"
+color identifier.macro start="<<-?'?EOT'?" end="^EOT"
-color brightcyan "(XXX|TODO|FIXME|\?\?\?)"
+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 constant.specialChar """
-color special "'"
+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 "\b[A-Z_]a[0-9A-Z_]+\b" 
-color red "\<[0-9]+\>" 
+color constant.number "\b[0-9]+\b" 
 
-green (i) "\<(action|advance|all|allocatable|allocated|any|apostrophe)\>"
+color type  "(?i)\b(action|advance|all|allocatable|allocated|any|apostrophe)\b"
-green (i) "\<(append|asis|assign|assignment|associated|character|common)\>"
+color type  "(?i)\b(append|asis|assign|assignment|associated|character|common)\b"
-green (i) "\<(complex|data|default|delim|dimension|double precision)\>"
+color type  "(?i)\b(complex|data|default|delim|dimension|double precision)\b"
-green (i) "\<(elemental|epsilon|external|file|fmt|form|format|huge)\>"
+color type  "(?i)\b(elemental|epsilon|external|file|fmt|form|format|huge)\b"
-green (i) "\<(implicit|include|index|inquire|integer|intent|interface)\>"
+color type  "(?i)\b(implicit|include|index|inquire|integer|intent|interface)\b"
-green (i) "\<(intrinsic|iostat|kind|logical|module|none|null|only)\>"
+color type  "(?i)\b(intrinsic|iostat|kind|logical|module|none|null|only)\\b"
-green (i) "\<(operator|optional|pack|parameter|pointer|position|private)\>"
+color type  "(?i)\b(operator|optional|pack|parameter|pointer|position|private)\b"
-green (i) "\<(program|public|real|recl|recursive|selected_int_kind)\>"
+color type  "(?i)\b(program|public|real|recl|recursive|selected_int_kind)\b"
-green (i) "\<(selected_real_kind|subroutine|status)\>"
+color type  "(?i)\b(selected_real_kind|subroutine|status)\b"
 
-cyan (i) "\<(abs|achar|adjustl|adjustr|allocate|bit_size|call|char)\>" 
+color constant  "(?i)\b(abs|achar|adjustl|adjustr|allocate|bit_size|call|char)\b" 
-cyan (i) "\<(close|contains|count|cpu_time|cshift|date_and_time)\>" 
+color constant  "(?i)\b(close|contains|count|cpu_time|cshift|date_and_time)\b" 
-cyan (i) "\<(deallocate|digits|dot_product|eor|eoshift|function|iachar)\>" 
+color constant  "(?i)\b(deallocate|digits|dot_product|eor|eoshift|function|iachar)\b" 
-cyan (i) "\<(iand|ibclr|ibits|ibset|ichar|ieor|iolength|ior|ishft|ishftc)\>" 
+color constant  "(?i)\b(iand|ibclr|ibits|ibset|ichar|ieor|iolength|ior|ishft|ishftc)\b" 
-cyan (i) "\<(lbound|len|len_trim|matmul|maxexponent|maxloc|maxval|merge)\>" 
+color constant  "(?i)\b(lbound|len|len_trim|matmul|maxexponent|maxloc|maxval|merge)\b" 
-cyan (i) "\<(minexponent|minloc|minval|mvbits|namelist|nearest|nullify)\>" 
+color constant  "(?i)\b(minexponent|minloc|minval|mvbits|namelist|nearest|nullify)\b" 
-cyan (i) "\<(open|pad|present|print|product|pure|quote|radix)\>" 
+color constant  "(?i)\b(open|pad|present|print|product|pure|quote|radix)\b" 
-cyan (i) "\<(random_number|random_seed|range|read|readwrite|replace)\>" 
+color constant  "(?i)\b(random_number|random_seed|range|read|readwrite|replace)\b" 
-cyan (i) "\<(reshape|rewind|save|scan|sequence|shape|sign|size|spacing)\>" 
+color constant  "(?i)\b(reshape|rewind|save|scan|sequence|shape|sign|size|spacing)\b" 
-cyan (i) "\<(spread|sum|system_clock|target|transfer|transpose|trim)\>" 
+color constant  "(?i)\b(spread|sum|system_clock|target|transfer|transpose|trim)\b" 
-cyan (i) "\<(ubound|unpack|verify|write|tiny|type|use|yes)\>"
+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)\>"
+color statement "(?i)\b(.and.|case|do|else|else?if|else?where|end|end?do|end?if)\b"
-yellow (i) "\<(end?select|.eqv.|forall|if|lge|lgt|lle|llt|.neqv.|.not.)\>"
+color statement "(?i)\b(end?select|.eqv.|forall|if|lge|lgt|lle|llt|.neqv.|.not.)\b"
-yellow (i) "\<(.or.|repeat|select case|then|where|while)\>"
+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) "<[^=     ]*>" ""(\\.|[^"])*""
+color constant.string "\b[^=     ]*\b" ""(\\.|[^"])*""
-cyan (i) "<[^=     ]*>" "'(\\.|[^"])*'"
+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 constant.bool.false "[[:space:]]+\+?[a-zA-Z0-9_-]+"
-color brightblue "[[: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 identifier.class "[~-]?\b(alpha|amd64|arm|hppa|ia64|mips|ppc|ppc64|s390|sh|sparc|x86|x86-fbsd)\b"
-color white "[[:space:]][~-]?\*"
+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 statement       "#[[:space:]](deleted|modified|new file|renamed):[[:space:]].*"
-color keyword         "#[[:space:]]deleted:"
+color statement         "#[[:space:]]deleted:"
-color keyword       "#[[:space:]]modified:"
+color statement       "#[[:space:]]modified:"
-color keyword "#[[:space:]]new file:"
+color statement "#[[:space:]]new file:"
-color keyword  "#[[:space:]]renamed:"
+color statement  "#[[:space:]]renamed:"
 
 # Untracked filenames
 color error "^#	[^/?*:;{}\\]+\.[^/?*:;{}\\]+$"
 
-color keyword "^#[[:space:]]Changes.*[:]"
+color statement "^#[[:space:]]Changes.*[:]"
-color keyword "^#[[:space:]]Your branch and '[^']+"
+color statement "^#[[:space:]]Your branch and '[^']+"
-color keyword "^#[[:space:]]Your branch and '"
+color statement "^#[[:space:]]Your branch and '"
-color keyword "^#[[:space:]]On branch [^ ]+"
+color statement "^#[[:space:]]On branch [^ ]+"
-color keyword "^#[[: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 constant.bool "\<(true|false)\>"
-color keyword "^[[:space:]]*[^=]*="
+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 statement       "^(e|edit) [0-9a-f]{7,40}"
-color keyword       "^#  (e, edit)"
+color statement       "^#  (e, edit)"
-color keyword "^(f|fixup) [0-9a-f]{7,40}"
+color statement "^(f|fixup) [0-9a-f]{7,40}"
-color keyword "^#  (f, fixup)"
+color statement "^#  (f, fixup)"
-color keyword "^(p|pick) [0-9a-f]{7,40}"
+color statement "^(p|pick) [0-9a-f]{7,40}"
-color keyword "^#  (p, pick)"
+color statement "^#  (p, pick)"
-color keyword        "^(r|reword) [0-9a-f]{7,40}"
+color statement        "^(r|reword) [0-9a-f]{7,40}"
-color keyword        "^#  (r, reword)"
+color statement        "^#  (r, reword)"
-color keyword   "^(s|squash) [0-9a-f]{7,40}"
+color statement   "^(s|squash) [0-9a-f]{7,40}"
-color keyword   "^#  (s, squash)"
+color statement   "^#  (s, squash)"
-color keyword      "^(x|exec) [^ ]+ [0-9a-f]{7,40}"
+color statement      "^(x|exec) [^ ]+ [0-9a-f]{7,40}"
-color keyword      "^#  (x, exec)"
+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 identifier.class "[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 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 green     "\<gl_(DepthRangeParameters|PointParameters|MaterialParameters|LightSourceParameters|LightModelParameters|LightModelProducts|LightProducts|FogParameters)\>"
+color identifier     "\<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 statement  "\<(const|attribute|varying|uniform|in|out|inout|if|else|return|discard|while|for|do)\>"
-color brightred     "\<(break|continue)\>"
+color special     "\<(break|continue)\>"
-color brightcyan "\<(true|false)\>"
+color constant.bool "\<(true|false)\>"
-color red "[-+/*=<>?:!~%&|^]"
+color symbol.operator "[-+/*=<>?:!~%&|^]"
-color blue   "\<([0-9]+|0x[0-9a-fA-F]*)\>"
+color constant.number   "\<([0-9]+|0x[0-9a-fA-F]*)\>"
-color brightblack "(^|[[:space:]])//.*"
+color comment "(^|[[:space:]])//.*"
-color brightblack start="/\*" end="\*/"
+color comment start="/\*" end="\*/"
-color brightwhite,cyan "TODO:?"
+color todo "TODO:?"
-color ,green "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"
-color ,red "	+ +| +	+"
+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 special "\b(break|case|continue|default|go|goto|range|return)\b"
-color statement "\b(package|import|const|var|type|struct|func|go|defer|iota)\b"
+color statement "\b(else|for|if|switch)\b"
-color statement "[-+/*=<>!~%&|^]|:="
+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 symbol.brackets "(\{|\})"
-color statement "(\(|\))"
+color symbol.brackets "(\(|\))"
-color statement "(\[|\])"
+color symbol.brackets "(\[|\])"
-color statement "!"
+##Redundant??
-color statement ","
+#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 identifier.class "\b(augment|pimp)\b"
-color statement "\b(interfaces|implements|extends|overrides|maker|newInstance)\b"
+color identifier.class "\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 identifier.class "\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 identifier.class "\b(result|option|trying|raising|nullify|catching)\b"
-color statement "\b(promise|setFuture|failedFuture|all|any)\b"
+color identifier.class "\b(promise|setFuture|failedFuture|all|any)\b"
-color statement "\b(initialize|initializeWithinThread|start|future|fallbackTo|onSet|onFail|cancel|enqueue)\b"
+color identifier.class "\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 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 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 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 statement "\b(emptyList|cons|lazyList|fromIter|generator|repeat|iterate)\b"
+color identifier.class "\b(emptyList|cons|lazyList|fromIter|generator|repeat|iterate)\b"
-color statement "\b(asLazyList|foldl|foldr|take|takeWhile|drop|dropWhile|subList)\b"
+color identifier.class "\b(asLazyList|foldl|foldr|take|takeWhile|drop|dropWhile|subList)\b"
-color statement "\b(import)\b"
+color identifier.class "\b(import)\b"
-color statement "\b(module)\b"
+color identifier.class "\b(module)\b"
-color statement "\b(JSON)\b"
+color identifier.class "\b(JSON)\b"
-color statement "\b(stringify|parse|toJSON|toDynamicObject|updateFromJSON)\b"
+color identifier.class "\b(stringify|parse|toJSON|toDynamicObject|updateFromJSON)\b"
-color statement "\b(newInstance|define|getKey|getValue|properties|fallback)\b"
+color identifier.class "\b(newInstance|define|getKey|getValue|properties|fallback)\b"
-color statement "\b(times|upTo|downTo)\b"
+color identifier.class "\b(times|upTo|downTo)\b"
-color statement "\b(format|toInt|toInteger|toDouble|toFloat|toLong)\b"
+color identifier.class "\b(format|toInt|toInteger|toDouble|toFloat|toLong)\b"
-color statement "\b(head|tail|isEmpty|reduce|each|count|exists)\b"
+color identifier.class "\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 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 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 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 statement "\b(toUpperCase|equals|startsWith)\b"
+color identifier.class "\b(toUpperCase|equals|startsWith)\b"
 
-color preproc "\b(if|else|then|when|case|match|otherwise)\b"
+color statement "\b(if|else|then|when|case|match|otherwise)\b"
-color preproc "\b(with|break|continue|return)\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 symbol.brackets "[(){}]" "\[" "\]"
-color preproc "\b(for|while|foreach|in)\b"
+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 constant "(\\|\\\\)n(.|\(..)"
-color cyan start="(\\|\\\\)n\[" end="]"
+color constant start="(\\|\\\\)n\[" end="]"
 ## Requests
-color brightgreen "^\.[[:space:]]*[^[[:space:]]]*"
+color type "^\.[[:space:]]*[^[[:space:]]]*"
 ## Comments
-color yellow "^\.\\".*$"
+color comment "^\.\\".*$"
 ## Strings
-color green "(\\|\\\\)\*(.|\(..)"
+color constant.string "(\\|\\\\)\*(.|\(..)"
-color green start="(\\|\\\\)\*\[" end="]"
+color constant.string start="(\\|\\\\)\*\[" end="]"
 ## Characters
-color brightred "\\\(.."
+color constant.specialChar "\\\(.."
-color brightred start="\\\[" end="]"
+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 symbol   "-|="
-color white "->|=>"
+color default "->|=>"
-cyan (i) "([  ]|^)%[0-9A-Z_]+\>"
+color constant  "([  ]|^)%[0-9A-Za-z_]+>"
-magenta (i) ":[0-9A-Z_]+\>"
+color special ":[0-9A-Za-z_]+>"
-yellow (i) "\.[A-Z_]+\>"
+color type "\.[A-Za-z_]+>"
 ## Double quote & single quote
-color green ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!"
+color constant.string ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!"
-color green "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
+color constant.string "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
 ## Vars
-color brightgreen  "#\{[^}]*\}"
+color identifier  "#\{[^}]*\}"
-color brightblue "(@|@@)[0-9A-Z_a-z]+"
+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 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 red "(^data|^foreign|^import|^infix|^infixl|^infixr|^instance|^module|^newtype|^type)[ ]"
+color statement "(^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$)"
 
 ## Various symbols
-color cyan "(\||@|!|:|_|~|=|\\|;|\(\)|,|\[|\]|\{|\})"
+color symbol "(\||@|!|:|_|~|=|\\|;|\(\)|,|\[|\]|\{|\})"
 
 ## Operators
-color magenta "(==|/=|&&|\|\||<|>|<=|>=)"
+color symbol.operator "(==|/=|&&|\|\||<|>|<=|>=)"
 
 ## Various symbols
-color cyan "(->|<-)"
+color special "(->|<-)"
-color magenta "\.|\$"
+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 comment "--.*"
-color green start="\{-" end="-\}"
+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 constant.bool.false   "\<(off|none)\>"
-color green "\<on\>"
+color constant.bool.true "\<on\>"
-color brightblue   "\<set|\$include\>"
+color preproc   "\<set|\$include\>"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color magenta     "\\.?"
+color constant.specialChar     "\\.?"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
+color comment "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"
-color ,red "	+ +| +	+"
+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.bool  "\b(null|undefined|NaN)\b"
-color constant "\b(true|false)\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.bool  "\b(null)\b"
-color constant "\b(true|false)\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 indent-char.whitespace "[[:space:]]+$"
-color ,red "	+ +| +	+"
+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 statement  "\<(add|clear|compose|keycode|keymaps|keysym|remove|string)\>"
-color cyan  "\<(control|alt|shift)\>"
+color statement  "\<(control|alt|shift)\>"
-color blue   "\<[0-9]+\>"
+color constant.number   "\<[0-9]+\>"
-color red "="
+color symbol "="
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightblack  "^!.*$"
+color comment  "^!.*$"
-color ,green "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color indent-char "	+ +| +	+"

runtime/syntax/kickstart.micro

@@ -1,15 +1,15 @@
 syntax "kickstart" "\.ks$" "\.kickstart$"
 
-color brightmagenta  "%[a-z]+"
+color special  "%[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 statement  "^[[: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 constant  "--(name|mirrorlist|baseurl|utc)(=|\>)"
-color brightyellow "\$(releasever|basearch)\>"
+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 comment "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"
-color ,red "	+ +| +	+"
+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 special  "^([0-9]{4}(/|-)[0-9]{2}(/|-)[0-9]{2}|[=~]) .*"
-color blue   "^[0-9]{4}(/|-)[0-9]{2}(/|-)[0-9]{2}"
+color constant   "^[0-9]{4}(/|-)[0-9]{2}(/|-)[0-9]{2}"
-color brightyellow "^~ .*"
+color statement "^~ .*"
-color brightblue "^= .*"
+color identifier.var "^= .*"
-color cyan  "^[[:space:]]+(![[:space:]]+)?\(?[A-Za-z ]+(:[A-Za-z ]+)*\)?"
+color identifier  "^[[:space:]]+(![[:space:]]+)?\(?[A-Za-z ]+(:[A-Za-z ]+)*\)?"
-color cyan  "^[[:space:]]+(![[:space:]]+)?\(?[A-Za-z_-]+(:[A-Za-z_-]+)*\)?"
+color identifier  "^[[:space:]]+(![[:space:]]+)?\(?[A-Za-z_-]+(:[A-Za-z_-]+)*\)?"
-color red "[*!]"
+color symbol "[*!]"
-color brightblack  "^[[:space:]]*;.*"
+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 indent-char.whitespace "[[:space:]]+$"
-color ,red "	+ +| +	+"
+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 default "\([a-z-]+"
-color red "\(([-+*/<>]|<=|>=)|'"
+color symbol "\(([-+*/<>]|<=|>=)|'"
-color blue   "\<[0-9]+\>"
+color constant.number   "\b[0-9]+b>"
-cyan (i) "\<nil\>"
+color special  "\bnil\b"
-color brightcyan  "\<[tT]\>"
+color brightcyan  "\b[tT]b>"
-color yellow   "\"(\\.|[^"])*\""
+color constant.string   "\"(\\.|[^"])*\""
-color magenta   "'[A-Za-z][A-Za-z0-9_-]+"
+color constant.specialChar   "'[A-Za-z][A-Za-z0-9_-]+"
-color magenta   "\\.?"
+color constant.specialChar   "\\.?"
-color brightblack  "(^|[[:space:]]);.*"
+color comment  "(^|[[:space:]]);.*"
-color ,green "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"
-color ,red "	+ +| +	+"
+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 preproc  "^(export|include|override)\>"
-color operator  "^[^:=	]+:"
+color symbol.operator  "^[^:=	]+:"
-color 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 statement "\<(user|group|bind_to_address|host|port|plugin|name|type)\>"
-color cyan "\<((music|playlist)_directory|(db|log|state|pid|sticker)_file)\>"
+color statement "\<((music|playlist)_directory|(db|log|state|pid|sticker)_file)\>"
-color brightmagenta "^(input|audio_output|decoder)[[:space:]]*\{|\}"
+color special "^(input|audio_output|decoder)[[:space:]]*\{|\}"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
+color comment "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"
-color ,red "	+ +| +	+"
+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)\>"
+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"
-green (i) "^[[:space:]]*(set|unset|include|syntax|header)\>"
+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))?\>"
+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"
-magenta (i) "^[[:space:]]*i?color\>" "\<(start|end)="
+color special "(?i)^[[:space:]]*(i)?color\b" "\b(start|end)="
 ## Strings
-white (i) ""(\\.|[^"])*""
+color constant.string ""(\\.|[^"])*""
 ## Comments
-brightblue (i) "^[[:space:]]*#.*$"
+color comment "^[[:space:]]*#.*$"
-cyan (i) "^[[: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 preproc  "\b(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 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 brightcyan  "\<(on|off)\>"
+color constant.bool  "\<(on|off)\>"
-color brightyellow "\$[A-Za-z][A-Za-z0-9_]*"
+color identifier "\$[A-Za-z][A-Za-z0-9_]*"
-color red "[*]"
+color symbol "[*]"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant-string ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color yellow   start="'$" end="';$"
+color constant.string   start="'$" end="';$"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
+color comment "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"
-color ,red "	+ +| +	+"
+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 identifier  "^[[:space:]]*[A-Za-z][A-Za-z0-9_]*[[:space:]]*<-"
-color blue   "\^[+-]?[0-9]+"
+color constant.number   "\^[+-]?[0-9]+"
-color red "[-+*?^/!&]|->|<-|=>"
+color symbol.operator "[-+*?^/!&]|->|<-|=>"
-color brightyellow    "%[A-Za-z][A-Za-z0-9_]*"
+color identifier.var    "%[A-Za-z][A-Za-z0-9_]*"
-color magenta   "\[[^]]*\]"
+color special   "\[[^]]*\]"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color brightblack  "(^|[[:space:]])\-\-.*$"
+color comment  "(^|[[:space:]])\-\-.*$"
-color brightwhite,cyan "TODO:?"
+color todo "TODO:?"
-color ,green "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"
-color ,red "	+ +| +	+"
+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 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 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)\>"
+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)\>"
-cyan (i) start="[$@%]" end="( |[^0-9A-Z_]|-)"
+#TODO: This regex needs to be fixed.
-color yellow "".*"|qq\|.*\|"
+color identifier (i) start="[$@%]" end="( |[^0-9A-Z_]|-)"
-color white "[sm]/.*/"
+#ENDTODO.
-color white start="(^use| = new)" end=";"
+color constant.string "".*"|qq\|.*\|"
-color green "#.*"
+color default "[sm]/.*/"
-color yellow start="<< 'STOP'" end="STOP"
+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 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 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 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 special "\<(has|is|class|role|given|when|BUILD|multi|returns|method|submethod|slurp|say|sub)\>"
-color brightmagenta start="[$@%]" end="( |\\W|-)"
+color identifier start="[$@%]" end="( |\\W|-)"
-color brightred "".*"|qq\|.*\|"
+color constant.string "".*"|qq\|.*\|"
-color white "[sm]/.*/"
+color default "[sm]/.*/"
-color brightblue start="(^use| = new)" end=";"
+color preproc start="(^use| = new)" end=";"
-color brightgreen "#.*"
+color comment "#.*"
-color brightred start="<<EOSQL" end="EOSQL"
+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 identifier.var "(\$[a-zA-Z0-9\-_]+)"
-color default "[\(|\)|/|+|-|\*|\[|,|;]"
+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 preproc  "^(Name|Description|URL|Version|Conflicts|Cflags):"
-color cyan  "^(Requires|Libs)(\.private)?:"
+color preproc  "^(Requires|Libs)(\.private)?:"
-color red "="
+color symbol.operator "="
-color brightyellow "\$\{[A-Za-z_][A-Za-z0-9_]*\}"
+color identifier.var "\$\{[A-Za-z_][A-Za-z0-9_]*\}"
-color ,green "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"
-color ,red "	+ +| +	+"
+color indent-char "	+ +| +	+"

runtime/syntax/po.micro

@@ -1,8 +1,8 @@
 syntax "po" "\.pot?$"
 
-color cyan  "\<(msgid|msgstr)\>"
+color preproc  "\<(msgid|msgstr)\>"
-color yellow ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color constant.string ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color magenta   "\\.?"
+color special   "\\.?"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
+color comment "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
+color indent-char.whitespace "[[:space:]]+$"
-color ,red "	+ +| +	+"
+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 symbol.operator "(\-|\+|\*|/|\!|%|<<|>>)"
-color statement "(==|!=|<=|>=|<|>)"
+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 preproc "^[[:space:]]*#[[:space:]]*(declare)"
-color brightyellow "\<(sphere|cylinder|translate|matrix|rotate|scale)\>"
+color statement "\b(sphere|cylinder|translate|matrix|rotate|scale)\b"
-color brightyellow "\<(orthographic|location|up|right|direction|clipped_by)\>"
+color statement "\b(orthographic|location|up|right|direction|clipped_by)\b"
-color brightyellow "\<(fog_type|fog_offset|fog_alt|rgb|distance|transform)\>"
+color statement "\b(fog_type|fog_offset|fog_alt|rgb|distance|transform)\b"
-color brightred "^\<(texture)\>"
+color identifier "^\b(texture)\b"
-color brightred "\<(light_source|background)\>"
+color identifier "\b(light_source|background)\b"
-color brightred "\<(fog|object|camera)\>"
+color identifier "\b(fog|object|camera)\b"
-color green "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
+color symbol.operator "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|!|=|&|\|)"
-color brightmagenta "\<(union|group|subgroup)\>"
+color special "\b(union|group|subgroup)\b"
 ## Comment highlighting
-color brightblue "//.*"
+color comment "//.*"
-color brightblue start="/\*" end="\*/"
+color comment start="/\*" end="\*/"