Changed way variables are highlighted

Changed from `match` to `begin`/`end` syntax.