Cleaning up and standardizing
Randomize colors
Pulled changes from main repo

Pulled in changes from main repo