Cleanup of various patterns, expanded colors