Added Colors, Squares and Circles

Added functionality for squares circles and color changes