amend(): fix test problems for themes, fix firefox problems