Safari (WiP) and Firefox tweaks