Updating colors to reflect consolidation by @nnnnic

First step in simplifying colors.
Need dark and shared updated next.