Major cleanup, add keywords, tweak highlighting