numerous changes in all templates, due to adjustments all over