re-arranged the order of values to make things easier in the admin interface
forgot to add the talk template in
merged breaking changes
merged breaking changes back in