Clean-up/Rewrite

General clean-up by removing the old themes and rewriting the syntax
highlighting rules to be more future proof. A positive trade-off being a
much smaler file :)