diff --git a/Makefile b/Makefile
index 5b54155d..633f56d6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,15 @@
-build:
+.PHONY: runtime
+
+build: runtime
 	go get -d ./cmd/micro
 	go build -o micro ./cmd/micro
 
-install: build
+install: build runtime
 	mv micro $(GOPATH)/bin
 
 runtime:
 	go get -u github.com/jteeuwen/go-bindata/...
-	go-bindata -o runtime.go data/
+	go-bindata -o runtime.go runtime/...
 	mv runtime.go cmd/micro
 
 test:
diff --git a/cmd/micro/highlighter.go b/cmd/micro/highlighter.go
index 61ff58b9..7f75ad69 100644
--- a/cmd/micro/highlighter.go
+++ b/cmd/micro/highlighter.go
@@ -11,7 +11,8 @@ import (
 // FileTypeRules represents a complete set of syntax rules for a filetype
 type FileTypeRules struct {
 	filetype string
-	rules    []SyntaxRule
+	filename string
+	text     string
 }
 
 // SyntaxRule represents a regex to highlight in a certain style
@@ -49,8 +50,11 @@ var preInstalledSynFiles = []string{
 	"erb",
 	"fish",
 	"fortran",
-	"gentoo",
-	"git",
+	"gentoo-ebuild",
+	"gentoo-etc-portage",
+	"git-commit",
+	"git-config",
+	"git-rebase-todo",
 	"glsl",
 	"go",
 	"groff",
@@ -83,7 +87,9 @@ var preInstalledSynFiles = []string{
 	"pkgbuild",
 	"po",
 	"pov",
-	"privoxy",
+	"privoxy-action",
+	"privoxy-config",
+	"privoxy-filter",
 	"puppet",
 	"python",
 	"reST",
@@ -170,15 +176,9 @@ func LoadSyntaxFile(text, filename string) {
 	// Regex for parsing header statements
 	headerParser := regexp.MustCompile(`header "(.*)"`)
 
-	// Regex for parsing standard syntax rules
-	ruleParser := regexp.MustCompile(`color (.*?)\s+(?:\((.*?)\)\s+)?"(.*)"`)
-	// Regex for parsing syntax rules with start="..." end="..."
-	ruleStartEndParser := regexp.MustCompile(`color (.*?)\s+(?:\((.*?)\)\s+)?start="(.*)"\s+end="(.*)"`)
-
 	var syntaxRegex *regexp.Regexp
 	var headerRegex *regexp.Regexp
 	var filetype string
-	var rules []SyntaxRule
 	for lineNum, line := range lines {
 		if strings.TrimSpace(line) == "" ||
 			strings.TrimSpace(line)[0] == '#' {
@@ -191,11 +191,8 @@ func LoadSyntaxFile(text, filename string) {
 			syntaxMatches := syntaxParser.FindSubmatch([]byte(line))
 			if len(syntaxMatches) == 3 {
 				if syntaxRegex != nil {
-					// Add the current rules to the syntaxFiles variable
-					regexes := [2]*regexp.Regexp{syntaxRegex, headerRegex}
-					syntaxFiles[regexes] = FileTypeRules{filetype, rules}
+					TermError(filename, lineNum, "Syntax statement redeclaration")
 				}
-				rules = rules[:0]
 
 				filetype = string(syntaxMatches[1])
 				extensions := JoinRule(string(syntaxMatches[2]))
@@ -224,112 +221,135 @@ func LoadSyntaxFile(text, filename string) {
 				TermError(filename, lineNum, "Header statement is not valid: "+line)
 				continue
 			}
-		} else {
-			// Syntax rule, but it could be standard or start-end
-			if ruleParser.MatchString(line) {
-				// Standard syntax rule
-				// Parse the line
-				submatch := ruleParser.FindSubmatch([]byte(line))
-				var color string
-				var regexStr string
-				var flags string
-				if len(submatch) == 4 {
-					// If len is 4 then the user specified some additional flags to use
-					color = string(submatch[1])
-					flags = string(submatch[2])
-					regexStr = "(?" + flags + ")" + JoinRule(string(submatch[3]))
-				} else if len(submatch) == 3 {
-					// If len is 3, no additional flags were given
-					color = string(submatch[1])
-					regexStr = JoinRule(string(submatch[2]))
-				} else {
-					// If len is not 3 or 4 there is a problem
-					TermError(filename, lineNum, "Invalid statement: "+line)
-					continue
-				}
-				// Compile the regex
-				regex, err := regexp.Compile(regexStr)
-				if err != nil {
-					TermError(filename, lineNum, err.Error())
-					continue
-				}
-
-				// Get the style
-				// The user could give us a "color" that is really a part of the colorscheme
-				// in which case we should look that up in the colorscheme
-				// They can also just give us a straight up color
-				st := defStyle
-				if _, ok := colorscheme[color]; ok {
-					st = colorscheme[color]
-				} else {
-					st = StringToStyle(color)
-				}
-				// Add the regex, flags, and style
-				// False because this is not start-end
-				rules = append(rules, SyntaxRule{regex, flags, false, st})
-			} else if ruleStartEndParser.MatchString(line) {
-				// Start-end syntax rule
-				submatch := ruleStartEndParser.FindSubmatch([]byte(line))
-				var color string
-				var start string
-				var end string
-				// Use m and s flags by default
-				flags := "ms"
-				if len(submatch) == 5 {
-					// If len is 5 the user provided some additional flags
-					color = string(submatch[1])
-					flags += string(submatch[2])
-					start = string(submatch[3])
-					end = string(submatch[4])
-				} else if len(submatch) == 4 {
-					// If len is 4 the user did not provide additional flags
-					color = string(submatch[1])
-					start = string(submatch[2])
-					end = string(submatch[3])
-				} else {
-					// If len is not 4 or 5 there is a problem
-					TermError(filename, lineNum, "Invalid statement: "+line)
-					continue
-				}
-
-				// Compile the regex
-				regex, err := regexp.Compile("(?" + flags + ")" + "(" + start + ").*?(" + end + ")")
-				if err != nil {
-					TermError(filename, lineNum, err.Error())
-					continue
-				}
-
-				// Get the style
-				// The user could give us a "color" that is really a part of the colorscheme
-				// in which case we should look that up in the colorscheme
-				// They can also just give us a straight up color
-				st := defStyle
-				if _, ok := colorscheme[color]; ok {
-					st = colorscheme[color]
-				} else {
-					st = StringToStyle(color)
-				}
-				// Add the regex, flags, and style
-				// True because this is start-end
-				rules = append(rules, SyntaxRule{regex, flags, true, st})
-			}
 		}
 	}
 	if syntaxRegex != nil {
 		// Add the current rules to the syntaxFiles variable
 		regexes := [2]*regexp.Regexp{syntaxRegex, headerRegex}
-		syntaxFiles[regexes] = FileTypeRules{filetype, rules}
+		syntaxFiles[regexes] = FileTypeRules{filetype, filename, text}
 	}
 }
 
+func LoadRulesFromFile(text, filename string) []SyntaxRule {
+	lines := strings.Split(string(text), "\n")
+
+	// Regex for parsing standard syntax rules
+	ruleParser := regexp.MustCompile(`color (.*?)\s+(?:\((.*?)\)\s+)?"(.*)"`)
+	// Regex for parsing syntax rules with start="..." end="..."
+	ruleStartEndParser := regexp.MustCompile(`color (.*?)\s+(?:\((.*?)\)\s+)?start="(.*)"\s+end="(.*)"`)
+
+	var rules []SyntaxRule
+	for lineNum, line := range lines {
+		if strings.TrimSpace(line) == "" ||
+			strings.TrimSpace(line)[0] == '#' ||
+			strings.HasPrefix(line, "syntax") ||
+			strings.HasPrefix(line, "header") {
+			// Ignore this line
+			continue
+		}
+
+		// Syntax rule, but it could be standard or start-end
+		if ruleParser.MatchString(line) {
+			// Standard syntax rule
+			// Parse the line
+			submatch := ruleParser.FindSubmatch([]byte(line))
+			var color string
+			var regexStr string
+			var flags string
+			if len(submatch) == 4 {
+				// If len is 4 then the user specified some additional flags to use
+				color = string(submatch[1])
+				flags = string(submatch[2])
+				regexStr = "(?" + flags + ")" + JoinRule(string(submatch[3]))
+			} else if len(submatch) == 3 {
+				// If len is 3, no additional flags were given
+				color = string(submatch[1])
+				regexStr = JoinRule(string(submatch[2]))
+			} else {
+				// If len is not 3 or 4 there is a problem
+				TermError(filename, lineNum, "Invalid statement: "+line)
+				continue
+			}
+			// Compile the regex
+			regex, err := regexp.Compile(regexStr)
+			if err != nil {
+				TermError(filename, lineNum, err.Error())
+				continue
+			}
+
+			// Get the style
+			// The user could give us a "color" that is really a part of the colorscheme
+			// in which case we should look that up in the colorscheme
+			// They can also just give us a straight up color
+			st := defStyle
+			if _, ok := colorscheme[color]; ok {
+				st = colorscheme[color]
+			} else {
+				st = StringToStyle(color)
+			}
+			// Add the regex, flags, and style
+			// False because this is not start-end
+			rules = append(rules, SyntaxRule{regex, flags, false, st})
+		} else if ruleStartEndParser.MatchString(line) {
+			// Start-end syntax rule
+			submatch := ruleStartEndParser.FindSubmatch([]byte(line))
+			var color string
+			var start string
+			var end string
+			// Use m and s flags by default
+			flags := "ms"
+			if len(submatch) == 5 {
+				// If len is 5 the user provided some additional flags
+				color = string(submatch[1])
+				flags += string(submatch[2])
+				start = string(submatch[3])
+				end = string(submatch[4])
+			} else if len(submatch) == 4 {
+				// If len is 4 the user did not provide additional flags
+				color = string(submatch[1])
+				start = string(submatch[2])
+				end = string(submatch[3])
+			} else {
+				// If len is not 4 or 5 there is a problem
+				TermError(filename, lineNum, "Invalid statement: "+line)
+				continue
+			}
+
+			// Compile the regex
+			regex, err := regexp.Compile("(?" + flags + ")" + "(" + start + ").*?(" + end + ")")
+			if err != nil {
+				TermError(filename, lineNum, err.Error())
+				continue
+			}
+
+			// Get the style
+			// The user could give us a "color" that is really a part of the colorscheme
+			// in which case we should look that up in the colorscheme
+			// They can also just give us a straight up color
+			st := defStyle
+			if _, ok := colorscheme[color]; ok {
+				st = colorscheme[color]
+			} else {
+				st = StringToStyle(color)
+			}
+			// Add the regex, flags, and style
+			// True because this is start-end
+			rules = append(rules, SyntaxRule{regex, flags, true, st})
+		}
+	}
+	return rules
+}
+
 // GetRules finds the syntax rules that should be used for the buffer
 // and returns them. It also returns the filetype of the file
 func GetRules(buf *Buffer) ([]SyntaxRule, string) {
 	for r := range syntaxFiles {
 		if r[0] != nil && r[0].MatchString(buf.path) {
-			return syntaxFiles[r].rules, syntaxFiles[r].filetype
+			// Check if the syntax statement matches the extension
+			return LoadRulesFromFile(syntaxFiles[r].text, syntaxFiles[r].filename), syntaxFiles[r].filetype
 		} else if r[1] != nil && r[1].MatchString(buf.lines[0]) {
-			return syntaxFiles[r].rules, syntaxFiles[r].filetype
+			// Check if the header statement matches the first line
+			return LoadRulesFromFile(syntaxFiles[r].text, syntaxFiles[r].filename), syntaxFiles[r].filetype
 		}
 	}
 	return nil, "Unknown"
diff --git a/cmd/micro/runtime.go b/cmd/micro/runtime.go
index 5d6469c9..a27854ff 100644
--- a/cmd/micro/runtime.go
+++ b/cmd/micro/runtime.go
@@ -26,8 +26,11 @@
 // runtime/syntax/erb.micro
 // runtime/syntax/fish.micro
 // runtime/syntax/fortran.micro
-// runtime/syntax/gentoo.micro
-// runtime/syntax/git.micro
+// runtime/syntax/gentoo-ebuild.micro
+// runtime/syntax/gentoo-etc-portage.micro
+// runtime/syntax/git-commit.micro
+// runtime/syntax/git-config.micro
+// runtime/syntax/git-rebase-todo.micro
 // runtime/syntax/glsl.micro
 // runtime/syntax/go.micro
 // runtime/syntax/groff.micro
@@ -60,7 +63,9 @@
 // runtime/syntax/pkgbuild.micro
 // runtime/syntax/po.micro
 // runtime/syntax/pov.micro
-// runtime/syntax/privoxy.micro
+// runtime/syntax/privoxy-action.micro
+// runtime/syntax/privoxy-config.micro
+// runtime/syntax/privoxy-filter.micro
 // runtime/syntax/puppet.micro
 // runtime/syntax/python.micro
 // runtime/syntax/reST.micro
@@ -150,7 +155,7 @@ func (fi bindataFileInfo) Sys() interface{} {
 	return nil
 }
 
-var _runtimeReadmeMd = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x14\xcb\xb1\x0d\x03\x21\x0c\x05\xd0\x9e\x29\xbe\x94\x9e\x4c\x92\x26\xca\x00\x28\x60\x84\x25\xb0\x4f\xb6\x29\xae\xb9\xd9\x4f\x37\xc0\x7b\xe1\xbb\x25\x78\x11\x3a\x4f\x72\x74\x35\x7c\xb8\x9a\xa6\xf4\x1b\x84\xaa\x12\x24\xe1\xd0\x8e\x18\xec\x68\x6c\x54\x43\xed\x84\x0f\xdd\xb3\xe1\x4f\x38\x76\x80\x05\xe5\x7a\xe7\xf5\xd0\x92\xd3\x1d\x00\x00\xff\xff\x40\x55\x36\xa9\x57\x00\x00\x00")
+var _runtimeReadmeMd = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x6c\x90\x4f\x4a\xc7\x30\x10\x85\xf7\x39\xc5\x03\xb7\x3f\xda\x63\x88\x0b\x37\xe2\x01\x9a\x3f\x53\x3b\x9a\x64\x4a\x32\xb1\x66\xe3\xd9\x4d\x2d\x82\xa0\xab\x40\xe6\xbd\xef\x63\xe6\x0e\x4f\x2d\x2b\x27\xc2\xca\x91\x2a\x56\x29\x78\x64\x5f\xc4\x98\xe7\x8d\x2b\x02\x17\xf2\x2a\xa5\xe3\xe0\x18\xe1\x08\x94\x1c\x85\x40\x01\x9c\xa1\x1b\xe1\x5e\xe0\x38\xdb\x91\x38\xbb\xbb\x14\xb5\x8e\x23\x6b\xbf\xc1\x35\x05\x2b\x92\xed\x78\x6d\x55\x61\x2b\x0e\xba\x28\xfb\x39\xca\x58\x3e\xe7\xc9\x4b\x5e\xf9\x65\x4e\xa7\x75\x99\xf0\xb0\xa2\x4b\xc3\x21\x2d\x06\x44\x7e\x23\xa8\x0c\xc4\x78\xc7\x77\x81\x1c\x19\x5e\xa2\x94\xea\x37\x4a\x54\x8d\xcd\x01\xb5\x67\xb5\x1f\xd7\x0a\xb7\xef\xba\xb7\xf9\xc7\xf1\x8f\x66\xfe\x4d\x58\x70\x22\xfe\x44\x2e\xe6\x82\x42\x75\x1f\x27\xe0\x77\x8a\x7d\x32\xe6\x2b\x00\x00\xff\xff\xd8\x8e\x0e\x48\x31\x01\x00\x00")
 
 func runtimeReadmeMdBytes() ([]byte, error) {
 	return bindataRead(
@@ -165,7 +170,7 @@ func runtimeReadmeMd() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "runtime/README.md", size: 87, mode: os.FileMode(420), modTime: time.Unix(1459091032, 0)}
+	info := bindataFileInfo{name: "runtime/README.md", size: 305, mode: os.FileMode(420), modTime: time.Unix(1461002675, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -270,7 +275,7 @@ func runtimeSyntaxLicense() (*asset, error) {
 	return a, nil
 }
 
-var _runtimeSyntaxReadmeMd = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x7c\x54\x4f\x6b\xe3\x3e\x10\xbd\xfb\x53\x0c\xe9\xa1\x69\x30\xce\xe1\x77\x2b\xfc\x58\xd8\xa5\xdb\x2d\xb4\x61\xa1\xed\xa9\x14\xac\x48\xe3\x48\xad\xac\x11\x92\x9c\x34\x7b\xd8\xcf\xbe\x23\xd9\xe9\x26\x94\x6e\xc0\xb6\x90\xe6\xcf\x7b\x4f\x6f\x72\x06\x77\x46\x06\x82\xb8\x77\x49\xbc\x81\x36\x1b\x6d\xf9\x49\xc6\x6d\xa0\x33\x16\x63\x55\x3d\x68\x8c\x08\x22\x20\x24\x8d\x9f\x07\x42\x47\x01\xfa\x5c\xac\x81\x07\x02\xe3\x62\x12\xd6\xe6\x9c\xbe\x86\x97\x21\xa6\xca\x0f\x09\xa6\xad\x43\x99\x31\xd3\x38\x68\x7f\x2f\x9b\x92\xbc\x1c\x4f\xda\xa6\x34\xde\x8f\x7d\xc5\x2b\x3a\xe8\x02\xf5\xb0\x12\x8e\x6a\x88\x1e\xa5\xe9\x8c\xe4\x6a\xfb\x71\xff\x29\x69\x13\x21\xa0\xa7\x68\x12\x85\xfd\xf3\x5c\xa7\xe4\xe3\xe5\x72\xb9\x31\x49\x0f\xeb\x46\x52\xbf\x8c\x92\xbc\x48\xbf\x96\x8e\x8b\x04\x79\xd1\x54\x27\xdc\x47\x2c\xb9\x9f\xb0\x3d\xc5\x04\x46\xa1\x4b\xb9\x09\x24\x2a\x8d\xcf\x63\x0d\xf8\x26\xd1\xa7\x42\x36\x52\x8f\xf0\xca\x18\x95\xe9\x3a\x0c\xe8\x24\xc6\xcb\xaa\x5a\x4c\x92\x2a\xe2\x72\x8e\x12\x0c\x2c\x5f\x6b\x24\x59\x0a\x6d\x03\x37\x2c\x0c\x0a\x55\x97\x12\x02\xa4\xe0\x53\x16\x0b\x1d\x03\x37\x5b\x84\x5e\x24\xa9\xeb\x92\x94\x85\xfa\x70\xde\x59\xb1\x81\x79\x6b\xda\x8b\xac\x5b\x0e\x09\xb8\x19\xac\x08\x0c\xcd\x07\x8c\xd1\x90\xab\x80\x7f\x0b\xf8\x4e\x79\x53\xf4\xde\x62\x7d\x40\x00\x9b\x80\x2c\xe6\xac\x59\xcc\x5a\xd8\xd1\x60\x15\xac\x51\x66\x26\xed\xf1\xf9\xdc\x5c\x8c\x31\x1f\xe9\xc4\xc1\x7b\x0a\x09\x5a\xbe\xe0\x90\xfe\x9f\x35\x4d\x33\x03\x74\x6a\x5c\xfd\x65\xf8\x4e\xa1\x8d\xed\x88\x9a\x65\x2c\xec\xc0\xe1\xce\x1a\x97\xd5\x76\x0a\xb2\x2d\xda\x66\xf1\xa5\x3d\xf0\xe9\x8d\x52\x16\x3f\x72\x38\x45\x38\x75\xd7\x68\x2d\x4d\xfd\x77\x14\xac\xfa\x37\xad\xc8\xb4\x4a\x0a\x37\x9c\xc2\xab\xea\x0c\x1e\x63\xf6\xf1\x8e\xad\x02\x25\x3c\x4a\xb6\x6d\x36\xff\x8a\x46\xcf\x52\x97\xa1\x31\xa1\xd1\x25\x5a\xf0\x4d\xac\x73\x45\x49\x6e\x8b\x21\xa1\xca\xec\x32\xe3\xe2\xe2\xf3\x78\x5c\x07\x3a\x14\x69\x08\xd8\xc0\x5d\xf6\xd5\x58\xab\x2f\x43\xc1\x95\x82\x92\xa4\xa6\xcb\x2e\x39\x35\xec\xb4\x91\xba\x92\xc2\x71\x0f\xf0\x81\xd6\x16\x59\x38\x23\x41\xa1\x67\xa6\x19\x2b\xb9\xa3\x8c\xb1\xcb\x9e\x86\x8c\x80\x27\xe7\x07\xbb\x11\x78\x1e\x04\x58\xf3\xde\x70\x82\x9e\xb4\x48\x9f\xe1\xe7\x56\x1e\x03\xcf\x54\x26\x72\x2c\x44\xb1\xf5\xd6\xf0\x6b\x43\xfc\x92\xfc\x28\x7e\x7a\x11\x5e\x15\xed\x1c\x2f\x75\xea\x2d\x7f\xec\x20\xf8\x1d\x77\xa6\x4b\xfc\x0d\x79\xec\x17\xf0\x22\xb6\x62\xfa\x44\x19\x8c\xcf\x7b\x7e\x9f\x34\xb9\x12\xb3\xde\xe7\x14\x9d\x8b\x9b\x94\x6f\xe3\xd6\x48\xb6\x3b\x56\xd5\x57\x94\xe2\xe0\xa2\x3c\xb4\xa7\xa3\x7a\x33\xd2\xe8\x89\xe7\xcf\x30\x81\x3c\xba\x8a\xf9\x06\xb3\x1e\x32\xa1\xc1\x29\x0c\x25\xf7\x7a\xf5\x08\xd7\x3f\x6f\xb7\xff\xb1\x1e\xa5\x74\x7d\x72\x9b\xe3\xcc\x47\x3a\xce\xae\x0e\xd9\xac\xd6\x94\xd4\xc0\x3d\x22\x3c\xdd\xde\x7c\xbb\x5a\xdd\x5f\x3d\xcf\xa7\x05\xff\x8f\xfc\x09\x00\x00\xff\xff\xae\xbd\x5e\xef\x46\x05\x00\x00")
+var _runtimeSyntaxReadmeMd = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x7c\x54\x4d\x6f\xe3\x36\x10\xbd\xeb\x57\x0c\xbc\x87\x75\x0c\x41\x3e\xf4\xb6\x40\x51\xa0\xc5\x76\x1b\x20\x6b\x14\xd8\xe4\x14\x04\x10\x4d\x8e\xc4\x49\x28\x8e\x40\x52\x76\xdc\x43\x7f\x7b\x87\x94\x9c\xda\x08\xb2\x06\xf4\x01\x8a\xf3\xde\xbc\xc7\x37\xfe\x04\xdf\x49\x07\x86\x78\xf2\x49\xbd\x82\xa5\xde\x3a\xb9\x12\xf9\x1e\x3a\x72\x18\xab\xea\xde\x62\x44\x50\x01\x21\x59\xfc\x78\x23\x74\x1c\x60\xc8\x60\x0d\xdc\x33\x90\x8f\x49\x39\x97\x6b\x86\x1a\x9e\xa7\x98\xaa\x71\x4a\xb0\x2c\x9d\x61\xe6\x4a\xf2\xd0\xfe\xbb\x6d\x34\xfb\x8e\xfa\x6d\xc1\xd8\xce\x1b\xda\xa6\xf0\x9f\x66\x7a\xf5\x82\x1e\xba\xc0\x03\xec\x94\xe7\x1a\xe2\x88\x9a\x3a\xd2\x02\x7a\x9a\xd7\x1f\x93\xa5\x08\x01\x47\x8e\x94\x38\x9c\x9e\xd6\x36\xa5\x31\x7e\xd9\x6e\x7b\x4a\x76\xda\x0b\xc7\xb0\x8d\x9a\x47\x95\xfe\xd9\x7a\x01\x09\xfa\xa6\xa9\xae\x2c\x98\x5b\xca\x7c\xca\x0d\x1c\x13\x90\x41\x9f\x32\x09\x24\x2e\xc4\x9f\x63\x0d\xf8\xaa\x71\x4c\x45\x73\xe4\x01\xe1\x45\x7a\x34\xd4\x75\x18\xd0\x6b\x8c\x5f\xaa\x6a\xb3\x38\x6b\x58\xe0\x3c\x27\x98\xc4\xc5\x96\x34\x3b\x0e\x6d\x03\xb7\xe2\x0f\x2a\x53\x17\x08\x05\x5a\xc9\x57\xf1\x0c\xbd\x34\x4e\x07\x84\x41\x25\x6d\xeb\x52\x94\xfd\x7a\xf7\xbd\x73\xaa\x87\x75\x4b\xed\x4d\xb6\x2f\x6f\x09\xd8\x4f\x4e\x05\x69\x6d\x0c\x18\x23\xb1\xaf\x40\x7e\x1b\xf8\x93\xf3\xa2\x1a\x46\x87\xf5\xb9\x03\xe8\x03\x8a\x99\xab\x66\xb3\x6a\xe1\xc8\x93\x33\xb0\x47\x9d\x95\xb4\x97\xdf\xd7\x74\x33\xef\x79\x2f\x27\x4e\xe3\xc8\x21\x41\x2b\xe7\x1c\xd2\xaf\xab\xa6\x69\x56\x80\xde\xcc\x6f\xff\x2b\x7c\x93\xd0\xc6\x76\xee\x5a\x6c\x2c\xea\xc0\xe3\xd1\x91\xcf\x6e\x7b\x03\x39\x1d\x6d\xb3\xf9\xad\x3d\xeb\x19\xc8\x18\x87\xef\x35\x5c\x77\xb8\xb0\x5b\x74\x8e\x17\xfe\x23\x07\x67\x7e\x2e\x2b\x8a\xac\x52\x22\x84\xcb\xf6\xaa\xfa\x04\x0f\x31\xc7\xf9\x28\x51\x81\xb2\x3d\x6a\x49\x6f\x9e\x81\x1d\xcf\xd1\xe5\x2e\xb7\x26\x82\xe6\x94\x58\x25\x27\xb1\xcf\x88\x92\xdd\x03\x86\x84\x26\xab\xcb\x8a\x4b\x8a\x3f\xc7\x4b\x1c\xe8\x50\xa5\x29\x60\x03\xdf\x73\xae\x66\xac\xa1\xcc\x86\x20\x05\xa3\xd9\x2c\x87\x5d\x6a\x6a\x38\x5a\xd2\xb6\xd2\xca\x0b\x07\x8c\x81\xf7\x0e\xc5\x38\xd2\x60\x70\x14\xa5\xb9\x57\xf6\x17\x15\x33\xcb\x89\xa7\xdc\x81\x4c\xce\x5f\x92\x46\x90\x79\x50\xe0\xe8\x8d\x70\x69\x3d\x59\x95\x3e\xea\x5f\xa8\x46\x0c\x32\x53\x59\xc8\xa5\x11\x25\xd6\x07\x92\x5b\xcf\x72\xd3\x72\x19\xb9\x06\x15\x5e\x0c\x1f\xbd\xbc\xda\x34\x38\x79\xb8\x49\xc9\x3d\x1e\xa9\x4b\xf2\x0c\x79\xfa\x37\xf0\xac\x0e\x6a\x79\x44\x1d\x68\xcc\x6b\xe3\x29\x59\xf6\x65\xcf\xfe\x94\x4b\x6c\x06\xa7\x94\x4f\xe3\x8e\xb4\xc4\x1d\xab\xea\x77\xd4\xea\x9c\xa2\x3c\xb4\xd7\xa3\x7a\x3b\xcb\x18\x58\xe6\x8f\x44\x40\x1e\x5d\x23\x7a\x03\xed\xa7\x2c\x68\xf2\x06\x43\xa9\xfd\xb6\x7b\x80\x6f\x7f\xdf\x1d\x7e\x11\x3f\x0a\x74\x7d\x75\x9a\xf3\xcc\x47\xbe\xac\xae\xce\xd5\xe2\xd6\x52\xd4\xc0\x0f\x44\x78\xbc\xbb\xfd\xe3\xeb\xee\xc7\xd7\xa7\xf5\xf2\x22\xff\x23\xff\x05\x00\x00\xff\xff\x67\x39\x94\x62\x4d\x05\x00\x00")
 
 func runtimeSyntaxReadmeMdBytes() ([]byte, error) {
 	return bindataRead(
@@ -285,7 +290,7 @@ func runtimeSyntaxReadmeMd() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "runtime/syntax/README.md", size: 1350, mode: os.FileMode(420), modTime: time.Unix(1460170621, 0)}
+	info := bindataFileInfo{name: "runtime/syntax/README.md", size: 1357, mode: os.FileMode(420), modTime: time.Unix(1461002675, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -670,42 +675,102 @@ func runtimeSyntaxFortranMicro() (*asset, error) {
 	return a, nil
 }
 
-var _runtimeSyntaxGentooMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x84\x56\x7b\x73\xda\xb8\x16\xff\x3f\x9f\x42\x25\x99\x5b\x9b\x14\xda\x99\x7b\xa7\x73\x9b\x9b\x84\xa1\x40\x1b\xa6\x34\x61\x80\xf4\x76\x37\x26\x59\x61\xcb\xb6\x16\x59\xf2\x4a\x72\x08\xed\x69\x3f\xfb\x1e\xd9\x26\x85\x3c\x66\x67\xc0\xd6\xe3\xe8\x9c\xdf\xf9\xe9\x3c\xbc\xbf\x4f\xce\x98\x66\x84\x1b\x42\x25\x61\x77\x34\xcb\x05\x23\xb1\xd2\x84\x2d\x0a\x2e\x22\xf3\x9a\x85\x82\x1a\xc3\xcc\xde\xfe\xfe\x9e\x59\x4b\x4b\xef\x48\x63\x50\xee\x35\x48\x23\x68\x33\xaf\x1c\x43\x29\xe5\x1f\x34\x50\x8c\x74\x85\x20\x36\x65\xc4\x58\x2a\x23\xaa\x23\x92\x2b\x6d\x69\x82\x7a\x0b\x19\x5a\xae\xa4\xd9\x0b\x95\x40\x1b\x0b\xcd\x93\xd4\x26\x9a\x31\x49\x1a\xd7\x46\x87\x37\x5e\x21\x73\x1a\x2e\x21\x54\x59\xce\x05\x03\x2e\x51\x89\x10\x60\x99\xb1\x3e\x1a\xbc\xce\x97\xc9\x8d\x17\x2a\x19\xf3\x04\xa4\x8a\x99\x0d\x53\x30\xcc\x16\x39\x78\xb9\x66\x90\x2b\x94\xf3\xdc\x29\xd0\x99\xef\x97\x70\xce\xd0\x88\x70\x86\xc8\x82\x9a\x94\x68\x26\xa8\x65\x11\xa9\x9c\xa9\x91\xd4\x18\x82\x63\x2f\xa4\x86\x41\xa4\xf0\x27\x19\x30\xc1\x63\x7c\xe0\x0a\x33\x34\x04\x76\xc7\x2d\xc4\x1c\x90\x1f\xd8\xf8\x02\x28\xc1\x25\x08\x15\x52\x01\x9a\xd1\x08\x1f\xb6\xd0\x12\x51\x09\x16\x5a\x30\x29\x8f\x2d\x20\x1d\x12\x2c\xcf\x18\x14\xd2\x72\x01\xab\xd4\x79\x87\x7e\x58\x2e\x0b\x06\x0b\x3c\xb8\xf4\x83\xd3\xc6\x2e\x1c\x2f\xf8\x0e\xc1\x0f\x08\x3c\x08\x7c\x08\xfe\x07\xc1\x1c\x82\x2b\xf8\x03\x82\x00\x82\x03\x38\x86\x53\x78\x01\x27\xf0\x2f\x08\xc0\x7f\x70\xb2\xe5\xa1\x13\x10\x83\x86\x04\x0a\x58\xc1\x1d\x8c\x1e\xab\x47\xa1\xbf\x00\xbd\x4c\x2c\x08\x0b\x09\x03\x84\x64\x40\xc2\xb7\x52\x74\x87\xb9\x5b\xaa\x39\x5d\x08\x66\x48\xbb\xdd\x26\x2a\x8e\x79\xc8\xa9\xb8\xbf\x58\xe4\xca\x10\x2e\x91\xdb\xe8\x15\xc1\xfb\x22\x0a\x1d\xd6\xe5\x52\x75\xc7\x6e\x67\xe7\xd2\x71\x8e\x74\x1f\x04\xdf\x3b\x57\xb4\xf5\xad\xdb\xfa\xfd\xe6\x4d\xeb\xdd\xfc\x30\xf8\xd1\xd9\x80\xac\x24\x8e\xbd\xee\xa4\x77\x06\x67\x17\x9f\x07\xe3\xee\xc7\x01\xf4\x07\xd3\xde\x64\x38\x9e\x0d\x2f\xce\x61\x78\x39\x1d\xc0\x74\xd2\xbb\xb9\x9c\x0c\x61\x34\xec\x0d\xce\xdd\x7c\x74\x31\x83\x4f\x83\xdf\xfe\x7f\x31\xe9\x4f\xe1\xc3\x70\x34\x98\xf6\x87\x13\xc0\xe9\x27\xf7\xf6\xc6\x30\xf1\x3b\xfd\xc1\x78\x70\xde\x87\xf1\xe4\xe2\xcb\xb0\x8f\x4a\x87\xd3\x99\xdb\x9c\x0c\xa6\xb3\xc9\xb0\x37\x03\x54\x3c\x19\x75\xcf\xfb\x5b\x9c\x6d\xe0\x4c\xa1\x0f\x33\x18\x7f\x81\xf1\x07\x18\xc3\xf8\x1c\xba\x4e\xc8\x6d\xf5\xbc\xaf\x5f\xfd\xce\x87\x51\xf7\xe3\xb4\x5e\x19\xf5\xb7\x67\x3d\xef\xec\x62\x3a\x83\x59\x77\xf2\x71\x30\x83\xf7\x97\xc3\x51\xff\x31\xd1\x1b\x46\x31\x01\x32\xcc\x9e\x4d\xa6\x64\xb8\x86\xe1\xea\xd4\x14\x86\x79\x37\xde\x8a\xdb\x14\x98\x74\x77\xe2\xfb\x9d\xe0\x94\x5c\xbd\xa8\x78\x44\x1a\x6f\x0e\x49\x6b\xde\x44\x9b\x5c\xe2\x2d\x70\xdb\x6e\x36\x76\xb8\x5f\x88\x82\x39\x4d\x98\xbb\x2c\xc1\xd8\x65\x32\x72\xa1\x18\xdf\x67\x5b\x46\x97\x0c\x56\x14\x83\x98\xcb\x58\xc9\x0e\x30\xad\x31\xe4\x85\x4a\x20\xa7\x2e\xe3\x24\x5b\x79\x89\x56\x98\x75\x88\x46\xfb\x5b\x34\xed\x5a\x88\x38\xab\x9d\x7f\x1a\x75\xb9\x55\xa3\xac\x67\x29\x35\xf5\xc8\xc3\x21\x2c\x5c\xe2\xdf\xdc\x62\x30\x61\xae\x6d\x74\x95\x35\xe2\x39\x9b\x1e\x26\x2f\xe2\x2b\xab\x00\x98\xce\x02\x1d\x8c\x54\x08\x82\x2f\xbc\xa0\x6d\x14\x04\x6d\xea\xa3\x87\x95\x6f\x98\xd2\xae\xc8\x70\x5b\x31\x10\x21\xb8\xdb\x08\x9d\xcc\x20\x63\xb2\x00\x8e\x8b\xcf\x3b\xa7\xbc\x7c\x6d\x53\xe5\x52\x3d\x82\x88\x6b\x48\xb1\xd8\x81\x59\x67\x90\xda\x4c\xc0\x9f\x54\x43\xa6\x36\xd1\xb1\x64\x2c\x47\x99\xa7\x95\x61\xe9\xca\x91\x78\x84\x1e\x9a\x0a\x97\x03\x68\xac\xe6\xb9\xab\x7a\x6e\xdb\x2b\x97\xd1\x0b\xf7\x0f\xda\x1e\x7a\x52\xfb\x51\x8b\x3d\x47\x46\xe8\xae\xd5\xf9\xe9\x73\x69\x55\x8d\x26\xf6\xd4\x4a\x22\xa9\x90\x33\x9d\x99\x0d\x46\xaf\x62\xc3\x38\x67\x7c\x95\x5b\xf3\x28\x3c\x5d\x58\x2a\x79\x1f\x9d\x04\xaf\x35\x72\x59\x5e\x77\x8b\x0d\x86\xda\xba\x8b\xa3\x8d\xea\x90\x5a\x08\x91\xe5\x34\x53\xee\x89\xe6\x21\xcc\x81\xe1\xc8\x71\x8e\xf8\x5c\xe4\x03\x56\xa6\x1c\xcb\x10\x16\x24\x09\xd9\xd2\x71\x9a\xdd\x62\x25\x2f\x19\xc6\x32\x0f\x16\x39\xb5\xaa\xc0\x10\x2c\x24\xce\x1f\xe7\x8f\x43\x86\x99\x62\x08\x7a\xce\x8c\xb4\x64\xa5\xf4\x12\xbb\x11\xc5\x11\x13\xc2\xaf\x11\xae\x71\xac\x56\xa4\xb1\xdf\x6e\x1e\x3c\xd0\xe0\xe8\x94\xc9\x3f\x29\xa8\x68\xde\xa8\xc1\x4a\x1d\xb4\xe1\xea\x3a\x68\xcc\xfd\x66\x03\x1d\x7e\x59\x2f\xbc\xc4\xf9\xcb\xd2\xc0\x4c\x53\x2e\x50\x31\x31\x18\xbc\x65\xc3\x5d\xd0\xe8\x45\xad\xed\x55\x5d\x91\xaf\xae\x8e\xca\xed\xa3\xf9\xfc\x10\x71\xed\x3d\xdf\x9e\xc7\xf7\x75\x42\x5a\xad\x04\x89\xb1\x9f\xec\xf4\x68\xec\x8c\xad\xba\x98\x94\x8d\xda\x5b\xb2\x35\xba\x12\x19\x8c\x19\xb3\x44\xfa\xaa\x97\x61\x75\xd3\x7e\x8f\x7d\x8f\x58\x76\x67\x8f\x76\x9b\xc4\x75\xfb\xb0\x12\xb8\xc4\xfd\x58\xd0\xc4\x1c\x3d\x2e\xe4\xdb\xb8\x83\xc3\x4d\x49\x77\xa5\xa8\x35\x3f\x7c\x2a\x32\xb7\x0f\xb4\x1e\x8a\xa3\xb1\x11\x5f\x32\xb1\x26\x75\xde\x13\x59\x64\x0b\x1c\x1e\x3d\xac\x86\x2d\xd4\x13\xf1\x84\x5b\xd4\xd3\x6e\x7a\x5b\x5a\xe1\xa0\x6a\xfe\xdd\x30\x64\xb9\x6b\xf7\x54\x87\x29\xbb\xd7\x80\xfd\xd7\x3a\x18\x3f\x5b\xf3\x0e\x06\x27\x15\x79\x4a\x81\x66\xd1\xdb\xff\x00\xc5\x70\x4b\xf3\x9c\x02\xa7\x38\xcb\x78\x8e\x49\x92\x87\xee\x8f\x53\xf3\xef\x77\x6f\xb0\xa5\x03\x9a\xd1\x21\xdc\xfd\xf7\xad\xfb\xb7\xe2\x85\x89\xb6\xca\xc4\x46\xf9\x2f\x34\x95\x9d\x66\x89\xa8\x87\x5f\x1f\x89\xd2\xfc\x17\x98\x70\x4d\x1d\xd1\x5b\xf2\xcd\x76\xf3\x75\x29\xfc\x19\x2f\xc9\x05\x8d\x66\x49\x81\x9f\x2d\x4a\x3f\x60\xff\x9e\x89\x9d\xd3\xde\x09\xfc\xc4\xcf\x83\xe3\x13\x38\x71\x1f\x09\xa7\xf8\x3e\xad\xe8\xe8\xd5\xe9\x71\xf4\x64\x1e\xfc\x1d\x00\x00\xff\xff\xdc\xfd\xf5\x3d\x0e\x0a\x00\x00")
+var _runtimeSyntaxGentooEbuildMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x84\x55\xed\x72\xd3\x46\x14\xfd\xcf\x53\x2c\x4e\xa6\xac\x02\x71\xfb\xb7\x94\xe2\x71\x6d\x43\x3c\xb8\x89\xc7\x36\x94\x36\x0a\xee\x5a\x5a\x5b\x5b\xaf\x76\xd5\xdd\x55\x9c\xc0\xe1\xdd\x7b\x57\x96\x19\x42\xc8\x74\x26\x91\xf7\xe3\xea\xde\x73\xce\xfd\xd0\xd1\x11\x3b\x93\x4e\x32\xe5\x99\x30\x4c\xde\x88\xb2\xd2\x92\xad\xad\x63\x72\x55\x2b\x9d\xfb\x1f\x65\xa6\x85\xf7\xd2\x3f\x3a\x3a\x7a\xe4\x6f\x4d\x10\x37\xac\x33\x6a\xee\x3a\xac\x93\x76\x25\x6f\xd6\x68\xac\x92\xe3\x0e\x99\xb1\xbe\xd6\x2c\x14\x92\xf9\x20\x4c\x2e\x5c\xce\x2a\xeb\x82\xd8\x90\xdf\xda\x64\x41\x59\xe3\x1f\x65\x56\x53\x8c\x95\x53\x9b\x22\x6c\x9c\x94\x86\x75\x3e\x78\x97\x2d\x79\x6d\x2a\x91\x6d\x91\xd9\xb2\x52\x5a\x42\x19\x72\xa2\x35\x82\xf4\x21\xa1\x80\x1f\xaa\xed\x66\xc9\x33\x6b\xd6\x6a\x03\x63\xd7\x32\x64\x05\xbc\x0c\x75\x05\x5e\x39\x89\xca\x92\x1d\x8f\x6f\xc1\x95\x49\xd2\xc0\x39\xa3\x20\x3a\x06\x62\x2b\xe1\x0b\xe6\xa4\x16\x41\xe6\x6c\x4f\xa6\x45\xd2\x62\x48\x5f\xf0\x4c\x78\x89\xdc\xd2\x9f\x91\x90\x5a\xad\xe9\x41\x27\xd2\x8b\x0c\xf2\x46\x05\xac\x15\x48\x1f\x1c\xb8\x80\x2c\x94\x81\xb6\x99\xd0\x70\x52\xe4\xf4\x08\xb5\x33\x84\x4a\xcb\x2c\xc0\x17\x6a\x1d\x40\x72\x18\x04\x55\x4a\xd4\x26\x28\x8d\x5d\x11\xd9\x11\x8f\xa0\x4c\x2d\xb1\xa2\x17\xb7\x49\xfa\xb2\x73\x17\x0e\x4f\x3f\x21\xfd\x8c\x94\x23\x4d\x90\xfe\x82\xf4\x0a\xe9\x25\xfe\x46\x9a\x22\x3d\xc6\x0b\xbc\xc4\x63\xfc\x8a\x1f\x90\x22\xf9\xe6\xcd\x53\x4e\x24\xb0\x86\xc3\x06\x35\x76\xb8\xc1\xe4\xbe\x7b\x32\xfa\x17\xc4\x72\x13\xa0\x03\x36\x12\x04\xc9\xc3\xe0\x63\x63\x7a\x47\xb9\x6b\xe1\x94\x58\x69\xe9\x59\xb7\xdb\x65\x76\xbd\x56\x99\x12\xfa\x4b\x62\x49\x2b\xcf\x94\x21\x6d\xf3\x67\x8c\xf2\xc5\x2c\x11\x76\xcd\xd1\x3e\xc7\xf1\xe6\x4e\xd2\x69\x4f\x72\x1f\xa7\x9f\x7a\x97\xe2\xf4\x63\xff\xf4\xaf\xe5\x4f\xa7\x3f\x5f\x3d\x4d\x3f\xf7\x0e\x20\xf7\x16\x2f\x78\x7f\x36\x38\xc3\xd9\xc5\xef\xa3\x69\xff\xf5\x08\xc3\xd1\x7c\x30\x1b\x4f\x17\xe3\x8b\x73\x8c\xdf\xce\x47\x98\xcf\x06\xcb\xb7\xb3\x31\x26\xe3\xc1\xe8\x3c\xee\x27\x17\x0b\xbc\x19\xfd\xf9\xc7\xc5\x6c\x38\xc7\xab\xf1\x64\x34\x1f\x8e\x67\xa0\xed\x9b\xf8\xcb\xa7\x98\x25\xbd\xe1\x68\x3a\x3a\x1f\x62\x3a\xbb\x78\x37\x1e\x92\xd3\xf1\x7c\x11\x2f\x67\xa3\xf9\x62\x36\x1e\x2c\x40\x8e\x67\x93\xfe\xf9\xf0\x2b\xcd\x0e\x70\xe6\x18\x62\x81\xe9\x3b\x4c\x5f\x61\x8a\xe9\x39\xfa\xd1\x28\x5e\x0d\xf8\xfb\xf7\x49\xef\xd5\xa4\xff\x7a\xde\x9e\x4c\x86\x5f\xef\x06\xfc\xec\x62\xbe\xc0\xa2\x3f\x7b\x3d\x5a\xe0\xb7\xb7\xe3\xc9\xf0\xbe\xd0\x07\x45\xa9\x01\x4a\xea\x9e\x43\xa7\x94\x74\x46\xe5\x1a\xdd\xd4\x5e\xf2\x25\xdf\xa9\x50\x40\x9a\x98\x93\x24\xe9\xa5\x2f\xd9\xe5\xe3\xbd\x8e\x24\xe3\xf2\x29\x3b\xbd\x3a\xa1\x98\xca\x50\x16\x54\xe8\x9e\x74\xee\x68\xbf\xd2\xb5\x8c\x9e\xa8\x77\xe5\x86\x6a\x57\x9a\x3c\x96\xe2\xfa\x4b\xb7\x95\x62\x2b\xb1\x13\x54\xc4\xca\xac\xad\xe9\x41\x3a\x47\x25\xaf\xed\x06\x95\x88\x1d\x67\xe4\x8e\x6f\x9c\xa5\xae\x23\x34\x2e\xf9\x4a\xa6\xbb\x11\x72\x25\x5b\xf2\xdf\x47\xdd\x5c\xb5\x28\xdb\x5d\x21\x7c\xbb\xe2\xb4\xc4\x2a\x36\xfe\xf2\x9a\x8a\x89\x7a\xed\xe0\xab\x99\x11\x0f\xc5\xe4\xd4\xbc\x84\xaf\x99\x02\xf0\xbd\x15\x11\xcc\x6d\x06\xad\x56\x3c\xed\x7a\x8b\xb4\x2b\x12\x62\xb8\xe7\x46\x2d\x1d\x87\x8c\x0a\x7b\x05\x72\x02\x77\x9d\x13\xc9\x12\xa5\x34\x35\x14\x1d\x3e\x4c\xce\xf2\xea\x36\x14\x36\xb6\x7a\x8e\x5c\x39\x14\x34\xec\xe0\x6f\x4b\x14\xa1\xd4\xf8\x47\x38\x94\xf6\x50\x1d\x5b\x29\x2b\xb2\xf9\xbe\x33\x1a\x5d\x15\x09\x4f\xd0\x33\xbf\xc7\x15\x01\xfa\xe0\x54\x15\xa7\x5e\xbc\xe6\xcd\x31\xb1\x88\xff\x69\x97\x13\x93\x96\x47\x6b\xf6\x90\x18\x59\x4c\x6b\xe4\x99\x28\x13\x6c\x8b\x66\xcd\xed\xce\x90\xa8\xa8\xa4\x2b\xfd\x01\x23\xdf\xab\xe1\x23\x99\xc4\x56\xc1\xdf\x2b\xcf\x58\x96\xd6\x7c\xa9\x4e\x46\x69\xcd\x63\x97\xb7\x5f\x8b\x03\x86\x36\x7a\xac\xa3\x83\xeb\x4c\x04\x64\xa4\x72\x51\xda\xf8\xa4\xf0\xc8\x2a\x48\x5a\x45\xcd\x09\x5f\xac\x7c\xd0\x64\xaa\x68\x0c\xd1\x40\x32\x28\xb7\x51\xd3\xf2\x9a\x26\x79\xa3\x30\x8d\x79\x04\xd2\x34\xd8\x9a\x4a\xb0\x36\xb4\xbf\xdf\x3f\x11\x19\x75\x8a\x67\xc4\x5c\x7a\x13\xd8\xce\xba\x2d\x7d\x8d\x04\xad\xa4\xd6\x49\x8b\xf0\x96\xd6\x76\xc7\x3a\x47\xdd\x93\xe3\x6f\x3c\x44\x39\xcd\xe6\xff\x1c\xec\x65\x3e\xb8\xa1\x49\x9d\x76\x71\xf9\x21\xed\x5c\x25\x27\x1d\x22\xfc\xa4\x3d\x78\x42\xfb\x27\x4d\x80\x85\x13\x4a\x93\x63\xe6\xa9\x78\x9b\x0f\xee\x4a\xe4\x8f\x5b\x6f\xcf\xda\x89\x7c\x79\xf9\xbc\xb9\x7e\x7e\x75\xf5\x94\x70\xfd\x17\x00\x00\xff\xff\xe3\x3f\xd9\xd5\x9e\x07\x00\x00")
 
-func runtimeSyntaxGentooMicroBytes() ([]byte, error) {
+func runtimeSyntaxGentooEbuildMicroBytes() ([]byte, error) {
 	return bindataRead(
-		_runtimeSyntaxGentooMicro,
-		"runtime/syntax/gentoo.micro",
+		_runtimeSyntaxGentooEbuildMicro,
+		"runtime/syntax/gentoo-ebuild.micro",
 	)
 }
 
-func runtimeSyntaxGentooMicro() (*asset, error) {
-	bytes, err := runtimeSyntaxGentooMicroBytes()
+func runtimeSyntaxGentooEbuildMicro() (*asset, error) {
+	bytes, err := runtimeSyntaxGentooEbuildMicroBytes()
 	if err != nil {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "runtime/syntax/gentoo.micro", size: 2574, mode: os.FileMode(420), modTime: time.Unix(1459091032, 0)}
+	info := bindataFileInfo{name: "runtime/syntax/gentoo-ebuild.micro", size: 1950, mode: os.FileMode(420), modTime: time.Unix(1461004583, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
 
-var _runtimeSyntaxGitMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x9c\x55\x51\x6f\xdb\x36\x10\x7e\x5e\x7e\xc5\x41\x0e\x10\xc9\xb1\xe5\x6c\x18\x30\xcc\x5d\x57\x74\xc9\x16\x04\x68\x5a\xa0\x71\x1f\x06\xc9\x1a\x68\xe9\x64\x11\x91\x48\x8f\xa4\x66\x1b\x51\xff\xfb\x8e\x94\x9c\xd8\xb1\xbd\x64\xf5\x83\xcd\x3b\x7e\xfc\xee\x78\xc7\xef\xac\xd7\xc2\xb0\x15\x78\x73\x6e\x86\xa9\x14\x39\x9f\x7b\xce\xf0\x5b\xa3\xa9\x64\x56\x97\xa8\x83\xd3\x26\x0e\xc9\x3d\x6a\xdd\xa7\xde\xc9\x49\x2a\x4b\xa9\x80\x6c\x6d\x98\x30\xe0\xc5\xbf\xf8\x46\xd5\xd8\xe4\xac\xd4\x18\xc4\xbf\x7a\x1d\xe2\x1e\xd7\x4b\xa9\x32\xf0\x92\x28\x1a\xeb\x05\x4b\x71\x3c\x9d\xf6\xa3\xe4\xed\xb4\xff\xd6\xdb\x63\xd9\x01\xc5\x51\xd8\x8f\xa7\xa7\xfb\x28\xcf\x8f\xe3\xb0\x89\x12\x6f\x1a\xf4\xbd\xe6\xac\xb3\xce\xc8\x3a\x7b\x02\x57\x15\x5a\xac\x9f\x34\x5b\x9c\x41\xcf\x8f\x92\x87\x69\xd8\x0f\xde\xd9\x4b\xf4\x60\x52\x70\x4d\xe0\x0c\x81\x7e\x73\x85\x08\x5a\xe6\x66\xc9\x14\xbe\x81\xb5\xac\x21\x65\x02\x14\x66\x5c\x1b\xc5\x67\xb5\x21\x98\x01\x26\xb2\x11\x85\xa0\xda\xf0\x7c\x6d\x1d\xb5\xc8\x50\x11\x99\x29\x10\x0c\xaa\x4a\x83\xcc\x9d\x21\x70\x09\xbf\xdd\x5d\xc1\x07\x9e\xa2\xd0\x18\x9e\xf4\x08\x75\x29\x17\x6b\xc5\xe7\x85\x01\x3f\x0d\xe0\x87\x8b\xef\x2f\x06\x70\x87\x33\xa6\x0d\xa7\x60\x77\x86\xd5\x99\xb1\xa9\xbd\x07\xc1\x84\x84\xb6\xe4\xb5\x62\x86\x4b\x01\x39\x2f\x29\x86\x04\x14\x6c\x46\xab\xae\x7f\x05\xd1\x95\x96\x92\x8b\xb9\x8d\xad\x65\x85\x70\x4d\x99\xe9\x05\xa6\x3c\xe7\x29\xd1\xd9\x93\x1a\x96\xdc\x14\x2e\xb5\xeb\x8f\x5f\x5a\x7e\x83\x2b\x03\x74\x43\x43\x57\xf2\x0b\x63\x16\xe3\xd1\x68\xb9\x5c\x86\x76\x73\xd8\xfa\x43\xa9\xe6\x01\xe5\xbe\xfb\x5a\xaa\x8a\x1b\x7a\x2d\x97\x9f\x6e\x6f\x6f\x26\x7f\xfd\x7e\x75\x33\xb9\xbd\xbb\x6e\x26\xef\xaf\x37\x6b\x57\xe0\x4b\x87\x83\x0a\xb5\x66\x73\xec\xba\xc3\xe7\x42\x2a\x04\x2f\xec\x3f\x62\xa8\x59\xfa\x79\xef\x92\x5e\x07\xf8\xc3\xe5\x9e\x16\x4c\xcc\x51\x3f\x7b\x58\xed\xc7\xeb\x6d\x75\xd9\xcf\xb0\x44\x83\x59\xe3\x5a\xc4\x69\x61\x1b\x61\x0b\xd0\x28\x2a\x5c\x85\x59\x30\xde\x82\xdb\x20\x87\x38\x9f\xb1\x76\xa4\xe3\xc3\xe0\x1d\xe8\x26\xee\x1e\x76\x07\xb5\x49\x6a\x9f\x71\x07\xd6\xa5\x3c\x76\x95\xf8\x22\x8c\x62\xe9\x3d\x66\xee\xa4\xdd\xd8\xd4\x03\x95\xa2\x6f\xaa\xd9\x77\x51\x32\x7a\xd7\x1f\xbf\x79\xf8\x1a\xc7\xd3\xf3\x38\xdc\x31\x9f\xa4\xfb\x24\xcc\xed\x60\x97\x6d\x8d\xc3\x7e\x34\x9e\xee\x4b\x78\x1b\xf9\xa7\xac\x15\xcc\x14\x13\x69\x61\x15\x01\x67\x56\x81\xe7\xff\xf3\xcc\x7f\xc3\x3f\x89\x0d\x38\x4a\xe0\x25\xee\x47\xb0\xab\xd3\x67\x6c\xb1\x05\xd3\x05\xa9\xa4\x9a\xc9\x52\x1f\xf5\xb7\x2e\xa7\x15\x56\x52\xf1\xdb\xc9\xa0\x18\x2f\xad\x9e\x5c\x00\x0d\xfe\xf9\x87\x9b\x8f\x13\x3b\x26\x84\x34\x20\xef\x07\x30\xb7\xd2\xd7\xb4\x65\xd8\x4c\x07\x1d\xcb\xa0\xeb\xc3\x56\x66\xae\xe8\x9b\x59\xd3\x69\x28\x97\xaa\x62\xc6\xb2\x11\x43\x66\x4d\xe0\x82\x66\x07\x4b\x0d\xff\x07\x69\xe4\xd0\x3c\xa0\xe0\x3b\x92\x73\x4e\x1c\x1a\x99\x49\x6f\xdf\x63\x23\x5c\x61\xce\xea\xd2\x7c\xa3\xca\x3e\x3b\x36\xb7\x41\xcd\x39\xa2\xb3\xc4\xc7\xc6\x4e\x85\x00\xa2\x8b\xe1\xcf\x6c\x98\x4f\x1f\x7e\x1a\xfc\x78\xf1\xf5\x88\x2a\x92\x1e\x80\x8f\x03\x37\x60\x82\xfd\x06\xfa\x79\x93\xf3\x55\xbd\x78\x89\xad\xe5\xc9\x07\xd0\xa2\x0f\x10\x2d\x9a\x05\x4f\xef\x5f\xc7\xb3\x18\x80\x03\x1f\x91\x3d\xb1\x29\x1a\x14\xd6\xf5\xba\x5b\x76\xb4\x6a\x00\xdd\xa9\x7d\x18\x71\xea\x46\xff\x5d\xd3\xb3\x7b\x99\xb3\xa5\xd3\x03\xe8\x0e\x1c\x8c\x4a\x8c\xab\x06\x57\x48\xff\x21\x4e\x1d\xaf\xc9\xb4\x25\x5e\x51\x3b\xec\xb9\xe3\x42\x39\x28\x88\x6e\x92\xdf\x5c\x6d\xf6\x79\x46\xef\xc7\xce\x39\xfb\xdc\x9f\x05\x3f\xf9\x37\x00\x00\xff\xff\x78\xe9\x0c\x63\x5a\x08\x00\x00")
+var _runtimeSyntaxGentooEtcPortageMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x5c\x51\xcd\x8e\xda\x30\x10\xbe\xf3\x14\x23\x67\x0f\x10\x94\x74\xa5\x56\xab\x2e\x02\x56\xdb\xbd\xf4\xd0\x4a\xbd\xf4\x52\xa0\xd5\xe0\x0c\x89\x85\x1d\x5b\xb6\x29\xa4\xb2\xf6\xd9\x3b\x10\x2d\x0b\x1c\x2c\xc7\xca\xf7\x37\xdf\x64\x19\x7c\x25\x4f\xa0\x02\x60\x0b\x74\x40\xe3\x34\xc1\xc6\x7a\xf8\x61\x7d\xc4\x9a\x40\xda\x36\x7a\xab\x61\xa3\x34\x85\x41\x96\x0d\x42\xd7\x46\x3c\x80\xa0\x28\x0b\xd7\x83\x04\x88\x65\x39\xdc\x52\xb7\xb7\xbe\x0a\xc9\x60\xd8\xa6\x5d\xdb\x5f\x81\x46\x77\x82\x79\xf0\x05\x03\x41\xa4\x43\x9c\x0c\xa4\xd5\xec\x50\x7b\xa2\x16\xc4\xef\x72\xdc\x03\x7e\xf2\xff\x8d\xc6\x3a\xbc\x01\xd6\x5e\xd5\x4d\xf4\x54\x81\x58\x2c\x26\xc1\xa1\xa4\xc9\x6a\x35\x5e\x8e\x9f\x16\x58\xfc\x7b\x2e\x7e\xdd\x17\x8f\x7f\x8a\xd5\x58\x5c\xe1\xd7\x7a\x47\xd7\x84\xe2\x16\xce\x66\xdf\xd4\x96\x74\x07\x7f\xc9\x07\x65\x5b\x68\x77\x66\xcd\x9f\x6f\xce\x86\x87\xe2\x29\x41\x14\xac\x53\xa9\x5a\x45\xd6\x29\xf3\xe1\x85\x6a\xba\x1b\x9d\x84\x9e\xa5\x24\x17\x39\x23\x7a\xd9\xd0\x59\x61\xdf\xa8\x78\x8c\xf1\x5a\xac\x9e\x96\xd3\x21\x6a\xd7\x60\x42\x53\x3d\x7c\x4a\xe8\x4d\x6a\x9c\xc3\xa4\x90\x5f\x46\xb9\x90\x9c\x93\xc7\xc3\xcf\xf0\xf1\xf1\x3e\x85\x26\xb1\x8d\x97\xe9\xf0\xf9\xe1\x78\x8a\xcd\x3a\x54\xa3\xe5\x5c\xdc\x88\xbf\xa7\xe9\x7d\xf2\x53\xa2\x17\x8c\x54\x5b\xaf\xde\xc3\xc8\x0e\x8f\x45\x5f\xe0\xf3\x32\xff\x70\x02\x7f\xe7\x25\xa9\xb6\x06\x4f\xf5\x4e\x63\xb4\xfe\xa6\xfd\x73\x13\x57\xec\xe1\x2c\xbd\xa6\x69\x9a\xce\xd2\x6c\x9a\xe6\x69\xce\xf7\xbc\xaf\xe3\xc5\x1a\xc3\x84\xb3\x4a\x47\x5a\xdb\x3d\x88\xac\xcc\x79\xcb\xff\x03\x00\x00\xff\xff\xa5\x03\x85\x88\x6f\x02\x00\x00")
 
-func runtimeSyntaxGitMicroBytes() ([]byte, error) {
+func runtimeSyntaxGentooEtcPortageMicroBytes() ([]byte, error) {
 	return bindataRead(
-		_runtimeSyntaxGitMicro,
-		"runtime/syntax/git.micro",
+		_runtimeSyntaxGentooEtcPortageMicro,
+		"runtime/syntax/gentoo-etc-portage.micro",
 	)
 }
 
-func runtimeSyntaxGitMicro() (*asset, error) {
-	bytes, err := runtimeSyntaxGitMicroBytes()
+func runtimeSyntaxGentooEtcPortageMicro() (*asset, error) {
+	bytes, err := runtimeSyntaxGentooEtcPortageMicroBytes()
 	if err != nil {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "runtime/syntax/git.micro", size: 2138, mode: os.FileMode(420), modTime: time.Unix(1460170621, 0)}
+	info := bindataFileInfo{name: "runtime/syntax/gentoo-etc-portage.micro", size: 623, mode: os.FileMode(420), modTime: time.Unix(1461004583, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _runtimeSyntaxGitCommitMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x94\x94\xdb\x6f\xda\x30\x14\xc6\x9f\xc7\x5f\x71\x14\x26\x15\x7a\x09\xdd\x1e\xd3\x87\xa9\x6b\x37\x54\xa9\xb4\xd2\x48\x1f\xa6\x00\x93\xe3\x9c\x24\x16\x89\x8d\xec\x13\xa5\x68\xec\x7f\x9f\x9d\x4b\x05\xa5\xdb\x34\x1e\xc0\x97\x9f\xbf\xf3\xf9\xb3\x0e\x43\x08\x73\x61\x80\xab\x04\xc1\xfe\xa6\x1a\x11\x8c\x4a\xa9\x66\x1a\xaf\x60\xab\x2a\xe0\x4c\x82\xc6\x44\x18\xd2\x22\xae\xc8\x62\x04\x4c\x26\x13\xa5\xa1\x54\x89\x48\xb7\x6e\xa1\x92\x09\xea\xc1\x10\x28\x47\x20\xd4\xa5\x01\x95\x36\x13\x89\x35\x7c\x9e\xdf\xc2\xbd\xe0\x28\x0d\xfa\x83\xa1\xa5\x6e\xd4\x66\xab\x45\x96\x13\x8c\xf8\x18\x3e\x5e\x7e\xb8\x3c\x87\x39\xc6\xcc\x90\xb0\xc5\xe6\xc4\xaa\x84\x2c\x76\x0d\x92\x49\x65\xbd\xc9\x54\x64\x95\x66\x24\x94\x84\x54\x14\xb6\x84\x02\x94\x2c\xb6\x23\xb3\x95\xc4\x9e\x21\xb7\x6a\x85\x53\x14\x32\x73\xa5\x8d\x2a\x11\xa6\xd6\x98\xd9\x20\x17\xa9\xe0\x56\xce\x9d\x34\x50\x0b\xca\x1b\x67\xd3\x87\xa7\x56\x9f\xf0\x99\xc0\x5e\x90\xec\x8d\x46\x39\xd1\x26\x98\x4c\xea\xba\xf6\xdd\xe6\x45\xbb\xee\x2b\x9d\x8d\xad\xf5\xae\x9a\x97\x09\xba\xe0\xaa\x2c\x05\x79\xe0\xdd\x3c\xce\x66\x77\xe1\x8f\x2f\xb7\x77\xe1\x6c\x3e\xdd\x85\xd7\xd3\x7e\xec\x0d\x9a\xcb\x3a\x0e\x4a\x34\x86\x65\x38\xe0\xaa\xb0\x75\x44\x26\x95\x46\xf0\xfc\xd3\x17\x06\x25\x99\x6e\x97\xb7\x53\xf0\x56\xc3\x0e\xf8\xda\x78\xe7\x39\x93\x19\xf6\xd4\x1a\xb7\xb5\xd2\x09\xb4\x1f\x6f\x18\x45\x81\xd9\x30\x8e\xc1\x72\x39\x4a\xb0\x40\xc2\x64\xd7\xbc\x90\xb0\x03\xf7\x0e\x2e\x80\x9d\xb6\xc1\x95\x98\x8c\x83\x3d\xdc\x15\x79\x4b\xf3\x95\x6a\x27\x1a\xbc\x0d\x1f\xa0\x7d\xdd\x23\xf6\x80\xea\x4d\x1d\x2b\x1e\x60\x9d\xe5\xa0\x49\xe2\x49\x92\x66\x7c\x8d\x49\x73\xd2\x6d\xf4\x79\xa0\xd6\xf6\xdb\x66\xf6\x2e\x5a\x4d\x3e\x9d\x06\x57\x3f\x7f\x2d\x16\xcb\xb3\x85\x7f\x30\x7d\x6f\x55\x5e\x59\x5a\xed\x17\xbb\x69\x33\xf6\x4f\xa3\x60\x79\x64\xfe\x80\xfc\xae\x2a\x0d\xb1\x66\x92\xe7\xae\x21\xe0\x24\x5a\x9d\x2c\xcf\xfe\xf3\xcc\xdf\xf1\x47\xd9\xc3\xd1\x0a\xfe\xa5\xfd\x02\x37\x39\x7d\xc3\x96\xcd\x99\xc9\x6d\x97\x94\xb1\x2a\xcc\x1f\xd7\xdb\xa5\xa6\x57\x58\x61\xc3\x6f\x14\x42\xcd\x44\xe1\xfa\xa9\x29\x60\x60\x74\x76\x7f\xf7\x10\xba\x7f\x09\xa9\x08\xd4\xfa\x1c\x32\xd7\xf9\xc6\x6e\x11\x8b\xcd\xb8\x53\x39\xef\xde\x61\xcf\x99\x0b\xfd\x77\x00\x00\x00\xff\xff\x5c\x55\x4a\x64\x69\x04\x00\x00")
+
+func runtimeSyntaxGitCommitMicroBytes() ([]byte, error) {
+	return bindataRead(
+		_runtimeSyntaxGitCommitMicro,
+		"runtime/syntax/git-commit.micro",
+	)
+}
+
+func runtimeSyntaxGitCommitMicro() (*asset, error) {
+	bytes, err := runtimeSyntaxGitCommitMicroBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "runtime/syntax/git-commit.micro", size: 1129, mode: os.FileMode(420), modTime: time.Unix(1461004537, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _runtimeSyntaxGitConfigMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x64\xcc\x51\x8a\x83\x30\x14\x85\xe1\x77\x57\x11\xee\x08\x26\x81\xc9\xbc\xcb\x38\xb3\x90\xdc\x04\x82\x46\x91\xaa\x29\x26\xd2\x4a\xb3\xf8\xa6\x55\x68\x8b\x8f\xff\xe1\xe3\xf8\x75\x0a\xe6\x4a\xa0\xeb\xc3\x77\xed\xa6\xb6\xef\xe0\x19\x74\x8b\x38\xba\x66\x19\xac\x67\x79\x44\x91\xe6\x9f\x6d\xce\x21\xcb\x6a\x37\xb8\x99\xa4\xf6\xc1\x4c\x81\x00\xfe\xd2\x30\x2f\x36\xb6\x66\xf0\x96\xe1\x1f\xec\xe2\x64\xd7\x8b\x9b\x1b\x02\x5a\xca\xd2\x9f\x4d\x6d\x4b\xa5\xb8\xd4\x95\xe2\x15\x1c\x5e\x3e\x10\x4a\xc1\x51\xe5\x47\x05\x14\x51\x44\xa9\x41\x31\x0e\xb1\xd8\xab\x48\x55\xbc\xf0\x38\xda\x87\xa5\x3a\xbe\x7d\xb2\x2f\x2a\xf5\x4d\x09\xce\xfe\xd3\xef\x3d\x00\x00\xff\xff\xc2\x05\x8a\xe9\xfe\x00\x00\x00")
+
+func runtimeSyntaxGitConfigMicroBytes() ([]byte, error) {
+	return bindataRead(
+		_runtimeSyntaxGitConfigMicro,
+		"runtime/syntax/git-config.micro",
+	)
+}
+
+func runtimeSyntaxGitConfigMicro() (*asset, error) {
+	bytes, err := runtimeSyntaxGitConfigMicroBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "runtime/syntax/git-config.micro", size: 254, mode: os.FileMode(420), modTime: time.Unix(1461004542, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _runtimeSyntaxGitRebaseTodoMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x8c\x92\xc1\x4e\xc3\x30\x0c\x40\xef\xfd\x0a\x2b\xbd\x0c\x68\xd1\x0e\x48\x88\x33\xbb\x70\x45\xdc\xd0\x26\x65\x8d\xb3\x59\x6b\x93\x92\xa4\xd0\x89\xf0\xef\xa4\x49\xc6\x61\x1b\xda\x7a\x8b\xfd\xfc\xec\xca\x2e\xe1\x6d\x4b\x16\xec\x5e\x39\x3e\x82\xd4\xa6\xe3\x0e\x42\x60\xb0\x28\xa6\x27\x90\x72\x68\x78\xe3\xe8\x13\xc1\xe0\x9a\x5b\x52\x9b\x22\xe3\x6c\x43\xae\x8e\x41\xac\x9d\x16\x9a\x9d\x46\x8a\xa2\x84\x05\x4a\x3e\xb4\xae\x68\x74\x3b\x09\x37\x4a\x1b\x04\x76\x7f\x1b\x93\xcf\xba\xeb\x50\x39\x9b\xb3\x4d\x7a\x02\x5b\x95\x19\x78\x8d\xb6\x98\xe0\x4a\x1c\xb8\x1d\xee\xbf\xb4\x11\x90\x3e\xb6\x9a\xa1\x47\x41\xee\x06\xde\xe7\xf5\x13\xaf\xe5\xf2\xfb\xb1\x7a\x98\xff\xb0\x7f\xf0\x12\x60\x86\x15\xc4\x92\x63\x26\xc8\xa4\x97\x34\x0e\xfd\x25\x5b\xf2\xc8\x0a\x12\x7d\x46\xd4\xfb\x9e\x9a\xdd\x75\x9e\xbe\x82\x08\x9f\x9f\x79\xb2\x19\x6f\x70\x0a\x5d\xf7\x97\x59\x6b\x2a\xc8\x55\xa7\x58\x70\x5a\x6f\x3f\x06\x6e\xb7\x97\x9d\x49\x67\x2b\xc8\x05\x67\xbb\x06\xe3\xe8\x71\xc4\x26\xf8\x56\xb0\xbc\xbb\x66\xd2\x24\x1e\xc3\x3a\xa6\xba\xbc\xf4\xc4\x6d\x43\xa3\x70\x9c\xdd\x5a\xb7\x87\xcd\xdb\x1e\x1b\xe2\x2d\xb0\xf2\xef\x7e\xc8\xc1\xcb\xe2\x90\x27\x11\xee\x87\x24\xa1\x01\x76\xdc\xfc\x37\x00\x00\xff\xff\x9e\x10\xac\x53\xee\x02\x00\x00")
+
+func runtimeSyntaxGitRebaseTodoMicroBytes() ([]byte, error) {
+	return bindataRead(
+		_runtimeSyntaxGitRebaseTodoMicro,
+		"runtime/syntax/git-rebase-todo.micro",
+	)
+}
+
+func runtimeSyntaxGitRebaseTodoMicro() (*asset, error) {
+	bytes, err := runtimeSyntaxGitRebaseTodoMicroBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "runtime/syntax/git-rebase-todo.micro", size: 750, mode: os.FileMode(420), modTime: time.Unix(1461004508, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -1350,22 +1415,62 @@ func runtimeSyntaxPovMicro() (*asset, error) {
 	return a, nil
 }
 
-var _runtimeSyntaxPrivoxyMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xec\x56\x4d\x6f\xe3\x36\x10\x3d\xef\xfe\x0a\x41\xcd\xc1\xae\x3b\xe9\xa5\xbd\xe4\xb2\x58\xb4\xee\x76\x81\x45\x51\xa4\x41\x2f\xb1\x03\xd0\xd4\x48\x22\x4c\x91\x2a\x39\x4a\xec\x86\xfd\xef\x1d\x8a\x92\x65\xb9\xee\xb1\xdb\xcb\xe6\x10\x51\x8f\xc3\xf9\x7c\x8f\xb2\x3f\x1a\x12\x87\x2c\xff\xd5\xa9\x67\x7b\x38\x82\xb4\xa6\x54\x55\x9e\xe5\x6d\x02\xbe\x4d\xc0\x4d\xfe\xf6\xad\xb4\xda\xba\x4c\x1e\x85\xc9\xf2\x85\x90\x12\x5b\x02\x65\x08\x5d\x5c\x61\x01\x0e\xff\xe8\xd0\x93\x0f\x42\x92\xb2\xc6\x97\x4a\x63\x10\x45\xa3\x0c\x88\xa2\x70\xe8\x79\x47\x6b\xfb\x02\xb2\x52\xa3\x31\x48\xd7\x19\x59\x2b\x53\x85\x5d\x57\x96\xe8\x40\xab\x46\x51\x90\xb6\x69\xe3\x09\xf6\x03\x1a\x9f\x51\x87\x98\x47\xa1\x5c\x7c\x1a\xec\x03\x80\xaf\x85\x8b\x27\x0b\xdc\x75\xf1\x7f\x29\x3a\x4d\xe0\xd1\x3d\xb3\x1f\x52\x0d\xda\x8e\x18\x36\x47\x88\xd9\x72\x78\x34\x62\xa7\x11\xce\x9c\x8f\x10\x16\x8a\x60\xc8\x7b\xc4\x1c\x36\x96\x10\x6a\xa2\x16\xc8\x56\x15\x57\x33\xdf\x39\x81\xa5\xe5\x1e\xc0\x4e\x5b\xb9\xf7\x81\xcb\xe6\x9e\xf4\xc5\x33\xfe\x22\x5c\x31\x3e\xb9\x47\x43\xf6\xec\x81\x9c\x42\x3f\xee\x80\x8f\x47\xbf\xbb\x78\x15\xf3\xf7\xef\x43\x2d\x4c\xc1\xe1\x85\x07\x6c\x5a\x3a\x42\x61\x65\xf4\xd4\x39\xe3\xc1\xee\x43\x6d\x3d\x19\xd1\x60\xd8\x23\xb6\x20\xb4\x7a\xc6\x53\x1b\xb4\xf2\x84\xd3\x20\xb4\xad\x62\x33\xf9\xd1\x27\xda\x88\x03\x48\xad\xd0\x10\x4c\xfd\xf5\xa1\x45\xd7\xf4\x7d\xe9\xbb\xd7\xba\x48\x10\xc5\xd5\x42\xe7\x74\xf0\xdc\x7a\x4e\x86\x6a\x87\x82\x4b\x0b\x31\x47\xa4\x53\x40\xdf\x6a\x3e\xaa\x85\xab\x10\xb8\x8c\xc6\x07\xe2\xa4\x75\x8c\x3a\xf4\x8d\xac\x46\x27\xb8\x8f\xad\x6a\x51\x2b\x13\x47\x49\xae\xf3\xd4\xa7\xd4\xaf\xa6\x68\x1d\x8f\x15\x1a\x61\x3a\xa1\x97\x8f\x8f\x77\xbe\x15\x12\xef\xb6\xdb\x7c\x60\xe5\xce\xa9\xaa\xa6\x9d\x16\x72\xcf\xe4\x7c\x0a\x67\x26\xcb\xaf\x16\x8f\x4f\xaf\xdb\xdb\xaf\x97\xef\x6e\x46\xf3\x6f\x2a\x87\xc8\x34\x3e\x33\x5b\x4d\x9b\x0e\x8b\x2c\x7f\xb3\xca\x56\x21\x5b\xbd\x59\x31\xf3\x2f\x45\x92\x88\xc2\x22\xd9\xdc\xa6\xe5\x24\x8f\x94\x48\xf4\x90\xb1\xfb\xd7\xc9\xff\x26\xf1\x63\x31\x85\x7c\xfd\x6b\x1b\x6e\x96\xf3\x0a\xc6\xbc\xce\x0f\xae\xfe\xed\xe0\xb5\x90\xb0\xe0\x11\x43\x1d\x47\xc2\x5a\x61\xc2\x70\xfb\x0f\x30\x11\x90\x57\x61\x98\x74\x32\x82\xc4\xd7\x0b\x90\x44\x55\x61\x2f\x36\x8a\x28\x1d\x5b\x04\xcb\xb2\x7a\x71\x8a\x30\x24\xd1\xc2\xec\xc8\x08\xaa\x12\x8c\x35\xc8\xb3\x22\x59\x9f\x40\xc3\x9a\xe3\xf9\x32\xbb\xec\x3e\xf2\x7e\xc0\x99\x28\x95\xbd\x82\x0f\x1a\x1e\x3c\x17\x28\x8c\x6a\x22\x53\x2a\x55\xfa\x50\xd8\x17\x53\x39\xde\x49\xd2\x64\xc3\x5e\xc9\xa5\xf0\x51\x57\x4c\x30\xa6\xef\x28\xc3\x90\xa4\x49\x78\x20\x68\x6c\x71\x92\x64\x5f\x8c\x53\x0c\x5c\xd1\x54\xd7\x70\x59\x67\x1b\x1c\xbb\x62\x43\xb6\x86\xe1\xda\xd3\xdc\xd7\xee\x04\x8e\x5d\x2a\x94\x6f\xad\x57\x91\x10\x69\xa3\x74\xb6\x19\x8b\xe8\x01\x6e\x0e\x67\xa1\x4a\xc5\x93\x60\xfd\xc8\xc1\x81\x43\xbe\xf9\xdc\x68\xd4\x53\x9d\x9d\x9b\xa8\xda\xa8\xbf\x41\x92\xe1\x34\x00\x8e\xef\xe9\xe4\x89\x85\xc9\x37\x64\x2f\xdd\xe9\x5e\x1b\x1b\x11\x66\xad\x1c\x87\x3d\x07\x87\x61\xfb\xe1\xbe\x1d\x66\x01\xd6\xe8\x23\x83\x94\xea\x4f\xf4\x45\x77\x9d\xb0\x9b\xd5\x17\xde\x7d\xe1\xdd\x67\xe1\x5d\xd3\xa7\x28\xb2\xe9\x2f\xdf\x6c\x6e\xdf\xfd\x3f\x5f\x82\x54\x57\xff\x25\x48\xcb\x8b\x1f\x4a\x59\xfe\xb4\xf8\xe9\xe3\xa7\x87\xf5\x7d\xf8\xe1\xd3\xc7\xf5\x2f\x0f\xf0\xf3\xfa\xfd\x8f\xeb\x7b\xb8\x0a\x3e\xbc\xff\xf0\x81\xc1\xdf\xd6\xf7\xbf\xf3\xdb\xdc\x72\x0e\x26\xcb\xe5\x5d\xf6\x28\xe0\x4f\xd8\xae\x2e\xab\xef\xf0\xbf\x8e\xfc\xcf\x71\x7c\xbe\x31\xfc\x1d\x00\x00\xff\xff\x16\xb7\x51\xb9\xb5\x0a\x00\x00")
+var _runtimeSyntaxPrivoxyActionMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xec\x54\x4d\x8e\xe2\x3c\x10\x5d\x37\xa7\x88\xfc\xb1\x80\x2f\x53\x1c\xa0\x37\x7d\x85\xd9\x03\x2d\x19\xbb\xe2\x58\x24\xae\xc8\x2e\xfe\x84\xe7\xee\x53\x01\x0c\x43\x8b\xd9\xce\xaa\xb3\x8a\x5e\xfd\xbe\x57\x4f\x4e\xa7\xc0\xfa\x58\xa9\x9f\xd1\xef\xe9\x78\x02\x6d\xd8\x53\x50\x95\x5a\x2d\xae\xbf\x53\x35\x99\x18\xea\x28\x56\x9b\xe8\x5d\xcb\x11\x6d\x55\x55\x6a\x79\x5e\xbe\xa7\x41\x1b\x7c\x5f\xaf\x57\xb0\xe9\xc8\x6c\x67\xcb\x3b\x74\xfe\xb5\xce\xd3\xb9\x7a\x2a\x74\x11\x31\x7c\x29\xac\xff\x56\xf8\x6a\x24\xcc\xb4\xb5\xd0\xa2\xb6\x18\xb3\x69\x75\x70\x08\x47\x68\x28\x1e\x74\xb4\x68\xc7\xbf\x6c\x3a\x8f\x81\x6f\x49\xd0\xf8\x8e\xf1\x2b\xc8\xda\xb9\x11\xa4\xc0\x23\xca\xa7\x01\x81\xf6\x18\x0f\xd1\x33\x66\x13\x77\xc1\xb4\xf0\x54\x52\x40\xdf\x40\xa0\x80\xd0\x6b\x36\xed\x1d\x0c\x86\x7a\x1f\x1c\x18\xa2\xad\xc7\x54\x70\xda\xb1\xa3\x17\x78\xc2\x28\xc3\x4a\x67\x8b\x3a\x78\xe9\x87\xe0\x7c\x93\xb2\xa5\x43\x70\x51\x22\xd0\x32\x0f\x20\x89\x49\x4e\x90\x1b\x9d\x18\x44\x05\x1f\xd1\x70\xca\x37\x5a\xc2\xd7\x20\x30\x1e\x19\x7a\xb2\x98\x6f\x4a\x5c\xc8\x44\x2f\x80\x48\x64\x3b\x04\x9d\x00\xfb\x81\x4f\x60\xc9\xec\x7a\xa1\xf5\x47\x40\x66\x3b\x49\x94\x6c\xb9\xbc\xc1\x81\xa1\x13\x5d\x77\x77\xb0\xa8\x64\x7d\x1a\x28\xf9\xd1\x10\xd7\x40\x13\xa9\x2f\x24\x2e\x80\x88\x23\x5b\xf8\xc6\xcb\x25\x92\x88\x72\x6b\x10\xb1\x91\x6d\x4a\xd2\x4e\xd8\x83\x34\x97\x1d\x3a\xdf\x7b\x1e\xfb\x07\xe1\x94\xef\x07\x90\xf9\x89\xef\x9d\xf2\x10\x71\x3f\xce\x17\x8d\xe5\x37\x5d\xd4\x28\x42\xe4\x27\x29\xcb\xb1\x9f\xc1\xdb\xb1\xd3\xb5\xb4\xdc\x02\x28\x74\x27\x01\xf9\xca\xff\x6a\x5f\x8c\xaf\x0d\xbb\xaa\xbf\x7d\xf7\xed\xbb\x7f\xe2\xbb\xfe\xb2\xa2\xae\x1e\x9f\x5a\xad\x16\x1f\xcf\xb6\xdc\x74\xda\x6c\x2b\x35\xfb\xcc\x8f\x67\x73\x3d\xff\x6f\xb6\xfc\x3c\xaf\x17\xff\xcf\x3f\xa6\x25\xfd\x47\x79\x71\x1f\x69\xf5\x23\x38\x3e\xaa\xea\xad\xae\xea\x5c\xd5\x6f\xb5\x9a\xfc\x0e\x00\x00\xff\xff\x0c\x31\xb0\xba\x09\x06\x00\x00")
 
-func runtimeSyntaxPrivoxyMicroBytes() ([]byte, error) {
+func runtimeSyntaxPrivoxyActionMicroBytes() ([]byte, error) {
 	return bindataRead(
-		_runtimeSyntaxPrivoxyMicro,
-		"runtime/syntax/privoxy.micro",
+		_runtimeSyntaxPrivoxyActionMicro,
+		"runtime/syntax/privoxy-action.micro",
 	)
 }
 
-func runtimeSyntaxPrivoxyMicro() (*asset, error) {
-	bytes, err := runtimeSyntaxPrivoxyMicroBytes()
+func runtimeSyntaxPrivoxyActionMicro() (*asset, error) {
+	bytes, err := runtimeSyntaxPrivoxyActionMicroBytes()
 	if err != nil {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "runtime/syntax/privoxy.micro", size: 2741, mode: os.FileMode(420), modTime: time.Unix(1459091032, 0)}
+	info := bindataFileInfo{name: "runtime/syntax/privoxy-action.micro", size: 1545, mode: os.FileMode(420), modTime: time.Unix(1461004444, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _runtimeSyntaxPrivoxyConfigMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x5c\x52\xcd\x72\xdb\x3c\x0c\x3c\xc7\x4f\xa1\xd1\x97\x43\xfc\xb9\x68\x2f\xed\x25\x97\xbe\x42\xef\x1e\x67\x06\xa2\x20\x89\x63\x8a\x64\x41\xd0\xb1\xa7\x7c\xf8\x82\x8a\x65\x3b\xbd\x88\xe2\xe2\x6f\x77\x89\x74\xf1\x82\xe7\xa6\xfd\xc5\xf6\x14\xce\x17\x30\xc1\x0f\x76\x6c\x9b\x36\x7e\x00\xdf\x3e\x80\xe7\x76\xb3\x31\xc1\x05\x6e\xcc\x05\x7d\xd3\xbe\xa0\x31\x14\x05\xac\x17\xe2\xfa\x47\x3d\x30\xfd\xce\x94\x24\x15\x34\x62\x83\x4f\x83\x75\x54\xb0\x9f\xad\x07\xec\x7b\xa6\xa4\x11\xe7\xc2\x3b\x98\xd1\xae\xc9\x60\x38\x7b\x33\x59\x3f\x96\x2e\x0f\x03\x31\x38\x3b\x5b\x29\x26\xcc\xb1\x56\x68\x1f\x70\x74\x22\x57\x2a\x8f\xde\x72\x3d\x3d\x2d\x03\x20\x4d\xc8\xb5\xb2\xa7\x2e\xd7\xef\x80\xd9\x09\x24\xe2\x93\xf6\x11\x3b\x53\xc8\xa2\xb0\xbf\x40\x65\xab\xe3\xc9\x63\xe7\x08\x1e\x9a\xaf\x10\xf5\x56\xe0\xca\x7b\xc5\x98\xe6\x20\x04\x93\x48\x04\x09\xe3\xa8\x6a\x3e\x47\x6e\xe0\x10\xd4\x03\xe8\x5c\x30\xc7\x54\x54\xb6\x7a\xb2\x88\x57\xfc\x1d\xb9\x5f\x4f\xf5\xe8\xca\x5e\x3b\x08\x5b\x4a\x6b\x04\x52\x2d\xfd\xfe\xcf\x15\x3f\xdf\x7f\x94\x09\x7d\xaf\xe3\x31\x01\xcd\x51\x2e\xd0\x07\x53\x3b\x65\xf6\x09\xc2\xb1\x4c\x21\x89\xc7\x99\xca\x91\x28\x02\x3a\x7b\xa2\x9b\x0d\xce\x26\xa1\xfb\x43\xb8\x30\x56\x33\xf5\x58\x88\xce\x78\x06\xe3\x2c\x79\x81\xbb\xbf\xa9\x44\xe2\x79\xf1\x65\x71\x2f\x72\x5d\x10\xab\x6a\x21\xb3\x2b\x49\xad\x57\x32\x32\x31\xa1\x4a\x2b\x95\x23\xc9\x6d\x60\x8a\x4e\x4b\x1d\xf2\x48\xa0\x32\xe6\x54\x44\x49\xbb\x3a\xf5\xea\x9b\x04\x47\x8c\xea\x63\xb4\x91\x9c\xf5\xf5\x29\x85\x73\x92\x85\xd2\xf2\x77\x9f\x96\xf5\x59\x61\x46\x9f\xd1\x6d\xf7\xfb\xd7\x14\xd1\xd0\xeb\xe1\xd0\x5e\xb7\xb2\x63\x3b\x4e\xd2\x39\x34\x47\x5d\xce\xb7\xf2\x90\xb2\xfd\xef\x65\xff\xf6\xe7\xf0\xf5\xff\xed\xcf\xe7\x35\xfd\xcb\xc8\x44\xba\xc6\x0f\x69\xbb\x7b\x90\xa9\x6f\xda\xa7\x5d\xb3\x2b\xcd\xee\x69\xd7\x6e\xfe\x06\x00\x00\xff\xff\xc7\x01\x8c\x99\x24\x03\x00\x00")
+
+func runtimeSyntaxPrivoxyConfigMicroBytes() ([]byte, error) {
+	return bindataRead(
+		_runtimeSyntaxPrivoxyConfigMicro,
+		"runtime/syntax/privoxy-config.micro",
+	)
+}
+
+func runtimeSyntaxPrivoxyConfigMicro() (*asset, error) {
+	bytes, err := runtimeSyntaxPrivoxyConfigMicroBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "runtime/syntax/privoxy-config.micro", size: 804, mode: os.FileMode(420), modTime: time.Unix(1461004455, 0)}
+	a := &asset{bytes: bytes, info: info}
+	return a, nil
+}
+
+var _runtimeSyntaxPrivoxyFilterMicro = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xb4\x90\x51\x4b\x86\x30\x14\x86\xaf\xbf\xef\x57\x1c\x4e\x5e\x68\x6b\xfe\x00\x6f\x44\x6a\x99\x20\x11\x26\xdd\xcc\x09\x73\x2d\x93\x4c\x63\x5a\x68\xf9\xe3\x1b\x98\x94\xd1\x6d\x77\xdb\x7b\x1e\x78\xce\x7b\x86\xb9\x1b\xe5\x04\x78\x63\x9a\xb7\x7e\x9a\xe9\x43\xd3\x8e\xda\x20\x60\xe1\xaf\x4f\x07\x8f\x47\xd5\xb7\xbd\x01\x35\xcb\x0e\x00\x4b\xf7\x32\x49\x73\x96\x2d\xe7\x69\xc2\xae\x73\x7a\xc5\xa2\x0b\x96\xd1\x3f\xc3\x3c\x8a\x63\x1b\xde\xb2\xec\xce\xfe\xf6\xe4\x3e\x5c\x49\x2f\x00\x2e\xe9\x3b\x15\x04\xbf\xa4\x95\x69\xea\xc7\xb1\x6a\x5f\xf5\x7f\x9b\x37\xe3\xb3\xac\xb5\xbd\x09\xd8\xaa\x45\xe1\x87\xbf\x17\x91\xea\x09\xd0\x2d\x17\xce\x83\xe1\x45\x2a\x1d\x08\xe1\x9d\xb8\xbc\xfc\x10\xfe\xa9\x17\x3a\x1b\x7e\x56\x1b\xad\x3b\xc0\x1f\x18\xf9\x1e\x1a\x7d\x0f\x78\x20\x40\x16\x20\x07\xdb\xf5\x33\x00\x00\xff\xff\x1a\x56\x23\xb7\x86\x01\x00\x00")
+
+func runtimeSyntaxPrivoxyFilterMicroBytes() ([]byte, error) {
+	return bindataRead(
+		_runtimeSyntaxPrivoxyFilterMicro,
+		"runtime/syntax/privoxy-filter.micro",
+	)
+}
+
+func runtimeSyntaxPrivoxyFilterMicro() (*asset, error) {
+	bytes, err := runtimeSyntaxPrivoxyFilterMicroBytes()
+	if err != nil {
+		return nil, err
+	}
+
+	info := bindataFileInfo{name: "runtime/syntax/privoxy-filter.micro", size: 390, mode: os.FileMode(420), modTime: time.Unix(1461004426, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -1888,8 +1993,11 @@ var _bindata = map[string]func() (*asset, error){
 	"runtime/syntax/erb.micro": runtimeSyntaxErbMicro,
 	"runtime/syntax/fish.micro": runtimeSyntaxFishMicro,
 	"runtime/syntax/fortran.micro": runtimeSyntaxFortranMicro,
-	"runtime/syntax/gentoo.micro": runtimeSyntaxGentooMicro,
-	"runtime/syntax/git.micro": runtimeSyntaxGitMicro,
+	"runtime/syntax/gentoo-ebuild.micro": runtimeSyntaxGentooEbuildMicro,
+	"runtime/syntax/gentoo-etc-portage.micro": runtimeSyntaxGentooEtcPortageMicro,
+	"runtime/syntax/git-commit.micro": runtimeSyntaxGitCommitMicro,
+	"runtime/syntax/git-config.micro": runtimeSyntaxGitConfigMicro,
+	"runtime/syntax/git-rebase-todo.micro": runtimeSyntaxGitRebaseTodoMicro,
 	"runtime/syntax/glsl.micro": runtimeSyntaxGlslMicro,
 	"runtime/syntax/go.micro": runtimeSyntaxGoMicro,
 	"runtime/syntax/groff.micro": runtimeSyntaxGroffMicro,
@@ -1922,7 +2030,9 @@ var _bindata = map[string]func() (*asset, error){
 	"runtime/syntax/pkgbuild.micro": runtimeSyntaxPkgbuildMicro,
 	"runtime/syntax/po.micro": runtimeSyntaxPoMicro,
 	"runtime/syntax/pov.micro": runtimeSyntaxPovMicro,
-	"runtime/syntax/privoxy.micro": runtimeSyntaxPrivoxyMicro,
+	"runtime/syntax/privoxy-action.micro": runtimeSyntaxPrivoxyActionMicro,
+	"runtime/syntax/privoxy-config.micro": runtimeSyntaxPrivoxyConfigMicro,
+	"runtime/syntax/privoxy-filter.micro": runtimeSyntaxPrivoxyFilterMicro,
 	"runtime/syntax/puppet.micro": runtimeSyntaxPuppetMicro,
 	"runtime/syntax/python.micro": runtimeSyntaxPythonMicro,
 	"runtime/syntax/reST.micro": runtimeSyntaxRestMicro,
@@ -2017,8 +2127,11 @@ var _bintree = &bintree{nil, map[string]*bintree{
 			"erb.micro": &bintree{runtimeSyntaxErbMicro, map[string]*bintree{}},
 			"fish.micro": &bintree{runtimeSyntaxFishMicro, map[string]*bintree{}},
 			"fortran.micro": &bintree{runtimeSyntaxFortranMicro, map[string]*bintree{}},
-			"gentoo.micro": &bintree{runtimeSyntaxGentooMicro, map[string]*bintree{}},
-			"git.micro": &bintree{runtimeSyntaxGitMicro, map[string]*bintree{}},
+			"gentoo-ebuild.micro": &bintree{runtimeSyntaxGentooEbuildMicro, map[string]*bintree{}},
+			"gentoo-etc-portage.micro": &bintree{runtimeSyntaxGentooEtcPortageMicro, map[string]*bintree{}},
+			"git-commit.micro": &bintree{runtimeSyntaxGitCommitMicro, map[string]*bintree{}},
+			"git-config.micro": &bintree{runtimeSyntaxGitConfigMicro, map[string]*bintree{}},
+			"git-rebase-todo.micro": &bintree{runtimeSyntaxGitRebaseTodoMicro, map[string]*bintree{}},
 			"glsl.micro": &bintree{runtimeSyntaxGlslMicro, map[string]*bintree{}},
 			"go.micro": &bintree{runtimeSyntaxGoMicro, map[string]*bintree{}},
 			"groff.micro": &bintree{runtimeSyntaxGroffMicro, map[string]*bintree{}},
@@ -2051,7 +2164,9 @@ var _bintree = &bintree{nil, map[string]*bintree{
 			"pkgbuild.micro": &bintree{runtimeSyntaxPkgbuildMicro, map[string]*bintree{}},
 			"po.micro": &bintree{runtimeSyntaxPoMicro, map[string]*bintree{}},
 			"pov.micro": &bintree{runtimeSyntaxPovMicro, map[string]*bintree{}},
-			"privoxy.micro": &bintree{runtimeSyntaxPrivoxyMicro, map[string]*bintree{}},
+			"privoxy-action.micro": &bintree{runtimeSyntaxPrivoxyActionMicro, map[string]*bintree{}},
+			"privoxy-config.micro": &bintree{runtimeSyntaxPrivoxyConfigMicro, map[string]*bintree{}},
+			"privoxy-filter.micro": &bintree{runtimeSyntaxPrivoxyFilterMicro, map[string]*bintree{}},
 			"puppet.micro": &bintree{runtimeSyntaxPuppetMicro, map[string]*bintree{}},
 			"python.micro": &bintree{runtimeSyntaxPythonMicro, map[string]*bintree{}},
 			"reST.micro": &bintree{runtimeSyntaxRestMicro, map[string]*bintree{}},
diff --git a/runtime/syntax/gentoo.micro b/runtime/syntax/gentoo-ebuild.micro
similarity index 75%
rename from runtime/syntax/gentoo.micro
rename to runtime/syntax/gentoo-ebuild.micro
index 24b54853..0ad62815 100644
--- a/runtime/syntax/gentoo.micro
+++ b/runtime/syntax/gentoo-ebuild.micro
@@ -28,23 +28,3 @@ color yellow "#.*$"
 color brightyellow ""(\\.|[^\"])*"" "'(\\.|[^'])*'"
 ## Trailing space is bad!
 color ,green "[[:space:]]+$"
-
-## Here is an example for Portage control files
-##
-syntax "etc-portage" "\.(keywords|mask|unmask|use)$"
-## Base text:
-color green "^.+$"
-## Use flags:
-color brightred "[[:space:]]+\+?[a-zA-Z0-9_-]+"
-color brightblue "[[:space:]]+-[a-zA-Z0-9_-]+"
-## Likely version numbers:
-color magenta "-[[:digit:]].*([[:space:]]|$)"
-## Accepted arches:
-color white "[~-]?\<(alpha|amd64|arm|hppa|ia64|mips|ppc|ppc64|s390|sh|sparc|x86|x86-fbsd)\>"
-color white "[[:space:]][~-]?\*"
-## Categories:
-color cyan "^[[:space:]]*.*/"
-## Masking regulators:
-color brightmagenta "^[[:space:]]*(=|~|<|<=|=<|>|>=|=>)"
-## Comments:
-color yellow "#.*$"
diff --git a/runtime/syntax/gentoo-etc-portage.micro b/runtime/syntax/gentoo-etc-portage.micro
new file mode 100644
index 00000000..33a59a17
--- /dev/null
+++ b/runtime/syntax/gentoo-etc-portage.micro
@@ -0,0 +1,19 @@
+## Here is an example for Portage control files
+##
+syntax "etc-portage" "\.(keywords|mask|unmask|use)$"
+## Base text:
+color green "^.+$"
+## Use flags:
+color brightred "[[:space:]]+\+?[a-zA-Z0-9_-]+"
+color brightblue "[[:space:]]+-[a-zA-Z0-9_-]+"
+## Likely version numbers:
+color magenta "-[[:digit:]].*([[:space:]]|$)"
+## Accepted arches:
+color white "[~-]?\<(alpha|amd64|arm|hppa|ia64|mips|ppc|ppc64|s390|sh|sparc|x86|x86-fbsd)\>"
+color white "[[:space:]][~-]?\*"
+## Categories:
+color cyan "^[[:space:]]*.*/"
+## Masking regulators:
+color brightmagenta "^[[:space:]]*(=|~|<|<=|=<|>|>=|=>)"
+## Comments:
+color yellow "#.*$"
diff --git a/runtime/syntax/git.micro b/runtime/syntax/git-commit.micro
similarity index 52%
rename from runtime/syntax/git.micro
rename to runtime/syntax/git-commit.micro
index efa025cf..033356b5 100644
--- a/runtime/syntax/git.micro
+++ b/runtime/syntax/git-commit.micro
@@ -1,16 +1,7 @@
-syntax "git-config" "git(config|modules)$|\.git/config$"
-
-color constant "\<(true|false)\>"
-color keyword "^[[:space:]]*[^=]*="
-color constant "^[[:space:]]*\[.*\]$"
-color constant ""(\\.|[^"])*"|'(\\.|[^'])*'"
-color comment "(^|[[:space:]])#([^{].*)?$"
-
 # This code is free software; you can redistribute it and/or modify it under
 # the terms of the new BSD License.
 #
 # Copyright (c) 2010, Sebastian Staudt
-
 # A nano configuration file to enable syntax highlighting of some Git specific
 # files with the GNU nano text editor (http://www.nano-editor.org)
 #
@@ -45,34 +36,3 @@ color special "#"
 
 # Trailing spaces (+LINT is not ok, git uses tabs)
 color ,error "[[:space:]]+$"
-
-
-# This syntax format is used for interactive rebasing
-syntax "git-rebase-todo" "git-rebase-todo"
-
-# Default
-color ignore ".*"
-
-# Comments
-color comment "^#.*"
-
-# Rebase commands
-color keyword       "^(e|edit) [0-9a-f]{7,40}"
-color keyword       "^#  (e, edit)"
-color keyword "^(f|fixup) [0-9a-f]{7,40}"
-color keyword "^#  (f, fixup)"
-color keyword "^(p|pick) [0-9a-f]{7,40}"
-color keyword "^#  (p, pick)"
-color keyword        "^(r|reword) [0-9a-f]{7,40}"
-color keyword        "^#  (r, reword)"
-color keyword   "^(s|squash) [0-9a-f]{7,40}"
-color keyword   "^#  (s, squash)"
-color keyword      "^(x|exec) [^ ]+ [0-9a-f]{7,40}"
-color keyword      "^#  (x, exec)"
-
-# Recolor hash symbols
-color special "#"
-
-# Commit IDs
-color identifier "[0-9a-f]{7,40}"
-
diff --git a/runtime/syntax/git-config.micro b/runtime/syntax/git-config.micro
new file mode 100644
index 00000000..74cb7065
--- /dev/null
+++ b/runtime/syntax/git-config.micro
@@ -0,0 +1,7 @@
+syntax "git-config" "git(config|modules)$|\.git/config$"
+
+color constant "\<(true|false)\>"
+color keyword "^[[:space:]]*[^=]*="
+color constant "^[[:space:]]*\[.*\]$"
+color constant ""(\\.|[^"])*"|'(\\.|[^'])*'"
+color comment "(^|[[:space:]])#([^{].*)?$"
diff --git a/runtime/syntax/git-rebase-todo.micro b/runtime/syntax/git-rebase-todo.micro
new file mode 100644
index 00000000..2de39a4b
--- /dev/null
+++ b/runtime/syntax/git-rebase-todo.micro
@@ -0,0 +1,28 @@
+# This syntax format is used for interactive rebasing
+syntax "git-rebase-todo" "git-rebase-todo"
+
+# Default
+color ignore ".*"
+
+# Comments
+color comment "^#.*"
+
+# Rebase commands
+color keyword       "^(e|edit) [0-9a-f]{7,40}"
+color keyword       "^#  (e, edit)"
+color keyword "^(f|fixup) [0-9a-f]{7,40}"
+color keyword "^#  (f, fixup)"
+color keyword "^(p|pick) [0-9a-f]{7,40}"
+color keyword "^#  (p, pick)"
+color keyword        "^(r|reword) [0-9a-f]{7,40}"
+color keyword        "^#  (r, reword)"
+color keyword   "^(s|squash) [0-9a-f]{7,40}"
+color keyword   "^#  (s, squash)"
+color keyword      "^(x|exec) [^ ]+ [0-9a-f]{7,40}"
+color keyword      "^#  (x, exec)"
+
+# Recolor hash symbols
+color special "#"
+
+# Commit IDs
+color identifier "[0-9a-f]{7,40}"
diff --git a/runtime/syntax/privoxy.micro b/runtime/syntax/privoxy-action.micro
similarity index 56%
rename from runtime/syntax/privoxy.micro
rename to runtime/syntax/privoxy-action.micro
index 6f1f609c..283cf38f 100644
--- a/runtime/syntax/privoxy.micro
+++ b/runtime/syntax/privoxy-action.micro
@@ -1,10 +1,3 @@
-syntax "Privoxy-config" "privoxy/config$"
-
-color cyan "(accept-intercepted-requests|actionsfile|admin-address|allow-cgi-request-crunching|buffer-limit|compression-level|confdir|connection-sharing|debug|default-server-timeout|deny-access|enable-compression|enable-edit-actions|enable-remote-http-toggle|enable-remote-toggle|enforce-blocks|filterfile|forward|forwarded-connect-retries|forward-socks4|forward-socks4a|forward-socks5|handle-as-empty-doc-returns-ok|hostname|keep-alive-timeout|listen-address|logdir|logfile|max-client-connections|permit-access|proxy-info-url|single-threaded|socket-timeout|split-large-forms|templdir|toggle|tolerate-pipelining|trustfile|trust-info-url|user-manual)[[:space:]]"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
-
 syntax "Privoxy-action" "\.action$"
 
 color brightred   "[{[:space:]]\-block([[:space:]{}]|$)"
@@ -16,12 +9,3 @@ color magenta           "\\.?"
 color brightblack "(^|[[:space:]])#([^{].*)?$"
 color ,green "[[:space:]]+$"
 color ,red "	+ +| +	+"
-
-syntax "Privoxy-filter" "\.filter$"
-
-color cyan  "^(FILTER|CLIENT-HEADER-FILTER|CLIENT-HEADER-TAGGER|SERVER-HEADER-FILTER|SERVER-HEADER-TAGGER): [a-z-]+"
-color brightblue "^(FILTER|CLIENT-HEADER-FILTER|CLIENT-HEADER-TAGGER|SERVER-HEADER-FILTER|SERVER-HEADER-TAGGER):"
-color magenta   "\\.?"
-color brightblack "(^|[[:space:]])#([^{].*)?$"
-color ,green "[[:space:]]+$"
-color ,red "	+ +| +	+"
diff --git a/runtime/syntax/privoxy-config.micro b/runtime/syntax/privoxy-config.micro
new file mode 100644
index 00000000..f7da2328
--- /dev/null
+++ b/runtime/syntax/privoxy-config.micro
@@ -0,0 +1,6 @@
+syntax "Privoxy-config" "privoxy/config$"
+
+color cyan "(accept-intercepted-requests|actionsfile|admin-address|allow-cgi-request-crunching|buffer-limit|compression-level|confdir|connection-sharing|debug|default-server-timeout|deny-access|enable-compression|enable-edit-actions|enable-remote-http-toggle|enable-remote-toggle|enforce-blocks|filterfile|forward|forwarded-connect-retries|forward-socks4|forward-socks4a|forward-socks5|handle-as-empty-doc-returns-ok|hostname|keep-alive-timeout|listen-address|logdir|logfile|max-client-connections|permit-access|proxy-info-url|single-threaded|socket-timeout|split-large-forms|templdir|toggle|tolerate-pipelining|trustfile|trust-info-url|user-manual)[[:space:]]"
+color brightblack "(^|[[:space:]])#([^{].*)?$"
+color ,green "[[:space:]]+$"
+color ,red "	+ +| +	+"
diff --git a/runtime/syntax/privoxy-filter.micro b/runtime/syntax/privoxy-filter.micro
new file mode 100644
index 00000000..babc77bf
--- /dev/null
+++ b/runtime/syntax/privoxy-filter.micro
@@ -0,0 +1,8 @@
+syntax "Privoxy-filter" "\.filter$"
+
+color cyan  "^(FILTER|CLIENT-HEADER-FILTER|CLIENT-HEADER-TAGGER|SERVER-HEADER-FILTER|SERVER-HEADER-TAGGER): [a-z-]+"
+color brightblue "^(FILTER|CLIENT-HEADER-FILTER|CLIENT-HEADER-TAGGER|SERVER-HEADER-FILTER|SERVER-HEADER-TAGGER):"
+color magenta   "\\.?"
+color brightblack "(^|[[:space:]])#([^{].*)?$"
+color ,green "[[:space:]]+$"
+color ,red "	+ +| +	+"