diff --git a/chrome.manifest b/chrome.manifest
index f6a1e07533..aabd04d476 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -64,10 +64,6 @@ locale	zotero	zh-TW		chrome/locale/zh-TW/zotero/
 
 skin		zotero	default		chrome/skin/default/zotero/
 
-overlay	chrome://browser/content/browser.xul	chrome://zotero/content/overlay.xul
-
-style	chrome://browser/content/browser.xul	chrome://zotero/skin/zotero.css
-
 component	{e4c61080-ec2d-11da-8ad9-0800200c9a66}			components/zotero-service.js
 component	{531828f8-a16c-46be-b9aa-14845c3b010f}			components/zotero-service.js
 contract	@zotero.org/Zotero;1 							{e4c61080-ec2d-11da-8ad9-0800200c9a66}
diff --git a/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul b/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul
deleted file mode 100644
index a02c917273..0000000000
--- a/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2009 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-	The Original Code is Mozilla.org Code.
- 
-	The Initial Developer of the Original Code is Netscape
-	Communications Corporation. Portions created by Netscape are
-	Copyright (C) 1998-2000 Netscape Communications Corporation. All
-	Rights Reserved.
-	
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
--->
-
-
-<!DOCTYPE overlay [
-	<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
-	<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd"> %standaloneDTD;
-	<!ENTITY % browserDTD SYSTEM "chrome://zotero/locale/mozilla/browser.dtd"> %browserDTD;
-]>
-<overlay id="menuOverlay"
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-    
-    <script type="application/javascript" src="chrome://global/content/macWindowMenu.js"/>
-	<script>
-		function openPrefs() {
-			var Zotero = Components.classes['@zotero.org/Zotero;1']
-				.getService(Components.interfaces.nsISupports)
-				.wrappedJSObject;
-			Zotero.Utilities.Internal.openPreferences();
-		}
-	</script>
-
-	<commandset id="mainCommandSet">
-		<command id="minimizeWindow"
-				label="&minimizeWindow.label;"
-				oncommand="window.minimize();" />
-		<command id="zoomWindow"
-				label="&zoomWindow.label;"
-				oncommand="zoomWindow();" />
-	</commandset>
-	
-	<keyset id="mainKeyset">
-		<key id="key_minimizeWindow"
-				command="minimizeWindow"
-				key="&minimizeWindow.key;"
-				modifiers="accel"/>
-		<key id="key_openHelpMac"
-				oncommand="ZoteroStandalone.openHelp();"
-				key="&helpMac.commandkey;"
-				modifiers="accel"/>
-		
-		<!-- These are used to build the Application menu under Cocoa widgets -->
-		<key id="key_preferencesCmdMac"
-				key="&preferencesCmdMac.commandkey;"
-				modifiers="accel"/>
-		<key id="key_hideThisAppCmdMac"
-				key="&hideThisAppCmdMac.commandkey;"
-				modifiers="accel"/>
-		<key id="key_hideOtherAppsCmdMac"
-				key="&hideOtherAppsCmdMac.commandkey;"
-				modifiers="accel,alt"/>
-		<key id="key_quitApplication"
-				key="&quitApplicationCmdMac.key;"
-				command="cmd_quitApplication"
-				modifiers="accel"/>
-	</keyset>
-
-	<!-- nsMenuBarX hides these and uses them to build the Application menu. -->
-    <menupopup id="menu_FilePopup">
-        <menuitem id="menu_preferences"
-				label="&preferencesCmdMac.label;"
-				key="key_preferencesCmdMac"
-				oncommand="openPrefs()"/>
-        <menuitem id="menu_mac_services"
-				label="&servicesMenuMac.label;"/>
-        <menuitem id="menu_mac_hide_app"
-				label="&hideThisAppCmdMac.label;"
-				key="key_hideThisAppCmdMac"/>
-        <menuitem id="menu_mac_hide_others"
-				label="&hideOtherAppsCmdMac.label;"
-				key="key_hideOtherAppsCmdMac"/>
-        <menuitem id="menu_mac_show_all"
-				label="&showAllAppsCmdMac.label;"/>
-		<menuitem id="menu_FileQuitItem"
-				label="&quitApplicationCmdMac.label;"
-				key="key_quitApplication"
-				command="cmd_quitApplication"/>
-    </menupopup>
-	
-    <menu id="windowMenu"
-			label="&windowMenu.label;"
-			datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot"
-			onpopupshowing="macWindowMenuDidShow();"
-			hidden="false">
-		<template>
-			<rule>
-				<menupopup>
-					<menuitem uri="rdf:*"
-							label="rdf:http://home.netscape.com/NC-rdf#Name"
-							type="radio"
-							name="windowList"
-							oncommand="ShowWindowFromResource(event.target)"/>
-				</menupopup>
-			</rule>
-		</template>
-        <menupopup id="windowPopup">
-            <menuitem command="minimizeWindow" label="&minimizeWindow.label;" key="key_minimizeWindow"/>
-            <menuitem command="zoomWindow" label="&zoomWindow.label;"/>
-            <!-- decomment when "BringAllToFront" is implemented
-                <menuseparator/>
-                <menuitem label="&bringAllToFront.label;" disabled="true"/> -->
-            <menuseparator id="sep-window-list"/>
-        </menupopup>
-    </menu>
-</overlay>
diff --git a/chrome/content/zotero-platform/unix/standalone/menuOverlay.xul b/chrome/content/zotero-platform/unix/standalone/menuOverlay.xul
deleted file mode 100644
index 0e4b1ed670..0000000000
--- a/chrome/content/zotero-platform/unix/standalone/menuOverlay.xul
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2009 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-	The Original Code is Mozilla.org Code.
- 
-	The Initial Developer of the Original Code is Netscape
-	Communications Corporation. Portions created by Netscape are
-	Copyright (C) 1998-2000 Netscape Communications Corporation. All
-	Rights Reserved.
-	
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
--->
-
-
-<!DOCTYPE overlay [
-	<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
-	<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd"> %standaloneDTD;
-	<!ENTITY % browserDTD SYSTEM "chrome://zotero/locale/mozilla/browser.dtd"> %browserDTD;
-]>
-<overlay id="menuOverlay"
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-    <menupopup id="menu_FilePopup">
-		<menuseparator/>		
-		<menuitem id="menu_FileQuitItem" 
-				label="&quitApplicationCmd.label;"
-				key="key_quitApplication"
-				command="cmd_quitApplication"/>
-    </menupopup>
-    <menupopup id="menu_EditPopup">
-		<menuseparator/>
-        <menuitem id="menu_preferences"
-				label="&preferencesCmdUnix.label;"
-				accesskey="&preferencesCmdUnix.accesskey;"
-				oncommand="Zotero.Utilities.Internal.openPreferences();"/>
-    </menupopup>
-</overlay>
diff --git a/chrome/content/zotero-platform/win/standalone/menuOverlay.xul b/chrome/content/zotero-platform/win/standalone/menuOverlay.xul
deleted file mode 100644
index 5105683986..0000000000
--- a/chrome/content/zotero-platform/win/standalone/menuOverlay.xul
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2009 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-	The Original Code is Mozilla.org Code.
- 
-	The Initial Developer of the Original Code is Netscape
-	Communications Corporation. Portions created by Netscape are
-	Copyright (C) 1998-2000 Netscape Communications Corporation. All
-	Rights Reserved.
-	
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
--->
-
-
-<!DOCTYPE overlay [
-	<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
-	<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd"> %standaloneDTD;
-	<!ENTITY % browserDTD SYSTEM "chrome://zotero/locale/mozilla/browser.dtd"> %browserDTD;
-]>
-<overlay id="menuOverlay"
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-    <menupopup id="menu_FilePopup">
-		<menuseparator/>
-		<menuitem id="menu_FileQuitItem" 
-				label="&quitApplicationCmdWin.label;"
-				key="key_quitApplication"
-				command="cmd_quitApplication"/>
-    </menupopup>
-    <menupopup id="menu_EditPopup">
-		<menuseparator/>
-        <menuitem id="menu_preferences"
-				label="&preferencesCmdUnix.label;"
-				accesskey="&preferencesCmdUnix.accesskey;"
-				oncommand="Zotero.Utilities.Internal.openPreferences();"/>
-    </menupopup>
-</overlay>
diff --git a/chrome/content/zotero/containers/containers.xul b/chrome/content/zotero/containers/containers.xul
deleted file mode 100644
index bb5b6f9d54..0000000000
--- a/chrome/content/zotero/containers/containers.xul
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2018 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
--->
-<?xml-stylesheet href="chrome://zotero-platform/content/zotero-react-client.css"?>
-<?xul-overlay href="chrome://zotero/content/containers/tagSelector.xul"?>
-<?xul-overlay href="chrome://zotero/content/containers/tagsBox.xul"?>
-
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<script src="chrome://zotero/content/include.js"></script>
-	
-	<script src="tagSelectorContainer.js"></script>
-</overlay>
\ No newline at end of file
diff --git a/chrome/content/zotero/containers/tagSelector.xul b/chrome/content/zotero/containers/tagSelector.xul
deleted file mode 100644
index 6963bee568..0000000000
--- a/chrome/content/zotero/containers/tagSelector.xul
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2017 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
--->
-<!DOCTYPE overlay [
-	<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
-	<!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd"> %zoteroDTD;
-]>
-
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<menupopup id="tag-menu">
-		<menuitem label="&zotero.tagSelector.assignColor;"
-			oncommand="ZoteroPane.tagSelector.openColorPickerWindow(); event.stopPropagation();"/>
-		<menuitem label="&zotero.tagSelector.renameTag;"
-			oncommand="ZoteroPane.tagSelector.openRenamePrompt(); event.stopPropagation();"/>
-		<menuitem label="&zotero.tagSelector.deleteTag;"
-			oncommand="ZoteroPane.tagSelector.openDeletePrompt(); event.stopPropagation();"/>
-	</menupopup>
-	<menupopup id="tag-selector-view-settings-menu"
-		onpopupshowing="
-			document.getElementById('show-automatic').setAttribute('checked', ZoteroPane.tagSelector.showAutomatic);
-			document.getElementById('display-all-tags').setAttribute('checked', ZoteroPane.tagSelector.displayAllTags);
-			document.getElementById('num-selected').label = ZoteroPane.tagSelector.label;
-			(async function () {
-				var libraryID = ZoteroPane.tagSelector.libraryID;
-				var library = Zotero.Libraries.get(libraryID);
-				var enabled = false;
-				if (library.editable) {
-					if ((await Zotero.Tags.getAutomaticInLibrary(libraryID)).length) {
-						enabled = true;
-					}
-				}
-				document.getElementById('delete-automatic-tags').disabled = !enabled;
-			})();">
-		<menuitem id="num-selected" disabled="true"/>
-		<menuitem id="deselect-all" label="&zotero.tagSelector.clearAll;"
-			oncommand="ZoteroPane.tagSelector.deselectAll(); event.stopPropagation();"/>
-		<menuseparator/>
-		<menuitem id="show-automatic" label="&zotero.tagSelector.showAutomatic;" type="checkbox"
-			oncommand="ZoteroPane.tagSelector.toggleShowAutomatic(); event.stopPropagation();"/>
-		<menuitem 
-			id="display-all-tags"
-			label="&zotero.tagSelector.displayAllInLibrary;"
-			type="checkbox"
-			oncommand="ZoteroPane.tagSelector.toggleDisplayAllTags(); event.stopPropagation();"
-		/>
-		<menuseparator/>
-		<menuitem id="delete-automatic-tags" label="&zotero.tagSelector.deleteAutomaticInLibrary;" type="checkbox"
-									oncommand="ZoteroPane.tagSelector.deleteAutomatic();
-										this.setAttribute('checked', false);
-										event.stopPropagation();"/>
-	</menupopup>
-</overlay>
\ No newline at end of file
diff --git a/chrome/content/zotero/containers/tagsBox.xul b/chrome/content/zotero/containers/tagsBox.xul
deleted file mode 100644
index ff69329398..0000000000
--- a/chrome/content/zotero/containers/tagsBox.xul
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2019 Corporation for Digital Scholarship
-                     Vienna, Virginia, USA
-                     https://digitalscholar.org/
-    
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
--->
-<!DOCTYPE overlay [
-	<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
-	<!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd"> %zoteroDTD;
-]>
-
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<popupset>
-		<menupopup id="tags-context-menu"
-				onpopupshowing="return ZoteroItemPane.onTagsContextPopupShowing()">
-			<menuitem id="remove-all-item-tags" label="&zotero.item.tags.removeAll;"
-				oncommand="ZoteroItemPane.removeAllTags()"/>
-		</menupopup>
-	</popupset>
-</overlay>
\ No newline at end of file
diff --git a/chrome/content/zotero/itemPane.xul b/chrome/content/zotero/itemPane.xul
deleted file mode 100644
index 8d48762550..0000000000
--- a/chrome/content/zotero/itemPane.xul
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2009 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
--->
-<?xml-stylesheet href="chrome://zotero/skin/itemPane.css" type="text/css"?>
-<?xml-stylesheet href="chrome://zotero-platform/content/itemPane.css" type="text/css"?>
-
-<!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
-
-<overlay
-		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-		xmlns:html="http://www.w3.org/1999/xhtml">
-	<script src="include.js"/>
-	<script src="itemPane.js"></script>
-	
-	<vbox id="zotero-item-pane" zotero-persist="width height">
-		<!-- My Publications -->
-		<hbox id="zotero-item-pane-top-buttons-my-publications" class="zotero-item-pane-top-buttons" hidden="true">
-			<button id="zotero-item-collection-show-hide"/>
-		</hbox>
-		
-		<!-- Trash -->
-		<hbox id="zotero-item-pane-top-buttons-trash" class="zotero-item-pane-top-buttons" hidden="true">
-			<button id="zotero-item-restore-button" label="&zotero.items.menu.restoreToLibrary;"
-				oncommand="ZoteroPane_Local.restoreSelectedItems()"/>
-			<button id="zotero-item-delete-button" label="&zotero.item.deletePermanently;"
-				oncommand="ZoteroPane_Local.deleteSelectedItems()"/>
-		</hbox>
-		
-		<!-- Feed -->
-		<hbox id="zotero-item-pane-top-buttons-feed" class="zotero-item-pane-top-buttons" hidden="true">
-			<button id="zotero-feed-item-toggleRead-button"
-				oncommand="ZoteroPane_Local.toggleSelectedItemsRead();"/>
-			<button id="zotero-feed-item-addTo-button" type="menu-button"
-				oncommand="ZoteroItemPane.translateSelectedItems()">
-				<menupopup id="zotero-item-addTo-menu" onpopupshowing="ZoteroItemPane.buildTranslateSelectContextMenu(event);"/>
-			</button>
-		</hbox>
-		
-		<!-- Commons -->
-		<button id="zotero-item-show-original" label="Show Original"
-			oncommand="ZoteroPane_Local.showOriginalItem()" hidden="true"/>
-		
-		<deck id="zotero-item-pane-content" class="zotero-item-pane-content" selectedIndex="0" flex="1">
-			<!-- Center label (for zero or multiple item selection) -->
-			<groupbox id="zotero-item-pane-groupbox" pack="center" align="center">
-				<vbox id="zotero-item-pane-message-box"/>
-			</groupbox>
-			
-			<!-- Regular item -->
-			<!-- 
-				Keep in sync with contextPane.js (_addItemContext function) which
-				dynamically creates this itemPane part for each tab
-			-->
-			<tabbox id="zotero-view-tabbox" class="zotero-view-tabbox" flex="1" onselect="if (!ZoteroPane_Local.getCollectionTreeRow() || event.originalTarget.localName != 'tabpanels') { return; }; ZoteroItemPane.viewItem(ZoteroPane_Local.getSelectedItems()[0], ZoteroPane_Local.collectionsView.editable ? 'edit' : 'view', this.selectedIndex)">
-				<tabs id="zotero-editpane-tabs" class="zotero-editpane-tabs">
-					<tab id="zotero-editpane-info-tab" label="&zotero.tabs.info.label;"/>
-					<tab id="zotero-editpane-notes-tab" label="&zotero.tabs.notes.label;"/>
-					<tab id="zotero-editpane-tags-tab" label="&zotero.tabs.tags.label;"/>
-					<tab id="zotero-editpane-related-tab" label="&zotero.tabs.related.label;"/>
-				</tabs>
-				<tabpanels id="zotero-view-item" class="zotero-view-item" flex="1">
-					<tabpanel flex="1">
-						<zoteroitembox id="zotero-editpane-item-box" class="zotero-editpane-item-box" flex="1"/>
-					</tabpanel>
-					
-					<tabpanel flex="1" orient="vertical">
-						<vbox flex="1" id="zotero-editpane-notes" class="zotero-box">
-							<hbox align="center">
-								<label id="zotero-editpane-notes-label"/>
-								<button id="zotero-editpane-notes-add" label="&zotero.item.add;" oncommand="ZoteroItemPane.addNote(event.shiftKey);"/>
-							</hbox>
-							<grid flex="1">
-								<columns>
-									<column flex="1"/>
-									<column/>
-								</columns>
-								<rows id="zotero-editpane-dynamic-notes" flex="1"/>
-							</grid>
-						</vbox>
-					</tabpanel>
-					
-					<tabpanel id="tags-pane" class="tags-pane" orient="vertical" context="tags-context-menu">
-						<html:div id="tags-box-container" class="tags-box-container"></html:div>
-					</tabpanel>
-					
-					<tabpanel>
-						<relatedbox id="zotero-editpane-related" class="zotero-editpane-related" flex="1"/>
-					</tabpanel>
-				</tabpanels>
-			</tabbox>
-			
-			<!-- Note item -->
-			<groupbox id="zotero-view-note" flex="1">
-				<!--
-					'onerror' handler crashes the app on a save error to prevent typing in notes
-					while they're not being saved
-				-->
-				<zoteronoteeditor id="zotero-note-editor" flex="1" notitle="1"
-					previousfocus="zotero-items-tree"/>
-			</groupbox>
-			
-			<!-- Attachment item -->
-			<groupbox>
-				<zoteroattachmentbox id="zotero-attachment-box" flex="1"/>
-			</groupbox>
-			
-			<!-- Duplicate merging -->
-			<vbox id="zotero-duplicates-merge-pane" flex="1">
-				<groupbox>
-					<button id="zotero-duplicates-merge-button" oncommand="Zotero_Duplicates_Pane.merge()"/>
-				</groupbox>
-				
-				<groupbox id="zotero-duplicates-merge-version-select">
-					<description>&zotero.duplicatesMerge.versionSelect;</description>
-					<hbox>
-						<listbox id="zotero-duplicates-merge-original-date" onselect="Zotero_Duplicates_Pane.setMaster(this.selectedIndex)" rows="0"/>
-					</hbox>
-				</groupbox>
-				
-				<groupbox flex="1">
-					<description id="zotero-duplicates-merge-field-select">&zotero.duplicatesMerge.fieldSelect;</description>
-					<zoteroitembox id="zotero-duplicates-merge-item-box" flex="1"/>
-				</groupbox>
-			</vbox>
-		</deck>
-	</vbox>
-</overlay>
\ No newline at end of file
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
deleted file mode 100644
index 82709c4c22..0000000000
--- a/chrome/content/zotero/overlay.xul
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2009 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
--->
-
-
-<?xul-overlay href="chrome://zotero/content/zoteroPane.xul"?>
-<?xul-overlay href="chrome://zotero/content/itemPane.xul"?>
-
-<!DOCTYPE overlay [
-	<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
-	<!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd"> %zoteroDTD;
-]>
-
-<overlay id="zotero"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	
-	<script src="overlay.js"/>
-	
-	<toolbar id="zotero-toolbar" nowindowdrag="true"/>
-	
-	<vbox id="appcontent">
-		<stack id="zotero-pane-stack"/>
-	</vbox>
-</overlay>
diff --git a/chrome/content/zotero/preferences/preferences.xul b/chrome/content/zotero/preferences/preferences.xul
index 0f8a875ead..f4bfe2338e 100644
--- a/chrome/content/zotero/preferences/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@@ -23,7 +23,10 @@
     
     ***** END LICENSE BLOCK *****
 -->
-<!DOCTYPE prefwindow SYSTEM "chrome://zotero/locale/preferences.dtd">
+<!DOCTYPE prefwindow [
+	<!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd"> %zoteroDTD;
+	<!ENTITY % preferencesDTD SYSTEM "chrome://zotero/locale/preferences.dtd"> %preferencesDTD;
+]>
 
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?xml-stylesheet href="chrome://zotero-platform/content/preferences.css"?>
@@ -46,45 +49,918 @@
 		windowtype="zotero:pref"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	
-	<prefpane id="zotero-prefpane-general"
-		label="&zotero.preferences.prefpane.general;"
-		image="chrome://zotero/skin/prefs-general.png"
-		src="chrome://zotero/content/preferences/preferences_general.xul"/>
-	
-	<prefpane id="zotero-prefpane-sync"
-			label="&zotero.preferences.prefpane.sync;"
-			image="chrome://zotero/skin/prefs-sync.png"
-			src="chrome://zotero/content/preferences/preferences_sync.xul"/>
-	
-	<prefpane id="zotero-prefpane-search"
-			label="&zotero.preferences.prefpane.search;"
-			image="chrome://zotero/skin/prefs-search.png"
-			src="chrome://zotero/content/preferences/preferences_search.xul"/>
-	
-	<prefpane id="zotero-prefpane-export"
-			label="&zotero.preferences.prefpane.export;"
-			image="chrome://zotero/skin/prefs-export.png"
-			src="chrome://zotero/content/preferences/preferences_export.xul"/>
-	
-	<prefpane id="zotero-prefpane-cite"
-			label="&zotero.preferences.prefpane.cite;"
-			image="chrome://zotero/skin/prefs-styles.png"
-			src="chrome://zotero/content/preferences/preferences_cite.xul"/>
-	
-	<prefpane id="zotero-prefpane-advanced"
-			label="&zotero.preferences.prefpane.advanced;"
-			image="chrome://zotero/skin/prefs-advanced.png"
-			src="chrome://zotero/content/preferences/preferences_advanced.xul"/>
-	
-	<!-- These mess up the prefwindow (more) if they come before the prefpanes
-	 https://bugzilla.mozilla.org/show_bug.cgi?id=296418 -->
 	<script src="chrome://zotero/content/include.js"></script>
+	<script src="preferences.js"></script>
+	<script src="preferences_general.js"></script>
+	<script src="preferences_sync.js"></script>
+	<script src="preferences_search.js"></script>
+	<script src="preferences_export.js"></script>
+	<script src="preferences_cite.js"></script>
+	<script src="preferences_advanced.js"></script>
+	
 	<script src="chrome://zotero/content/charsetMenu.js"></script>
-	<script type="application/javascript">
+	<script>
 	<![CDATA[
 		var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
 		observerService.notifyObservers(null, "charsetmenu-selected", "other");
 	]]>
 	</script>
-	<script src="preferences.js" type="application/javascript"/>
+	
+	<!-- General -->
+	<prefpane id="zotero-prefpane-general"
+			label="&zotero.preferences.prefpane.general;"
+			image="chrome://zotero/skin/prefs-general.png"
+			onpaneload="Zotero_Preferences.General.init()"
+			helpTopic="general">
+		<preferences id="zotero-prefpane-general-preferences">
+			<preference id="pref-automaticSnapshots" name="extensions.zotero.automaticSnapshots" type="bool"/>
+			<preference id="pref-downloadAssociatedFiles" name="extensions.zotero.downloadAssociatedFiles" type="bool"/>
+			<preference id="pref-autoRecognizeFiles" name="extensions.zotero.autoRecognizeFiles" type="bool"/>
+			<preference id="pref-autoRenameFiles" name="extensions.zotero.autoRenameFiles" type="bool"/>
+			<preference id="pref-autoRenameFilesLinked" name="extensions.zotero.autoRenameFiles.linked" type="bool"/>
+			
+			<preference id="pref-automaticTags" name="extensions.zotero.automaticTags" type="bool"/>
+			<preference id="pref-trashAutoEmptyDays" name="extensions.zotero.trashAutoEmptyDays" type="int"/>
+			
+			<preference id="pref-groups-copyChildNotes" name="extensions.zotero.groups.copyChildNotes" type="bool"/>
+			<preference id="pref-groups-copyChildFileAttachments" name="extensions.zotero.groups.copyChildFileAttachments" type="bool"/>
+			<preference id="pref-groups-copyAnnotations" name="extensions.zotero.groups.copyAnnotations" type="bool"/>
+			<preference id="pref-groups-copyChildLinks" name="extensions.zotero.groups.copyChildLinks" type="bool"/>
+			<preference id="pref-groups-copyTags" name="extensions.zotero.groups.copyTags" type="bool"/>
+		</preferences>
+		
+		<groupbox id="zotero-prefpane-file-handling-groupbox">
+			<caption label="&zotero.preferences.fileHandling;"/>
+			
+			<checkbox id="automaticSnapshots-checkbox"
+				label="&zotero.preferences.automaticSnapshots;"
+				preference="pref-automaticSnapshots"/>
+			<checkbox label="&zotero.preferences.downloadAssociatedFiles;" preference="pref-downloadAssociatedFiles"/>
+			<checkbox label="&zotero.preferences.autoRecognizeFiles;" preference="pref-autoRecognizeFiles"/>
+			<checkbox label="&zotero.preferences.autoRenameFiles;"
+					preference="pref-autoRenameFiles"
+					oncommand="Zotero_Preferences.General.updateAutoRenameFilesUI()"/>
+			<checkbox id="rename-linked-files" class="indented-pref"
+					label="&zotero.preferences.autoRenameFiles.renameLinked;"
+					preference="pref-autoRenameFilesLinked"
+					oncommand="Zotero_Preferences.General.updateAutoRenameFilesUI()"/>
+			
+			<hbox align="center">
+				<label value="&zotero.preferences.fileHandler.openPDFsUsing;" control="file-handler-pdf"/>
+				<menulist id="fileHandler-pdf" class="fileHandler-menu">
+					<menupopup>
+						<menuitem id="fileHandler-internal"
+								oncommand="Zotero_Preferences.General.setFileHandler('pdf', '')"/>
+						<menuitem label="&zotero.preferences.fileHandler.systemDefault;"
+								oncommand="Zotero_Preferences.General.setFileHandler('pdf', 'system')"/>
+						<menuitem id="fileHandler-custom"/>
+						<menuitem label="&zotero.preferences.custom;"
+								oncommand="Zotero_Preferences.General.chooseFileHandler('pdf')"/>
+					</menupopup>
+				</menulist>
+			</hbox>
+		</groupbox>
+		
+		<groupbox id="zotero-prefpane-miscellaneous-groupbox">
+			<caption label="&zotero.preferences.miscellaneous;"/>
+			
+			<checkbox label="&zotero.preferences.automaticTags;" preference="pref-automaticTags"/>
+			<hbox align="center">
+				<label value="&zotero.preferences.trashAutoEmptyDaysPre;"/>
+				<textbox size="2" preference="pref-trashAutoEmptyDays"/>
+				<label value="&zotero.preferences.trashAutoEmptyDaysPost;"/>
+			</hbox>
+		</groupbox>
+		
+		<groupbox>
+			<caption label="&zotero.preferences.groups;"/>
+			
+			<label value="&zotero.preferences.groups.whenCopyingInclude;"/>
+			<vbox style="margin-left: 2em">
+				<checkbox label="&zotero.preferences.groups.childNotes;" preference="pref-groups-copyChildNotes"/>
+				<checkbox label="&zotero.preferences.groups.childFiles;" preference="pref-groups-copyChildFileAttachments"/>
+				<checkbox label="&zotero.preferences.groups.annotations;" preference="pref-groups-copyAnnotations"/>
+				<checkbox label="&zotero.preferences.groups.childLinks;" preference="pref-groups-copyChildLinks"/>
+				<checkbox label="&zotero.preferences.groups.tags;" preference="pref-groups-copyTags"/>
+			</vbox>
+		</groupbox>
+		
+		<separator/>
+		<separator/>
+	</prefpane>
+	
+	<!-- Sync -->
+	<prefpane id="zotero-prefpane-sync"
+			label="&zotero.preferences.prefpane.sync;"
+			image="chrome://zotero/skin/prefs-sync.png"
+			src="chrome://zotero/content/preferences/preferences_sync.xul"
+			onpaneload="Zotero_Preferences.Sync.init()"
+			helpTopic="sync">
+		<preferences>
+			<preference id="pref-sync-autosync" name="extensions.zotero.sync.autoSync" type="bool"/>
+			<preference id="pref-sync-username" name="extensions.zotero.sync.server.username" type="unichar" instantApply="true"/>
+			<preference id="pref-sync-fulltext-enabled" name="extensions.zotero.sync.fulltext.enabled" type="bool"/>
+			<preference id="pref-storage-enabled" name="extensions.zotero.sync.storage.enabled" type="bool"/>
+			<preference id="pref-storage-protocol" name="extensions.zotero.sync.storage.protocol" type="string"/>
+			<preference id="pref-storage-scheme" name="extensions.zotero.sync.storage.scheme" type="string" instantApply="true"/>
+			<preference id="pref-storage-url" name="extensions.zotero.sync.storage.url" type="string"/>
+			<preference id="pref-storage-username" name="extensions.zotero.sync.storage.username" type="string"/>
+			<preference id="pref-storage-downloadMode-personal" name="extensions.zotero.sync.storage.downloadMode.personal" type="string"/>
+			<preference id="pref-storage-downloadMode-groups" name="extensions.zotero.sync.storage.downloadMode.groups" type="string"/>
+			<preference id="pref-storage-groups-enabled" name="extensions.zotero.sync.storage.groups.enabled" type="bool"/>
+		</preferences>
+		
+		<tabbox>
+			<tabs>
+				<tab label="&zotero.preferences.settings;"/>
+				<tab id="sync-reset-tab" label="&zotero.preferences.sync.reset;" disabled="true"/>
+			</tabs>
+			
+			<tabpanels>
+				<tabpanel orient="vertical">
+					<vbox id="sync-unauthorized">
+						<groupbox>
+							<caption label="&zotero.preferences.sync.syncServer;"/>
+
+							<hbox>
+								<grid>
+									<columns>
+										<column/>
+										<column/>
+									</columns>
+
+									<rows>
+										<row>
+											<label value="&zotero.preferences.sync.username;"/>
+											<textbox id="sync-username-textbox"
+												preference="pref-sync-username"
+												onblur="Zotero_Preferences.Sync.trimUsername()"
+												oninput="Zotero_Preferences.Sync.credentialsChange(event)"
+												onchange="Zotero_Preferences.Sync.credentialsChange(event)"
+												onkeypress="Zotero_Preferences.Sync.credentialsKeyPress(event)"/>
+										</row>
+										<row>
+											<label value="&zotero.preferences.sync.password;"/>
+											<textbox id="sync-password" type="password"
+												oninput="Zotero_Preferences.Sync.credentialsChange(event)"
+												onchange="Zotero_Preferences.Sync.credentialsChange(event)"
+												onkeypress="Zotero_Preferences.Sync.credentialsKeyPress(event)"/>
+										</row>
+										<row>
+											<box/>
+											<hbox align="baseline">
+												<button id="sync-auth-button"
+													label="&zotero.preferences.sync.setUpSync;"
+													oncommand="Zotero_Preferences.Sync.linkAccount(event)"
+													disabled="true"/>
+												<label id="sync-status-indicator"/>
+											</hbox>
+										</row>
+									</rows>
+								</grid>
+								<vbox style="width:2em"/>
+								<vbox>
+									<label class="zotero-text-link" value="&zotero.preferences.sync.createAccount;" href="http://zotero.org/user/register"/>
+									<separator class="thin"/>
+									<label class="zotero-text-link" value="&zotero.preferences.sync.lostPassword;" href="http://zotero.org/user/lostpassword"/>
+									<separator class="thin"/>
+									<label class="zotero-text-link" value="&zotero.preferences.sync.about;" href="http://www.zotero.org/support/sync"/>
+								</vbox>
+							</hbox>
+						</groupbox>
+					</vbox>
+
+					<vbox id="sync-authorized" hidden="true">
+						<groupbox>
+							<caption label="&zotero.preferences.sync.syncServer;"/>
+
+							<grid>
+								<columns>
+									<column/>
+									<column/>
+								</columns>
+
+								<rows>
+									<row>
+										<label value="&zotero.preferences.sync.username;"/>
+										<hbox>
+											<label id="sync-username" value="Username"/>
+											<button label="&zotero.preferences.sync.unlinkAccount;"
+													oncommand="Zotero_Preferences.Sync.unlinkAccount()"/>
+										</hbox>
+									</row>
+									<row>
+										<box/>
+										<box>
+											<button id="sync-libraries-button" label="&zotero.preferences.sync.librariesToSync.button;"
+													oncommand="Zotero_Preferences.Sync.showLibrariesToSyncDialog()"/>
+										</box>
+									</row>
+									<row>
+										<box/>
+										<checkbox label="&zotero.preferences.sync.syncAutomatically;"
+												  preference="pref-sync-autosync"/>
+									</row>
+									<row>
+										<box/>
+										<checkbox label="&zotero.preferences.sync.syncFullTextContent;"
+												preference="pref-sync-fulltext-enabled"
+												tooltiptext="&zotero.preferences.sync.syncFullTextContent.desc;"/>
+									</row>
+									<row>
+										<box/>
+										<label class="zotero-text-link" value="&zotero.preferences.sync.about;" href="http://www.zotero.org/support/sync"/>
+									</row>
+								</rows>
+							</grid>
+
+						</groupbox>
+
+						<groupbox id="storage-settings">
+							<caption label="&zotero.preferences.sync.fileSyncing;"/>
+
+							<!-- My Library -->
+							<hbox>
+								<checkbox label="&zotero.preferences.sync.fileSyncing.myLibrary;"
+										preference="pref-storage-enabled"
+										oncommand="Zotero_Preferences.Sync.onStorageSettingsChange()"/>
+								<menulist id="storage-protocol" class="storage-personal"
+										style="margin-left: .5em"
+										preference="pref-storage-protocol"
+										oncommand="Zotero_Preferences.Sync.onStorageSettingsChange()">
+									<menupopup>
+										<menuitem label="Zotero" value="zotero"/>
+										<menuitem label="WebDAV" value="webdav"/>
+									</menupopup>
+								</menulist>
+							</hbox>
+
+							<stack id="storage-webdav-settings" style="margin-top: .5em; margin-bottom: .8em; border: 1px gray solid; border-radius: 3px">
+							<!-- Background shading -->
+							<box style="background: black; opacity:.03"/>
+
+							<grid style="padding: .7em .4em .7em 0">
+								<columns>
+									<column/>
+									<column flex="1"/>
+								</columns>
+
+								<rows>
+									<row>
+										<label value="&zotero.preferences.sync.fileSyncing.url;"/>
+										<hbox>
+											<menulist id="storage-url-prefix"
+													preference="pref-storage-scheme"
+													onsynctopreference="Zotero_Preferences.Sync.unverifyStorageServer()"
+													style="padding: 0; width: 7em">
+												<menupopup>
+													<menuitem label="https" value="https" style="padding: 0"/>
+													<menuitem label="http" value="http" style="padding: 0"/>
+												</menupopup>
+											</menulist>
+											<label value="://"/>
+											<textbox id="storage-url" flex="1"
+												preference="pref-storage-url"
+												onkeypress="Zotero_Preferences.Sync.onStorageSettingsKeyPress(event)"
+												onchange="Zotero_Preferences.Sync.onStorageSettingsChange()"/>
+											<label value="/zotero/"/>
+										</hbox>
+									</row>
+									<row>
+										<label value="&zotero.preferences.sync.username;"/>
+										<hbox>
+											<textbox id="storage-username"
+												preference="pref-storage-username"
+												onkeypress="Zotero_Preferences.Sync.onStorageSettingsKeyPress(event)"
+												onchange="Zotero_Preferences.Sync.onStorageSettingsChange()"/>
+										</hbox>
+									</row>
+									<row>
+										<label value="&zotero.preferences.sync.password;"/>
+										<hbox>
+											<textbox id="storage-password" flex="0" type="password"
+												onkeypress="Zotero_Preferences.Sync.onStorageSettingsKeyPress(event)"
+												onchange="Zotero_Preferences.Sync.onStorageSettingsChange()"/>
+										</hbox>
+									</row>
+									<row>
+										<box/>
+										<hbox>
+											<button id="storage-verify" label="&zotero.preferences.sync.fileSyncing.verifyServer;"
+												oncommand="Zotero_Preferences.Sync.verifyStorageServer()"/>
+											<button id="storage-abort" label="Stop" hidden="true"/>
+											<progressmeter id="storage-progress" hidden="true"
+												mode="undetermined"/>
+										</hbox>
+									</row>
+								</rows>
+							</grid>
+
+							</stack>
+
+							<hbox class="storage-settings-download-options" align="center">
+								<label value="&zotero.preferences.sync.fileSyncing.download;"/>
+								<menulist id="storage-user-download-mode"
+										class="storage-mode"
+										preference="pref-storage-downloadMode-personal"
+										style="margin-left: 0">
+									<menupopup>
+										<menuitem label="&zotero.preferences.sync.fileSyncing.download.onDemand;" value="on-demand"/>
+										<menuitem label="&zotero.preferences.sync.fileSyncing.download.atSyncTime;" value="on-sync"/>
+									</menupopup>
+								</menulist>
+							</hbox>
+
+							<separator id="storage-separator" class="thin"/>
+
+							<!-- Group Libraries -->
+							<checkbox label="&zotero.preferences.sync.fileSyncing.groups;"
+									preference="pref-storage-groups-enabled"
+										oncommand="Zotero_Preferences.Sync.updateStorageSettingsGroupsUI()"/>
+
+							<hbox class="storage-settings-download-options" align="center">
+								<label value="&zotero.preferences.sync.fileSyncing.download;"/>
+								<menulist id="storage-groups-download-mode"
+										class="storage-mode"
+										preference="pref-storage-downloadMode-groups"
+										style="margin-left: 0">
+									<menupopup>
+										<menuitem label="&zotero.preferences.sync.fileSyncing.download.onDemand;" value="on-demand"/>
+										<menuitem label="&zotero.preferences.sync.fileSyncing.download.atSyncTime;" value="on-sync"/>
+									</menupopup>
+								</menulist>
+							</hbox>
+
+							<separator class="thin"/>
+
+							<vbox id="storage-terms">
+								<hbox style="margin-top: .4em; display: block" align="center">
+									<label>&zotero.preferences.sync.fileSyncing.tos1;</label>
+									<label class="zotero-text-link" href="https://www.zotero.org/support/terms/terms_of_service" value="&zotero.preferences.sync.fileSyncing.tos2;"/>
+									<label>&zotero.preferences.period;</label>
+								</hbox>
+							</vbox>
+						</groupbox>
+					</vbox>
+				</tabpanel>
+
+				<tabpanel id="sync-reset" orient="vertical">
+					<!-- This doesn't wrap without an explicit width, for some reason -->
+					<description id="reset-sync-warning" width="45em">&zotero.preferences.sync.reset.warning1;<label style="margin-left: 0; margin-right: 0" class="zotero-text-link" href="http://zotero.org/support/kb/sync_reset_options">&zotero.preferences.sync.reset.warning2;</label>&zotero.preferences.sync.reset.warning3;</description>
+					
+					<div id="sync-reset-form" xmlns="http://www.w3.org/1999/xhtml">
+						<div id="sync-reset-library-menu-container">
+							<label>Library: <select id="sync-reset-library-menu"/></label>
+						</div>
+						
+						<ul id="sync-reset-list">
+							<!--<li>
+								<p>&zotero.preferences.sync.reset.restoreFromServer;</p>
+								<p>&zotero.preferences.sync.reset.restoreFromServer.desc;</p>
+							</li>-->
+							
+							<li id="restore-to-server">
+								<label>
+									<input name="sync-reset-radiogroup" value="restore-to-server" type="radio"/>
+									<span class="sync-reset-option-name">&zotero.preferences.sync.reset.restoreToServer;</span>
+									<span class="sync-reset-option-desc">&zotero.preferences.sync.reset.restoreToServer.desc;</span>
+								</label>
+							</li>
+							
+							<!--<li>
+								<h2>&zotero.preferences.sync.reset.resetDataSyncHistory;</h2>
+								<description>&zotero.preferences.sync.reset.resetDataSyncHistory.desc;</p>
+							</li>-->
+							
+							<li id="reset-file-sync-history">
+								<label>
+									<input name="sync-reset-radiogroup" value="reset-file-sync-history" type="radio"/>
+									<span class="sync-reset-option-name">&zotero.preferences.sync.reset.resetFileSyncHistory;</span>
+									<span class="sync-reset-option-desc">&zotero.preferences.sync.reset.resetFileSyncHistory.desc;</span>
+								</label>
+							</li>
+						</ul>
+						
+						<button id="sync-reset-button"
+							disabled="disabled"
+							onclick="Zotero_Preferences.Sync.reset()">&zotero.preferences.sync.reset.button;</button>
+					</div>
+				</tabpanel>
+			</tabpanels>
+		</tabbox>
+		
+		<separator/>
+		<separator/>
+	</prefpane>
+	
+	<!-- Search -->
+	<prefpane id="zotero-prefpane-search"
+			label="&zotero.preferences.prefpane.search;"
+			image="chrome://zotero/skin/prefs-search.png"
+			onpaneload="Zotero_Preferences.Search.init()"
+			helpTopic="search">
+		<preferences>
+			<preference id="pref-fulltext-textMaxLength" name="extensions.zotero.fulltext.textMaxLength" type="int"/>
+			<preference id="pref-fulltext-pdfmaxpages" name="extensions.zotero.fulltext.pdfMaxPages" type="int"/>
+		</preferences>
+		
+		<groupbox>
+			<caption label="&zotero.preferences.search.fulltextCache;"/>
+			
+			<hbox>
+				<button id="fulltext-rebuildIndex" flex="1" oncommand="Zotero_Preferences.Search.rebuildIndexPrompt()"/>
+				<button id="fulltext-clearIndex" flex="1" oncommand="Zotero_Preferences.Search.clearIndexPrompt()"/>
+			</hbox>
+			
+			<separator/>
+			
+			<hbox align="center">
+				<label value="&zotero.preferences.fulltext.textMaxLength;"/>
+				<textbox size="10" preference="pref-fulltext-textMaxLength"/>
+				<label value="(&zotero.preferences.default; 500000)"/>
+			</hbox>
+
+			<separator class="thin"/>
+
+			<hbox align="center">
+				<label value="&zotero.preferences.fulltext.pdfMaxPages;"/>
+				<textbox size="5" preference="pref-fulltext-pdfmaxpages"/>
+				<label value="(&zotero.preferences.default; 100)"/>
+			</hbox>
+		</groupbox>
+		
+		<groupbox id="fulltext-stats">
+			<caption label="&zotero.preferences.search.indexStats;"/>
+			
+			<grid>
+				<columns>
+					<column/>
+					<column/>
+				</columns>
+				
+				<rows>
+					<row id="fulltext-stats-indexed">
+						<label value="&zotero.preferences.search.indexStats.indexed;"/>
+						<label/>
+					</row>
+					<row id="fulltext-stats-partial">
+						<label value="&zotero.preferences.search.indexStats.partial;"/>
+						<label/>
+					</row>
+					<row id="fulltext-stats-unindexed">
+						<label value="&zotero.preferences.search.indexStats.unindexed;"/>
+						<label/>
+					</row>
+					<row id="fulltext-stats-words">
+						<label value="&zotero.preferences.search.indexStats.words;"/>
+						<label/>
+					</row>
+				</rows>
+			</grid>
+		</groupbox>
+		
+		<separator/>
+		<separator/>
+	</prefpane>
+	
+	<!-- Export -->
+	<prefpane id="zotero-prefpane-export"
+			label="&zotero.preferences.prefpane.export;"
+			image="chrome://zotero/skin/prefs-export.png"
+			onpaneload="Zotero_Preferences.Export.init()"
+			helpTopic="export">
+		<preferences>
+			<preference id="pref-quickCopy-setting" name="extensions.zotero.export.quickCopy.setting" type="string"/>
+			<preference id="pref-quickCopy-dragLimit" name="extensions.zotero.export.quickCopy.dragLimit" type="int"/>
+			<preference id="pref-quickCopy-locale" name="extensions.zotero.export.quickCopy.locale" type="string"/>
+			<preference id="pref-noteQuickCopy-setting" name="extensions.zotero.export.noteQuickCopy.setting" type="string"/>
+			<preference id="pref-import-charset" name="extensions.zotero.import.charset" type="string"/>
+		</preferences>
+		
+		<groupbox id="zotero-prefpane-export-groupbox">
+			<caption label="&zotero.preferences.quickCopy.caption;"/>
+			
+			<label id="quickCopy-instructions"/>
+			<separator class="thin"/>
+			<label id="quickCopy-citationInstructions"/>
+			
+			<separator/>
+			
+			<label value="&zotero.preferences.quickCopy.itemFormat;" control="quickCopy-menu"/>
+			<menulist id="zotero-quickCopy-menu" label="&zotero.general.loading;"/>
+			
+			<hbox align="center">
+				<label id="zotero-quickCopy-locale-menu-label" value="&zotero.bibliography.locale.label;" control="zotero-quickCopy-locale-menu"/>
+				<menulist id="zotero-quickCopy-locale-menu" oncommand="Zotero_Preferences.Export._lastSelectedLocale = this.value"/>
+				
+				<separator orient="vertical" width="15px"/>
+				
+				<checkbox id="zotero-quickCopy-copyAsHTML" label="&zotero.preferences.quickCopy.copyAsHTML;"
+					oncommand="Zotero_Preferences.Export.onCopyAsHTMLChange(this.checked)"/>
+			</hbox>
+			
+			<separator/>
+			
+			<label value="&zotero.preferences.quickCopy.noteFormat;" control="zotero-noteQuickCopy-menu"/>
+			<menulist id="zotero-noteQuickCopy-menu" label="&zotero.general.loading;"/>
+			
+			<separator/>
+			
+			<label value="&zotero.preferences.quickCopy.siteEditor.setings;" control="quickCopy-siteSettings"/>
+			<hbox class="virtualized-table-container" flex="1" height="120px">
+				<html:div id="quickCopy-siteSettings"/>
+			</hbox>
+			<separator class="thin"/>
+			<hbox>
+				<button disabled="true" id="quickCopy-edit" label="&zotero.general.edit;"
+					onclick="Zotero_Preferences.Export.showQuickCopySiteEditor(true)"/>
+				<spacer flex="1"/>
+				<button disabled="true" id="quickCopy-delete" label="-" onclick="Zotero_Preferences.Export.deleteSelectedQuickCopySite()"/>
+				<button label="+"
+					onclick="Zotero_Preferences.Export.showQuickCopySiteEditor()"/>
+			</hbox>
+			
+			<hbox align="center">
+				<label value="&zotero.preferences.quickCopy.dragLimit;"/>
+				<textbox preference="pref-quickCopy-dragLimit" size="3"/>
+				<label value="&zotero.preferences.items;" flex="1"/>
+			</hbox>
+		</groupbox>
+		
+		<groupbox>
+			<caption label="&zotero.preferences.charset;"/>
+			
+			<hbox align="center">
+				<label value="&zotero.preferences.charset.importCharset;:" control="zotero-import-charsetMenu"/>
+				<menulist id="zotero-import-charsetMenu" preference="pref-import-charset"/>
+			</hbox>
+		</groupbox>
+	</prefpane>
+	
+	<!-- Cite -->
+	<prefpane id="zotero-prefpane-cite"
+			label="&zotero.preferences.prefpane.cite;"
+			image="chrome://zotero/skin/prefs-styles.png"
+			onpaneload="Zotero_Preferences.Cite.init()"
+			helpTopic="cite">
+		<preferences id="zotero-preferences-cite">
+			<preference id="pref-cite-useClassicAddCitationDialog" name="extensions.zotero.integration.useClassicAddCitationDialog" type="bool"/>
+			<preference id="pref-cite-citePaperJournalArticleURL" name="extensions.zotero.export.citePaperJournalArticleURL" type="bool"/>
+		</preferences>
+		
+		<tabbox>
+			<tabs>
+				<tab id="styles-tab" label="&zotero.preferences.cite.styles;"/>
+				<tab id="wordProcessors-tab" label="&zotero.preferences.cite.wordProcessors;"/>
+			</tabs>
+			<tabpanels>
+				<tabpanel orient="vertical" id="styles">
+					<groupbox flex="1">
+						<caption label="&zotero.preferences.cite.styles.styleManager;"/>
+						
+						<hbox class="virtualized-table-container" flex="1" height="300px">
+							<html:div id="styleManager"/>
+						</hbox>
+						<separator class="thin"/>
+						<hbox align="center" flex="1" height="40">
+							<label class="zotero-text-link"
+									value="&zotero.preferences.export.getAdditionalStyles;" flex="1"
+									onclick="Zotero_Preferences.Cite.openStylesPage(); event.preventDefault()"/>
+							<button disabled="true" id="styleManager-delete" label="-"
+								oncommand="Zotero_Preferences.Cite.deleteStyle()"/>
+							<button label="+" oncommand="Zotero_Preferences.Cite.addStyle()"/>
+						</hbox>
+					</groupbox>
+					
+					<groupbox>
+						<caption label="&zotero.preferences.citationOptions.caption;"/>
+						
+						<checkbox label="&zotero.preferences.export.citePaperJournalArticleURL;" preference="pref-cite-citePaperJournalArticleURL"/>
+						<!-- This doesn't wrap without an explicit width, for some reason -->
+						<label id="export-citePaperJournalArticleURL" width="45em">
+							&zotero.preferences.export.citePaperJournalArticleURL.description;
+						</label>
+					</groupbox>
+					
+					<groupbox>
+						<caption label="&zotero.general.tools;"/>
+						
+						<hbox>
+							<button id="openCSLEdit"
+								label="&zotero.preferences.styleEditor;"
+								oncommand="Zotero_Preferences.openInViewer('chrome://zotero/content/tools/csledit.xul', true)"/>
+							<button id="openCSLPreview"
+								label="&zotero.preferences.stylePreview;"
+								oncommand="Zotero_Preferences.openInViewer('chrome://zotero/content/tools/cslpreview.xul', true)"/>
+						</hbox>
+					</groupbox>
+				</tabpanel>
+				<tabpanel orient="vertical" id="wordProcessors">
+					<vbox id="wordProcessors-somePluginsDisabled" hidden="true">
+						<label style="font-weight: bold; margin-top: 1em; text-align: center">Some word processor plugins are disabled.</label>
+						<hbox pack="center" style="margin-bottom: 2em">
+							<button id="wordProcessors-enablePlugins"
+								label="Enable Plugins and Restart Zotero"
+								oncommand="Zotero_Preferences.Cite.enableWordPlugins()"/>
+						</hbox>
+					</vbox>
+					<checkbox label="&zotero.preferences.cite.wordProcessors.useClassicAddCitationDialog;" preference="pref-cite-useClassicAddCitationDialog"/>
+				</tabpanel>
+			</tabpanels>
+		</tabbox>
+	</prefpane>
+	
+	<!-- Advanced -->
+	<prefpane id="zotero-prefpane-advanced"
+			label="&zotero.preferences.prefpane.advanced;"
+			image="chrome://zotero/skin/prefs-advanced.png"
+			onpaneload="Zotero_Preferences.Advanced.init()"
+			helpTopic="advanced">
+		<preferences>
+			<preference id="pref-automaticScraperUpdates" name="extensions.zotero.automaticScraperUpdates" type="bool"/>
+			<preference id="pref-reportTranslationFailure" name="extensions.zotero.reportTranslationFailure" type="bool"/>
+			
+			<preference id="pref-baseAttachmentPath" name="extensions.zotero.baseAttachmentPath" type="string"/>
+			<preference id="pref-useDataDir" name="extensions.zotero.useDataDir" type="bool"/>
+			<preference id="pref-dataDir" name="extensions.zotero.dataDir" type="string"/>
+			<preference id="pref-debug-output-enableAfterRestart" name="extensions.zotero.debug.store" type="bool"/>
+			<preference id="pref-openURL-resolver" name="extensions.zotero.openURL.resolver" type="string"/>
+			<preference id="pref-openURL-version" name="extensions.zotero.openURL.version" type="string"/>
+			
+			<preference id="pref-keys-saveToZotero" name="extensions.zotero.keys.saveToZotero" type="string"/>
+			<preference id="pref-keys-library" name="extensions.zotero.keys.library" type="string"/>
+			<preference id="pref-keys-quicksearch" name="extensions.zotero.keys.quicksearch" type="string"/>
+			<preference id="pref-keys-newItem" name="extensions.zotero.keys.newItem" type="string"/>
+			<preference id="pref-keys-newNote" name="extensions.zotero.keys.newNote" type="string"/>
+			<preference id="pref-keys-toggleRead" name="extensions.zotero.keys.toggleRead" type="string"/>
+			<preference id="pref-keys-toggleAllRead" name="extensions.zotero.keys.toggleAllRead" type="string"/>
+			<preference id="pref-keys-copySelectedItemCitationsToClipboard" name="extensions.zotero.keys.copySelectedItemCitationsToClipboard" type="string"/>
+			<preference id="pref-keys-copySelectedItemsToClipboard" name="extensions.zotero.keys.copySelectedItemsToClipboard" type="string"/>
+
+			<preference id="pref-feeds-sortAscending" name="extensions.zotero.feeds.sortAscending" type="bool"/>
+		</preferences>
+		
+		<tabbox id="zotero-prefpane-advanced-tabs">
+			<tabs>
+				<tab label="&zotero.preferences.prefpane.general;"/>
+				<tab label="&zotero.preferences.advanced.filesAndFolders;"/>
+				<tab label="&zotero.preferences.advanced.keys;"/>
+				<tab label="&zotero.preferences.feeds;"/> 
+			</tabs>
+			
+			<tabpanels id="zotero-prefpane-advanced-tabpanels">
+				<tabpanel id="zotero-prefpane-advanced-general-tab" orient="vertical">
+					<groupbox id="zotero-prefpane-advanced-miscellaneous">
+						<caption label="&zotero.preferences.miscellaneous;"/>
+						
+						<hbox align="center">
+							<checkbox label="&zotero.preferences.autoUpdate;" preference="pref-automaticScraperUpdates"/>
+							<button id="updateButton" style="margin-top:0" label="&zotero.preferences.updateNow;"
+								oncommand="Zotero_Preferences.Advanced.updateTranslators()"/>
+						</hbox>
+						
+						<checkbox label="&zotero.preferences.reportTranslationFailure;" preference="pref-reportTranslationFailure"/>
+						
+						<hbox align="center">
+							<label value="&zotero.bibliography.locale.label;"/>
+							<menulist id="locale-menu"
+									onblur="if (!Zotero.isMac) Zotero_Preferences.Advanced.onLocaleChange()">
+								<menupopup onpopuphidden="Zotero_Preferences.Advanced.onLocaleChange()"/>
+							</menulist>
+						</hbox>
+					</groupbox>
+					
+					<groupbox>
+						<caption label="OpenURL"/>
+						
+						<hbox>
+							<menulist id="openurl-menu">
+								<menupopup
+										id="openurl-primary-popup"
+										onpopupshowing="Zotero_Preferences.Advanced.handleOpenURLPopupShowing(event)"
+										oncommand="Zotero_Preferences.Advanced.handleOpenURLSelected(event)">
+									<menuitem label="&zotero.preferences.openurl.choose;"/>
+								</menupopup>
+							</menulist>
+						</hbox>
+						
+						<hbox align="center">
+							<label value="&zotero.preferences.openurl.server;"/>
+							<textbox id="openURLServerField" flex="1"
+								oninput="Zotero_Preferences.Advanced.onOpenURLCustomized();"
+								preference="pref-openURL-resolver"
+							/>
+						</hbox>
+					
+						<hbox align="center">
+							<label value="&zotero.preferences.openurl.version;" control="openURLVersionMenu"/>
+							<menulist id="openURLVersionMenu"
+									oncommand="Zotero_Preferences.Advanced.onOpenURLCustomized();"
+									preference="pref-openURL-version">
+								<menupopup>
+									<menuitem label="0.1" value="0.1"/>
+									<menuitem label="1.0" value="1.0"/>
+								</menupopup>
+							</menulist>
+						</hbox>
+					</groupbox>
+					
+					<groupbox id="zotero-prefpane-advanced-advancedConfiguration">
+						<caption label="&zotero.preferences.advanced.advancedConfiguration;"/>
+						
+						<hbox id="zotero-prefpane-advanced-openbuttons" align="center" style="display: block">
+							<button id="config-editor"
+								label="&zotero.preferences.configEditor;"
+								oncommand="Zotero_Preferences.openInViewer('about:config')"/>
+							<button id="memory-info"
+								label="Memory Info"
+								oncommand="Zotero_Preferences.openInViewer('about:memory')"
+								hidden="true"/>
+						</hbox>
+					</groupbox>
+				</tabpanel>
+				
+				<tabpanel orient="vertical">
+					<groupbox>
+						<caption label="&zotero.preferences.attachmentBaseDir.caption;"/>
+						
+						<!-- This doesn't wrap without an explicit width -->
+						<vbox>
+							<description width="45em">&zotero.preferences.attachmentBaseDir.message;</description>
+						</vbox>
+						
+						<hbox align="center">
+							<label value="&zotero.preferences.attachmentBaseDir.basePath;"/>
+							<filefield id="baseAttachmentPath"
+								preference="pref-baseAttachmentPath"
+								onsyncfrompreference="Zotero_Preferences.Attachment_Base_Directory.updateUI()"
+								preference-editable="true"
+								readonly="true"
+								flex="1"
+								tabindex="-1"/>
+							<button id="baseAttachmentPathButton"
+								label="&zotero.preferences.attachmentBaseDir.selectBasePath;"
+								oncommand="Zotero_Preferences.Attachment_Base_Directory.choosePath()"/>
+						</hbox>
+						
+						<hbox>
+							<button id="resetBasePath"
+								label="&zotero.preferences.attachmentBaseDir.resetBasePath;"
+								oncommand="Zotero_Preferences.Attachment_Base_Directory.clearPath()"/>
+						</hbox>
+						
+					</groupbox>
+					
+					<groupbox>
+						<caption label="&zotero.preferences.dataDir;"/>
+						
+						<radiogroup id="data-dir"
+								preference="pref-useDataDir"
+								onsyncfrompreference="return Zotero_Preferences.Advanced.onDataDirLoad()"
+								onsynctopreference="Zotero_Preferences.Advanced.onDataDirUpdate(event);">
+							<radio id="default-data-dir" label="&zotero.preferences.dataDir.useProfile;" value="false"/>
+							<hbox>
+								<radio label="&zotero.preferences.dataDir.custom;" value="true"/>
+								<textbox id="data-dir-path" preference="pref-dataDir"
+									onsyncfrompreference="return Zotero_Preferences.Advanced.getDataDirPath();"
+									readonly="true" flex="1"/>
+								<button label="&zotero.preferences.dataDir.choose;"
+									oncommand="return Zotero_Preferences.Advanced.chooseDataDir(event)"/>
+							</hbox>
+						</radiogroup>
+						
+						<vbox id="command-line-data-dir" hidden="true">
+							<description id="command-line-data-dir-path"/>
+							<label value="&zotero.preferences.dataDir.viaCommandLine;"/>
+						</vbox>
+						
+						<hbox>
+							<button label="&zotero.preferences.dataDir.reveal;"
+								oncommand="Zotero.DataDirectory.reveal()"/>
+							<button id="migrate-data-dir" label="&zotero.preferences.dataDir.migrate;"
+								oncommand="Zotero_Preferences.Advanced.migrateDataDirectory()" hidden="true"/>
+						</hbox>
+					</groupbox>
+					
+					<groupbox>
+						<caption label="&zotero.preferences.dbMaintenance;"/>
+						
+						<hbox style="display: block">
+							<button label="&zotero.preferences.dbMaintenance.integrityCheck;"
+								oncommand="Zotero_Preferences.Advanced.runIntegrityCheck(this)"/>
+							<button id="reset-translators-button"
+								label="&zotero.preferences.dbMaintenance.resetTranslators;"
+								oncommand="Zotero_Preferences.Advanced.resetTranslators()"/>
+							<button id="reset-styles-button"
+								label="&zotero.preferences.dbMaintenance.resetStyles;"
+								oncommand="Zotero_Preferences.Advanced.resetStyles()"/>
+						</hbox>
+					</groupbox>
+				</tabpanel>
+			
+				<tabpanel id="zotero-prefpane-advanced-keys-tab" orient="vertical">
+				
+					<grid id="zotero-keys-grid">
+						<columns>
+							<column flex="1"/>
+							<column/>
+							<column/>
+						</columns>
+			
+						<rows id="zotero-keys-rows">
+							<row id="zotero-keys-new-item">
+								<label value="&zotero.preferences.keys.newItem;" control="textbox-newItem"/>
+								<label class="modifier"/>
+								<textbox id="textbox-newItem" maxlength="1" size="1" preference="pref-keys-newItem"/>
+							</row>
+				
+							<row>
+								<label value="&zotero.preferences.keys.newNote;" control="textbox-newNote"/>
+								<label class="modifier"/>
+								<textbox id="textbox-newNote" maxlength="1" size="1" preference="pref-keys-newNote"/>
+							</row>
+				
+							<row id="zotero-keys-focus-libraries-pane">
+								<label value="&zotero.preferences.keys.focusLibrariesPane;" control="textbox-library"/>
+								<label class="modifier"/>
+								<textbox id="textbox-library" maxlength="1" size="1" preference="pref-keys-library"/>
+							</row>
+				
+							<row>
+								<label value="&zotero.preferences.keys.quicksearch;" control="textbox-quicksearch"/>
+								<label class="modifier"/>
+								<textbox id="textbox-quicksearch" maxlength="1" size="1" preference="pref-keys-quicksearch"/>
+							</row>
+				
+							<row>
+								<label value="&zotero.preferences.keys.copySelectedItemCitationsToClipboard;" control="textbox-copySelectedItemCitationsToClipboard"/>
+								<label class="modifier"/>
+								<textbox id="textbox-copySelectedItemCitationsToClipboard" maxlength="1" size="1"
+										preference="pref-keys-copySelectedItemCitationsToClipboard"
+										onchange="if (Zotero_Preferences.Export) { Zotero_Preferences.Export.updateQuickCopyInstructions(); }"/>
+							</row>
+							
+							<row>
+								<label value="&zotero.preferences.keys.copySelectedItemsToClipboard;" control="textbox-copySelectedItemsToClipboard"/>
+								<label class="modifier"/>
+								<textbox id="textbox-copySelectedItemsToClipboard" maxlength="1" size="1"
+										preference="pref-keys-copySelectedItemsToClipboard"
+										onchange="if (Zotero_Preferences.Export) { Zotero_Preferences.Export.updateQuickCopyInstructions(); }"/>
+							</row>
+							
+							<row>
+								<label value="&zotero.preferences.keys.toggleAllRead;" control="textbox-toggleAllRead"/>
+								<label class="modifier"/>
+								<textbox id="textbox-toggleAllRead" maxlength="1" size="1" preference="pref-keys-toggleAllRead"/>
+							</row>
+						</rows>
+					</grid>
+					
+					<label class="statusLine" value="&zotero.preferences.keys.changesTakeEffect;"/>
+					
+					<separator/>				
+				</tabpanel>
+				<tabpanel id="zotero-prefpane-advanced-feeds-tab" orient="vertical">
+					<groupbox>
+						<hbox>
+							<hbox align="center">
+								<label value="&zotero.preferences.feeds.sorting.label;"/>
+								<menulist id="feed-sort" preference="pref-feeds-sortAscending">
+									<menupopup>
+										<menuitem label="&zotero.preferences.feeds.sorting.newest;" value="false"/>
+										<menuitem label="&zotero.preferences.feeds.sorting.oldest;" value="true"/>
+									</menupopup>
+								</menulist>
+							</hbox>
+						</hbox>
+					</groupbox>
+					
+					<groupbox id="zotero-prefpane-advanced-feeds-feedDefaults">
+						<caption label="&zotero.preferences.feeds.feedDefaults;"/>
+						<hbox>
+							<hbox align="center">
+								<label value="&zotero.feedSettings.refresh.label1;"/>
+								<html:input class="html-input" type="number" min="1" step="1" size="3" data-preference="feeds.defaultTTL"/>
+								<label value="&zotero.feedSettings.refresh.label2;"/>
+							</hbox>
+						</hbox>
+						<hbox>
+							<hbox align="center">
+								<label value="&zotero.feedSettings.cleanupReadAfter.label1;"/>
+								<html:input class="html-input" type="number" min="1" step="1" size="2" data-preference="feeds.defaultCleanupUnreadAfter"/>
+								<label value="&zotero.feedSettings.cleanupReadAfter.label2;"/>
+							</hbox>
+						</hbox>
+						<hbox>
+							<hbox align="center">
+								<label value="&zotero.feedSettings.cleanupUnreadAfter.label1;"/>
+								<html:input class="html-input" type="number" min="1" step="1" size="2" data-preference="feeds.defaultCleanupReadAfter"/>
+								<label value="&zotero.feedSettings.cleanupUnreadAfter.label2;"/>
+							</hbox>
+						</hbox>
+					</groupbox>
+				</tabpanel>
+			</tabpanels>
+		</tabbox>
+	</prefpane>
 </prefwindow>
diff --git a/chrome/content/zotero/preferences/preferences_search.xul b/chrome/content/zotero/preferences/preferences_search.xul
deleted file mode 100644
index b5791f1f51..0000000000
--- a/chrome/content/zotero/preferences/preferences_search.xul
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2006–2013 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
--->
-<!DOCTYPE prefwindow SYSTEM "chrome://zotero/locale/preferences.dtd">
-
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<prefpane id="zotero-prefpane-search"
-			onpaneload="Zotero_Preferences.Search.init()"
-			helpTopic="search">
-		<preferences>
-			<preference id="pref-fulltext-textMaxLength" name="extensions.zotero.fulltext.textMaxLength" type="int"/>
-			<preference id="pref-fulltext-pdfmaxpages" name="extensions.zotero.fulltext.pdfMaxPages" type="int"/>
-		</preferences>
-		
-		<groupbox>
-			<caption label="&zotero.preferences.search.fulltextCache;"/>
-			
-			<hbox>
-				<button id="fulltext-rebuildIndex" flex="1" oncommand="Zotero_Preferences.Search.rebuildIndexPrompt()"/>
-				<button id="fulltext-clearIndex" flex="1" oncommand="Zotero_Preferences.Search.clearIndexPrompt()"/>
-			</hbox>
-			
-			<separator/>
-			
-			<hbox align="center">
-				<label value="&zotero.preferences.fulltext.textMaxLength;"/>
-				<textbox size="10" preference="pref-fulltext-textMaxLength"/>
-				<label value="(&zotero.preferences.default; 500000)"/>
-			</hbox>
-
-			<separator class="thin"/>
-
-			<hbox align="center">
-				<label value="&zotero.preferences.fulltext.pdfMaxPages;"/>
-				<textbox size="5" preference="pref-fulltext-pdfmaxpages"/>
-				<label value="(&zotero.preferences.default; 100)"/>
-			</hbox>
-		</groupbox>
-		
-		<groupbox id="fulltext-stats">
-			<caption label="&zotero.preferences.search.indexStats;"/>
-			
-			<grid>
-				<columns>
-					<column/>
-					<column/>
-				</columns>
-				
-				<rows>
-					<row id="fulltext-stats-indexed">
-						<label value="&zotero.preferences.search.indexStats.indexed;"/>
-						<label/>
-					</row>
-					<row id="fulltext-stats-partial">
-						<label value="&zotero.preferences.search.indexStats.partial;"/>
-						<label/>
-					</row>
-					<row id="fulltext-stats-unindexed">
-						<label value="&zotero.preferences.search.indexStats.unindexed;"/>
-						<label/>
-					</row>
-					<row id="fulltext-stats-words">
-						<label value="&zotero.preferences.search.indexStats.words;"/>
-						<label/>
-					</row>
-				</rows>
-			</grid>
-		</groupbox>
-		
-		<separator/>
-		<separator/>
-	</prefpane>
-	
-	<script src="preferences_search.js" type="application/javascript"/>
-</overlay>
diff --git a/chrome/content/zotero/preferences/preferences_sync.xul b/chrome/content/zotero/preferences/preferences_sync.xul
deleted file mode 100644
index 3f56e1baae..0000000000
--- a/chrome/content/zotero/preferences/preferences_sync.xul
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2008–2013 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
--->
-<!DOCTYPE prefwindow SYSTEM "chrome://zotero/locale/preferences.dtd">
-
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<prefpane id="zotero-prefpane-sync"
-			onpaneload="Zotero_Preferences.Sync.init()"
-			helpTopic="sync">
-		<preferences>
-			<preference id="pref-sync-autosync" name="extensions.zotero.sync.autoSync" type="bool"/>
-			<preference id="pref-sync-username" name="extensions.zotero.sync.server.username" type="unichar" instantApply="true"/>
-			<preference id="pref-sync-fulltext-enabled" name="extensions.zotero.sync.fulltext.enabled" type="bool"/>
-			<preference id="pref-storage-enabled" name="extensions.zotero.sync.storage.enabled" type="bool"/>
-			<preference id="pref-storage-protocol" name="extensions.zotero.sync.storage.protocol" type="string"/>
-			<preference id="pref-storage-scheme" name="extensions.zotero.sync.storage.scheme" type="string" instantApply="true"/>
-			<preference id="pref-storage-url" name="extensions.zotero.sync.storage.url" type="string"/>
-			<preference id="pref-storage-username" name="extensions.zotero.sync.storage.username" type="string"/>
-			<preference id="pref-storage-downloadMode-personal" name="extensions.zotero.sync.storage.downloadMode.personal" type="string"/>
-			<preference id="pref-storage-downloadMode-groups" name="extensions.zotero.sync.storage.downloadMode.groups" type="string"/>
-			<preference id="pref-storage-groups-enabled" name="extensions.zotero.sync.storage.groups.enabled" type="bool"/>
-		</preferences>
-		
-		<tabbox>
-			<tabs>
-				<tab label="&zotero.preferences.settings;"/>
-				<tab id="sync-reset-tab" label="&zotero.preferences.sync.reset;" disabled="true"/>
-			</tabs>
-			
-			<tabpanels>
-				<tabpanel orient="vertical">
-					<vbox id="sync-unauthorized">
-						<groupbox>
-							<caption label="&zotero.preferences.sync.syncServer;"/>
-
-							<hbox>
-								<grid>
-									<columns>
-										<column/>
-										<column/>
-									</columns>
-
-									<rows>
-										<row>
-											<label value="&zotero.preferences.sync.username;"/>
-											<textbox id="sync-username-textbox"
-												preference="pref-sync-username"
-												onblur="Zotero_Preferences.Sync.trimUsername()"
-												oninput="Zotero_Preferences.Sync.credentialsChange(event)"
-												onchange="Zotero_Preferences.Sync.credentialsChange(event)"
-												onkeypress="Zotero_Preferences.Sync.credentialsKeyPress(event)"/>
-										</row>
-										<row>
-											<label value="&zotero.preferences.sync.password;"/>
-											<textbox id="sync-password" type="password"
-												oninput="Zotero_Preferences.Sync.credentialsChange(event)"
-												onchange="Zotero_Preferences.Sync.credentialsChange(event)"
-												onkeypress="Zotero_Preferences.Sync.credentialsKeyPress(event)"/>
-										</row>
-										<row>
-											<box/>
-											<hbox align="baseline">
-												<button id="sync-auth-button"
-													label="&zotero.preferences.sync.setUpSync;"
-													oncommand="Zotero_Preferences.Sync.linkAccount(event)"
-													disabled="true"/>
-												<label id="sync-status-indicator"/>
-											</hbox>
-										</row>
-									</rows>
-								</grid>
-								<vbox style="width:2em"/>
-								<vbox>
-									<label class="zotero-text-link" value="&zotero.preferences.sync.createAccount;" href="http://zotero.org/user/register"/>
-									<separator class="thin"/>
-									<label class="zotero-text-link" value="&zotero.preferences.sync.lostPassword;" href="http://zotero.org/user/lostpassword"/>
-									<separator class="thin"/>
-									<label class="zotero-text-link" value="&zotero.preferences.sync.about;" href="http://www.zotero.org/support/sync"/>
-								</vbox>
-							</hbox>
-						</groupbox>
-					</vbox>
-
-					<vbox id="sync-authorized" hidden="true">
-						<groupbox>
-							<caption label="&zotero.preferences.sync.syncServer;"/>
-
-							<grid>
-								<columns>
-									<column/>
-									<column/>
-								</columns>
-
-								<rows>
-									<row>
-										<label value="&zotero.preferences.sync.username;"/>
-										<hbox>
-											<label id="sync-username" value="Username"/>
-											<button label="&zotero.preferences.sync.unlinkAccount;"
-													oncommand="Zotero_Preferences.Sync.unlinkAccount()"/>
-										</hbox>
-									</row>
-									<row>
-										<box/>
-										<box>
-											<button id="sync-libraries-button" label="&zotero.preferences.sync.librariesToSync.button;"
-													oncommand="Zotero_Preferences.Sync.showLibrariesToSyncDialog()"/>
-										</box>
-									</row>
-									<row>
-										<box/>
-										<checkbox label="&zotero.preferences.sync.syncAutomatically;"
-												  preference="pref-sync-autosync"/>
-									</row>
-									<row>
-										<box/>
-										<checkbox label="&zotero.preferences.sync.syncFullTextContent;"
-												preference="pref-sync-fulltext-enabled"
-												tooltiptext="&zotero.preferences.sync.syncFullTextContent.desc;"/>
-									</row>
-									<row>
-										<box/>
-										<label class="zotero-text-link" value="&zotero.preferences.sync.about;" href="http://www.zotero.org/support/sync"/>
-									</row>
-								</rows>
-							</grid>
-
-						</groupbox>
-
-						<groupbox id="storage-settings">
-							<caption label="&zotero.preferences.sync.fileSyncing;"/>
-
-							<!-- My Library -->
-							<hbox>
-								<checkbox label="&zotero.preferences.sync.fileSyncing.myLibrary;"
-										preference="pref-storage-enabled"
-										oncommand="Zotero_Preferences.Sync.onStorageSettingsChange()"/>
-								<menulist id="storage-protocol" class="storage-personal"
-										style="margin-left: .5em"
-										preference="pref-storage-protocol"
-										oncommand="Zotero_Preferences.Sync.onStorageSettingsChange()">
-									<menupopup>
-										<menuitem label="Zotero" value="zotero"/>
-										<menuitem label="WebDAV" value="webdav"/>
-									</menupopup>
-								</menulist>
-							</hbox>
-
-							<stack id="storage-webdav-settings" style="margin-top: .5em; margin-bottom: .8em; border: 1px gray solid; border-radius: 3px">
-							<!-- Background shading -->
-							<box style="background: black; opacity:.03"/>
-
-							<grid style="padding: .7em .4em .7em 0">
-								<columns>
-									<column/>
-									<column flex="1"/>
-								</columns>
-
-								<rows>
-									<row>
-										<label value="&zotero.preferences.sync.fileSyncing.url;"/>
-										<hbox>
-											<menulist id="storage-url-prefix"
-													preference="pref-storage-scheme"
-													onsynctopreference="Zotero_Preferences.Sync.unverifyStorageServer()"
-													style="padding: 0; width: 7em">
-												<menupopup>
-													<menuitem label="https" value="https" style="padding: 0"/>
-													<menuitem label="http" value="http" style="padding: 0"/>
-												</menupopup>
-											</menulist>
-											<label value="://"/>
-											<textbox id="storage-url" flex="1"
-												preference="pref-storage-url"
-												onkeypress="Zotero_Preferences.Sync.onStorageSettingsKeyPress(event)"
-												onchange="Zotero_Preferences.Sync.onStorageSettingsChange()"/>
-											<label value="/zotero/"/>
-										</hbox>
-									</row>
-									<row>
-										<label value="&zotero.preferences.sync.username;"/>
-										<hbox>
-											<textbox id="storage-username"
-												preference="pref-storage-username"
-												onkeypress="Zotero_Preferences.Sync.onStorageSettingsKeyPress(event)"
-												onchange="Zotero_Preferences.Sync.onStorageSettingsChange()"/>
-										</hbox>
-									</row>
-									<row>
-										<label value="&zotero.preferences.sync.password;"/>
-										<hbox>
-											<textbox id="storage-password" flex="0" type="password"
-												onkeypress="Zotero_Preferences.Sync.onStorageSettingsKeyPress(event)"
-												onchange="Zotero_Preferences.Sync.onStorageSettingsChange()"/>
-										</hbox>
-									</row>
-									<row>
-										<box/>
-										<hbox>
-											<button id="storage-verify" label="&zotero.preferences.sync.fileSyncing.verifyServer;"
-												oncommand="Zotero_Preferences.Sync.verifyStorageServer()"/>
-											<button id="storage-abort" label="Stop" hidden="true"/>
-											<progressmeter id="storage-progress" hidden="true"
-												mode="undetermined"/>
-										</hbox>
-									</row>
-								</rows>
-							</grid>
-
-							</stack>
-
-							<hbox class="storage-settings-download-options" align="center">
-								<label value="&zotero.preferences.sync.fileSyncing.download;"/>
-								<menulist id="storage-user-download-mode"
-										class="storage-mode"
-										preference="pref-storage-downloadMode-personal"
-										style="margin-left: 0">
-									<menupopup>
-										<menuitem label="&zotero.preferences.sync.fileSyncing.download.onDemand;" value="on-demand"/>
-										<menuitem label="&zotero.preferences.sync.fileSyncing.download.atSyncTime;" value="on-sync"/>
-									</menupopup>
-								</menulist>
-							</hbox>
-
-							<separator id="storage-separator" class="thin"/>
-
-							<!-- Group Libraries -->
-							<checkbox label="&zotero.preferences.sync.fileSyncing.groups;"
-									preference="pref-storage-groups-enabled"
-										oncommand="Zotero_Preferences.Sync.updateStorageSettingsGroupsUI()"/>
-
-							<hbox class="storage-settings-download-options" align="center">
-								<label value="&zotero.preferences.sync.fileSyncing.download;"/>
-								<menulist id="storage-groups-download-mode"
-										class="storage-mode"
-										preference="pref-storage-downloadMode-groups"
-										style="margin-left: 0">
-									<menupopup>
-										<menuitem label="&zotero.preferences.sync.fileSyncing.download.onDemand;" value="on-demand"/>
-										<menuitem label="&zotero.preferences.sync.fileSyncing.download.atSyncTime;" value="on-sync"/>
-									</menupopup>
-								</menulist>
-							</hbox>
-
-							<separator class="thin"/>
-
-							<vbox id="storage-terms">
-								<hbox style="margin-top: .4em; display: block" align="center">
-									<label>&zotero.preferences.sync.fileSyncing.tos1;</label>
-									<label class="zotero-text-link" href="https://www.zotero.org/support/terms/terms_of_service" value="&zotero.preferences.sync.fileSyncing.tos2;"/>
-									<label>&zotero.preferences.period;</label>
-								</hbox>
-							</vbox>
-						</groupbox>
-					</vbox>
-				</tabpanel>
-
-				<tabpanel id="sync-reset" orient="vertical">
-					<!-- This doesn't wrap without an explicit width, for some reason -->
-					<description id="reset-sync-warning" width="45em">&zotero.preferences.sync.reset.warning1;<label style="margin-left: 0; margin-right: 0" class="zotero-text-link" href="http://zotero.org/support/kb/sync_reset_options">&zotero.preferences.sync.reset.warning2;</label>&zotero.preferences.sync.reset.warning3;</description>
-					
-					<div id="sync-reset-form" xmlns="http://www.w3.org/1999/xhtml">
-						<div id="sync-reset-library-menu-container">
-							<label>Library: <select id="sync-reset-library-menu"/></label>
-						</div>
-						
-						<ul id="sync-reset-list">
-							<!--<li>
-								<p>&zotero.preferences.sync.reset.restoreFromServer;</p>
-								<p>&zotero.preferences.sync.reset.restoreFromServer.desc;</p>
-							</li>-->
-							
-							<li id="restore-to-server">
-								<label>
-									<input name="sync-reset-radiogroup" value="restore-to-server" type="radio"/>
-									<span class="sync-reset-option-name">&zotero.preferences.sync.reset.restoreToServer;</span>
-									<span class="sync-reset-option-desc">&zotero.preferences.sync.reset.restoreToServer.desc;</span>
-								</label>
-							</li>
-							
-							<!--<li>
-								<h2>&zotero.preferences.sync.reset.resetDataSyncHistory;</h2>
-								<description>&zotero.preferences.sync.reset.resetDataSyncHistory.desc;</p>
-							</li>-->
-							
-							<li id="reset-file-sync-history">
-								<label>
-									<input name="sync-reset-radiogroup" value="reset-file-sync-history" type="radio"/>
-									<span class="sync-reset-option-name">&zotero.preferences.sync.reset.resetFileSyncHistory;</span>
-									<span class="sync-reset-option-desc">&zotero.preferences.sync.reset.resetFileSyncHistory.desc;</span>
-								</label>
-							</li>
-						</ul>
-						
-						<button id="sync-reset-button"
-							disabled="disabled"
-							onclick="Zotero_Preferences.Sync.reset()">&zotero.preferences.sync.reset.button;</button>
-					</div>
-				</tabpanel>
-			</tabpanels>
-		</tabbox>
-		
-		<separator/>
-		<separator/>
-	</prefpane>
-	
-	<script src="preferences_sync.js" type="application/javascript"/>
-</overlay>
diff --git a/chrome/content/zotero/standalone/editMenuOverlay.xul b/chrome/content/zotero/standalone/editMenuOverlay.xul
deleted file mode 100644
index 93ec9cb50c..0000000000
--- a/chrome/content/zotero/standalone/editMenuOverlay.xul
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0"?> <!-- -*- Mode: HTML -*- -->
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!-- Zotero note: This file is copied from Firefox, with an include for the built-in editMenuOverlay.dtd,
-     which is available only in English in our Firefox build, replaced with our own .dtd files. -->
-
-<!DOCTYPE window [
-	<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd"> %standaloneDTD;
-	<!ENTITY % editMenuOverlayDTD SYSTEM "chrome://zotero/locale/mozilla/editMenuOverlay.dtd" > %editMenuOverlayDTD;
-]>
-
-<overlay id="editMenuOverlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script type="application/javascript" src="chrome://global/content/editMenuOverlay.js"/>
-
-  <commandset id="editMenuCommands">
-    <commandset id="editMenuCommandSetAll" commandupdater="true" events="focus,select"
-                oncommandupdate="goUpdateGlobalEditMenuItems()"/>
-    <commandset id="editMenuCommandSetUndo" commandupdater="true" events="undo"
-                oncommandupdate="goUpdateUndoEditMenuItems()"/>
-    <commandset id="editMenuCommandSetPaste" commandupdater="true" events="clipboard"
-                oncommandupdate="goUpdatePasteMenuItems()"/>
-    <command id="cmd_undo" oncommand="goDoCommand('cmd_undo')"/>
-    <command id="cmd_redo" oncommand="goDoCommand('cmd_redo')"/>
-    <command id="cmd_cut" oncommand="goDoCommand('cmd_cut')"/>
-    <command id="cmd_copy" oncommand="goDoCommand('cmd_copy')"/>
-    <command id="cmd_paste" oncommand="goDoCommand('cmd_paste')"/>
-    <command id="cmd_delete" oncommand="goDoCommand('cmd_delete')"/>
-    <command id="cmd_selectAll" oncommand="goDoCommand('cmd_selectAll')"/>
-    <command id="cmd_switchTextDirection" oncommand="goDoCommand('cmd_switchTextDirection');"/>
-  </commandset>
-
-  <!-- These key nodes are here only for show. The real bindings come from
-       XBL, in platformHTMLBindings.xml. See bugs 57078 and 71779. -->
-
-  <keyset id="editMenuKeys">
-    <key id="key_undo" key="&undoCmd.key;" modifiers="accel" command="cmd_undo"/>
-    <key id="key_redo" key="&undoCmd.key;" modifiers="accel,shift" command="cmd_redo"/>
-    <key id="key_cut" key="&cutCmd.key;" modifiers="accel" command="cmd_cut"/>
-    <key id="key_copy" key="&copyCmd.key;" modifiers="accel" command="cmd_copy"/>
-    <key id="key_paste" key="&pasteCmd.key;" modifiers="accel" command="cmd_paste"/>
-    <key id="key_delete" keycode="VK_DELETE" command="cmd_delete"/>
-    <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel" command="cmd_selectAll"/>
-    <key id="key_find" key="&findCmd.key;" modifiers="accel" command="cmd_find"/>
-    <key id="key_findAgain" key="&findAgainCmd.key;" modifiers="accel" command="cmd_findAgain"/>
-    <key id="key_findPrevious" key="&findAgainCmd.key;" modifiers="shift,accel" command="cmd_findPrevious"/>
-    <key id="key_findAgain2" keycode="&findAgainCmd.key2;" command="cmd_findAgain"/>
-    <key id="key_findPrevious2" keycode="&findAgainCmd.key2;" modifiers="shift" command="cmd_findPrevious"/>
-  </keyset>
-
-  <!-- Edit Menu -->
-  <menu id="menu_edit" label="&editMenu.label;"
-        accesskey="&editMenu.accesskey;"/>
-
-  <menuitem id="menu_undo" label="&undoCmd.label;"
-            key="key_undo" accesskey="&undoCmd.accesskey;"
-            command="cmd_undo"/>
-  <menuitem id="menu_redo" label="&redoCmd.label;"
-            key="key_redo" accesskey="&redoCmd.accesskey;"
-            command="cmd_redo"/>
-  <menuitem id="menu_cut" label="&cutCmd.label;"
-            key="key_cut" accesskey="&cutCmd.accesskey;"
-            command="cmd_cut"/>
-  <menuitem id="menu_copy" label="&copyCmd.label;"
-            key="key_copy" accesskey="&copyCmd.accesskey;"
-            command="cmd_copy"/>
-  <menuitem id="menu_paste" label="&pasteCmd.label;"
-            key="key_paste" accesskey="&pasteCmd.accesskey;"
-            command="cmd_paste"/>
-  <menuitem id="menu_delete" label="&deleteCmd.label;"
-            key="key_delete" accesskey="&deleteCmd.accesskey;"
-            command="cmd_delete"/>
-  <menuitem id="menu_selectAll" label="&selectAllCmd.label;"
-            key="key_selectAll" accesskey="&selectAllCmd.accesskey;"
-            command="cmd_selectAll"/>
-  <menuitem id="menu_find" label="&findCmd.label;"
-            key="key_find" accesskey="&findCmd.accesskey;"
-            command="cmd_find"/>
-  <menuitem id="menu_findAgain" label="&findAgainCmd.label;"
-            key="key_findAgain" accesskey="&findAgainCmd.accesskey;"
-            command="cmd_findAgain"/>
-  <menuitem id="menu_findPrevious" label="&findPreviousCmd.label;"
-            key="key_findPrevious" accesskey="&findPreviousCmd.accesskey;"
-            command="cmd_findPrevious"/>
-
-  <menuitem id="cMenu_undo" label="&undoCmd.label;"
-            accesskey="&undoCmd.accesskey;" command="cmd_undo"/>
-  <menuitem id="cMenu_redo" label="&redoCmd.label;"
-            accesskey="&redoCmd.accesskey;" command="cmd_redo"/>
-  <menuitem id="cMenu_cut" label="&cutCmd.label;"
-            accesskey="&cutCmd.accesskey;" command="cmd_cut"/>
-  <menuitem id="cMenu_copy" label="&copyCmd.label;"
-            accesskey="&copyCmd.accesskey;" command="cmd_copy"/>
-  <menuitem id="cMenu_paste" label="&pasteCmd.label;"
-            accesskey="&pasteCmd.accesskey;" command="cmd_paste"/>
-  <menuitem id="cMenu_delete" label="&deleteCmd.label;"
-            accesskey="&deleteCmd.accesskey;" command="cmd_delete"/>
-  <menuitem id="cMenu_selectAll" label="&selectAllCmd.label;"
-            accesskey="&selectAllCmd.accesskey;" command="cmd_selectAll"/>
-  <menuitem id="cMenu_find" label="&findCmd.label;"
-            accesskey="&findCmd.accesskey;" command="cmd_find"/>
-  <menuitem id="cMenu_findAgain" label="&findAgainCmd.label;"
-            accesskey="&findAgainCmd.accesskey;" command="cmd_findAgain"/>
-  <menuitem id="cMenu_findPrevious" label="&findPreviousCmd.label;"
-            accesskey="&findPreviousCmd.accesskey;" command="cmd_findPrevious"/>
-</overlay>
-
diff --git a/chrome/content/zotero/standalone/standalone.xul b/chrome/content/zotero/standalone/standalone.xul
deleted file mode 100644
index 6956c24c8c..0000000000
--- a/chrome/content/zotero/standalone/standalone.xul
+++ /dev/null
@@ -1,584 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2009 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
--->
-
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
-<?xml-stylesheet href="chrome://zotero/skin/standalone.css" type="text/css"?>
-<?xul-overlay href="chrome://zotero/content/standalone/editMenuOverlay.xul"?>
-<?xul-overlay href="chrome://zotero/content/zoteroPane.xul"?>
-<?xul-overlay href="chrome://zotero/content/itemPane.xul"?>
-<?xul-overlay href="chrome://zotero-platform/content/standalone/menuOverlay.xul"?>
-
-<!DOCTYPE window [
-	<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
-	<!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd" > %textcontextDTD;
-	<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd" > %standaloneDTD;
-	<!ENTITY % editMenuOverlayDTD SYSTEM "chrome://zotero/locale/mozilla/editMenuOverlay.dtd" > %editMenuOverlayDTD;
-	<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD;
-	<!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd"> %zoteroDTD;
-]>
-
-<window id="main-window"
-				xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-				xmlns:html="http://www.w3.org/1999/xhtml"
-				windowtype="navigator:browser" 
-				title="&brandShortName;"
-				width="1000" height="600"
-				persist="screenX screenY width height sizemode">
-	<script type="application/javascript" src="resource://zotero/require.js"/>
-	<script type="application/javascript" src="standalone.js"/>
-	<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-	<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
-	<script type="application/javascript" src="chrome://global/content/inlineSpellCheckUI.js"/>
-	
-	<commandset id="mainCommandSet">
-		<!--FILE-->
-		<command id="cmd_quitApplication" oncommand="goQuitApplication();"/>
-		<command id="cmd_close" oncommand="window.close();"/>
-		
-		<!--EDIT-->
-		<commandset id="editMenuCommands"/>
-		<command id="cmd_find"
-			oncommand="document.getElementById('zotero-tb-search').select()"/>
-	</commandset>
-	
-	<keyset id="mainKeyset">
-		<key id="key_close" key="&closeCmd.key;" command="cmd_close" modifiers="accel"/>
-		<key id="key_import"
-				key="&importCmd.key;"
-				command="cmd_zotero_import"
-				modifiers="accel shift"/>
-		<key id="key_importFromClipboard"
-				key="&importCmd.key;"
-				command="cmd_zotero_importFromClipboard"
-				modifiers="accel shift alt"/>
-		<key id="key_copyCitation"
-				command="cmd_zotero_copyCitation"
-				modifiers="accel shift"/>
-		<key id="key_copyBibliography"
-				command="cmd_zotero_copyBibliography"
-				modifiers="accel shift"/>
-		<key id="key_advancedSearch"
-				command="cmd_zotero_advancedSearch"
-				key="&findCmd.key;"
-				modifiers="accel,shift"/>
-		<key id="key_back"/>
-		<key id="key_forward"/>
-	</keyset>
-	<keyset id="editMenuKeys"/>
-	
-	<menupopup id="contentAreaContextMenu">
-		<menuitem id="context-undo"
-				label="&undoCmd.label;"
-				accesskey="&undoCmd.accesskey;"
-				command="cmd_undo"/>
-		<menuseparator id="context-sep-undo"/>
-		<menuitem id="context-cut"
-				label="&cutCmd.label;"
-				accesskey="&cutCmd.accesskey;"
-				command="cmd_cut"/>
-		<menuitem id="context-copy"
-				label="&copyCmd.label;"
-				accesskey="&copyCmd.accesskey;"
-				command="cmd_copy"/>
-		<menuitem id="context-paste"
-				label="&pasteCmd.label;"
-				accesskey="&pasteCmd.accesskey;"
-				command="cmd_paste"/>
-		<menuitem id="context-delete"
-				label="&deleteCmd.label;"
-				accesskey="&deleteCmd.accesskey;"
-				command="cmd_delete"/>
-		<menuseparator id="context-sep-paste"/>
-		<menuitem id="context-selectall"
-				label="&selectAllCmd.label;"
-				accesskey="&selectAllCmd.accesskey;"
-				command="cmd_selectAll"/>
-	</menupopup>
-	<vbox id="titlebar">
-		<hbox id="titlebar-buttonbox-container" skipintoolbarset="true">
-			<hbox id="titlebar-buttonbox">
-				<toolbarbutton class="titlebar-button titlebar-min" oncommand="window.minimize();"/>
-				<toolbarbutton class="titlebar-button titlebar-max" oncommand="onTitlebarMaxClick();"/>
-				<toolbarbutton class="titlebar-button titlebar-close" command="cmd_closeWindow"/>
-			</hbox>
-		</hbox>
-	</vbox>
-	<toolbox id="navigator-toolbox" class="toolbox-top" mode="icons" defaultmode="icons">
-		<!-- Menu -->
-		<toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
-				defaultset="menubar-items"
-				mode="icons" iconsize="small" defaulticonsize="small"
-				context="toolbar-context-menu">
-			<toolbaritem id="menubar-items" align="center">
-				<!-- TODO: Localize labels -->
-				<!--
-					On macOS the document's top-most menubar node is used and
-					there is no way to change it after the initialization, only
-					the children can be modified. All non-menu nodes are ignored
-				-->
-				<menubar id="main-menubar"
-				style="border:0px;padding:0px;margin:0px;-moz-appearance:none">
-					<menu id="fileMenu" label="&fileMenu.label;" accesskey="&fileMenu.accesskey;"
-							onpopupshowing="ZoteroStandalone.onFileMenuOpen()">
-						<menupopup id="menu_FilePopup">
-							<menu id="menu_newItem" class="menu-type-library" label="&zotero.toolbar.newItem.label;">
-								<menupopup id="menu_NewItemPopup"
-										onpopupshowing="ZoteroStandalone.buildNewItemMenu()"/>
-							</menu>
-							<menuitem id="menu_newNote" class="menu-type-library" label="&zotero.toolbar.newNote;"
-									command="cmd_zotero_newStandaloneNote"/>
-							<menuitem id="menu_newCollection" class="menu-type-library" label="&zotero.toolbar.newCollection.label;"
-									command="cmd_zotero_newCollection"/>
-							<menuitem
-								id="menu_transferFromPDF"
-								class="menu-type-reader"
-								label="&zotero.pdfReader.transferFromPDF;"
-								oncommand="ZoteroStandalone.onReaderCmd('transferFromPDF')"
-							/>
-							<menuseparator class="menu-type-reader"/>
-							<menuitem id="menu_export_file" class="menu-type-reader"
-									label="&zotero.general.saveAs;"
-									oncommand="ZoteroStandalone.onReaderCmd('export')"/>
-							<menuseparator class="menu-type-reader"/>
-							<menuitem label="Print" class="menu-type-reader" oncommand="ZoteroStandalone.onReaderCmd('print')"/>
-							<menuitem label="&zotero.items.menu.showInLibrary;" class="menu-type-reader" oncommand="ZoteroStandalone.onReaderCmd('showInLibrary')"/>
-							<menuseparator/>
-							<menuitem id="menu_close" class="menu-type-library" label="&closeCmd.label;" key="key_close"
-									accesskey="&closeCmd.accesskey;" command="cmd_close"/>
-							<menuitem id="menu_close_tab" class="menu-type-reader" label="&closeCmd.label;" key="key_close"
-									accesskey="&closeCmd.accesskey;" oncommand="Zotero_Tabs.close()"/>
-							<menuseparator class="menu-type-library"/>
-							<menuitem id="menu_export_files" class="menu-type-library"
-									oncommand="ZoteroPane.exportSelectedFiles()"
-									hidden="true"/>
-							<menuseparator class="menu-type-library" hidden="true"/>
-							<menuitem id="menu_import" class="menu-type-library" label="&importCmd.label;"
-									command="cmd_zotero_import" key="key_import"/>
-							<menuitem id="menu_importFromClipboard" class="menu-type-library" label="&importFromClipboardCmd.label;"
-									command="cmd_zotero_importFromClipboard" key="key_importFromClipboard"/>
-							<menuitem id="menu_exportLibrary" class="menu-type-library" label="&zotero.toolbar.export.label;"
-									command="cmd_zotero_exportLibrary"/>
-						</menupopup>
-					</menu>
-					
-					<menu id="menu_edit"
-							onpopupshowing="ZoteroStandalone.updateQuickCopyOptions()">
-						<menupopup id="menu_EditPopup">
-							<menuitem id="menu_undo"/>
-							<menuitem id="menu_redo"/>
-							<menuseparator/>
-							<menuitem id="menu_cut"/>
-							<menuitem id="menu_copy"/>
-							<menuitem id="menu_copyCitation"
-									label="&copyCitationCmd.label;"
-									command="cmd_zotero_copyCitation"
-									key="key_copyCitation"
-									hidden="true"/>
-							<menuitem id="menu_copyBibliography"
-									label="&copyBibliographyCmd.label;"
-									command="cmd_zotero_copyBibliography"
-									key="key_copyBibliography"
-									hidden="true"/>
-							<menuitem id="menu_copyExport"
-									class="menu-type-library"
-									key="key_copyBibliography"
-									command="cmd_zotero_copyBibliography"
-									hidden="true"/>
-							<menuitem id="menu_copyNote"
-									label="&copyNoteCmd.label;"
-									command="cmd_zotero_copyBibliography"
-									key="key_copyBibliography"
-									hidden="true"/>
-							<menuitem id="menu_paste"/>
-							<menuitem id="menu_delete"/>
-							<menuseparator class="menu-type-library"/>
-							<menuitem id="menu_selectAll" class="menu-type-library"/>
-							<menuseparator class="menu-type-library"/>
-							<menuitem id="menu_find" class="menu-type-library"/>
-							<menuitem id="menu_advancedSearch"
-									class="menu-type-library"
-									label="&zotero.toolbar.advancedSearch;"
-									command="cmd_zotero_advancedSearch"
-									key="key_advancedSearch"/>
-							<menuseparator hidden="true" id="textfieldDirection-separator"/>
-							<menuitem id="textfieldDirection-swap"
-									command="cmd_switchTextDirection"
-									key="key_switchTextDirection"
-									label="&bidiSwitchTextDirectionItem.label;"
-									accesskey="&bidiSwitchTextDirectionItem.accesskey;"
-									hidden="true"/>
-						</menupopup>
-					</menu>
-
-					<menu id="view-menu"
-							label="&viewMenu.label;"
-							accesskey="&viewMenu.accesskey;"
-							onpopupshowing="ZoteroStandalone.onViewMenuOpen()">
-						<menupopup id="menu_viewPopup">
-							<menuitem
-								class="menu-type-reader"
-								label="&zotero.pdfReader.rotateClockwise;"
-								oncommand="ZoteroStandalone.onReaderCmd('rotatecw')"
-							/>
-							<menuitem
-								class="menu-type-reader"
-								label="&zotero.pdfReader.rotateCounterclockwise;"
-								oncommand="ZoteroStandalone.onReaderCmd('rotateccw')"
-							/>
-							<menuseparator class="menu-type-reader"/>
-							<menuitem
-								id="view-menuitem-hand-tool"
-								class="menu-type-reader"
-								type="checkbox"
-								label="&zotero.pdfReader.handTool;"
-								oncommand="ZoteroStandalone.onReaderCmd('switchcursortool_hand')"
-							/>
-							<menuseparator class="menu-type-reader"/>
-							<menuitem
-								id="view-menuitem-vertical-scrolling"
-								class="menu-type-reader"
-								type="checkbox"
-								label="&zotero.pdfReader.verticalScrolling;"
-								oncommand="ZoteroStandalone.onReaderCmd('switchscrollmode_vertical')"
-							/>
-							<menuitem
-								id="view-menuitem-horizontal-scrolling"
-								class="menu-type-reader"
-								type="checkbox"
-								label="&zotero.pdfReader.horizontalScrolling;"
-								oncommand="ZoteroStandalone.onReaderCmd('switchscrollmode_horizontal')"
-							/>
-							<menuitem
-								id="view-menuitem-wrapped-scrolling"
-								class="menu-type-reader"
-								type="checkbox"
-								label="&zotero.pdfReader.wrappedScrolling;"
-								oncommand="ZoteroStandalone.onReaderCmd('switchscrollmode_wrapped')"
-							/>
-							<menuseparator class="menu-type-reader"/>
-							<menuitem
-								id="view-menuitem-no-spreads"
-								class="menu-type-reader"
-								type="checkbox"
-								label="&zotero.pdfReader.noSpreads;"
-								oncommand="ZoteroStandalone.onReaderCmd('switchspreadmode_none')"
-							/>
-							<menuitem
-								id="view-menuitem-odd-spreads"
-								class="menu-type-reader"
-								type="checkbox"
-								label="&zotero.pdfReader.oddSpreads;"
-								oncommand="ZoteroStandalone.onReaderCmd('switchspreadmode_odd')"
-							/>
-							<menuitem
-								id="view-menuitem-even-spreads"
-								class="menu-type-reader"
-								type="checkbox"
-								label="&zotero.pdfReader.evenSpreads;"
-								oncommand="ZoteroStandalone.onReaderCmd('switchspreadmode_even')"
-							/>
-							<menuseparator class="menu-type-reader"/>
-							<menuitem
-								id="view-menuitem-zoom-in"
-								class="menu-type-reader"
-								label="&zotero.pdfReader.zoomIn;"
-								oncommand="ZoteroStandalone.onReaderCmd('zoomIn')"
-							/>
-							<menuitem
-								id="view-menuitem-zoom-out"
-								class="menu-type-reader"
-								label="&zotero.pdfReader.zoomOut;"
-								oncommand="ZoteroStandalone.onReaderCmd('zoomOut')"
-							/>
-							<menuitem
-								id="view-menuitem-zoom-auto"
-								class="menu-type-reader"
-								type="checkbox"
-								label="&zotero.pdfReader.zoomAuto;"
-								oncommand="ZoteroStandalone.onReaderCmd('zoomAuto')"
-							/>
-							<menuitem
-								id="view-menuitem-zoom-page-width"
-								class="menu-type-reader"
-								type="checkbox"
-								label="&zotero.pdfReader.zoomPageWidth;"
-								oncommand="ZoteroStandalone.onReaderCmd('zoomPageWidth')"
-							/>
-							<menuitem
-								id="view-menuitem-zoom-page-height"
-								class="menu-type-reader"
-								type="checkbox"
-								label="&zotero.pdfReader.zoomPageHeight;"
-								oncommand="ZoteroStandalone.onReaderCmd('zoomPageHeight')"
-							/>
-							<menuseparator class="menu-type-reader"/>
-
-							<menu id="layout-menu" label="&layout.label;">
-								<menupopup oncommand="ZoteroStandalone.onViewMenuItemClick(event)">
-									<menuitem
-										id="view-menuitem-standard"
-										label="&standardView.label;"
-										type="checkbox"
-									/>
-									<menuitem
-										id="view-menuitem-stacked"
-										label="&stackedView.label;"
-										type="checkbox"
-									/>
-									<menuseparator/>
-									<menuitem
-										id="view-menuitem-collections-pane"
-										label="&collectionsPane.label;"
-										type="checkbox"
-									/>
-									<menuitem
-										id="view-menuitem-item-pane"
-										label="&itemPane.label;"
-										type="checkbox"
-									/>
-									<menuitem
-										id="view-menuitem-tag-selector"
-										label="&tagSelector.label;"
-										type="checkbox"
-									/>
-								</menupopup>
-							</menu>
-							<menu id="font-size-menu"
-									label="&fontSize.label;">
-								<menupopup oncommand="ZoteroStandalone.onViewMenuItemClick(event)">
-									<menuitem id="view-menuitem-font-size-bigger" label="&zotero.general.bigger;"/>
-									<menuitem id="view-menuitem-font-size-smaller" label="&zotero.general.smaller;"/>
-									<menuseparator/>
-									<menuitem id="view-menuitem-font-size-reset" label="&zotero.general.reset;"/>
-								</menupopup>
-							</menu>
-							<menu id="note-font-size-menu"
-									label="&noteFontSize.label;">
-								<!-- TODO: Maybe switch to Bigger/Smaller once we can update without restarting -->
-								<!--<menupopup oncommand="ZoteroStandalone.onViewMenuItemClick(event)">
-									<menuitem id="view-menuitem-note-font-size-bigger" label="&zotero.general.bigger;"/>
-									<menuitem id="view-menuitem-note-font-size-smaller" label="&zotero.general.smaller;"/>
-									<menuseparator/>
-									<menuitem id="view-menuitem-note-font-size-reset" label="&zotero.general.reset;"/>-->
-								<menupopup oncommand="ZoteroStandalone.updateNoteFontSize(event)">
-									<menuitem label="11" type="checkbox"/>
-									<menuitem label="12" type="checkbox"/>
-									<menuitem label="13" type="checkbox"/>
-									<menuitem label="14" type="checkbox"/>
-									<menuitem label="18" type="checkbox"/>
-									<menuitem label="24" type="checkbox"/>
-									<menuitem label="36" type="checkbox"/>
-									<menuitem label="48" type="checkbox"/>
-									<menuitem label="64" type="checkbox"/>
-									<menuitem label="72" type="checkbox"/>
-									<menuitem label="96" type="checkbox"/>
-									<menuseparator/>
-									<menuitem
-										id="view-menuitem-note-font-size-reset"
-										label="&zotero.general.reset;"
-										oncommand="ZoteroStandalone.onViewMenuItemClick(event); event.stopPropagation();"/>
-								</menupopup>
-							</menu>
-							<menuseparator/>
-							<menuitem id="view-menuitem-recursive-collections"
-								class="menu-type-library"
-								label="&recursiveCollections.label;"
-								oncommand="ZoteroStandalone.onViewMenuItemClick(event)"
-								type="checkbox"
-							/>
-						</menupopup>
-					</menu>
-					
-					<menu 
-						id="go-menu"
-						class="menu-type-reader"
-						label="&goMenu.label;"
-						onpopupshowing="ZoteroStandalone.onGoMenuOpen()"
-					>
-						<menupopup id="menu_goPopup">
-							<menuitem
-								id="go-menuitem-first-page"
-								class="menu-type-reader"
-								label="&zotero.pdfReader.firstPage;"
-								oncommand="ZoteroStandalone.onReaderCmd('firstpage')"
-							/>
-							<menuitem 
-								id="go-menuitem-last-page"
-								class="menu-type-reader"
-								label="&zotero.pdfReader.lastPage;"
-								oncommand="ZoteroStandalone.onReaderCmd('lastpage')"
-							/>
-							<menuseparator class="menu-type-reader"/>
-							<menuitem 
-								id="go-menuitem-back"
-								class="menu-type-reader"
-								label="&zotero.pdfReader.back;"
-								oncommand="ZoteroStandalone.onReaderCmd('back')"
-							/>
-							<menuitem 
-								id="go-menuitem-forward"
-								class="menu-type-reader"
-								label="&zotero.pdfReader.forward;"
-								oncommand="ZoteroStandalone.onReaderCmd('forward')"
-							/>
-						</menupopup>
-					</menu>
-					
-					<menu id="toolsMenu" label="&toolsMenu.label;" accesskey="&toolsMenu.accesskey;">
-						<menupopup id="menu_ToolsPopup">
-							<menuitem id="menu_createTimeline" class="menu-type-library" label="&zotero.toolbar.timeline.label;"
-									command="cmd_zotero_createTimeline"/>
-							<menuitem id="menu_rtfScan" class="menu-type-library" label="&zotero.toolbar.rtfScan.label;"
-									command="cmd_zotero_rtfScan"/>
-							<menuseparator/>
-							<menuitem id="installConnector"
-									accessKey="&installConnector.accesskey;"
-									label="&installConnector.label;"
-									oncommand="ZoteroStandalone.openHelp('connectors');"/>
-							<menuitem id="menu_addons" label="&addons.label;"
-									oncommand="Zotero.openInViewer('chrome://mozapps/content/extensions/extensions.xul', ZoteroStandalone.updateAddonsPane)"/>
-							<menu id="developer-menu"
-									label="&developer.label;">
-								<menupopup>
-									<menuitem id="menu_errorConsole" label="Error Console" oncommand="toJavaScriptConsole()"/>
-									<menuitem id="menu_runJS" label="Run JavaScript" oncommand="openRunJSWindow()"/>
-									<menuitem id="style-editor-menu-item" label="Style Editor" oncommand="openStyleEditor()"/>
-									<menuitem id="scaffold-menu-item" label="Translator Editor" oncommand="openScaffold()"/>
-								</menupopup>
-							</menu>
-							<menuseparator/>
-							<menu id="manage-attachments-menu" class="menu-type-library" label="&manageAttachments.label;"
-									onpopupshowing="ZoteroStandalone.onManageAttachmentsMenuOpen()"
-									oncommand="ZoteroStandalone.onManageAttachmentsMenuItemClick(event)">
-								<menupopup id="manage-attachments-menupopup">
-									<menuitem
-											id="file-menuitem-convert-to-stored"
-											label="&convertToStored.label;"/>
-								</menupopup>
-							</menu>
-						</menupopup>
-					</menu>
-					
-					<menu id="windowMenu"
-						  label="&windowMenu.label;"
-						  onpopupshowing="macWindowMenuDidShow();"
-						  onpopuphidden="macWindowMenuDidHide();"
-						  >
-					</menu>
-					
-					<menu id="helpMenu"
-							label="&helpMenu.label;"
-							accesskey="&helpMenu.accesskey;">
-						<menupopup id="menu_HelpPopup">
-							<menuitem id="menu_openHelp"
-									  oncommand="ZoteroStandalone.openHelp();"
-									  label="&productHelp.label;"
-									  accesskey="&productHelp.accesskey;"
-									  key="key_openHelpMac"/>
-							<menuitem id="troubleShooting"
-									  accesskey="&helpTroubleshootingInfo.accesskey;"
-									  label="&helpTroubleshootingInfo.label;"
-									  oncommand="ZoteroStandalone.openHelp('troubleshooting');"/>
-							<menuitem id="feedbackPage"
-									  accesskey="&helpFeedbackPage.accesskey;"
-									  label="&helpFeedbackPage.label;"
-									  oncommand="ZoteroStandalone.openHelp('feedback');"/>
-							<menuseparator/>
-							<menuitem id="reportErrors"
-									  accesskey="&helpReportErrors.accesskey;"
-									  label="&helpReportErrors.label;"
-									  command="cmd_zotero_reportErrors"/>
-							<menu id="debug-output-menu"
-									accesskey="&debugOutputLogging.accesskey;"
-									label="&debugOutputLogging.label;"
-									hidden="true">
-								<menupopup id="debug-output-popup"
-										onpopupshowing="ZoteroStandalone.DebugOutput.update()">
-									<menuitem id="debug-output-submit"
-											label="&debugOutputLogging.submit;"
-											oncommand="ZoteroStandalone.DebugOutput.submit()"
-											hidden="true"/>
-									<menuitem id="debug-output-enable-disable"
-											oncommand="ZoteroStandalone.DebugOutput.toggleStore()"/>
-									<menuseparator/>
-									<menuitem id="debug-output-status" disabled="true"/>
-									<menuseparator/>
-									<menuitem id="debug-output-view"
-											label="&debugOutputLogging.view;"
-											oncommand="ZoteroStandalone.DebugOutput.view()"/>
-									<menuitem id="debug-output-clear"
-											label="&debugOutputLogging.clear;"
-											oncommand="ZoteroStandalone.DebugOutput.clear()"/>
-									<menuseparator/>
-									<menuitem id="debug-output-restart-enabled"
-											label="&debugOutputLogging.restartWithLoggingEnabled;"
-											oncommand="ZoteroStandalone.DebugOutput.restartEnabled()"/>
-								</menupopup>
-							</menu>
-							<menuseparator/>
-							<menuitem id="checkForUpdates"
-									  accesskey="&helpCheckForUpdates.accesskey;"
-									  label="&helpCheckForUpdates.label;"
-									  oncommand="ZoteroStandalone.checkForUpdates();"/>
-							<menuitem id="aboutName"
-									  accesskey="&aboutProduct.accesskey;"
-									  label="&aboutProduct.label;"
-									  oncommand="ZoteroPane.openAboutDialog();"/>
-						</menupopup>
-					</menu>
-				</menubar>
-			</toolbaritem>
-		</toolbar>
-	</toolbox>
-	<!-- Keep in sync with Zotero.test conditional block in overlay.js -->
-	<div xmlns="http://www.w3.org/1999/xhtml" id="tab-bar-container"/>
-	<!--<toolbarpalette/>
-
-	<toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
-					 fullscreentoolbar="true" mode="icons" iconsize="large"
-					 customizable="true"
-					 defaultset="unified-back-forward-button,reload-button,stop-button,home-button,urlbar-container,search-container"
-					 context="toolbar-context-menu"/>
-
-	<toolbarset id="customToolbars" context="toolbar-context-menu"/>
-
-	<toolbar id="PersonalToolbar"
-					 mode="icons" iconsize="small" defaulticonsize="small"
-					 class="chromeclass-directories"
-					 context="toolbar-context-menu"
-					 defaultset="personal-bookmarks"
-					 customizable="true"/>-->
-	<hbox flex="1" id="browser">
-		<vbox id="appcontent" flex="1">
-			<stack id="zotero-pane-stack" fullscreenmode="true" flex="1"/>
-		</vbox>
-	</hbox>
-
-	<menupopup id="tag-menu"/>
-	<menupopup id="tag-selector-view-settings-menu"/>
-</window>
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index d096fba177..ec70635e44 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -25,35 +25,656 @@
 -->
 
 
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
+<?xml-stylesheet href="chrome://zotero/skin/standalone.css" type="text/css"?>
 <?xml-stylesheet href="chrome://zotero/skin/overlay.css" type="text/css"?>
 <?xml-stylesheet href="chrome://zotero/skin/contextPane.css" type="text/css"?>
 <?xml-stylesheet href="chrome://zotero-platform/content/overlay.css" type="text/css"?>
 <?xml-stylesheet href="chrome://zotero-platform-version/content/style.css"?>
-<?xul-overlay href="chrome://zotero/content/containers/containers.xul"?>
+<?xml-stylesheet href="chrome://zotero/skin/itemPane.css" type="text/css"?>
+<?xml-stylesheet href="chrome://zotero-platform/content/itemPane.css" type="text/css"?>
+<?xml-stylesheet href="chrome://zotero-platform/content/zotero-react-client.css"?>
 
-<!DOCTYPE overlay [
+<!DOCTYPE window [
 	<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
+	<!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd" > %textcontextDTD;
+	<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd" > %standaloneDTD;
+	<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD;
 	<!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd"> %zoteroDTD;
 	<!ENTITY % dialogOverlayDTD SYSTEM "chrome://global/locale/dialogOverlay.dtd"> %dialogOverlayDTD;
 ]>
 
-<overlay id="zotero"
-	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	xmlns:html="http://www.w3.org/1999/xhtml">
+<window id="main-window"
+		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+		windowtype="navigator:browser" 
+		title="&brandShortName;"
+		width="1000" height="600"
+		persist="screenX screenY width height sizemode"
+		xmlns:html="http://www.w3.org/1999/xhtml">
 	
-	<script src="include.js"/>
-	<script src="tabs.js"/>
-	<script src="zoteroPane.js" type="application/javascript"/>
-	<script src="contextPane.js"/>
-	<script src="fileInterface.js"/>
-	<script src="reportInterface.js"/>
-	<script src="timelineInterface.js"/>
-	<script src="progressQueueDialog.js"/>
-	<script src="browser.js" type="application/javascript"/>
-	<script src="lookup.js"/>
-	<script src="locateMenu.js" type="application/javascript"/>
-	<script src="tooltip.js"/>
+	<html:script src="include.js"></html:script>
 	
+	<html:script src="resource://zotero/require.js"></html:script>
+	<html:script src="standalone/standalone.js"></html:script>
+	<html:script src="chrome://global/content/globalOverlay.js"></html:script>
+	<html:script src="chrome://global/content/contentAreaUtils.js"></html:script>
+	<!--<html:script src="chrome://global/content/inlineSpellCheckUI.js"></html:script>-->
+	
+	<html:script src="overlay.js"></html:script>
+	<html:script src="tabs.js"></html:script>
+	<html:script src="zoteroPane.js"></html:script>
+	<html:script src="itemPane.js"></html:script>
+	<html:script src="contextPane.js"></html:script>
+	<html:script src="fileInterface.js"></html:script>
+	<html:script src="reportInterface.js"></html:script>
+	<html:script src="timelineInterface.js"></html:script>
+	<html:script src="progressQueueDialog.js"></html:script>
+	<html:script src="lookup.js"></html:script>
+	<html:script src="locateMenu.js"></html:script>
+	<html:script src="tooltip.js"></html:script>
+	<html:script src="containers/tagSelectorContainer.js"></html:script>
+	
+	<commandset id="mainCommandSet">
+		<!--FILE-->
+		<command id="cmd_quitApplication" oncommand="goQuitApplication();"/>
+		<command id="cmd_close" oncommand="window.close();"/>
+		
+		<!--EDIT-->
+		<commandset id="editMenuCommands"/>
+		<command id="cmd_find"
+			oncommand="document.getElementById('zotero-tb-search').select()"/>
+	</commandset>
+	
+	<keyset id="mainKeyset">
+		<key id="key_close" key="&closeCmd.key;" command="cmd_close" modifiers="accel"/>
+		<key id="key_import"
+				key="&importCmd.key;"
+				command="cmd_zotero_import"
+				modifiers="accel shift"/>
+		<key id="key_importFromClipboard"
+				key="&importCmd.key;"
+				command="cmd_zotero_importFromClipboard"
+				modifiers="accel shift alt"/>
+		<key id="key_copyCitation"
+				command="cmd_zotero_copyCitation"
+				modifiers="accel shift"/>
+		<key id="key_copyBibliography"
+				command="cmd_zotero_copyBibliography"
+				modifiers="accel shift"/>
+		<key id="key_advancedSearch"
+				command="cmd_zotero_advancedSearch"
+				key="&findCmd.key;"
+				modifiers="accel,shift"/>
+		<key id="key_back"/>
+		<key id="key_forward"/>
+	</keyset>
+	<keyset id="editMenuKeys"/>
+	
+	<menupopup id="contentAreaContextMenu">
+		<menuitem id="context-undo"
+				label="&undoCmd.label;"
+				accesskey="&undoCmd.accesskey;"
+				command="cmd_undo"/>
+		<menuseparator id="context-sep-undo"/>
+		<menuitem id="context-cut"
+				label="&cutCmd.label;"
+				accesskey="&cutCmd.accesskey;"
+				command="cmd_cut"/>
+		<menuitem id="context-copy"
+				label="&copyCmd.label;"
+				accesskey="&copyCmd.accesskey;"
+				command="cmd_copy"/>
+		<menuitem id="context-paste"
+				label="&pasteCmd.label;"
+				accesskey="&pasteCmd.accesskey;"
+				command="cmd_paste"/>
+		<menuitem id="context-delete"
+				label="&deleteCmd.label;"
+				accesskey="&deleteCmd.accesskey;"
+				command="cmd_delete"/>
+		<menuseparator id="context-sep-paste"/>
+		<menuitem id="context-selectall"
+				label="&selectAllCmd.label;"
+				accesskey="&selectAllCmd.accesskey;"
+				command="cmd_selectAll"/>
+	</menupopup>
+	<vbox id="titlebar">
+		<hbox id="titlebar-buttonbox-container" skipintoolbarset="true">
+			<hbox id="titlebar-buttonbox">
+				<toolbarbutton class="titlebar-button titlebar-min" oncommand="window.minimize();"/>
+				<toolbarbutton class="titlebar-button titlebar-max" oncommand="onTitlebarMaxClick();"/>
+				<toolbarbutton class="titlebar-button titlebar-close" command="cmd_closeWindow"/>
+			</hbox>
+		</hbox>
+	</vbox>
+	<toolbox id="navigator-toolbox" class="toolbox-top" mode="icons" defaultmode="icons">
+		<!-- Menu -->
+		<toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
+				defaultset="menubar-items"
+				mode="icons" iconsize="small" defaulticonsize="small"
+				context="toolbar-context-menu">
+			<toolbaritem id="menubar-items" align="center">
+				<!-- TODO: Localize labels -->
+				<!--
+					On macOS the document's top-most menubar node is used and
+					there is no way to change it after the initialization, only
+					the children can be modified. All non-menu nodes are ignored
+				-->
+				<menubar id="main-menubar"
+				style="border:0px;padding:0px;margin:0px;-moz-appearance:none">
+					<!-- File menu -->
+					<menu id="fileMenu" label="&fileMenu.label;" accesskey="&fileMenu.accesskey;"
+							onpopupshowing="ZoteroStandalone.onFileMenuOpen()">
+						<menupopup id="menu_FilePopup">
+							<menu id="menu_newItem" class="menu-type-library" label="&zotero.toolbar.newItem.label;">
+								<menupopup id="menu_NewItemPopup"
+										onpopupshowing="ZoteroStandalone.buildNewItemMenu()"/>
+							</menu>
+							<menuitem id="menu_newNote" class="menu-type-library" label="&zotero.toolbar.newNote;"
+									command="cmd_zotero_newStandaloneNote"/>
+							<menuitem id="menu_newCollection" class="menu-type-library" label="&zotero.toolbar.newCollection.label;"
+									command="cmd_zotero_newCollection"/>
+							<menuitem
+								id="menu_transferFromPDF"
+								class="menu-type-reader"
+								label="&zotero.pdfReader.transferFromPDF;"
+								oncommand="ZoteroStandalone.onReaderCmd('transferFromPDF')"
+							/>
+							<menuseparator class="menu-type-reader"/>
+							<menuitem id="menu_export_file" class="menu-type-reader"
+									label="&zotero.general.saveAs;"
+									oncommand="ZoteroStandalone.onReaderCmd('export')"/>
+							<menuseparator class="menu-type-reader"/>
+							<menuitem label="Print" class="menu-type-reader" oncommand="ZoteroStandalone.onReaderCmd('print')"/>
+							<menuitem label="&zotero.items.menu.showInLibrary;" class="menu-type-reader" oncommand="ZoteroStandalone.onReaderCmd('showInLibrary')"/>
+							<menuseparator/>
+							<menuitem id="menu_close" class="menu-type-library" label="&closeCmd.label;" key="key_close"
+									accesskey="&closeCmd.accesskey;" command="cmd_close"/>
+							<menuitem id="menu_close_tab" class="menu-type-reader" label="&closeCmd.label;" key="key_close"
+									accesskey="&closeCmd.accesskey;" oncommand="Zotero_Tabs.close()"/>
+							<menuseparator class="menu-type-library"/>
+							<menuitem id="menu_export_files" class="menu-type-library"
+									oncommand="ZoteroPane.exportSelectedFiles()"
+									hidden="true"/>
+							<menuseparator class="menu-type-library" hidden="true"/>
+							<menuitem id="menu_import" class="menu-type-library" label="&importCmd.label;"
+									command="cmd_zotero_import" key="key_import"/>
+							<menuitem id="menu_importFromClipboard" class="menu-type-library" label="&importFromClipboardCmd.label;"
+									command="cmd_zotero_importFromClipboard" key="key_importFromClipboard"/>
+							<menuitem id="menu_exportLibrary" class="menu-type-library" label="&zotero.toolbar.export.label;"
+									command="cmd_zotero_exportLibrary"/>
+							<!--
+							#ifdef XP_WIN
+							<menuseparator/>
+							<menuitem id="menu_FileQuitItem"
+									label="&quitApplicationCmdWin.label;"
+									key="key_quitApplication"
+									command="cmd_quitApplication"/>
+							#endif
+							-->
+						</menupopup>
+					</menu>
+					
+					<menu id="edit-menu" data-l10n-id="menu-edit">
+						<menupopup id="menu_EditPopup"
+									onpopupshowing="ZoteroStandalone.updateQuickCopyOptions()">
+							<menuitem id="menu_undo"
+									key="key_undo"
+									command="cmd_undo" data-l10n-id="text-action-undo"/>
+							<menuitem id="menu_redo"
+									key="key_redo"
+									command="cmd_redo" data-l10n-id="text-action-redo"/>
+							<menuseparator/>
+							<menuitem id="menu_cut"
+									key="key_cut"
+									command="cmd_cut" data-l10n-id="text-action-cut"/>
+							<menuitem id="menu_copy"
+									key="key_copy"
+									command="cmd_copy" data-l10n-id="text-action-copy"/>
+							<menuitem id="menu_copyCitation"
+									label="&copyCitationCmd.label;"
+									command="cmd_zotero_copyCitation"
+									key="key_copyCitation"
+									hidden="true"/>
+							<menuitem id="menu_copyBibliography"
+									label="&copyBibliographyCmd.label;"
+									command="cmd_zotero_copyBibliography"
+									key="key_copyBibliography"
+									hidden="true"/>
+							<menuitem id="menu_copyExport"
+									class="menu-type-library"
+									key="key_copyBibliography"
+									command="cmd_zotero_copyBibliography"
+									hidden="true"/>
+							<menuitem id="menu_copyNote"
+									label="&copyNoteCmd.label;"
+									command="cmd_zotero_copyBibliography"
+									key="key_copyBibliography"
+									hidden="true"/>
+							<menuitem id="menu_paste"/>
+							<menuitem id="menu_delete"/>
+							<menuseparator class="menu-type-library"/>
+							<menuitem id="menu_selectAll" class="menu-type-library"/>
+							<menuseparator class="menu-type-library"/>
+							<menuitem id="menu_find" class="menu-type-library"/>
+							<menuitem id="menu_advancedSearch"
+									class="menu-type-library"
+									label="&zotero.toolbar.advancedSearch;"
+									command="cmd_zotero_advancedSearch"
+									key="key_advancedSearch"/>
+							<menuseparator hidden="true" id="textfieldDirection-separator"/>
+							<menuitem id="textfieldDirection-swap"
+									command="cmd_switchTextDirection"
+									key="key_switchTextDirection"
+									label="&bidiSwitchTextDirectionItem.label;"
+									accesskey="&bidiSwitchTextDirectionItem.accesskey;"
+									hidden="true"/>
+						</menupopup>
+					</menu>
+					
+					<menu id="view-menu"
+							label="&viewMenu.label;"
+							accesskey="&viewMenu.accesskey;"
+							onpopupshowing="ZoteroStandalone.onViewMenuOpen()">
+						<menupopup id="menu_viewPopup">
+							<menuitem
+								class="menu-type-reader"
+								label="&zotero.pdfReader.rotateClockwise;"
+								oncommand="ZoteroStandalone.onReaderCmd('rotatecw')"
+							/>
+							<menuitem
+								class="menu-type-reader"
+								label="&zotero.pdfReader.rotateCounterclockwise;"
+								oncommand="ZoteroStandalone.onReaderCmd('rotateccw')"
+							/>
+							<menuseparator class="menu-type-reader"/>
+							<menuitem
+								id="view-menuitem-hand-tool"
+								class="menu-type-reader"
+								type="checkbox"
+								label="&zotero.pdfReader.handTool;"
+								oncommand="ZoteroStandalone.onReaderCmd('switchcursortool_hand')"
+							/>
+							<menuseparator class="menu-type-reader"/>
+							<menuitem
+								id="view-menuitem-vertical-scrolling"
+								class="menu-type-reader"
+								type="checkbox"
+								label="&zotero.pdfReader.verticalScrolling;"
+								oncommand="ZoteroStandalone.onReaderCmd('switchscrollmode_vertical')"
+							/>
+							<menuitem
+								id="view-menuitem-horizontal-scrolling"
+								class="menu-type-reader"
+								type="checkbox"
+								label="&zotero.pdfReader.horizontalScrolling;"
+								oncommand="ZoteroStandalone.onReaderCmd('switchscrollmode_horizontal')"
+							/>
+							<menuitem
+								id="view-menuitem-wrapped-scrolling"
+								class="menu-type-reader"
+								type="checkbox"
+								label="&zotero.pdfReader.wrappedScrolling;"
+								oncommand="ZoteroStandalone.onReaderCmd('switchscrollmode_wrapped')"
+							/>
+							<menuseparator class="menu-type-reader"/>
+							<menuitem
+								id="view-menuitem-no-spreads"
+								class="menu-type-reader"
+								type="checkbox"
+								label="&zotero.pdfReader.noSpreads;"
+								oncommand="ZoteroStandalone.onReaderCmd('switchspreadmode_none')"
+							/>
+							<menuitem
+								id="view-menuitem-odd-spreads"
+								class="menu-type-reader"
+								type="checkbox"
+								label="&zotero.pdfReader.oddSpreads;"
+								oncommand="ZoteroStandalone.onReaderCmd('switchspreadmode_odd')"
+							/>
+							<menuitem
+								id="view-menuitem-even-spreads"
+								class="menu-type-reader"
+								type="checkbox"
+								label="&zotero.pdfReader.evenSpreads;"
+								oncommand="ZoteroStandalone.onReaderCmd('switchspreadmode_even')"
+							/>
+							<menuseparator class="menu-type-reader"/>
+							<menuitem
+								id="view-menuitem-zoom-in"
+								class="menu-type-reader"
+								label="&zotero.pdfReader.zoomIn;"
+								oncommand="ZoteroStandalone.onReaderCmd('zoomIn')"
+							/>
+							<menuitem
+								id="view-menuitem-zoom-out"
+								class="menu-type-reader"
+								label="&zotero.pdfReader.zoomOut;"
+								oncommand="ZoteroStandalone.onReaderCmd('zoomOut')"
+							/>
+							<menuitem
+								id="view-menuitem-zoom-auto"
+								class="menu-type-reader"
+								type="checkbox"
+								label="&zotero.pdfReader.zoomAuto;"
+								oncommand="ZoteroStandalone.onReaderCmd('zoomAuto')"
+							/>
+							<menuitem
+								id="view-menuitem-zoom-page-width"
+								class="menu-type-reader"
+								type="checkbox"
+								label="&zotero.pdfReader.zoomPageWidth;"
+								oncommand="ZoteroStandalone.onReaderCmd('zoomPageWidth')"
+							/>
+							<menuitem
+								id="view-menuitem-zoom-page-height"
+								class="menu-type-reader"
+								type="checkbox"
+								label="&zotero.pdfReader.zoomPageHeight;"
+								oncommand="ZoteroStandalone.onReaderCmd('zoomPageHeight')"
+							/>
+							<menuseparator class="menu-type-reader"/>
+
+							<menu id="layout-menu" label="&layout.label;">
+								<menupopup oncommand="ZoteroStandalone.onViewMenuItemClick(event)">
+									<menuitem
+										id="view-menuitem-standard"
+										label="&standardView.label;"
+										type="checkbox"
+									/>
+									<menuitem
+										id="view-menuitem-stacked"
+										label="&stackedView.label;"
+										type="checkbox"
+									/>
+									<menuseparator/>
+									<menuitem
+										id="view-menuitem-collections-pane"
+										label="&collectionsPane.label;"
+										type="checkbox"
+									/>
+									<menuitem
+										id="view-menuitem-item-pane"
+										label="&itemPane.label;"
+										type="checkbox"
+									/>
+									<menuitem
+										id="view-menuitem-tag-selector"
+										label="&tagSelector.label;"
+										type="checkbox"
+									/>
+								</menupopup>
+							</menu>
+							<menu id="font-size-menu"
+									label="&fontSize.label;">
+								<menupopup oncommand="ZoteroStandalone.onViewMenuItemClick(event)">
+									<menuitem id="view-menuitem-font-size-bigger" label="&zotero.general.bigger;"/>
+									<menuitem id="view-menuitem-font-size-smaller" label="&zotero.general.smaller;"/>
+									<menuseparator/>
+									<menuitem id="view-menuitem-font-size-reset" label="&zotero.general.reset;"/>
+								</menupopup>
+							</menu>
+							<menu id="note-font-size-menu"
+									label="&noteFontSize.label;">
+								<!-- TODO: Maybe switch to Bigger/Smaller once we can update without restarting -->
+								<!--<menupopup oncommand="ZoteroStandalone.onViewMenuItemClick(event)">
+									<menuitem id="view-menuitem-note-font-size-bigger" label="&zotero.general.bigger;"/>
+									<menuitem id="view-menuitem-note-font-size-smaller" label="&zotero.general.smaller;"/>
+									<menuseparator/>
+									<menuitem id="view-menuitem-note-font-size-reset" label="&zotero.general.reset;"/>-->
+								<menupopup oncommand="ZoteroStandalone.updateNoteFontSize(event)">
+									<menuitem label="11" type="checkbox"/>
+									<menuitem label="12" type="checkbox"/>
+									<menuitem label="13" type="checkbox"/>
+									<menuitem label="14" type="checkbox"/>
+									<menuitem label="18" type="checkbox"/>
+									<menuitem label="24" type="checkbox"/>
+									<menuitem label="36" type="checkbox"/>
+									<menuitem label="48" type="checkbox"/>
+									<menuitem label="64" type="checkbox"/>
+									<menuitem label="72" type="checkbox"/>
+									<menuitem label="96" type="checkbox"/>
+									<menuseparator/>
+									<menuitem
+										id="view-menuitem-note-font-size-reset"
+										label="&zotero.general.reset;"
+										oncommand="ZoteroStandalone.onViewMenuItemClick(event); event.stopPropagation();"/>
+								</menupopup>
+							</menu>
+							<menuseparator/>
+							<menuitem id="view-menuitem-recursive-collections"
+								class="menu-type-library"
+								label="&recursiveCollections.label;"
+								oncommand="ZoteroStandalone.onViewMenuItemClick(event)"
+								type="checkbox"
+							/>
+						</menupopup>
+					</menu>
+					
+					<menu 
+						id="go-menu"
+						class="menu-type-reader"
+						label="&goMenu.label;"
+						onpopupshowing="ZoteroStandalone.onGoMenuOpen()"
+					>
+						<menupopup id="menu_goPopup">
+							<menuitem
+								id="go-menuitem-first-page"
+								class="menu-type-reader"
+								label="&zotero.pdfReader.firstPage;"
+								oncommand="ZoteroStandalone.onReaderCmd('firstpage')"
+							/>
+							<menuitem 
+								id="go-menuitem-last-page"
+								class="menu-type-reader"
+								label="&zotero.pdfReader.lastPage;"
+								oncommand="ZoteroStandalone.onReaderCmd('lastpage')"
+							/>
+							<menuseparator class="menu-type-reader"/>
+							<menuitem 
+								id="go-menuitem-back"
+								class="menu-type-reader"
+								label="&zotero.pdfReader.back;"
+								oncommand="ZoteroStandalone.onReaderCmd('back')"
+							/>
+							<menuitem 
+								id="go-menuitem-forward"
+								class="menu-type-reader"
+								label="&zotero.pdfReader.forward;"
+								oncommand="ZoteroStandalone.onReaderCmd('forward')"
+							/>
+						</menupopup>
+					</menu>
+					
+					<menu id="toolsMenu" label="&toolsMenu.label;" accesskey="&toolsMenu.accesskey;">
+						<menupopup id="menu_ToolsPopup">
+							<menuitem id="menu_createTimeline" class="menu-type-library" label="&zotero.toolbar.timeline.label;"
+									command="cmd_zotero_createTimeline"/>
+							<menuitem id="menu_rtfScan" class="menu-type-library" label="&zotero.toolbar.rtfScan.label;"
+									command="cmd_zotero_rtfScan"/>
+							<menuseparator/>
+							<menuitem id="installConnector"
+									accessKey="&installConnector.accesskey;"
+									label="&installConnector.label;"
+									oncommand="ZoteroStandalone.openHelp('connectors');"/>
+							<menuitem id="menu_addons" label="&addons.label;"
+									oncommand="Zotero.openInViewer('chrome://mozapps/content/extensions/extensions.xul', ZoteroStandalone.updateAddonsPane)"/>
+							<menu id="developer-menu"
+									label="&developer.label;">
+								<menupopup>
+									<menuitem id="menu_errorConsole" label="Error Console" oncommand="toJavaScriptConsole()"/>
+									<menuitem id="menu_runJS" label="Run JavaScript" oncommand="openRunJSWindow()"/>
+									<menuitem id="style-editor-menu-item" label="Style Editor" oncommand="openStyleEditor()"/>
+									<menuitem id="scaffold-menu-item" label="Translator Editor" oncommand="openScaffold()"/>
+								</menupopup>
+							</menu>
+							<menuseparator/>
+							<menu id="manage-attachments-menu" class="menu-type-library" label="&manageAttachments.label;"
+									onpopupshowing="ZoteroStandalone.onManageAttachmentsMenuOpen()"
+									oncommand="ZoteroStandalone.onManageAttachmentsMenuItemClick(event)">
+								<menupopup id="manage-attachments-menupopup">
+									<menuitem
+											id="file-menuitem-convert-to-stored"
+											label="&convertToStored.label;"/>
+								</menupopup>
+							</menu>
+						</menupopup>
+					</menu>
+					
+<!-- ifdef mac -->
+					<commandset id="macCommandSet"> <!-- was mainCommandSet -->
+						<command id="minimizeWindow"
+								label="&minimizeWindow.label;"
+								oncommand="window.minimize();" />
+						<command id="zoomWindow"
+								label="&zoomWindow.label;"
+								oncommand="zoomWindow();" />
+					</commandset>
+					
+					<keyset id="macKeyset">  <!-- was mainKeySet -->
+						<key id="key_minimizeWindow"
+								command="minimizeWindow"
+								key="&minimizeWindow.key;"
+								modifiers="accel"/>
+						<key id="key_openHelpMac"
+								oncommand="ZoteroStandalone.openHelp();"
+								key="&helpMac.commandkey;"
+								modifiers="accel"/>
+						
+						<!-- These are used to build the Application menu under Cocoa widgets -->
+						<key id="key_preferencesCmdMac"
+								key="&preferencesCmdMac.commandkey;"
+								modifiers="accel"/>
+						<key id="key_hideThisAppCmdMac"
+								key="&hideThisAppCmdMac.commandkey;"
+								modifiers="accel"/>
+						<key id="key_hideOtherAppsCmdMac"
+								key="&hideOtherAppsCmdMac.commandkey;"
+								modifiers="accel,alt"/>
+						<key id="key_quitApplication"
+								key="&quitApplicationCmdMac.key;"
+								command="cmd_quitApplication"
+								modifiers="accel"/>
+					</keyset>
+					
+					<!-- nsMenuBarX hides these and uses them to build the Application menu. -->
+					<menupopup id="menu_FilePopup">
+						<menuitem id="menu_preferences"
+								label="&preferencesCmdMac.label;"
+								key="key_preferencesCmdMac"
+								oncommand="Zotero.Utilities.Internal.openPreferences()"/>
+						<menuitem id="menu_mac_services"
+								label="&servicesMenuMac.label;"/>
+						<menuitem id="menu_mac_hide_app"
+								label="&hideThisAppCmdMac.label;"
+								key="key_hideThisAppCmdMac"/>
+						<menuitem id="menu_mac_hide_others"
+								label="&hideOtherAppsCmdMac.label;"
+								key="key_hideOtherAppsCmdMac"/>
+						<menuitem id="menu_mac_show_all"
+								label="&showAllAppsCmdMac.label;"/>
+						<menuitem id="menu_FileQuitItem"
+								label="&quitApplicationCmdMac.label;"
+								key="key_quitApplication"
+								command="cmd_quitApplication"/>
+					</menupopup>
+					
+					<menu id="windowMenu"
+							label="&windowMenu.label;"
+							datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot"
+							onpopupshowing="macWindowMenuDidShow();"
+							onpopuphidden="macWindowMenuDidHide();"
+							hidden="false">
+						<template>
+							<rule>
+								<menupopup>
+									<menuitem uri="rdf:*"
+											label="rdf:http://home.netscape.com/NC-rdf#Name"
+											type="radio"
+											name="windowList"
+											oncommand="ShowWindowFromResource(event.target)"/>
+								</menupopup>
+							</rule>
+						</template>
+						<menupopup id="windowPopup">
+							<menuitem command="minimizeWindow" label="&minimizeWindow.label;" key="key_minimizeWindow"/>
+							<menuitem command="zoomWindow" label="&zoomWindow.label;"/>
+							<!-- decomment when "BringAllToFront" is implemented
+								<menuseparator/>
+								<menuitem label="&bringAllToFront.label;" disabled="true"/> -->
+							<menuseparator id="sep-window-list"/>
+						</menupopup>
+					</menu>
+<!-- endif -->
+					
+					<menu id="helpMenu"
+							label="&helpMenu.label;"
+							accesskey="&helpMenu.accesskey;">
+						<menupopup id="menu_HelpPopup">
+							<menuitem id="menu_openHelp"
+									  oncommand="ZoteroStandalone.openHelp();"
+									  label="&productHelp.label;"
+									  accesskey="&productHelp.accesskey;"
+									  key="key_openHelpMac"/>
+							<menuitem id="troubleShooting"
+									  accesskey="&helpTroubleshootingInfo.accesskey;"
+									  label="&helpTroubleshootingInfo.label;"
+									  oncommand="ZoteroStandalone.openHelp('troubleshooting');"/>
+							<menuitem id="feedbackPage"
+									  accesskey="&helpFeedbackPage.accesskey;"
+									  label="&helpFeedbackPage.label;"
+									  oncommand="ZoteroStandalone.openHelp('feedback');"/>
+							<menuseparator/>
+							<menuitem id="reportErrors"
+									  accesskey="&helpReportErrors.accesskey;"
+									  label="&helpReportErrors.label;"
+									  command="cmd_zotero_reportErrors"/>
+							<menu id="debug-output-menu"
+									accesskey="&debugOutputLogging.accesskey;"
+									label="&debugOutputLogging.label;"
+									hidden="true">
+								<menupopup id="debug-output-popup"
+										onpopupshowing="ZoteroStandalone.DebugOutput.update()">
+									<menuitem id="debug-output-submit"
+											label="&debugOutputLogging.submit;"
+											oncommand="ZoteroStandalone.DebugOutput.submit()"
+											hidden="true"/>
+									<menuitem id="debug-output-enable-disable"
+											oncommand="ZoteroStandalone.DebugOutput.toggleStore()"/>
+									<menuseparator/>
+									<menuitem id="debug-output-status" disabled="true"/>
+									<menuseparator/>
+									<menuitem id="debug-output-view"
+											label="&debugOutputLogging.view;"
+											oncommand="ZoteroStandalone.DebugOutput.view()"/>
+									<menuitem id="debug-output-clear"
+											label="&debugOutputLogging.clear;"
+											oncommand="ZoteroStandalone.DebugOutput.clear()"/>
+									<menuseparator/>
+									<menuitem id="debug-output-restart-enabled"
+											label="&debugOutputLogging.restartWithLoggingEnabled;"
+											oncommand="ZoteroStandalone.DebugOutput.restartEnabled()"/>
+								</menupopup>
+							</menu>
+							<menuseparator/>
+							<menuitem id="checkForUpdates"
+									  accesskey="&helpCheckForUpdates.accesskey;"
+									  label="&helpCheckForUpdates.label;"
+									  oncommand="ZoteroStandalone.checkForUpdates();"/>
+							<menuitem id="aboutName"
+									  accesskey="&aboutProduct.accesskey;"
+									  label="&aboutProduct.label;"
+									  oncommand="ZoteroPane.openAboutDialog();"/>
+						</menupopup>
+					</menu>
+				</menubar>
+			</toolbaritem>
+		</toolbar>
+	</toolbox>
+	<!-- Keep in sync with Zotero.test conditional block in overlay.js -->
+	<div xmlns="http://www.w3.org/1999/xhtml" id="tab-bar-container"/>
+
 	<commandset id="mainCommandSet">
 		<command id="cmd_zotero_reportErrors" oncommand="ZoteroPane_Local.reportErrors();"/>
 		<command id="cmd_zotero_import" oncommand="Zotero_File_Interface.showImportWizard();"/>
@@ -75,7 +696,7 @@
 		<command id="cmd_zotero_newChildNote" oncommand="ZoteroPane_Local.newChildNote(event.shiftKey);"/>
 	</commandset>
 	
-	<stack id="zotero-pane-stack">
+	<stack id="zotero-pane-stack" flex="1">
 		<!-- A placeholder to persist pdf-reader sidebar collapse state to avoid introducing another pref -->
 		<box id="zotero-reader-sidebar-pane" hidden="true" collapsed="true" zotero-persist="collapsed width"/>
 		<hbox>
@@ -387,7 +1008,118 @@
 							</splitter>
 		
 							<!-- itemPane.xul -->
-							<vbox id="zotero-item-pane" zotero-persist="width height" height="300"/>
+							<vbox id="zotero-item-pane" zotero-persist="width height" height="300">
+								<!-- My Publications -->
+								<hbox id="zotero-item-pane-top-buttons-my-publications" class="zotero-item-pane-top-buttons" hidden="true">
+									<button id="zotero-item-collection-show-hide"/>
+								</hbox>
+								
+								<!-- Trash -->
+								<hbox id="zotero-item-pane-top-buttons-trash" class="zotero-item-pane-top-buttons" hidden="true">
+									<button id="zotero-item-restore-button" label="&zotero.items.menu.restoreToLibrary;"
+										oncommand="ZoteroPane_Local.restoreSelectedItems()"/>
+									<button id="zotero-item-delete-button" label="&zotero.item.deletePermanently;"
+										oncommand="ZoteroPane_Local.deleteSelectedItems()"/>
+								</hbox>
+								
+								<!-- Feed -->
+								<hbox id="zotero-item-pane-top-buttons-feed" class="zotero-item-pane-top-buttons" hidden="true">
+									<button id="zotero-feed-item-toggleRead-button"
+										oncommand="ZoteroPane_Local.toggleSelectedItemsRead();"/>
+									<button id="zotero-feed-item-addTo-button" type="menu-button"
+										oncommand="ZoteroItemPane.translateSelectedItems()">
+										<menupopup id="zotero-item-addTo-menu" onpopupshowing="ZoteroItemPane.buildTranslateSelectContextMenu(event);"/>
+									</button>
+								</hbox>
+								
+								<!-- Commons -->
+								<button id="zotero-item-show-original" label="Show Original"
+									oncommand="ZoteroPane_Local.showOriginalItem()" hidden="true"/>
+								
+								<deck id="zotero-item-pane-content" class="zotero-item-pane-content" selectedIndex="0" flex="1">
+									<!-- Center label (for zero or multiple item selection) -->
+									<groupbox id="zotero-item-pane-groupbox" pack="center" align="center">
+										<vbox id="zotero-item-pane-message-box"/>
+									</groupbox>
+									
+									<!-- Regular item -->
+									<!-- 
+										Keep in sync with contextPane.js (_addItemContext function) which
+										dynamically creates this itemPane part for each tab
+									-->
+									<tabbox id="zotero-view-tabbox" class="zotero-view-tabbox" flex="1" onselect="if (!ZoteroPane_Local.getCollectionTreeRow() || event.originalTarget.localName != 'tabpanels') { return; }; ZoteroItemPane.viewItem(ZoteroPane_Local.getSelectedItems()[0], ZoteroPane_Local.collectionsView.editable ? 'edit' : 'view', this.selectedIndex)">
+										<tabs id="zotero-editpane-tabs" class="zotero-editpane-tabs">
+											<tab id="zotero-editpane-info-tab" label="&zotero.tabs.info.label;"/>
+											<tab id="zotero-editpane-notes-tab" label="&zotero.tabs.notes.label;"/>
+											<tab id="zotero-editpane-tags-tab" label="&zotero.tabs.tags.label;"/>
+											<tab id="zotero-editpane-related-tab" label="&zotero.tabs.related.label;"/>
+										</tabs>
+										<tabpanels id="zotero-view-item" class="zotero-view-item" flex="1">
+											<tabpanel flex="1">
+												<zoteroitembox id="zotero-editpane-item-box" class="zotero-editpane-item-box" flex="1"/>
+											</tabpanel>
+											
+											<tabpanel flex="1" orient="vertical">
+												<vbox flex="1" id="zotero-editpane-notes" class="zotero-box">
+													<hbox align="center">
+														<label id="zotero-editpane-notes-label"/>
+														<button id="zotero-editpane-notes-add" label="&zotero.item.add;" oncommand="ZoteroItemPane.addNote(event.shiftKey);"/>
+													</hbox>
+													<grid flex="1">
+														<columns>
+															<column flex="1"/>
+															<column/>
+														</columns>
+														<rows id="zotero-editpane-dynamic-notes" flex="1"/>
+													</grid>
+												</vbox>
+											</tabpanel>
+											
+											<tabpanel id="tags-pane" class="tags-pane" orient="vertical" context="tags-context-menu">
+												<html:div id="tags-box-container" class="tags-box-container"></html:div>
+											</tabpanel>
+											
+											<tabpanel>
+												<relatedbox id="zotero-editpane-related" class="zotero-editpane-related" flex="1"/>
+											</tabpanel>
+										</tabpanels>
+									</tabbox>
+									
+									<!-- Note item -->
+									<groupbox id="zotero-view-note" flex="1">
+										<!--
+											'onerror' handler crashes the app on a save error to prevent typing in notes
+											while they're not being saved
+										-->
+										<zoteronoteeditor id="zotero-note-editor" flex="1" notitle="1"
+											previousfocus="zotero-items-tree"/>
+									</groupbox>
+									
+									<!-- Attachment item -->
+									<groupbox>
+										<zoteroattachmentbox id="zotero-attachment-box" flex="1"/>
+									</groupbox>
+									
+									<!-- Duplicate merging -->
+									<vbox id="zotero-duplicates-merge-pane" flex="1">
+										<groupbox>
+											<button id="zotero-duplicates-merge-button" oncommand="Zotero_Duplicates_Pane.merge()"/>
+										</groupbox>
+										
+										<groupbox id="zotero-duplicates-merge-version-select">
+											<description>&zotero.duplicatesMerge.versionSelect;</description>
+											<hbox>
+												<listbox id="zotero-duplicates-merge-original-date" onselect="Zotero_Duplicates_Pane.setMaster(this.selectedIndex)" rows="0"/>
+											</hbox>
+										</groupbox>
+										
+										<groupbox flex="1">
+											<description id="zotero-duplicates-merge-field-select">&zotero.duplicatesMerge.fieldSelect;</description>
+											<zoteroitembox id="zotero-duplicates-merge-item-box" flex="1"/>
+										</groupbox>
+									</vbox>
+								</deck>
+							</vbox>
 						</box>
 					</hbox>
 				</vbox>
@@ -470,4 +1202,57 @@
 		</stack>
 		
 	</stack>
-</overlay>
+	
+	<!-- Tag Selector -->
+	<menupopup id="tag-menu">
+		<menuitem label="&zotero.tagSelector.assignColor;"
+			oncommand="ZoteroPane.tagSelector.openColorPickerWindow(); event.stopPropagation();"/>
+		<menuitem label="&zotero.tagSelector.renameTag;"
+			oncommand="ZoteroPane.tagSelector.openRenamePrompt(); event.stopPropagation();"/>
+		<menuitem label="&zotero.tagSelector.deleteTag;"
+			oncommand="ZoteroPane.tagSelector.openDeletePrompt(); event.stopPropagation();"/>
+	</menupopup>
+	<menupopup id="tag-selector-view-settings-menu"
+		onpopupshowing="
+			document.getElementById('show-automatic').setAttribute('checked', ZoteroPane.tagSelector.showAutomatic);
+			document.getElementById('display-all-tags').setAttribute('checked', ZoteroPane.tagSelector.displayAllTags);
+			document.getElementById('num-selected').label = ZoteroPane.tagSelector.label;
+			(async function () {
+				var libraryID = ZoteroPane.tagSelector.libraryID;
+				var library = Zotero.Libraries.get(libraryID);
+				var enabled = false;
+				if (library.editable) {
+					if ((await Zotero.Tags.getAutomaticInLibrary(libraryID)).length) {
+						enabled = true;
+					}
+				}
+				document.getElementById('delete-automatic-tags').disabled = !enabled;
+			})();">
+		<menuitem id="num-selected" disabled="true"/>
+		<menuitem id="deselect-all" label="&zotero.tagSelector.clearAll;"
+			oncommand="ZoteroPane.tagSelector.deselectAll(); event.stopPropagation();"/>
+		<menuseparator/>
+		<menuitem id="show-automatic" label="&zotero.tagSelector.showAutomatic;" type="checkbox"
+			oncommand="ZoteroPane.tagSelector.toggleShowAutomatic(); event.stopPropagation();"/>
+		<menuitem
+			id="display-all-tags"
+			label="&zotero.tagSelector.displayAllInLibrary;"
+			type="checkbox"
+			oncommand="ZoteroPane.tagSelector.toggleDisplayAllTags(); event.stopPropagation();"
+		/>
+		<menuseparator/>
+		<menuitem id="delete-automatic-tags" label="&zotero.tagSelector.deleteAutomaticInLibrary;" type="checkbox"
+									oncommand="ZoteroPane.tagSelector.deleteAutomatic();
+										this.setAttribute('checked', false);
+										event.stopPropagation();"/>
+	</menupopup>
+	
+	<!-- Tags Box -->
+	<popupset>
+		<menupopup id="tags-context-menu"
+				onpopupshowing="return ZoteroItemPane.onTagsContextPopupShowing()">
+			<menuitem id="remove-all-item-tags" label="&zotero.item.tags.removeAll;"
+				oncommand="ZoteroItemPane.removeAllTags()"/>
+		</menupopup>
+	</popupset>
+</window>