Added rounded rect shapes and customizable colors