Updated to current default.tpl as a base