Cleaned up coloring a bit and added color palette constants