Fixed an error in a script
XPI name should be configurable
Removed ifdefs completely