Buttons changed for easy color changes.
Merge branch 'master' of https://github.com/rliebz/Puddle