Fix: lots of tweaks for better syntax highlighting