Fill and colors added