Added new marcelo based template
Changed templates again
edit