From 794cbaee2cda5a92b58fd2a099eab57c0683e5e2 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 24 Oct 2006 23:40:04 +0000
Subject: [PATCH] Decidedly not the time to make changes of this magnitude, but
 ids in the global overlay really need to be namespaced properly to avoid
 conflicts with other extensions

(These aren't all in the global overlay, but the ones that aren't at least share a CSS rule with elements that are.)
---
 chrome/content/zotero/addCitationDialog.xul   | 20 +++---
 chrome/content/zotero/bindings/noteeditor.xml |  4 +-
 chrome/content/zotero/bindings/relatedbox.xml |  4 +-
 chrome/content/zotero/bindings/tagsbox.xml    |  4 +-
 .../content/zotero/bindings/zoterosearch.xml  |  4 +-
 chrome/content/zotero/itemPane.js             | 46 +++++++-------
 chrome/content/zotero/itemPane.xul            | 32 +++++-----
 chrome/content/zotero/overlay.js              | 40 ++++++------
 chrome/content/zotero/overlay.xul             | 61 +++++++++----------
 chrome/content/zotero/selectItemsDialog.js    |  8 +--
 chrome/content/zotero/selectItemsDialog.xul   | 20 +++---
 .../zotero/xpcom/collectionTreeView.js        |  2 +-
 chrome/content/zotero/xpcom/itemTreeView.js   | 26 ++++----
 chrome/skin/default/zotero/overlay.css        | 56 ++++++++---------
 chrome/skin/default/zotero/zotero.css         | 34 +++++------
 15 files changed, 180 insertions(+), 181 deletions(-)

diff --git a/chrome/content/zotero/addCitationDialog.xul b/chrome/content/zotero/addCitationDialog.xul
index c8104167e..92a69ca74 100644
--- a/chrome/content/zotero/addCitationDialog.xul
+++ b/chrome/content/zotero/addCitationDialog.xul
@@ -44,19 +44,19 @@
 	<hbox flex="1">
 		<vbox flex="1">
 			<hbox align="center" pack="end">
-				<label value="&zotero.toolbar.search.label;" control="tb-search"/>
-				<textbox id="tb-search" type="timed" timeout="250" oncommand="onSearch()" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_zotero_search'); return false; }">
-					<toolbarbutton id="tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/>
+				<label value="&zotero.toolbar.search.label;" control="zotero-tb-search"/>
+				<textbox id="zotero-tb-search" type="timed" timeout="250" oncommand="onSearch()" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_zotero_search'); return false; }">
+					<toolbarbutton id="zotero-tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/>
 				</textbox>
 			</hbox>
 			
 			<hbox flex="1">
-				<tree id="collections-tree"
+				<tree id="zotero-collections-tree"
 					style="width: 200px;" hidecolumnpicker="true" seltype="single"
 					onselect="onCollectionSelected();">
 					<treecols>
 						<treecol
-							id="name_column"
+							id="zotero-collections-name-column"
 							label="&zotero.collections.name_column;"
 							flex="1"
 							primary="true"/>
@@ -64,27 +64,27 @@
 					<treechildren/>
 				</tree>
 			
-				<tree id="items-tree"
+				<tree id="zotero-items-tree"
 					flex="1" hidecolumnpicker="true" seltype="single"
 					onselect="Zotero_Citation_Dialog.treeItemSelected();">
 					<treecols>
 						<treecol
-							id="title" primary="true"
+							id="zotero-items-title-column" primary="true"
 							label="&zotero.items.title_column;"
 							flex="4" persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
-							id="firstCreator"
+							id="zotero-items-firstCreator-column"
 							label="&zotero.items.creator_column;"
 							flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
-							id="dateAdded" hidden="true"
+							id="zotero-items-dateAdded-column" hidden="true"
 							label="&zotero.items.dateAdded_column;"
 							flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
-							id="dateModified" hidden="true"
+							id="zotero-items-dateModified-column" hidden="true"
 							label="&zotero.items.dateModified_column;"
 							flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 					</treecols>				
diff --git a/chrome/content/zotero/bindings/noteeditor.xml b/chrome/content/zotero/bindings/noteeditor.xml
index a63e3b13f..6abded6fe 100644
--- a/chrome/content/zotero/bindings/noteeditor.xml
+++ b/chrome/content/zotero/bindings/noteeditor.xml
@@ -186,8 +186,8 @@
 		</implementation>
 		<content>
 			<xul:vbox xbl:inherits="flex">
-				<xul:label id="seeAlsoLabel" class="clicky" crop="end" onclick="this.parentNode.parentNode.seeAlsoClick();"/>
-				<xul:label id="tagsLabel" class="clicky" crop="end" onclick="this.parentNode.parentNode.tagsClick();"/>
+				<xul:label id="seeAlsoLabel" class="zotero-clicky" crop="end" onclick="this.parentNode.parentNode.seeAlsoClick();"/>
+				<xul:label id="tagsLabel" class="zotero-clicky" crop="end" onclick="this.parentNode.parentNode.tagsClick();"/>
 				<xul:popupset>
 					<xul:popup id="seeAlsoPopup" width="300" onpopupshowing="this.firstChild.reload();">
 						<xul:seealsobox id="seeAlso" flex="1"/>
diff --git a/chrome/content/zotero/bindings/relatedbox.xml b/chrome/content/zotero/bindings/relatedbox.xml
index 0090902e7..a55bb518e 100644
--- a/chrome/content/zotero/bindings/relatedbox.xml
+++ b/chrome/content/zotero/bindings/relatedbox.xml
@@ -106,7 +106,7 @@
 									
 									var box = document.createElement('box');
 									box.setAttribute('onclick',"this.parentNode.parentNode.parentNode.parentNode.parentNode.showItem('"+seealso[i].getID()+"')");
-									box.setAttribute('class','clicky');
+									box.setAttribute('class','zotero-clicky');
 									box.setAttribute('flex','1');
 									box.appendChild(icon);
 									box.appendChild(label);
@@ -114,7 +114,7 @@
 									var remove = document.createElement("label");
 									remove.setAttribute('value','-');
 									remove.setAttribute('onclick',"this.parentNode.parentNode.parentNode.parentNode.parentNode.remove('"+seealso[i].getID()+"');");
-									remove.setAttribute('class','clicky');
+									remove.setAttribute('class','zotero-clicky');
 							
 									var row = document.createElement("row");
 									row.appendChild(box);
diff --git a/chrome/content/zotero/bindings/tagsbox.xml b/chrome/content/zotero/bindings/tagsbox.xml
index 5f20cf317..b1f5a2e6c 100644
--- a/chrome/content/zotero/bindings/tagsbox.xml
+++ b/chrome/content/zotero/bindings/tagsbox.xml
@@ -120,12 +120,12 @@
 						{
 							remove.setAttribute('tabindex', -1);
 							remove.setAttribute('onclick',"this.parentNode.parentNode.parentNode.parentNode.parentNode.remove('"+id+"');");
-							remove.setAttribute('class','clicky');
+							remove.setAttribute('class','zotero-clicky');
 						}
 						else
 						{
 							remove.setAttribute('disabled', true);
-							remove.setAttribute('class', 'unclicky');
+							remove.setAttribute('class', 'zotero-unclicky');
 						}
 						
 						var row = document.createElement("row");
diff --git a/chrome/content/zotero/bindings/zoterosearch.xml b/chrome/content/zotero/bindings/zoterosearch.xml
index 7f00e1a99..757ef4b67 100644
--- a/chrome/content/zotero/bindings/zoterosearch.xml
+++ b/chrome/content/zotero/bindings/zoterosearch.xml
@@ -436,8 +436,8 @@
 				<xul:menulist id="valuemenu" flex="1" hidden="true">
 					<xul:menupopup/>
 				</xul:menulist>
-				<xul:toolbarbutton id="remove" class="clicky" label="-" oncommand="this.parentNode.parentNode.onRemoveClicked();"/>
-				<xul:toolbarbutton id="add" class="clicky" label="+" oncommand="this.parentNode.parentNode.onAddClicked();"/>
+				<xul:toolbarbutton id="remove" class="zotero-clicky" label="-" oncommand="this.parentNode.parentNode.onRemoveClicked();"/>
+				<xul:toolbarbutton id="add" class="zotero-clicky" label="+" oncommand="this.parentNode.parentNode.onAddClicked();"/>
 			</xul:hbox>
 		</content>
 	</binding>
diff --git a/chrome/content/zotero/itemPane.js b/chrome/content/zotero/itemPane.js
index 6b3149966..328adc485 100644
--- a/chrome/content/zotero/itemPane.js
+++ b/chrome/content/zotero/itemPane.js
@@ -84,15 +84,15 @@ var ZoteroItemPane = new function()
 			return false;
 		}
 		
-		_dynamicFields = document.getElementById('editpane-dynamic-fields');
-		_itemTypeMenu = document.getElementById('editpane-type-menu');
-		_creatorTypeMenu = document.getElementById('creatorTypeMenu');
-		_notesList = document.getElementById('editpane-dynamic-notes');
-		_notesLabel = document.getElementById('editpane-notes-label');
-		_attachmentsList = document.getElementById('editpane-dynamic-attachments');
-		_attachmentsLabel = document.getElementById('editpane-attachments-label');
-		_tagsBox = document.getElementById('editpane-tags');
-		_relatedBox = document.getElementById('editpane-related');
+		_dynamicFields = document.getElementById('zotero-editpane-dynamic-fields');
+		_itemTypeMenu = document.getElementById('zotero-editpane-type-menu');
+		_creatorTypeMenu = document.getElementById('zotero-creator-type-menu');
+		_notesList = document.getElementById('zotero-editpane-dynamic-notes');
+		_notesLabel = document.getElementById('zotero-editpane-notes-label');
+		_attachmentsList = document.getElementById('zotero-editpane-dynamic-attachments');
+		_attachmentsLabel = document.getElementById('zotero-editpane-attachments-label');
+		_tagsBox = document.getElementById('zotero-editpane-tags');
+		_relatedBox = document.getElementById('zotero-editpane-related');
 		
 		var itemTypes = Zotero.ItemTypes.getTypes();
 		for(var i = 0; i<itemTypes.length; i++)
@@ -184,10 +184,10 @@ var ZoteroItemPane = new function()
 				
 				validURI = uri.scheme && (uri.host || uri.scheme=='file');
 				
-				document.getElementById('tb-go-to-url').setAttribute('viewURL', spec);
+				document.getElementById('zotero-tb-go-to-url').setAttribute('viewURL', spec);
 			}
 			catch (e){}
-			document.getElementById('tb-go-to-url').setAttribute('disabled', !validURI);
+			document.getElementById('zotero-tb-go-to-url').setAttribute('disabled', !validURI);
 			
 			// Enable/disable "Locate =>" (OpenURL) button
 			switch (_itemBeingEdited.getType())
@@ -203,7 +203,7 @@ var ZoteroItemPane = new function()
 				default:
 					var openURL = false;
 			}
-			document.getElementById('tb-openurl').setAttribute('disabled', !openURL);
+			document.getElementById('zotero-tb-openurl').setAttribute('disabled', !openURL);
 			
 			// Clear and rebuild creator type menu
 			while(_creatorTypeMenu.hasChildNodes())
@@ -308,13 +308,13 @@ var ZoteroItemPane = new function()
 				
 					var box = document.createElement('box');
 					box.setAttribute('onclick',"ZoteroPane.selectItem("+notes[i].getID()+");");
-					box.setAttribute('class','clicky');
+					box.setAttribute('class','zotero-clicky');
 					box.appendChild(icon);
 					box.appendChild(label);
 				
 					var removeButton = document.createElement('label');
 					removeButton.setAttribute("value","-");
-					removeButton.setAttribute("class","clicky");
+					removeButton.setAttribute("class","zotero-clicky");
 					removeButton.setAttribute("onclick","ZoteroItemPane.removeNote("+notes[i].getID()+")");
 				
 					var row = document.createElement('row');
@@ -366,13 +366,13 @@ var ZoteroItemPane = new function()
 				
 					var box = document.createElement('box');
 					box.setAttribute('onclick',"ZoteroPane.selectItem('"+attachments[i].getID()+"')");
-					box.setAttribute('class','clicky');
+					box.setAttribute('class','zotero-clicky');
 					box.appendChild(icon);
 					box.appendChild(label);
 				
 					var removeButton = document.createElement('label');
 					removeButton.setAttribute("value","-");
-					removeButton.setAttribute("class","clicky");
+					removeButton.setAttribute("class","zotero-clicky");
 					removeButton.setAttribute("onclick","ZoteroItemPane.removeAttachment("+attachments[i].getID()+")");
 				
 					var row = document.createElement('row');
@@ -475,9 +475,9 @@ var ZoteroItemPane = new function()
 		var label = document.createElement("toolbarbutton");
 		label.setAttribute("label",Zotero.getString('creatorTypes.'+Zotero.CreatorTypes.getName(typeID))+":");
 		label.setAttribute("typeid", typeID);
-		label.setAttribute("popup","creatorTypeMenu");
+		label.setAttribute("popup","zotero-creator-type-menu");
 		label.setAttribute("fieldname",'creator-'+_creatorCount+'-typeID');
-		label.className = 'clicky';
+		label.className = 'zotero-clicky';
 		
 		// getCreatorFields(), switchCreatorMode() and handleCreatorAutoCompleteSelect()
 		// may need need to be adjusted if this DOM structure changes
@@ -519,7 +519,7 @@ var ZoteroItemPane = new function()
 		// Single/double field toggle
 		var toggleButton = document.createElement('toolbarbutton');
 		toggleButton.setAttribute('fieldname', 'creator-' + _creatorCount + '-singleField');
-		toggleButton.className = 'clicky';
+		toggleButton.className = 'zotero-clicky';
 		hbox.appendChild(toggleButton);
 		
 		// Minus (-) button
@@ -530,7 +530,7 @@ var ZoteroItemPane = new function()
 			disableButton(removeButton);
 		}
 		else {
-			removeButton.setAttribute("class","clicky");
+			removeButton.setAttribute("class","zotero-clicky");
 			removeButton.setAttribute("onclick","ZoteroItemPane.removeCreator("+_creatorCount+", this.parentNode.parentNode)");
 		}
 		hbox.appendChild(removeButton);
@@ -675,14 +675,14 @@ var ZoteroItemPane = new function()
 	function disableButton(button)
 	{
 		button.setAttribute('disabled', true);
-		button.setAttribute('class', 'unclicky');
+		button.setAttribute('class', 'zotero-unclicky');
 		button.setAttribute('onclick', false); 
 	}
 	
 	function _enablePlusButton(button, creatorTypeID, fieldMode)
 	{
 		button.setAttribute('disabled', false);
-		button.setAttribute("class","clicky");
+		button.setAttribute("class","zotero-clicky");
 		button.setAttribute("onclick",
 			"ZoteroItemPane.disableButton(this); ZoteroItemPane.addCreatorRow('', '', " + (creatorTypeID ? creatorTypeID : 'false') + ", " + fieldMode + ", true);");
 	}
@@ -703,7 +703,7 @@ var ZoteroItemPane = new function()
 			valueElement.setAttribute('fieldname',fieldName);
 			valueElement.setAttribute('tabindex', tabindex);
 			valueElement.setAttribute('onclick', 'ZoteroItemPane.showEditor(this)');
-			valueElement.className = 'clicky';
+			valueElement.className = 'zotero-clicky';
 			
 			switch (fieldName)
 			{
diff --git a/chrome/content/zotero/itemPane.xul b/chrome/content/zotero/itemPane.xul
index f418dd067..ce3f9ff38 100644
--- a/chrome/content/zotero/itemPane.xul
+++ b/chrome/content/zotero/itemPane.xul
@@ -29,7 +29,7 @@
 	<deck id="zotero-view-item" flex="1" onselect="if (this.selectedIndex!==''){ ZoteroItemPane.loadPane(this.selectedIndex) }">
 			<vbox id="zotero-info" flex="1">
 				<popupset>
-					<popup id="creatorTypeMenu" position="after_start"
+					<popup id="zotero-creator-type-menu" position="after_start"
 						oncommand="var otherFields = ZoteroItemPane.getCreatorFields(document.popupNode.parentNode);
 							var typeID = event.explicitOriginalTarget.getAttribute('typeid');
 							document.popupNode.setAttribute('label',
@@ -39,11 +39,11 @@
 								'typeID', typeID, otherFields)"/>
 				</popupset>
 				<hbox align="center">
-					<button id="tb-go-to-url" label="&zotero.toolbar.goToURL.label;" tooltiptext="&zotero.toolbar.goToURL.tooltip;" flex="1" oncommand="window.loadURI(this.getAttribute('viewURL'))" disabled="false"/>
-					<button id="tb-openurl" label="&zotero.toolbar.openURL.label;" tooltiptext="&zotero.toolbar.openURL.tooltip;" flex="1" oncommand="ZoteroItemPane.onOpenURLClick();"/>
+					<button id="zotero-tb-go-to-url" label="&zotero.toolbar.goToURL.label;" tooltiptext="&zotero.toolbar.goToURL.tooltip;" flex="1" oncommand="window.loadURI(this.getAttribute('viewURL'))" disabled="false"/>
+					<button id="zotero-tb-openurl" label="&zotero.toolbar.openURL.label;" tooltiptext="&zotero.toolbar.openURL.tooltip;" flex="1" oncommand="ZoteroItemPane.onOpenURLClick();"/>
 				</hbox>
 				<hbox align="center">
-					<menulist id="editpane-type-menu" oncommand="ZoteroItemPane.changeTypeTo(this.value)" flex="1">
+					<menulist id="zotero-editpane-type-menu" oncommand="ZoteroItemPane.changeTypeTo(this.value)" flex="1">
 						<menupopup/>
 					</menulist>
 				</hbox>
@@ -52,12 +52,12 @@
 						<column/>
 						<column flex="1"/>
 					</columns>
-					<rows id="editpane-dynamic-fields" flex="1"/>
+					<rows id="zotero-editpane-dynamic-fields" flex="1"/>
 				</grid>
 			</vbox>
 			<vbox flex="1">
 				<hbox align="center">
-					<label id="editpane-notes-label"/>
+					<label id="zotero-editpane-notes-label"/>
 					<button label="&zotero.item.add;" oncommand="ZoteroItemPane.addNote();"/>
 				</hbox>
 				<grid flex="1">
@@ -65,18 +65,18 @@
 						<column flex="1"/>
 						<column/>
 					</columns>
-					<rows id="editpane-dynamic-notes" flex="1"/>
+					<rows id="zotero-editpane-dynamic-notes" flex="1"/>
 				</grid>
 			</vbox>
 			<vbox flex="1">
 				<hbox align="center">
-					<label id="editpane-attachments-label"/>
-					<button id="tb-item-attachments-add" type="menu" label="&zotero.item.add;">
+					<label id="zotero-editpane-attachments-label"/>
+					<button id="zotero-tb-item-attachments-add" type="menu" label="&zotero.item.add;">
 						<menupopup>
-							<menuitem class="menuitem-iconic" id="tb-item-attachments-link" label="&zotero.toolbar.attachment.linked;" oncommand="ZoteroItemPane.addAttachmentFromDialog(true);"/>
-							<menuitem class="menuitem-iconic" id="tb-item-attachments-file" label="&zotero.toolbar.attachment.add;" oncommand="ZoteroItemPane.addAttachmentFromDialog();"/>
-							<menuitem class="menuitem-iconic" id="tb-item-attachments-web-link" label="&zotero.toolbar.attachment.weblink;" oncommand="ZoteroItemPane.addAttachmentFromPage(true);"/>
-							<menuitem class="menuitem-iconic" id="tb-item-attachments-snapshot" label="&zotero.toolbar.attachment.snapshot;" oncommand="ZoteroItemPane.addAttachmentFromPage();"/>
+							<menuitem class="menuitem-iconic" id="zotero-tb-item-attachments-link" label="&zotero.toolbar.attachment.linked;" oncommand="ZoteroItemPane.addAttachmentFromDialog(true);"/>
+							<menuitem class="menuitem-iconic" id="zotero-tb-item-attachments-file" label="&zotero.toolbar.attachment.add;" oncommand="ZoteroItemPane.addAttachmentFromDialog();"/>
+							<menuitem class="menuitem-iconic" id="zotero-tb-item-attachments-web-link" label="&zotero.toolbar.attachment.weblink;" oncommand="ZoteroItemPane.addAttachmentFromPage(true);"/>
+							<menuitem class="menuitem-iconic" id="zotero-tb-item-attachments-snapshot" label="&zotero.toolbar.attachment.snapshot;" oncommand="ZoteroItemPane.addAttachmentFromPage();"/>
 						</menupopup>
 					</button>
 				</hbox>
@@ -85,10 +85,10 @@
 						<column flex="1"/>
 						<column/>
 					</columns>
-					<rows id="editpane-dynamic-attachments" flex="1"/>
+					<rows id="zotero-editpane-dynamic-attachments" flex="1"/>
 				</grid>
 			</vbox>
-			<tagsbox id="editpane-tags" flex="1" style="overflow:auto"/>
-			<seealsobox id="editpane-related" flex="1"/>
+			<tagsbox id="zotero-editpane-tags" flex="1" style="overflow:auto"/>
+			<seealsobox id="zotero-editpane-related" flex="1"/>
 	</deck>
 </overlay>
\ No newline at end of file
diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index 9afe16d01..92f097e38 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -88,22 +88,22 @@ var ZoteroPane = new function()
 			appContent.removeChild(oldSplitter);
 			appContent.insertBefore(newSplitter, document.getElementById('content'));
 			
-			document.getElementById('tb-fullscreen').setAttribute('zoterotop','true');
+			document.getElementById('zotero-tb-fullscreen').setAttribute('zoterotop','true');
 		}
 		
 		//Initialize collections view
 		collectionsView = new Zotero.CollectionTreeView();
-		var collectionsTree = document.getElementById('collections-tree');
+		var collectionsTree = document.getElementById('zotero-collections-tree');
 		collectionsTree.view = collectionsView;
 		collectionsTree.controllers.appendController(new Zotero.CollectionTreeCommandController(collectionsTree));
 		
-		var itemsTree = document.getElementById('items-tree');
+		var itemsTree = document.getElementById('zotero-items-tree');
 		itemsTree.controllers.appendController(new Zotero.ItemTreeCommandController(itemsTree));
 		
 		// Create the New Item (+) menu with each item type
-		var addMenu = document.getElementById('tb-add').firstChild;
-		var separator = document.getElementById('tb-add').firstChild.firstChild;
-		var moreMenu = document.getElementById('tb-add-more');
+		var addMenu = document.getElementById('zotero-tb-add').firstChild;
+		var separator = document.getElementById('zotero-tb-add').firstChild.firstChild;
+		var moreMenu = document.getElementById('zotero-tb-add-more');
 		var itemTypes = Zotero.ItemTypes.getPrimaryTypes();
 		for(var i = 0; i<itemTypes.length; i++)
 		{
@@ -147,7 +147,7 @@ var ZoteroPane = new function()
 		if(!visible)
 		{
 			document.getElementById('content').setAttribute('collapsed', false);
-			document.getElementById('tb-fullscreen').setAttribute('fullscreenmode', false);
+			document.getElementById('zotero-tb-fullscreen').setAttribute('fullscreenmode', false);
 			
 			// Return focus to the browser content pane
 			window.content.window.focus();
@@ -161,7 +161,7 @@ var ZoteroPane = new function()
 		document.getElementById('zotero-pane').setAttribute('flex', collapsed ? "0" : "1");
 		document.getElementById('content').setAttribute('collapsed', !collapsed);
 		document.getElementById('zotero-splitter').setAttribute('collapsed', !collapsed);
-		document.getElementById('tb-fullscreen').setAttribute('fullscreenmode', !collapsed);
+		document.getElementById('zotero-tb-fullscreen').setAttribute('fullscreenmode', !collapsed);
 	}
 		
 	/*
@@ -231,7 +231,7 @@ var ZoteroPane = new function()
 		if(itemsView)
 			itemsView.unregister();
 		
-		document.getElementById('tb-search').value = "";
+		document.getElementById('zotero-tb-search').value = "";
 		
 		if(collectionsView.selection.count == 1 && collectionsView.selection.currentIndex != -1)
 		{
@@ -239,14 +239,14 @@ var ZoteroPane = new function()
 			itemgroup.setSearch('');
 			
 			itemsView = new Zotero.ItemTreeView(itemgroup);
-			document.getElementById('items-tree').view = itemsView;
-			document.getElementById('tb-collection-rename').disabled = itemgroup.isLibrary();
+			document.getElementById('zotero-items-tree').view = itemsView;
+			document.getElementById('zotero-tb-collection-rename').disabled = itemgroup.isLibrary();
 			itemsView.selection.clearSelection();
 		}
 		else
 		{
-			document.getElementById('items-tree').view = itemsView = null;
-			document.getElementById('tb-collection-rename').disabled = true;
+			document.getElementById('zotero-items-tree').view = itemsView = null;
+			document.getElementById('zotero-tb-collection-rename').disabled = true;
 		}
 	}
 	
@@ -270,7 +270,7 @@ var ZoteroPane = new function()
 				{
 					document.getElementById('zotero-view-note-button').removeAttribute('sourceID');
 				}
-				document.getElementById('item-pane-content').selectedIndex = 2;
+				document.getElementById('zotero-item-pane-content').selectedIndex = 2;
 			}
 			else if(item.isAttachment())
 			{
@@ -300,7 +300,7 @@ var ZoteroPane = new function()
 				}
 				
 				// For the time being, use a silly little popup
-				label.className = 'clicky';
+				label.className = 'zotero-clicky';
 				label.onclick = function(event){
 					var newTitle = prompt(Zotero.getString('itemFields.title') + ':', val);
 					if (newTitle && newTitle != val)
@@ -351,17 +351,17 @@ var ZoteroPane = new function()
 				noteEditor.item = null;
 				noteEditor.note = item.ref;
 				
-				document.getElementById('item-pane-content').selectedIndex = 3;
+				document.getElementById('zotero-item-pane-content').selectedIndex = 3;
 			}
 			else
 			{
 				ZoteroItemPane.viewItem(item.ref);
-				document.getElementById('item-pane-content').selectedIndex = 1;
+				document.getElementById('zotero-item-pane-content').selectedIndex = 1;
 			}
 		}
 		else
 		{
-			document.getElementById('item-pane-content').selectedIndex = 0;
+			document.getElementById('zotero-item-pane-content').selectedIndex = 0;
 			
 			var label = document.getElementById('zotero-view-selected-label');
 		
@@ -484,10 +484,10 @@ var ZoteroPane = new function()
 	{
 		if(itemsView)
 		{
-			var searchVal = document.getElementById('tb-search').value;
+			var searchVal = document.getElementById('zotero-tb-search').value;
 			itemsView.searchText(searchVal);
 			
-			document.getElementById('tb-search-cancel').hidden = searchVal == "";
+			document.getElementById('zotero-tb-search-cancel').hidden = searchVal == "";
 		}
 		
 	}
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index f4b661de1..10e313d38 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -75,13 +75,13 @@
 					<menuitem oncommand="Zotero_File_Interface.bibliographyFromItems();"/>
 				</popup>
 			</popupset>
-			<vbox id="collections-pane" persist="width" flex="1">
+			<vbox id="zotero-collections-pane" persist="width" flex="1">
 				<toolbar>
-					<toolbarbutton id="tb-collection-add" tooltiptext="&zotero.toolbar.newCollection.label;" command="cmd_zotero_newCollection"/>
-					<toolbarbutton id="tb-collection-addsearch" tooltiptext="&zotero.toolbar.newSavedSearch.label;" oncommand="ZoteroPane.newSearch();"/>
-					<toolbarbutton id="tb-collection-rename" tooltiptext="&zotero.toolbar.renameCollection.label;" oncommand="ZoteroPane.editSelectedCollection();" disabled="true"/>
+					<toolbarbutton id="zotero-tb-collection-add" tooltiptext="&zotero.toolbar.newCollection.label;" command="cmd_zotero_newCollection"/>
+					<toolbarbutton id="zotero-tb-collection-addsearch" tooltiptext="&zotero.toolbar.newSavedSearch.label;" oncommand="ZoteroPane.newSearch();"/>
+					<toolbarbutton id="zotero-tb-collection-rename" tooltiptext="&zotero.toolbar.renameCollection.label;" oncommand="ZoteroPane.editSelectedCollection();" disabled="true"/>
 					<spacer flex="1"/>
-					<toolbarbutton id="tb-actions-menu" tooltiptext="&zotero.toolbar.actions.label;" type="menu">
+					<toolbarbutton id="zotero-tb-actions-menu" tooltiptext="&zotero.toolbar.actions.label;" type="menu">
 						<menupopup>
 							<menuitem label="&zotero.toolbar.import.label;" oncommand="Zotero_File_Interface.importFile();"/>
 							<menuitem label="&zotero.toolbar.export.label;" oncommand="Zotero_File_Interface.exportFile();"/>
@@ -91,7 +91,7 @@
 						</menupopup>
 					</toolbarbutton>
 				</toolbar>
-				<tree id="collections-tree" hidecolumnpicker="true" context="zotero-collectionmenu"
+				<tree id="zotero-collections-tree" hidecolumnpicker="true" context="zotero-collectionmenu"
 					onselect="ZoteroPane.onCollectionSelected();" seltype="single"
 					ondragdrop="nsDragAndDrop.drop(event,ZoteroPane.getCollectionsView())"
 					ondraggesture="if (event.target.localName == 'treechildren') nsDragAndDrop.startDrag(event,ZoteroPane.getCollectionsView());"
@@ -99,7 +99,7 @@
 					flex="1">
 					<treecols>
 						<treecol
-							id="name_column"
+							id="zotero-collections-name-column"
 							label="&zotero.collections.name_column;"
 							flex="1"
 							primary="true"/>
@@ -108,9 +108,9 @@
 				</tree>
 			</vbox>
 			<splitter id="zotero-tree-splitter" resizebefore="closest" resizeafter="closest"/>
-			<vbox id="items-pane" persist="width" flex="1">
+			<vbox id="zotero-items-pane" persist="width" flex="1">
 				<toolbar align="center">
-					<toolbarbutton id="tb-add" tooltiptext="&zotero.toolbar.newItem.label;" type="menu">
+					<toolbarbutton id="zotero-tb-add" tooltiptext="&zotero.toolbar.newItem.label;" type="menu">
 						<!-- New Item drop-down built in overlay.js::onLoad() -->
 						<menupopup>
 							<menuseparator/>
@@ -118,23 +118,23 @@
 							<menuitem label="&zotero.toolbar.attachment.add;" oncommand="ZoteroPane.addAttachmentFromDialog();"/>
 							<menuseparator/>
 							<menu label="&zotero.toolbar.moreItemTypes.label;">
-								<menupopup id="tb-add-more"/>
+								<menupopup id="zotero-tb-add-more"/>
 							</menu>
 						</menupopup>
 					</toolbarbutton>
-					<toolbarbutton id="tb-item-from-page" tooltiptext="&zotero.toolbar.newItemFromPage.label;" oncommand="ZoteroPane.addItemFromPage()"/>
+					<toolbarbutton id="zotero-tb-item-from-page" tooltiptext="&zotero.toolbar.newItemFromPage.label;" oncommand="ZoteroPane.addItemFromPage()"/>
 					<toolbarseparator/>
-					<toolbarbutton id="tb-link-page" tooltiptext="&zotero.toolbar.attachment.weblink;" oncommand="ZoteroPane.addAttachmentFromPage(true)"/>
-					<toolbarbutton id="tb-snapshot-page" tooltiptext="&zotero.toolbar.attachment.snapshot;" oncommand="ZoteroPane.addAttachmentFromPage()"/>
-					<toolbarbutton id="tb-note-add" tooltiptext="&zotero.toolbar.note.standalone;" oncommand="ZoteroPane.newNote(event.shiftKey);"/>
+					<toolbarbutton id="zotero-tb-link-page" tooltiptext="&zotero.toolbar.attachment.weblink;" oncommand="ZoteroPane.addAttachmentFromPage(true)"/>
+					<toolbarbutton id="zotero-tb-snapshot-page" tooltiptext="&zotero.toolbar.attachment.snapshot;" oncommand="ZoteroPane.addAttachmentFromPage()"/>
+					<toolbarbutton id="zotero-tb-note-add" tooltiptext="&zotero.toolbar.note.standalone;" oncommand="ZoteroPane.newNote(event.shiftKey);"/>
 					<spacer flex="1"/>
-					<label value="&zotero.toolbar.search.label;" control="tb-search"/>
-					<textbox id="tb-search" type="timed" timeout="250" command="cmd_zotero_search" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_zotero_search'); return false; } return true;">
-						<toolbarbutton id="tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/>
+					<label value="&zotero.toolbar.search.label;" control="zotero-tb-search"/>
+					<textbox id="zotero-tb-search" type="timed" timeout="250" command="cmd_zotero_search" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_zotero_search'); return false; } return true;">
+						<toolbarbutton id="zotero-tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/>
 					</textbox>
 				</toolbar>
 				<tree 
-					id="items-tree" context="zotero-itemmenu"
+					id="zotero-items-tree" context="zotero-itemmenu"
 					ondblclick="ZoteroPane.onDoubleClick(event, this);"
 					enableColumnDrag="true"
 					onkeypress="if (event.keyCode == event.DOM_VK_BACK_SPACE || event.keyCode == event.DOM_VK_DELETE){ ZoteroPane.deleteSelectedItem(); } event.preventDefault();"
@@ -145,42 +145,37 @@
 					flex="1">
 					<treecols>
 						<treecol
-							id="title" primary="true"
+							id="zotero-items-title-column" primary="true"
 							label="&zotero.items.title_column;"
 							flex="4" persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
-							id="firstCreator"
+							id="zotero-items-firstCreator-column"
 							label="&zotero.items.creator_column;"
 							flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
-							id="numChildren"
+							id="zotero-items-numChildren-column"
 							label="&zotero.items.numChildren_column;"
 							persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
-							id="typeIcon" hidden="true"
+							id="zotero-items-typeIcon-column" hidden="true"
 							label="&zotero.items.type_column;"
 							width="40" persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
-							id="source" hidden="true"
-							label="&zotero.items.source_column;"
-							flex="1" persist="width ordinal hidden sortActive sortDirection"/>
-						<splitter class="tree-splitter"/>
-						<treecol
-							id="rights" hidden="true"
+							id="zotero-items-rights-column" hidden="true"
 							label="&zotero.items.rights_column;"
 							flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
-							id="dateAdded" hidden="true"
+							id="zotero-items-dateAdded-column" hidden="true"
 							label="&zotero.items.dateAdded_column;"
 							flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 						<splitter class="tree-splitter"/>
 						<treecol
-							id="dateModified" hidden="true"
+							id="zotero-items-dateModified-column" hidden="true"
 							label="&zotero.items.dateModified_column;"
 							flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 					</treecols>				
@@ -188,9 +183,9 @@
 				</tree>
 			</vbox>
 			<splitter id="zotero-view-splitter" resizebefore="closest" resizeafter="closest"/>
-			<vbox id="item-pane" persist="width">
+			<vbox id="zotero-item-pane" persist="width">
 				<toolbar align="right">
-					<toolbarbutton id="tb-fullscreen" tooltiptext="&zotero.toolbar.fullscreen.tooltip;" oncommand="ZoteroPane.fullScreen();"/>
+					<toolbarbutton id="zotero-tb-fullscreen" tooltiptext="&zotero.toolbar.fullscreen.tooltip;" oncommand="ZoteroPane.fullScreen();"/>
 					<toolbarbutton class="tabs-closebutton" oncommand="ZoteroPane.toggleDisplay()"/>
 				</toolbar>
 				<groupbox flex="1">
@@ -203,7 +198,7 @@
 							<tab label="&zotero.tabs.related.label;"/>
 						</tabs>
 					</caption>
-					<deck id="item-pane-content" selectedIndex="0" flex="1" onselect="document.getElementById('zotero-view-tabs').setAttribute('hidden',(this.selectedIndex != 1));">
+					<deck id="zotero-item-pane-content" selectedIndex="0" flex="1" onselect="document.getElementById('zotero-view-tabs').setAttribute('hidden',(this.selectedIndex != 1));">
 						<box pack="center" align="center">
 							<label id="zotero-view-selected-label"/>
 						</box>
diff --git a/chrome/content/zotero/selectItemsDialog.js b/chrome/content/zotero/selectItemsDialog.js
index 48d5a4040..036230124 100644
--- a/chrome/content/zotero/selectItemsDialog.js
+++ b/chrome/content/zotero/selectItemsDialog.js
@@ -34,7 +34,7 @@ function doLoad()
 	io = window.arguments[0];
 	
 	collectionsView = new Zotero.CollectionTreeView();
-	document.getElementById('collections-tree').view = collectionsView;
+	document.getElementById('zotero-collections-tree').view = collectionsView;
 
 	// move to center of screen
 	window.sizeToContent();
@@ -62,7 +62,7 @@ function onCollectionSelected()
 		collection.setSearch('');
 
 		itemsView = new Zotero.ItemTreeView(collection, (window.arguments[1] ? true : false));
-		document.getElementById('items-tree').view = itemsView;
+		document.getElementById('zotero-items-tree').view = itemsView;
 	}
 
 }
@@ -71,10 +71,10 @@ function onSearch()
 {
 	if(itemsView)
 	{
-		var searchVal = document.getElementById('tb-search').value;
+		var searchVal = document.getElementById('zotero-tb-search').value;
 		itemsView.searchText(searchVal);
 		
-		document.getElementById('tb-search-cancel').hidden = searchVal == "";
+		document.getElementById('zotero-tb-search-cancel').hidden = searchVal == "";
 	}
 }
 
diff --git a/chrome/content/zotero/selectItemsDialog.xul b/chrome/content/zotero/selectItemsDialog.xul
index df2be7ee2..7303f32aa 100644
--- a/chrome/content/zotero/selectItemsDialog.xul
+++ b/chrome/content/zotero/selectItemsDialog.xul
@@ -41,19 +41,19 @@
 	<script src="selectItemsDialog.js"/>
 	
 	<hbox align="center" pack="end">
-		<label value="&zotero.toolbar.search.label;" control="tb-search"/>
-		<textbox id="tb-search" type="timed" timeout="250" oncommand="onSearch()" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_zotero_search'); return false; }">
-			<toolbarbutton id="tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/>
+		<label value="&zotero.toolbar.search.label;" control="zotero-tb-search"/>
+		<textbox id="zotero-tb-search" type="timed" timeout="250" oncommand="onSearch()" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_zotero_search'); return false; }">
+			<toolbarbutton id="zotero-tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/>
 		</textbox>
 	</hbox>
 	
 	<hbox flex="1">
-		<tree id="collections-tree"
+		<tree id="zotero-collections-tree"
 			style="width: 200px;" hidecolumnpicker="true" seltype="single"
 			onselect="onCollectionSelected();">
 			<treecols>
 				<treecol
-					id="name_column"
+					id="zotero-collections-name-column"
 					label="&zotero.collections.name_column;"
 					flex="1"
 					primary="true"/>
@@ -61,27 +61,27 @@
 			<treechildren/>
 		</tree>
 	
-		<tree id="items-tree"
+		<tree id="zotero-items-tree"
 			flex="1" hidecolumnpicker="true" seltype="multiple"
 			onselect="onItemSelected();">
 			<treecols>
 				<treecol
-					id="title" primary="true"
+					id="zotero-items-title-column" primary="true"
 					label="&zotero.items.title_column;"
 					flex="4" persist="width ordinal hidden sortActive sortDirection"/>
 				<splitter class="tree-splitter"/>
 				<treecol
-					id="firstCreator"
+					id="zotero-items-firstCreator-column"
 					label="&zotero.items.creator_column;"
 					flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 				<splitter class="tree-splitter"/>
 				<treecol
-					id="dateAdded" hidden="true"
+					id="zotero-items-dateAdded-column" hidden="true"
 					label="&zotero.items.dateAdded_column;"
 					flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 				<splitter class="tree-splitter"/>
 				<treecol
-					id="dateModified" hidden="true"
+					id="zotero-items-dateModified-column" hidden="true"
 					label="&zotero.items.dateModified_column;"
 					flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 			</treecols>				
diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js
index 51c271ebe..1a0a51c3d 100644
--- a/chrome/content/zotero/xpcom/collectionTreeView.js
+++ b/chrome/content/zotero/xpcom/collectionTreeView.js
@@ -238,7 +238,7 @@ Zotero.CollectionTreeView.prototype.getCellText = function(row, column)
 {
 	var obj = this._getItemAtRow(row);
 	
-	if(column.id == "name_column")
+	if(column.id == "zotero-collections-name-column")
 		return obj.getName();
 	else
 		return "";
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
index 3b2dafcdc..0f28cad51 100644
--- a/chrome/content/zotero/xpcom/itemTreeView.js
+++ b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -103,7 +103,7 @@ Zotero.ItemTreeView.prototype.notify = function(action, type, ids)
 		var activeWindow = true;
 	}
 	
-	var quicksearch = this._treebox.treeBody.ownerDocument.getElementById('tb-search');
+	var quicksearch = this._treebox.treeBody.ownerDocument.getElementById('zotero-tb-search');
 	
 	if((action == 'remove' && !this._itemGroup.isLibrary()) || action == 'delete')
 	{
@@ -285,22 +285,22 @@ Zotero.ItemTreeView.prototype.getCellText = function(row, column)
 	var obj = this._getItemAtRow(row);
 	var val;
 	
-	if(column.id == "numChildren")
+	if(column.id == "zotero-items-numChildren-column")
 	{
 		var c = obj.numChildren();
 		if(c)	//don't display '0'
 			val = c;
 	}
-	else if(column.id == "typeIcon")
+	else if(column.id == "zotero-items-typeIcon-column")
 	{
 		val = Zotero.getString('itemTypes.'+Zotero.ItemTypes.getName(obj.getType()));
 	}
 	else
 	{
-		val = obj.getField(column.id);
+		val = obj.getField(column.id.substring(13, column.id.length-7));
 	}
 	
-	if(column.id == 'dateAdded' || column.id == 'dateModified')		//this is not so much that we will use this format for date, but a simple template for later revisions.
+	if(column.id == 'zotero-items-dateAdded-column' || column.id == 'zotero-items-dateModified-column')		//this is not so much that we will use this format for date, but a simple template for later revisions.
 	{
 		val = new Date(Date.parse(val.replace(/-/g,"/"))).toLocaleString();
 	}
@@ -310,7 +310,7 @@ Zotero.ItemTreeView.prototype.getCellText = function(row, column)
 
 Zotero.ItemTreeView.prototype.getImageSrc = function(row, col)
 {
-	if(col.id == 'title')
+	if(col.id == 'zotero-items-title-column')
 	{
 		var item = this._getItemAtRow(row);
 		var itemType = Zotero.ItemTypes.getName(item.getType());
@@ -509,10 +509,14 @@ Zotero.ItemTreeView.prototype.cycleHeader = function(column)
  */
 Zotero.ItemTreeView.prototype.sort = function()
 {
-	var column = this._treebox.columns.getSortedColumn()
+	var column = this._treebox.columns.getSortedColumn();
+	if (!column){
+		// DEBUG: This may be necessary for 1.0.0b2.r1=>1.0.0b2.r2 transition
+		column = this._treebox.columns.getFirstColumn();
+	}
 	var order = column.element.getAttribute('sortDirection') == 'descending';
 	
-	if(column.id == 'typeIcon')
+	if(column.id == 'zotero-items-typeIcon-column')
 	{
 		function columnSort(a,b)
 		{
@@ -522,7 +526,7 @@ Zotero.ItemTreeView.prototype.sort = function()
 			return (typeA > typeB) ? -1 : (typeA < typeB) ? 1 : 0;
 		}
 	}
-	else if(column.id == 'numNotes')
+	else if(column.id == 'zotero-items-numNotes-column')
 	{
 		function columnSort(a,b)
 		{
@@ -533,8 +537,8 @@ Zotero.ItemTreeView.prototype.sort = function()
 	{
 		function columnSort(a,b)
 		{
-			var fieldA = a.getField(column.id);
-			var fieldB = b.getField(column.id);
+			var fieldA = a.getField(column.id.substring(13, column.id.length-7));
+			var fieldB = b.getField(column.id.substring(13, column.id.length-7));
 			
 			if(typeof fieldA == 'string')
 			{
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index 9667097e4..35b7c824b 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -13,13 +13,13 @@
 	padding: 4px;
 }
 
-#collections-pane
+#zotero-collections-pane
 {
 	min-width: 150px;
 	width: 150px;
 }
 
-#collections-tree treechildren::-moz-tree-image
+#zotero-collections-tree treechildren::-moz-tree-image
 {
 	margin-right: 5px;
 }
@@ -30,17 +30,17 @@
 	border:0;
 }
 
-#items-tree treechildren::-moz-tree-image
+#zotero-items-tree treechildren::-moz-tree-image
 {
 	margin-right: 5px;
 }
 
-#items-pane
+#zotero-items-pane
 {
 	min-width: 300px;
 }
 
-#item-pane
+#zotero-item-pane
 {
 	width: 330px;
 	min-width: 330px;
@@ -67,17 +67,17 @@
 	font-size: larger;
 }
 
-#tb-collection-add
+#zotero-tb-collection-add
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-collection-add.png');
 }
 
-#tb-collection-rename
+#zotero-tb-collection-rename
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-collection-edit.png');
 }
 
-#tb-collection-rename[disabled="true"]
+#zotero-tb-collection-rename[disabled="true"]
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-collection-edit-gray.png');
 }
@@ -92,90 +92,90 @@
 {
 	margin-right:4px;
 }
-#tb-fullscreen .toolbarbutton-text, #editpane-dynamic-fields .toolbarbutton-text
+#zotero-tb-fullscreen .toolbarbutton-text, #zotero-editpane-dynamic-fields .toolbarbutton-text
 {
 	margin:0;
 }
 
 
-#tb-actions-menu
+#zotero-tb-actions-menu
 {
 	list-style-image: url('chrome://zotero/skin/cog.png');
 }
 
-#tb-add
+#zotero-tb-add
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-item-add.png');
 }
 
-#tb-item-from-page
+#zotero-tb-item-from-page
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-item-from-page.png');
 }
 
-#tb-link-page
+#zotero-tb-link-page
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-link-add.png');
 }
 
-#tb-snapshot-page
+#zotero-tb-snapshot-page
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-snapshot-add.png');
 }
 
-#tb-note-add
+#zotero-tb-note-add
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-note-add.png');
 }
 
-#tb-item-attachments-file
+#zotero-tb-item-attachments-file
 {
 	list-style-image: url('chrome://zotero/skin/treeitem-attachment-file.png');
 }
 
-#tb-item-attachments-link
+#zotero-tb-item-attachments-link
 {
 	list-style-image: url('chrome://zotero/skin/treeitem-attachment-link.png');
 }
 
-#tb-item-attachments-snapshot
+#zotero-tb-item-attachments-snapshot
 {
 	list-style-image: url('chrome://zotero/skin/treeitem-attachment-snapshot.png');
 }
 
-#tb-item-attachments-web-link
+#zotero-tb-item-attachments-web-link
 {
 	list-style-image: url('chrome://zotero/skin/treeitem-attachment-web-link.png');
 }
 
-#tb-fullscreen
+#zotero-tb-fullscreen
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-fullscreen-bottom.png');
 }
 
-#tb-fullscreen[zoterotop="true"]
+#zotero-tb-fullscreen[zoterotop="true"]
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-fullscreen-top.png');
 }
 
-#tb-fullscreen[fullscreenmode="true"]
+#zotero-tb-fullscreen[fullscreenmode="true"]
 {
 	background: #666666;
 	-moz-border-radius: 6px;
 }
 
-#tb-search
+#zotero-tb-search
 {
 	width: 150px;
 }
 
-#tb-collection-addsearch
+#zotero-tb-collection-addsearch
 {
 	list-style-image: url('chrome://zotero/skin/treesource-search.png');
 	margin-bottom:-5px;
 }
 
-#tb-search-cancel
+#zotero-tb-search-cancel
 {
 	margin: 0px;
 	padding: 0px;
@@ -183,18 +183,18 @@
 	list-style-image: url('chrome://zotero/skin/search-cancel.png');
 }
 
-#tb-search-cancel:hover:active
+#zotero-tb-search-cancel:hover:active
 {
 	list-style-image: url('chrome://zotero/skin/search-cancel-active.png');
 }
 
-#tb-go-to-url, #tb-openurl
+#zotero-tb-go-to-url, #zotero-tb-openurl
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-go-arrow.png');
 	-moz-box-direction: reverse;
 }
 
-#tb-go-to-url[disabled=true], #tb-openurl[disabled=true]
+#zotero-tb-go-to-url[disabled=true], #zotero-tb-openurl[disabled=true]
 {
 	list-style-image: url('chrome://zotero/skin/toolbar-go-arrow-disabled.png');
 }
diff --git a/chrome/skin/default/zotero/zotero.css b/chrome/skin/default/zotero/zotero.css
index 74cdd3224..709927a06 100644
--- a/chrome/skin/default/zotero/zotero.css
+++ b/chrome/skin/default/zotero/zotero.css
@@ -101,52 +101,52 @@ zoterosearchtextbox .toolbarbutton-menu-dropmarker
 	padding:0 2px;
 }
 
-#editpane-dynamic-fields row, tagsbox row
+#zotero-editpane-dynamic-fields row, tagsbox row
 {
 	margin:0 0 1px;
 }
 
-#editpane-dynamic-fields textbox, tagsbox textbox
+#zotero-editpane-dynamic-fields textbox, tagsbox textbox
 {
 	margin-top:0;
 	margin-bottom:-1px;
 }
 
 /* DEBUG: this doesn't seem to work, unfortunately
-#editpane-dynamic-fields label[singleField=false]:after
+#zotero-editpane-dynamic-fields label[singleField=false]:after
 {
 	content:",";
 }
 */
 
 /* creator switch button */
-#editpane-dynamic-fields row hbox toolbarbutton
+#zotero-editpane-dynamic-fields row hbox toolbarbutton
 {
 	margin-right:5px;
 }
 
 /* metadata field names */
-#editpane-dynamic-fields row > label:first-child,
-#editpane-dynamic-fields row > toolbarbutton .toolbarbutton-text /* creator type menu */
+#zotero-editpane-dynamic-fields row > label:first-child,
+#zotero-editpane-dynamic-fields row > toolbarbutton .toolbarbutton-text /* creator type menu */
 {
 	text-align: right;
 	font-weight: bold;
 }
 
  /* creator type menu */
-#editpane-dynamic-fields row > toolbarbutton 
+#zotero-editpane-dynamic-fields row > toolbarbutton 
 {
 	margin: 0;
 	padding: 0;
 	list-style-image: url("chrome://browser/skin/dropmark-nav-small.png");
 	-moz-image-region: rect(0px, 14px, 16px, 0px);
 }
-#editpane-dynamic-fields row > toolbarbutton .toolbarbutton-text
+#zotero-editpane-dynamic-fields row > toolbarbutton .toolbarbutton-text
 {
 	margin-top: -1px;
 }
-#editpane-dynamic-fields row > toolbarbutton .toolbarbutton-icon,
-#editpane-dynamic-fields row > toolbarbutton .toolbarbutton-menu-dropmarker
+#zotero-editpane-dynamic-fields row > toolbarbutton .toolbarbutton-icon,
+#zotero-editpane-dynamic-fields row > toolbarbutton .toolbarbutton-menu-dropmarker
 {
 	margin: 0;
 	padding: 0;
@@ -154,35 +154,35 @@ zoterosearchtextbox .toolbarbutton-menu-dropmarker
 
 
 /* no space between last name and comma */
-#editpane-dynamic-fields row hbox label:first-child
+#zotero-editpane-dynamic-fields row hbox label:first-child
 {
 	margin-right:1px;
 }
 
-#editpane-dynamic-fields row hbox label.comma
+#zotero-editpane-dynamic-fields row hbox label.comma
 {
 	margin-left:0;
 }
 
-#editpane-dynamic-fields row vbox[fieldname=extra]
+#zotero-editpane-dynamic-fields row vbox[fieldname=extra]
 {
 	margin-left:6px;
 }
 
-.clicky, .unclicky
+.zotero-clicky, .zotero-unclicky
 {	
 	-moz-border-radius: 6px;
 }
 
-.clicky[value="-"], .clicky[value="+"],
-.unclicky[value="-"], .unclicky[value="+"]
+.zotero-clicky[value="-"], .zotero-clicky[value="+"],
+.zotero-unclicky[value="-"], .zotero-unclicky[value="+"]
 {
 	margin: 0px;
 	padding-left: 4px;
 	padding-right: 4px;
 }
 
-.clicky:hover
+.zotero-clicky:hover
 {
 	color: white;
 	background: #666666;