Alternate colour scheme + small tweaks

Alternative colour scheme and fix where single line comments would not
highlight due to missing whitespace character. Re-assigned keywords
where they fit more naturally with the usage.