Added Firefox namespace "fix" and add / remove triggers; not working correcly yet