Fixed up various indentation issues, converted jacob's code to use colors.inc