Updated tags and template paths