added new templates + rename options