Updated color functions

just some cleanup; also got the multicolor function working