Updated most of colors to new Base Component