Removed xptemplate and added SnipMate