Add support for syntax highlighting, minor visual tweaks