just improve the colors architecture