Added colour support on square and round components