Updated most of colors to new Base Component
Merge remote-tracking branch 'origin/master'