Template updates, ready to branch web