Merge "New default color values for custom tokens." into main