refactored firefox form to use macros
refactored thunderbird form to use macros