Updated s2click and s2jsfplugin formats