Clean up code, attempt to color the rects

Still not colorizing, but getting closer