Remove named colors function because of no need
Update colors
Cleanup variables
Merge branch 'new-colors'