diff --git a/build.sh b/build.sh
index 983d5d1..58ab6e1 100644
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 mkdir -p build
-git archive --format=zip -o build/z2csl.xpi HEAD \
+rm -f build/z2csl.xpi
+zip -r  build/z2csl.xpi \
 	chrome.manifest \
 	install.rdf \
 	content/
diff --git a/chrome.manifest b/chrome.manifest
index 5d35057..cf33454 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -1,2 +1,2 @@
 content	z2csl	content/
-overlay	chrome://zotero/content/zoteroPane.xul	chrome://z2csl/content/overlay.xul
\ No newline at end of file
+overlay	chrome://zotero/content/standalone/standalone.xul	chrome://z2csl/content/overlay.xul
diff --git a/content/overlay.xul b/content/overlay.xul
index feff7c9..5ffac36 100644
--- a/content/overlay.xul
+++ b/content/overlay.xul
@@ -5,8 +5,7 @@
   <script src="include.js"/>
   <script src="z2csl.js"/>
 
-  <menupopup id="zotero-tb-actions-popup">
-		<menuseparator id="zotero-tb-actions-extension-separator"/>
+  <menupopup id="menu_ToolsPopup">
     <menuitem id="z2csl-export" label="Export Z2CSL map" 
               oncommand="Zotero.Z2CSL.exportMappings(event);"/>
   </menupopup>
diff --git a/content/z2csl.js b/content/z2csl.js
index 03f8105..79eb178 100644
--- a/content/z2csl.js
+++ b/content/z2csl.js
@@ -16,7 +16,6 @@ Zotero.Z2CSL = {
 		}
 		this.cslDateMap = context.CSL_DATE_MAPPINGS;
 		this.cslCreatorMap = context.CSL_NAMES_MAPPINGS;
-		this.zoteroTypes = Zotero.ItemTypes.getTypes();
 	},
 
 	exportMappings: function() {
@@ -37,6 +36,7 @@ Zotero.Z2CSL = {
 		
 		this.debug("Creating item type map...");
 		
+		this.zoteroTypes = Zotero.ItemTypes.getTypes();
 		for(var i=0, n=this.zoteroTypes.length; i<n; i++) {
 			type = {name:'typeMap',
 							attributes:{
@@ -179,7 +179,7 @@ Zotero.Z2CSL = {
 	retrieveCSLVariables: function(callback) {
 		if(this.cslVars) callback(this.cslVars);
 
-		var url = 'http://citationstyles.org/downloads/specification.html';
+		var url = 'http://docs.citationstyles.org/en/1.0.1/specification.html';
 		var me = this;
 
 		Zotero.HTTP.processDocuments(url, function(doc) {
diff --git a/install.rdf b/install.rdf
index 22f0083..72fffe9 100644
--- a/install.rdf
+++ b/install.rdf
@@ -9,22 +9,15 @@
     <em:version>1.1</em:version>
     <em:description>Produces Zotero to CSL type and field map</em:description>
     <em:creator>Aurimas Vinckevicius</em:creator>
+    <em:type>2</em:type> <!-- type=extension -->
 
-		<!-- Requires Firefox or Zotero Standalone -->
-		<em:targetApplication>
-			<Description>
-				<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-				<em:minVersion>3.6</em:minVersion>
-				<em:maxVersion>20.*</em:maxVersion>
-			</Description>
-		</em:targetApplication>
-		<em:targetApplication>
-			<Description>
-				<em:id>zotero@chnm.gmu.edu</em:id>
-				<em:minVersion>3.0</em:minVersion>
-				<em:maxVersion>4.0.*</em:maxVersion>
-			</Description>
-		</em:targetApplication>
+    <em:targetApplication>
+      <Description>
+        <em:id>zotero@chnm.gmu.edu</em:id>
+        <em:minVersion>4.999</em:minVersion>
+        <em:maxVersion>5.*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
 
   </Description>