changed call for shape drawing
refactored shape drawing and colouring
merged conflicts and refactored shape drawing