diff --git a/chrome/chromeFiles/skin/default/scholar/about.css b/chrome/chromeFiles/skin/default/zotero/about.css
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/about.css
rename to chrome/chromeFiles/skin/default/zotero/about.css
diff --git a/chrome/chromeFiles/skin/default/scholar/addCitationDialog.css b/chrome/chromeFiles/skin/default/zotero/addCitationDialog.css
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/addCitationDialog.css
rename to chrome/chromeFiles/skin/default/zotero/addCitationDialog.css
diff --git a/chrome/chromeFiles/skin/default/scholar/citation-add-gray.png b/chrome/chromeFiles/skin/default/zotero/citation-add-gray.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/citation-add-gray.png
rename to chrome/chromeFiles/skin/default/zotero/citation-add-gray.png
diff --git a/chrome/chromeFiles/skin/default/scholar/citation-add.png b/chrome/chromeFiles/skin/default/zotero/citation-add.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/citation-add.png
rename to chrome/chromeFiles/skin/default/zotero/citation-add.png
diff --git a/chrome/chromeFiles/skin/default/scholar/citation-delete-gray.png b/chrome/chromeFiles/skin/default/zotero/citation-delete-gray.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/citation-delete-gray.png
rename to chrome/chromeFiles/skin/default/zotero/citation-delete-gray.png
diff --git a/chrome/chromeFiles/skin/default/scholar/citation-delete.png b/chrome/chromeFiles/skin/default/zotero/citation-delete.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/citation-delete.png
rename to chrome/chromeFiles/skin/default/zotero/citation-delete.png
diff --git a/chrome/chromeFiles/skin/default/scholar/cog.png b/chrome/chromeFiles/skin/default/zotero/cog.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/cog.png
rename to chrome/chromeFiles/skin/default/zotero/cog.png
diff --git a/chrome/chromeFiles/skin/default/scholar/item-attachments-add.png b/chrome/chromeFiles/skin/default/zotero/item-attachments-add.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/item-attachments-add.png
rename to chrome/chromeFiles/skin/default/zotero/item-attachments-add.png
diff --git a/chrome/chromeFiles/skin/default/scholar/overlay.css b/chrome/chromeFiles/skin/default/zotero/overlay.css
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/overlay.css
rename to chrome/chromeFiles/skin/default/zotero/overlay.css
diff --git a/chrome/chromeFiles/skin/default/scholar/search-cancel-active.png b/chrome/chromeFiles/skin/default/zotero/search-cancel-active.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/search-cancel-active.png
rename to chrome/chromeFiles/skin/default/zotero/search-cancel-active.png
diff --git a/chrome/chromeFiles/skin/default/scholar/search-cancel.png b/chrome/chromeFiles/skin/default/zotero/search-cancel.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/search-cancel.png
rename to chrome/chromeFiles/skin/default/zotero/search-cancel.png
diff --git a/chrome/chromeFiles/skin/default/scholar/tag.png b/chrome/chromeFiles/skin/default/zotero/tag.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/tag.png
rename to chrome/chromeFiles/skin/default/zotero/tag.png
diff --git a/chrome/chromeFiles/skin/default/scholar/textfield-dual.png b/chrome/chromeFiles/skin/default/zotero/textfield-dual.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/textfield-dual.png
rename to chrome/chromeFiles/skin/default/zotero/textfield-dual.png
diff --git a/chrome/chromeFiles/skin/default/scholar/textfield-single.png b/chrome/chromeFiles/skin/default/zotero/textfield-single.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/textfield-single.png
rename to chrome/chromeFiles/skin/default/zotero/textfield-single.png
diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-collection-add.png b/chrome/chromeFiles/skin/default/zotero/toolbar-collection-add.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/toolbar-collection-add.png
rename to chrome/chromeFiles/skin/default/zotero/toolbar-collection-add.png
diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-collection-edit-gray.png b/chrome/chromeFiles/skin/default/zotero/toolbar-collection-edit-gray.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/toolbar-collection-edit-gray.png
rename to chrome/chromeFiles/skin/default/zotero/toolbar-collection-edit-gray.png
diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-collection-edit.png b/chrome/chromeFiles/skin/default/zotero/toolbar-collection-edit.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/toolbar-collection-edit.png
rename to chrome/chromeFiles/skin/default/zotero/toolbar-collection-edit.png
diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-fullscreen-bottom.png b/chrome/chromeFiles/skin/default/zotero/toolbar-fullscreen-bottom.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/toolbar-fullscreen-bottom.png
rename to chrome/chromeFiles/skin/default/zotero/toolbar-fullscreen-bottom.png
diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-fullscreen-top.png b/chrome/chromeFiles/skin/default/zotero/toolbar-fullscreen-top.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/toolbar-fullscreen-top.png
rename to chrome/chromeFiles/skin/default/zotero/toolbar-fullscreen-top.png
diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-go-arrow-disabled.png b/chrome/chromeFiles/skin/default/zotero/toolbar-go-arrow-disabled.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/toolbar-go-arrow-disabled.png
rename to chrome/chromeFiles/skin/default/zotero/toolbar-go-arrow-disabled.png
diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-go-arrow.png b/chrome/chromeFiles/skin/default/zotero/toolbar-go-arrow.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/toolbar-go-arrow.png
rename to chrome/chromeFiles/skin/default/zotero/toolbar-go-arrow.png
diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-item-add.png b/chrome/chromeFiles/skin/default/zotero/toolbar-item-add.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/toolbar-item-add.png
rename to chrome/chromeFiles/skin/default/zotero/toolbar-item-add.png
diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-item-from-page.png b/chrome/chromeFiles/skin/default/zotero/toolbar-item-from-page.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/toolbar-item-from-page.png
rename to chrome/chromeFiles/skin/default/zotero/toolbar-item-from-page.png
diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-link-add.png b/chrome/chromeFiles/skin/default/zotero/toolbar-link-add.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/toolbar-link-add.png
rename to chrome/chromeFiles/skin/default/zotero/toolbar-link-add.png
diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-note-add.png b/chrome/chromeFiles/skin/default/zotero/toolbar-note-add.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/toolbar-note-add.png
rename to chrome/chromeFiles/skin/default/zotero/toolbar-note-add.png
diff --git a/chrome/chromeFiles/skin/default/scholar/toolbar-snapshot-add.png b/chrome/chromeFiles/skin/default/zotero/toolbar-snapshot-add.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/toolbar-snapshot-add.png
rename to chrome/chromeFiles/skin/default/zotero/toolbar-snapshot-add.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-artwork.png b/chrome/chromeFiles/skin/default/zotero/treeitem-artwork.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-artwork.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-artwork.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-attachment-file.png b/chrome/chromeFiles/skin/default/zotero/treeitem-attachment-file.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-attachment-file.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-attachment-file.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-attachment-link.png b/chrome/chromeFiles/skin/default/zotero/treeitem-attachment-link.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-attachment-link.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-attachment-link.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-attachment-snapshot.png b/chrome/chromeFiles/skin/default/zotero/treeitem-attachment-snapshot.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-attachment-snapshot.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-attachment-snapshot.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-attachment-web-link.png b/chrome/chromeFiles/skin/default/zotero/treeitem-attachment-web-link.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-attachment-web-link.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-attachment-web-link.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-attachment.png b/chrome/chromeFiles/skin/default/zotero/treeitem-attachment.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-attachment.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-attachment.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-book.png b/chrome/chromeFiles/skin/default/zotero/treeitem-book.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-book.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-book.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-bookSection.png b/chrome/chromeFiles/skin/default/zotero/treeitem-bookSection.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-bookSection.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-bookSection.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-film.png b/chrome/chromeFiles/skin/default/zotero/treeitem-film.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-film.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-film.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-interview.png b/chrome/chromeFiles/skin/default/zotero/treeitem-interview.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-interview.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-interview.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-journalArticle.png b/chrome/chromeFiles/skin/default/zotero/treeitem-journalArticle.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-journalArticle.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-journalArticle.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-letter.png b/chrome/chromeFiles/skin/default/zotero/treeitem-letter.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-letter.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-letter.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-magazineArticle.png b/chrome/chromeFiles/skin/default/zotero/treeitem-magazineArticle.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-magazineArticle.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-magazineArticle.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-manuscript.png b/chrome/chromeFiles/skin/default/zotero/treeitem-manuscript.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-manuscript.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-manuscript.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-newspaperArticle.png b/chrome/chromeFiles/skin/default/zotero/treeitem-newspaperArticle.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-newspaperArticle.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-newspaperArticle.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-note.png b/chrome/chromeFiles/skin/default/zotero/treeitem-note.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-note.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-note.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-thesis.png b/chrome/chromeFiles/skin/default/zotero/treeitem-thesis.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-thesis.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-thesis.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treeitem-webpage.png b/chrome/chromeFiles/skin/default/zotero/treeitem-webpage.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treeitem-webpage.png
rename to chrome/chromeFiles/skin/default/zotero/treeitem-webpage.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treesource-collection.png b/chrome/chromeFiles/skin/default/zotero/treesource-collection.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treesource-collection.png
rename to chrome/chromeFiles/skin/default/zotero/treesource-collection.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treesource-library.png b/chrome/chromeFiles/skin/default/zotero/treesource-library.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treesource-library.png
rename to chrome/chromeFiles/skin/default/zotero/treesource-library.png
diff --git a/chrome/chromeFiles/skin/default/scholar/treesource-search.png b/chrome/chromeFiles/skin/default/zotero/treesource-search.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/treesource-search.png
rename to chrome/chromeFiles/skin/default/zotero/treesource-search.png
diff --git a/chrome/chromeFiles/skin/default/scholar/zotero-z-16px-active.png b/chrome/chromeFiles/skin/default/zotero/zotero-z-16px-active.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/zotero-z-16px-active.png
rename to chrome/chromeFiles/skin/default/zotero/zotero-z-16px-active.png
diff --git a/chrome/chromeFiles/skin/default/scholar/zotero-z-16px-hover.png b/chrome/chromeFiles/skin/default/zotero/zotero-z-16px-hover.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/zotero-z-16px-hover.png
rename to chrome/chromeFiles/skin/default/zotero/zotero-z-16px-hover.png
diff --git a/chrome/chromeFiles/skin/default/scholar/zotero-z-16px.png b/chrome/chromeFiles/skin/default/zotero/zotero-z-16px.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/zotero-z-16px.png
rename to chrome/chromeFiles/skin/default/zotero/zotero-z-16px.png
diff --git a/chrome/chromeFiles/skin/default/scholar/zotero-z-24px-active.png b/chrome/chromeFiles/skin/default/zotero/zotero-z-24px-active.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/zotero-z-24px-active.png
rename to chrome/chromeFiles/skin/default/zotero/zotero-z-24px-active.png
diff --git a/chrome/chromeFiles/skin/default/scholar/zotero-z-24px-hover.png b/chrome/chromeFiles/skin/default/zotero/zotero-z-24px-hover.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/zotero-z-24px-hover.png
rename to chrome/chromeFiles/skin/default/zotero/zotero-z-24px-hover.png
diff --git a/chrome/chromeFiles/skin/default/scholar/zotero-z-24px.png b/chrome/chromeFiles/skin/default/zotero/zotero-z-24px.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/zotero-z-24px.png
rename to chrome/chromeFiles/skin/default/zotero/zotero-z-24px.png
diff --git a/chrome/chromeFiles/skin/default/scholar/zotero.css b/chrome/chromeFiles/skin/default/zotero/zotero.css
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/zotero.css
rename to chrome/chromeFiles/skin/default/zotero/zotero.css
diff --git a/chrome/chromeFiles/skin/default/scholar/zotero_logo_14px.png b/chrome/chromeFiles/skin/default/zotero/zotero_logo_14px.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/zotero_logo_14px.png
rename to chrome/chromeFiles/skin/default/zotero/zotero_logo_14px.png
diff --git a/chrome/chromeFiles/skin/default/scholar/zotero_logo_18px.png b/chrome/chromeFiles/skin/default/zotero/zotero_logo_18px.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/zotero_logo_18px.png
rename to chrome/chromeFiles/skin/default/zotero/zotero_logo_18px.png
diff --git a/chrome/chromeFiles/skin/default/scholar/zotero_logo_20px.png b/chrome/chromeFiles/skin/default/zotero/zotero_logo_20px.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/zotero_logo_20px.png
rename to chrome/chromeFiles/skin/default/zotero/zotero_logo_20px.png
diff --git a/chrome/chromeFiles/skin/default/scholar/zotero_logo_20px_2.png b/chrome/chromeFiles/skin/default/zotero/zotero_logo_20px_2.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/zotero_logo_20px_2.png
rename to chrome/chromeFiles/skin/default/zotero/zotero_logo_20px_2.png
diff --git a/chrome/chromeFiles/skin/default/scholar/zotero_logo_20px_3.png b/chrome/chromeFiles/skin/default/zotero/zotero_logo_20px_3.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/zotero_logo_20px_3.png
rename to chrome/chromeFiles/skin/default/zotero/zotero_logo_20px_3.png
diff --git a/chrome/chromeFiles/skin/default/scholar/zotero_z_32px.png b/chrome/chromeFiles/skin/default/zotero/zotero_z_32px.png
similarity index 100%
rename from chrome/chromeFiles/skin/default/scholar/zotero_z_32px.png
rename to chrome/chromeFiles/skin/default/zotero/zotero_z_32px.png