Moved all options to all templates