Revert 8e5034d..9eb307f

This rolls back to commit 8e5034ddff76f7987258807b330eecd2437eb70f.
Update syntax and auto completion