Added some more missing csp language components from the csp mode.
Reverted a change to the comment highlighting and disabled highlighting Topic Types, as the regex will need to be improved as it highlights too much at the moment.