Version two is an improvement; aside from the custom shapes (if you feel you need some, try some of your own, or try integrating the defaults in a more interesting way), and the typo I like that alot.
