Merge "New SettingsLibColor" into main