full base template rework