Update theme templates for new navigation structure