Further theme work, added syntax highlighting