Add 10.7 support and Emoticon classes