Merge "Clean up legacy colors"