Moved some support code into additional files
Fixed some highlighting code