diff --git a/rc/filetype/elm.kak b/rc/filetype/elm.kak
index 88057428..0365c6e7 100644
--- a/rc/filetype/elm.kak
+++ b/rc/filetype/elm.kak
@@ -30,16 +30,19 @@ provide-module elm %[
 # Highlighters
 # ‾‾‾‾‾‾‾‾‾‾‾‾
 
-add-highlighter shared/elm regions
-add-highlighter shared/elm/code default-region group
-add-highlighter shared/elm/string        region '"'     (?<!\\)(\\\\)*"       fill string
-add-highlighter shared/elm/line_comment  region (--) $                        fill comment
-add-highlighter shared/elm/comment       region -recurse \{- \{-   -\}        fill comment
+add-highlighter shared/elm               regions
+add-highlighter shared/elm/code          default-region group
+add-highlighter shared/elm/string        region         '"'     (?<!\\)(\\\\)*"       fill string
+add-highlighter shared/elm/line_comment  region         (--) $                        fill comment
+add-highlighter shared/elm/comment       region         -recurse \{- \{-   -\}        fill comment
 
-add-highlighter shared/elm/code/ regex \b(import|exposing|as|module|where)\b 0:meta
-add-highlighter shared/elm/code/ regex \b(True|False)\b 0:value
-add-highlighter shared/elm/code/ regex \b(if|then|else|case|of|let|in|type|port|alias)\b 0:keyword
-add-highlighter shared/elm/code/ regex \b(Array|Bool|Char|Float|Int|String)\b 0:type
+add-highlighter shared/elm/code/ regex \b([A-Z]+[^\s]*)\b                                                  0:type 
+add-highlighter shared/elm/code/ regex \b([a-z]+[^\s]*)\b                                                  0:variable
+add-highlighter shared/elm/code/ regex \b(^[a-z]+[^\s]*)\b                                                 0:function
+add-highlighter shared/elm/code/ regex "-?\b[0-9]*\.?[0-9]+"                                               0:value
+add-highlighter shared/elm/code/ regex \B(\+|\+\+|\*|/|//|-|=|==|&&|\|\||<\||\|>)\B                        0:operator
+add-highlighter shared/elm/code/ regex \b(import|exposing|as|module|where)\b                               0:meta
+add-highlighter shared/elm/code/ regex (\b(type|alias|if|then|else|case|of|let|in|infix|_)\b)|(\B(->|:)\B) 0:keyword
 
 # Commands
 # ‾‾‾‾‾‾‾‾