Some more substitutions
Added .xpi files, and misc changes