Cleaned up some code, added color variables.