changes to fadein/fadeout + template structures