extend and use uicolor category

color renaming

removal of unused default in switch