Fixed numerous links, restored protection for base templates