updated emoticons

and some filters and template