add angular; modify color layout