Removed stuff I'm not using, tweaked colors