Simplying some styles and updating the color picker shapes.