diff --git a/runtime/syntax/fish.micro b/runtime/syntax/fish.micro
index 2a8f5408..f953d7ea 100644
--- a/runtime/syntax/fish.micro
+++ b/runtime/syntax/fish.micro
@@ -5,11 +5,11 @@ header "^#!.*/(env +)?fish( |$)"
 color constant "\b[0-9]+\b"
 
 # Conditionals and control flow
-color statement "\b(and|begin|break|case|continue|else|end|for|function|if|not|or|return|select|shift|switch|while)\b"
+color statement "\b(and|begin|break|case|continue|else|end|for|function|if|in|not|or|return|select|shift|switch|while)\b"
 color special "(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|<|>|^|!|=|&|\|)"
 
 # 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|status|string|trap|type|ulimit|umask|vared)\b"
+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"
 
 # Common linux commands
 color type "\b((g|ig)?awk|bash|dash|find|\w{0,4}grep|kill|killall|\w{0,4}less|make|pkill|sed|sh|tar)\b"
@@ -22,8 +22,8 @@ color statement "--[a-z-]+"
 color statement "\ -[a-z]+"
 
 # Strings
-color constant ""(\\.|[^"])*""
-color constant "'(\\.|[^'])*'"
+color constant.string ""(\\.|[^"])*""
+color constant.string "'(\\.|[^'])*'"
 color special """
 color special "'"
 
@@ -32,4 +32,4 @@ color identifier (i) "\$\{?[0-9A-Z_!@#$*?-]+\}?"
 
 # Comments & TODOs
 color comment "(^|[[:space:]])#.*$"
-color todo "(TODO|XXX|FIXME):?"
\ No newline at end of file
+color todo "(TODO|XXX|FIXME):?"