diff --git a/chrome/content/TabView.xul b/chrome/content/TabView.xul
deleted file mode 100644
index 0db7e8b..0000000
--- a/chrome/content/TabView.xul
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0"?>
-<!-- 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/. -->
-
-<?xml-stylesheet href="chrome://tabgroups/skin/TabView.css" type="text/css"?>
-<?xml-stylesheet href="chrome://tabgroups-os/skin/TabView.css" type="text/css"?>
-<!DOCTYPE overlay [
-  <!ENTITY % overlayDTD SYSTEM "chrome://tabgroups/locale/TabView.dtd">
-  %overlayDTD;
-  <!-- <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
-  %browserDTD; -->
-]>
-
-<overlay id="TabView_overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<broadcasterset id="mainBroadcasterSet">
-		<broadcaster id="objName-tabviewGroupsNumber" groups="1"/>
-	</broadcasterset>
-
-	<menupopup id="tabContextMenu">
-		<menu id="objName-context_tabViewMenu"
-			label="&moveToGroup.label;"
-			accesskey="&moveToGroup.accesskey;"
-			insertbefore="context_openTabInWindow">
-
-			<menupopup id="objName-context_tabViewMenuPopup">
-				<menuseparator id="objName-context_tabViewNamedGroups" hidden="true"/>
-				<menuitem id="objName-context_tabViewNewGroup"
-					label="&moveToNewGroup.label;"
-					oncommand="objName.TabView.moveTabTo(TabContextMenu.contextTab, null);"/>
-			</menupopup>
-		</menu>
-	</menupopup>
-
-	<popupset id="mainPopupSet">
-		<tooltip id="objName-tab-view-tooltip"/>
-
-		<menupopup id="objName-tabview-context-input">
-			<menuitem data-lazy-l10n-id="text-action-undo"
-				command="cmd_undo"/>
-			<menuitem data-lazy-l10n-id="text-action-redo"
-				command="cmd_redo"/>
-			<menuseparator/>
-			<menuitem data-lazy-l10n-id="text-action-cut"
-				command="cmd_cut"/>
-			<menuitem data-lazy-l10n-id="text-action-copy"
-				command="cmd_copy"/>
-			<menuitem data-lazy-l10n-id="text-action-paste"
-				command="cmd_paste"/>
-			<menuitem data-lazy-l10n-id="text-action-delete"
-				command="cmd_delete"/>
-			<menuseparator/>
-			<menuitem data-lazy-l10n-id="text-action-select-all"
-				command="cmd_selectAll"/>
-		</menupopup>
-
-        <menupopup id="objName-tabview-context-group">
-            <menuitem id="objName-tabview-context-newtab"
-                label="&menuNewTab.label;"
-                accesskey="&menuNewTab.accesskey;"/>
-        </menupopup>
-	</popupset>
-
-	<menupopup id="alltabs-popup">
-		<menuitem id="objName-menu_tabview"
-			class="menuitem-iconic objName-icon"
-			key="objName-key_tabview"
-			label="&viewTabGroups.label;"
-			accesskey="&viewTabGroups.accesskey;"
-			command="objName:ToggleTabView"
-			observes="objName-tabviewGroupsNumber"
-			insertbefore="alltabs_undoCloseTab"/>
-	</menupopup>
-
-	<toolbarpalette id="BrowserToolbarPalette">
-		<toolbarbutton id="objName-tabview-button"
-			type="custom"
-			defaultArea="TabsToolbar"
-			class="toolbarbutton-1 chromeclass-toolbar-additional objName-icon"
-			label="&viewTabGroups.label;"
-			closemenu="none"
-			command="objName:CommandButton"
-			observes="objName-tabviewGroupsNumber"/>
-	</toolbarpalette>
-
-	<commandset id="mainCommandSet">
-		<command id="objName:ToggleTabView" oncommand="objName.TabView.toggle();"/>
-		<command id="objName:TabViewSettings" oncommand="objName.TabView.goToPreferences();"/>
-		<command id="objName:CommandButton" oncommand="objName.TabView.commandButton();"/>
-		<command id="objName:NextGroup" oncommand="objName.TabView.switchGroup(false);"/>
-		<command id="objName:PreviousGroup" oncommand="objName.TabView.switchGroup(true);"/>
-	</commandset>
-
-</overlay>
diff --git a/chrome/content/bug566510.xul b/chrome/content/bug566510.xul
deleted file mode 100644
index 69d109e..0000000
--- a/chrome/content/bug566510.xul
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!-- 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/. -->
-
-<overlay id="bug566510_overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<menu id="objName-context_tabViewMenu" observes="multiselectionContextBroadcaster"/>
-	<menuitem id="objName-context_tabViewNewGroup" oncommand="bug566510_TabView.moveTabsTo(TabContextMenu.contextTab, null);"/>
-
-</overlay>
diff --git a/chrome/content/paneHowTo.xul b/chrome/content/paneHowTo.xul
deleted file mode 100644
index 9ba0f9c..0000000
--- a/chrome/content/paneHowTo.xul
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0"?>
-<!-- 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/. -->
-
-<!DOCTYPE html [
-  <!ENTITY % htmlDTD
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "DTD/xhtml1-strict.dtd">
-  %htmlDTD;
-  <!ENTITY % howTo SYSTEM "chrome://tabgroups/locale/howto.dtd" >
-  %howTo;
-]>
-
-<overlay	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-			xmlns:html="http://www.w3.org/1999/xhtml">
-
-	<richlistbox id="categories">
-		<richlistitem id="category-howTo"
-			class="category"
-			value="paneHowTo"
-			tooltiptext="&howto.pane.label;"
-			position="3"
-			align="center">
-
-			<image class="category-icon"/>
-			<label class="category-name" flex="1" value="&howto.pane.label;"/>
-		</richlistitem>
-	</richlistbox>
-
-	<prefpane id="mainPrefPane">
-		<hbox id="header-howTo" class="header" collapsed="true" data-category="paneHowTo">
-			<label class="header-name">&howto.pane.label;</label>
-		</hbox>
-
-		<groupbox align="start" id="paneHowTo-overview" collapsed="true" data-category="paneHowTo">
-			<html:p>&howto.overview.a;</html:p>
-		</groupbox>
-
-		<groupbox align="start" id="paneHowTo-mode" collapsed="true" data-category="paneHowTo">
-			<caption label="&howto.mode.caption;"/>
-			<html:p>&nbsp;</html:p>
-			<html:p>&howto.mode.description;</html:p>
-			<html:ul>
-				<html:li>
-					<html:p>&howto.single.description;</html:p>
-					<html:p class="img-container"><html:img src="chrome://objPathString/skin/howto/singleview.png"/></html:p>
-				</html:li>
-				<html:li>
-					<html:p>&howto.grid.description;</html:p>
-					<html:p class="img-container"><html:img src="chrome://objPathString/skin/howto/grid.png"/></html:p>
-				</html:li>
-				<html:li>
-					<html:p>&howto.classic.description;</html:p>
-					<html:p class="img-container"><html:img src="chrome://objPathString/skin/howto/freearrange.png"/></html:p>
-				</html:li>
-			</html:ul>
-		</groupbox>
-
-		<groupbox align="start" id="paneHowTo-create" collapsed="true" data-category="paneHowTo">
-			<caption label="&howto.create.caption;"/>
-            <html:div>
-                <html:p>&nbsp;</html:p>
-                <html:p>&howto.create.step0;</html:p>
-                <html:ol>
-                    <html:li>
-                        <html:p>&howto.create.step1a;</html:p>
-                        <html:p>&howto.create.step1b;</html:p>
-                    </html:li>
-                    <html:li>
-                        <html:p>&howto.create.step2b;</html:p>
-                        <html:p class="img-container"><html:img src="chrome://objPathString/skin/howto/create.png"/></html:p>
-                    </html:li>
-                    <html:li><html:p>&howto.create.step3;</html:p></html:li>
-                </html:ol>
-            </html:div>
-		</groupbox>
-
-		<groupbox align="start" id="paneHowTo-switch" collapsed="true" data-category="paneHowTo">
-			<caption label="&howto.switch.caption;"/>
-			<html:p>&nbsp;</html:p>
-			<html:p>&howto.switch.description2;</html:p>
-		</groupbox>
-
-		<groupbox align="start" id="paneHowTo-overflow" collapsed="true" data-category="paneHowTo">
-			<caption label="&howto.overflow.caption;"/>
-			<html:p>&nbsp;</html:p>
-			<html:p>&howto.overflow.description;</html:p>
-			<html:ul>
-				<html:li>
-					<html:p>&howto.stack.description;</html:p>
-					<html:p class="img-container"><html:img src="chrome://objPathString/skin/howto/stack.png"/></html:p>
-				</html:li>
-				<html:li>
-					<html:p>&howto.list.description;</html:p>
-					<html:p class="img-container"><html:img src="chrome://objPathString/skin/howto/list.png"/></html:p>
-				</html:li>
-				<html:li>
-					<html:p>&howto.icons.description;</html:p>
-					<html:p class="img-container"><html:img src="chrome://objPathString/skin/howto/icons.png"/></html:p>
-				</html:li>
-				<html:li>
-					<html:p>&howto.thumbs.description2;</html:p>
-					<html:p class="img-container"><html:img src="chrome://objPathString/skin/howto/thumbs.png"/></html:p>
-				</html:li>
-			</html:ul>
-		</groupbox>
-
-		<groupbox align="start" id="paneHowTo-organize" collapsed="true" data-category="paneHowTo">
-			<caption label="&howto.organize.caption;"/>
-			<html:p>&nbsp;</html:p>
-			<html:p>&howto.organize.description1;</html:p>
-			<html:ul>
-				<html:li>
-					<caption label="&howto.resize.caption;"/>
-					<html:p>&nbsp;</html:p>
-					<html:p>&howto.resize.description3;</html:p>
-					<html:p>&howto.resize.description4;</html:p>
-				</html:li>
-				<html:li>
-					<caption label="&howto.rearrange.caption;"/>
-					<html:p>&nbsp;</html:p>
-					<html:p>&howto.rearrange.description;</html:p>
-					<html:p>&howto.rearrange.description3;</html:p>
-				</html:li>
-				<html:li>
-					<caption label="&howto.name.caption;"/>
-					<html:p>&nbsp;</html:p>
-					<html:p>&howto.name.description;</html:p>
-				</html:li>
-				<html:li>
-					<caption label="&howto.close.caption;"/>
-					<html:p>&nbsp;</html:p>
-					<html:p>&howto.close.description1;</html:p>
-					<html:p>&howto.close.description2;</html:p>
-				</html:li>
-			</html:ul>
-		</groupbox>
-
-		<groupbox align="start" id="paneHowTo-pinned" collapsed="true" data-category="paneHowTo">
-			<caption label="&howto.pinned.caption;"/>
-            <html:div>
-                <html:p>&nbsp;</html:p>
-                <html:p>&howto.pinned.description2;</html:p>
-                <html:p>&howto.pinned.description3;</html:p>
-                <html:p class="img-container"><html:img src="chrome://objPathString/skin/howto/pinned.png"/></html:p>
-            </html:div>
-		</groupbox>
-
-		<groupbox align="start" id="paneHowTo-search" collapsed="true" data-category="paneHowTo">
-			<caption label="&howto.search.caption;"/>
-			<html:ol>
-				<html:li>
-					<html:p>&howto.search.step2a;</html:p>
-					<html:p>&howto.search.step2b;</html:p>
-				</html:li>
-				<html:li>
-					<html:p>&howto.search.step4;</html:p>
-					<html:p class="img-container"><html:img src="chrome://objPathString/skin/howto/search.png"/></html:p>
-				</html:li>
-			</html:ol>
-		</groupbox>
-
-		<groupbox align="start" id="paneHowTo-credits" collapsed="true" data-category="paneHowTo">
-			<html:p><html:span id="paneHowTo-credits-body">&howto.credits;&nbsp;</html:span><html:a target="_blank" href="https://support.mozilla.org/user/marsf">marsf</html:a>, <html:a target="_blank" href="https://support.mozilla.org/user/djst">djst</html:a>, <html:a target="_blank" href="https://support.mozilla.org/user/JasnaPaka">JasnaPaka</html:a>, <html:a target="_blank" href="https://support.mozilla.org/user/KadirTopal">KadirTopal</html:a>, <html:a target="_blank" href="https://support.mozilla.org/user/Verdi">Verdi</html:a>, <html:a target="_blank" href="https://support.mozilla.org/user/scoobidiver">scoobidiver</html:a>, <html:a target="_blank" href="https://support.mozilla.org/user/Swarnava">Swarnava</html:a>, <html:a target="_blank" href="https://support.mozilla.org/user/linesarefuzzy">linesarefuzzy</html:a>, <html:a target="_blank" href="https://support.mozilla.org/user/greasemonkey">greasemonkey</html:a>, <html:a target="_blank" href="https://support.mozilla.org/user/ideato">ideato</html:a>, <html:a target="_blank" href="https://support.mozilla.org/user/deb.bhattacharya6">deb.bhattacharya6</html:a>, <html:a target="_blank" href="https://support.mozilla.org/user/KamranMackey">KamranMackey</html:a>, <html:a target="_blank" href="https://support.mozilla.org/user/grubert">grubert</html:a>, <html:a target="_blank" href="https://support.mozilla.org/user/jsavage">jsavage</html:a>.
-			</html:p>
-		</groupbox>
-	</prefpane>
-</overlay>
diff --git a/chrome/content/paneSession.xul b/chrome/content/paneSession.xul
deleted file mode 100644
index 35f4630..0000000
--- a/chrome/content/paneSession.xul
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0"?>
-<!-- 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/. -->
-
-<?xml-stylesheet href="chrome://browser/skin/aboutSessionRestore.css" type="text/css"?>
-<!DOCTYPE html [
-  <!ENTITY % htmlDTD
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "DTD/xhtml1-strict.dtd">
-  %htmlDTD;
-  <!ENTITY % options SYSTEM "chrome://tabgroups/locale/options.dtd" >
-  %options;
-]>
-
-<overlay	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-			xmlns:html="http://www.w3.org/1999/xhtml">
-
-	<richlistbox id="categories">
-		<richlistitem id="category-session"
-			class="category"
-			value="paneSession"
-			tooltiptext="&pane.session.label;"
-			position="2"
-			align="center">
-
-			<image class="category-icon"/>
-			<label class="category-name" flex="1" value="&pane.session.label;"/>
-		</richlistitem>
-	</richlistbox>
-
-	<prefpane id="mainPrefPane">
-		<hbox id="header-session" class="header" collapsed="true" data-category="paneSession">
-			<label class="header-name">&pane.session.label;</label>
-		</hbox>
-
-		<groupbox align="start" id="paneSession-backup" collapsed="true" data-category="paneSession">
-			<caption label="&cat.backup.label;"/>
-			<vbox jump="backup">
-				<description>&session.backup.description;</description>
-				<description>&session.backup.description2;</description>
-				<checkbox id="paneSession-backup-alldata"
-					label="&session.backup.alldata.checkbox.label;"
-					helpbox="paneSession-alldata-helptext"/>
-				<html:p id="paneSession-backup-warning" hidden="true">
-					<html:span class="warning">&session.backup.alldata.caution.a;</html:span>&nbsp;&session.backup.alldata.caution.b;
-				</html:p>
-				<button id="paneSession-backup-button"
-					class="content-cell-item"
-					label="&session.backup.button;"/>
-				<description id="paneSession-backup-autoloaded" hidden="true">&session.backup.autoloaded;</description>
-			</vbox>
-			<vbox id="paneSession-alldata-helptext" collapsed="true">
-				<description>&session.backup.alldata.checkbox.tooltip.a;</description>
-				<description>&session.backup.alldata.checkbox.tooltip.b;</description>
-			</vbox>
-		</groupbox>
-
-		<groupbox align="start" id="paneSession-restore" collapsed="true" data-category="paneSession">
-			<caption label="&cat.restore.label;"/>
-			<vbox jump="restore">
-				<description>&session.restore.description;</description>
-				<description id="paneSession-restore-invalid" hidden="true">&session.restore.invalid;</description>
-				<hbox>
-					<button id="paneSession-load-button"
-						class="content-cell-item"
-						type="menu"
-						label="&session.restore.button;">
-						<menupopup id="paneSession-load-menu" position="end_before">
-							<menuseparator id="paneSession-load-separator-manual"/>
-							<menuseparator id="paneSession-load-separator-recovery"/>
-							<menuseparator id="paneSession-load-separator-upgrade"/>
-							<menuseparator id="paneSession-load-separator-sessionManager"/>
-							<menuseparator id="paneSession-load-separator-tabMixPlus"/>
-							<menuitem id="paneSession-load-from-file" label="&session.restore.from.file;"/>
-						</menupopup>
-					</button>
-				</hbox>
-				<description id="paneSession-restore-finished" hidden="true">&session.restore.finished;</description>
-				<tree id="paneSession-restore-tabList"
-					seltype="single"
-					hidecolumnpicker="true"
-					hidden="true">
-					<treecols>
-						<treecol cycler="true" id="paneSession-restore-restore" type="checkbox" label="&session.restore.list.check;"/>
-						<splitter class="tree-splitter"/>
-						<treecol primary="true" id="paneSession-restore-title" label="&session.restore.list.items;" flex="1"/>
-					</treecols>
-					<treechildren flex="1"/>
-				</tree>
-				<button id="paneSession-import-button"
-					class="content-cell-item"
-					hidden="true"
-					label="&session.restore.import.button;"
-					helpbox="paneSession-import-helptext"/>
-			</vbox>
-			<vbox id="paneSession-import-helptext" collapsed="true">
-				<description>&session.restore.import.tooltip.a;</description>
-				<description>&session.restore.import.tooltip.b;</description>
-			</vbox>
-		</groupbox>
-
-		<groupbox align="start" id="paneSession-clear" collapsed="true" data-category="paneSession">
-			<caption label="&cat.clear.label;"/>
-			<vbox id="paneSession-clear-checklist" phase="1" jump="clear">
-				<description>&session.clear.description.a;&nbsp;<html:span class="underline">&session.clear.description.f;</html:span></description>
-				<html:ul>
-					<html:li class="item1">&session.clear.description.b;</html:li>
-					<html:li class="item2"><html:span class="warning">&session.clear.description.c;</html:span>&session.clear.description.g;</html:li>
-					<html:li class="item3"><html:span class="warning">&session.clear.description.d;</html:span><html:span class="confirm">&nbsp;&session.clear.description.e;</html:span></html:li>
-				</html:ul>
-				<hbox>
-					<button id="paneSession-clear-button-1"
-						flex="1"
-						class="content-cell-item"
-						label="&session.clear.button;"
-						helptext="&session.clear.tooltip;"/>
-					<button id="paneSession-clear-button-2"
-						flex="1"
-						class="content-cell-item"
-						label="&session.clear.button;"
-						helptext="&session.clear.tooltip;"/>
-					<button id="paneSession-clear-button-3"
-						flex="1"
-						class="content-cell-item"
-						label="&session.clear.button;"
-						helptext="&session.clear.tooltip;"/>
-				</hbox>
-			</vbox>
-		</groupbox>
-	</prefpane>
-</overlay>
diff --git a/chrome/content/paneTabGroups.xul b/chrome/content/paneTabGroups.xul
deleted file mode 100644
index 04019aa..0000000
--- a/chrome/content/paneTabGroups.xul
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0"?>
-<!-- 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/. -->
-
-<?xml-stylesheet href="chrome://tabgroups/skin/options.css" type="text/css"?>
-<!DOCTYPE overlay SYSTEM "chrome://tabgroups/locale/options.dtd">
-
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<richlistbox id="categories">
-		<richlistitem id="category-tabGroups"
-			class="category"
-			value="paneTabGroups"
-			tooltiptext="&pane.tabGroups.label;"
-			position="1"
-			align="center">
-
-			<image class="category-icon"/>
-			<label class="category-name" flex="1" value="&pane.tabGroups.label;"/>
-		</richlistitem>
-	</richlistbox>
-
-	<prefpane id="mainPrefPane">
-		<preferences>
-			<preference id="pref-noWarningsAboutSession" name="extensions.tabgroups.noWarningsAboutSession" type="bool"/>
-			<preference id="pref-quickAccessButton" name="extensions.tabgroups.quickAccessButton" type="bool"/>
-			<preference id="pref-groupTitleInButton" name="extensions.tabgroups.groupTitleInButton" type="bool"/>
-			<preference id="pref-showGroupThumbs" name="extensions.tabgroups.showGroupThumbs" type="bool"/>
-			<preference id="pref-gridDynamicSize" name="extensions.tabgroups.gridDynamicSize" type="bool"/>
-			<preference id="pref-closeIfEmpty" name="extensions.tabgroups.closeIfEmpty" type="bool"/>
-			<preference id="pref-showTabCounter" name="extensions.tabgroups.showTabCounter" type="bool"/>
-			<preference id="pref-sortGroupsByName" name="extensions.tabgroups.sortGroupsByName" type="bool"/>
-			<preference id="pref-stackTabs" name="extensions.tabgroups.stackTabs" type="bool"/>
-			<preference id="pref-showThumbs" name="extensions.tabgroups.showThumbs" type="bool"/>
-			<preference id="pref-showUrls" name="extensions.tabgroups.showUrls" type="bool"/>
-			<preference id="pref-tileIcons" name="extensions.tabgroups.tileIcons" type="bool"/>
-			<preference id="pref-tabViewKeycode" name="extensions.tabgroups.tabViewKeycode" type="string"/>
-			<preference id="pref-tabViewAccel" name="extensions.tabgroups.tabViewAccel" type="bool"/>
-			<preference id="pref-tabViewShift" name="extensions.tabgroups.tabViewShift" type="bool"/>
-			<preference id="pref-tabViewAlt" name="extensions.tabgroups.tabViewAlt" type="bool"/>
-			<preference id="pref-tabViewCtrl" name="extensions.tabgroups.tabViewCtrl" type="bool"/>
-			<preference id="pref-quickAccessKeycode" name="extensions.tabgroups.quickAccessKeycode" type="string"/>
-			<preference id="pref-quickAccessAccel" name="extensions.tabgroups.quickAccessAccel" type="bool"/>
-			<preference id="pref-quickAccessShift" name="extensions.tabgroups.quickAccessShift" type="bool"/>
-			<preference id="pref-quickAccessAlt" name="extensions.tabgroups.quickAccessAlt" type="bool"/>
-			<preference id="pref-quickAccessCtrl" name="extensions.tabgroups.quickAccessCtrl" type="bool"/>
-			<preference id="pref-nextGroupKeycode" name="extensions.tabgroups.nextGroupKeycode" type="string"/>
-			<preference id="pref-nextGroupAccel" name="extensions.tabgroups.nextGroupAccel" type="bool"/>
-			<preference id="pref-nextGroupShift" name="extensions.tabgroups.nextGroupShift" type="bool"/>
-			<preference id="pref-nextGroupAlt" name="extensions.tabgroups.nextGroupAlt" type="bool"/>
-			<preference id="pref-nextGroupCtrl" name="extensions.tabgroups.nextGroupCtrl" type="bool"/>
-			<preference id="pref-previousGroupKeycode" name="extensions.tabgroups.previousGroupKeycode" type="string"/>
-			<preference id="pref-previousGroupAccel" name="extensions.tabgroups.previousGroupAccel" type="bool"/>
-			<preference id="pref-previousGroupShift" name="extensions.tabgroups.previousGroupShift" type="bool"/>
-			<preference id="pref-previousGroupAlt" name="extensions.tabgroups.previousGroupAlt" type="bool"/>
-			<preference id="pref-previousGroupCtrl" name="extensions.tabgroups.previousGroupCtrl" type="bool"/>
-		</preferences>
-
-		<hbox id="header-tabGroups" class="header" collapsed="true" data-category="paneTabGroups">
-			<label class="header-name">&pane.tabGroups.label;</label>
-		</hbox>
-
-		<groupbox align="start" id="paneTabGroups-general" collapsed="true" data-category="paneTabGroups">
-			<checkbox label="&opt.showGroupThumbs.label;"
-				helptext="&opt.showGroupThumbs.tooltip;"
-				jump="showGroupThumbs"
-				delayPreference="pref-showGroupThumbs"/>
-			<checkbox label="&opt.gridDynamicSize.label;"
-				helpbox="paneTabGroups-gridDynamicSize-helptext"
-				jump="gridDynamicSize"
-				delayPreference="pref-gridDynamicSize"/>
-			<checkbox label="&opt.closeIfEmpty.label;"
-				helptext="&opt.closeIfEmpty.tooltip;"
-				jump="closeIfEmpty"
-				delayPreference="pref-closeIfEmpty"/>
-			<checkbox label="&opt.showTabCounter.label;"
-				helptext="&opt.showTabCounter.tooltip;"
-				jump="showTabCounter"
-				delayPreference="pref-showTabCounter"/>
-			<checkbox label="&opt.sortGroupsByName.label;"
-				helptext="&opt.sortGroupsByName.tooltip;"
-				jump="sortGroupsByName"
-				delayPreference="pref-sortGroupsByName"/>
-			<vbox id="paneTabGroups-gridDynamicSize-helptext" collapsed="true">
-				<description>&opt.gridDynamicSize.tooltip1;</description>
-				<description>&opt.gridDynamicSize.tooltip2;</description>
-				<description>&opt.gridDynamicSize.tooltip3;</description>
-			</vbox>
-		</groupbox>
-
-		<groupbox align="start" id="paneTabGroups-stackTabs" collapsed="true" data-category="paneTabGroups">
-			<caption label="&cat.defaults.label;"/>
-			<checkbox label="&opt.showThumbs.label;"
-				helpbox="paneTabGroups-showThumbs-helptext"
-				jump="showThumbs"
-				delayPreference="pref-showThumbs"/>
-			<checkbox label="&opt.tileIcons.label;"
-				helpbox="paneTabGroups-showThumbs-helptext"
-				jump="tileIcons"
-				dependson="pref-showThumbs"
-				delayPreference="pref-tileIcons"/>
-			<checkbox label="&opt.showUrls.label;"
-				helpbox="paneTabGroups-showThumbs-helptext"
-				jump="showUrls"
-				dependson="!pref-showThumbs"
-				delayPreference="pref-showUrls"/>
-			<vbox align="start" helpbox="paneTabGroups-stackTabs-helptext">
-				<label value="&cat.stackTabs.label;"
-					dependson="pref-showThumbs"/>
-				<radiogroup delayPreference="pref-stackTabs"
-					jump="stackTabs"
-					dependson="pref-showThumbs"
-					onsyncfrompreference="return document.getElementById(this.getAttribute('delayPreference')).value ? 'stack' : 'list';"
-					onsynctopreference="return this.value == 'stack';">
-					<hbox>
-						<radio label="&opt.stackTabs.label;"
-							class="smallindent"
-							dependson="pref-showThumbs"
-							value="stack"/>
-						<radio label="&opt.listTabs.label;"
-							class="smallindent"
-							dependson="pref-showThumbs"
-							value="list"/>
-					</hbox>
-				</radiogroup>
-			</vbox>
-			<groupbox align="start">
-				<button id="paneTabGroups-setdefaults-button"
-					label="&btn.setdefaults.label;"
-					helpbox="paneTabGroups-setdefaults-helptext"/>
-			</groupbox>
-			<vbox id="paneTabGroups-showThumbs-helptext" collapsed="true">
-				<description style="font-weight:bold;">&opt.showThumbs.label;</description>
-				<description>&opt.showThumbs.tooltip;</description>
-				<description style="font-weight:bold; margin-top:1em;">&opt.tileIcons.label;</description>
-				<description>&opt.tileIcons.tooltip;</description>
-				<description style="font-weight:bold; margin-top:1em;">&opt.showUrls.label;</description>
-				<description>&opt.showUrls.tooltip;</description>
-			</vbox>
-			<vbox id="paneTabGroups-stackTabs-helptext" collapsed="true">
-				<description>&cat.stackTabs.tooltip;</description>
-				<description style="font-weight:bold; margin-top:1em;">&opt.stackTabs.label;</description>
-				<description>&opt.stackTabs.tooltip;</description>
-				<description style="font-weight:bold; margin-top:1em;">&opt.listTabs.label;</description>
-				<description>&opt.listTabs.tooltip;</description>
-			</vbox>
-			<vbox id="paneTabGroups-setdefaults-helptext" collapsed="true">
-				<description>&btn.setdefaults.tooltip1;</description>
-				<description>&btn.setdefaults.tooltip2;</description>
-			</vbox>
-		</groupbox>
-
-		<groupbox align="start" id="paneTabGroups-toolbarbutton" collapsed="true" data-category="paneTabGroups">
-			<caption label="&cat.toolbarbutton.label;"/>
-			<checkbox label="&opt.groupTitleInButton.label;"
-				helpbox="paneTabGroups-toolbarbutton-helptext"
-				jump="groupTitleInButton"
-				delayPreference="pref-groupTitleInButton"/>
-			<checkbox label="&opt.quickAccessButton.label;"
-				helpbox="paneTabGroups-toolbarbutton-helptext"
-				jump="quickAccessButton"
-				delayPreference="pref-quickAccessButton"/>
-			<vbox id="paneTabGroups-toolbarbutton-helptext" collapsed="true">
-				<description style="font-weight:bold;">&opt.groupTitleInButton.label;</description>
-				<description>&opt.groupTitleInButton.tooltip1;</description>
-				<description>&opt.groupTitleInButton.tooltip2;</description>
-				<description style="font-weight:bold; margin-top:1em;">&opt.quickAccessButton.label;</description>
-				<description>&opt.quickAccessButton.tooltip1;</description>
-				<description>&opt.quickAccessButton.tooltip2;</description>
-			</vbox>
-		</groupbox>
-
-		<groupbox align="start" id="paneTabGroups-shortcut" collapsed="true" data-category="paneTabGroups">
-			<caption label="&cat.keyboardshortcuts.label;"/>
-			<vbox>
-				<hbox jump="tabViewKeycode,&opt.tabViewKeyset.label;">
-					<label class="stretch" value="&opt.tabViewKeyset.label;" flex="1"/>
-					<checkbox class="smallindent" keysetAccel="tabView" delayPreference="pref-tabViewAccel"/>
-					<checkbox class="smallindent" keysetAlt="tabView" delayPreference="pref-tabViewAlt"/>
-					<checkbox class="smallindent" keysetShift="tabView" delayPreference="pref-tabViewShift"/>
-					<checkbox class="smallindent" keysetCtrl="tabView" delayPreference="pref-tabViewCtrl"/>
-					<menulist class="smallindent" keyset="tabView" delayPreference="pref-tabViewKeycode"/>
-				</hbox>
-				<hbox jump="quickAccessKeycode,&opt.quickAccessKeyset.label;">
-					<label class="stretch" value="&opt.quickAccessKeyset.label;" flex="1"/>
-					<checkbox class="smallindent" keysetAccel="quickAccess" delayPreference="pref-quickAccessAccel"/>
-					<checkbox class="smallindent" keysetAlt="quickAccess" delayPreference="pref-quickAccessAlt"/>
-					<checkbox class="smallindent" keysetShift="quickAccess" delayPreference="pref-quickAccessShift"/>
-					<checkbox class="smallindent" keysetCtrl="quickAccess" delayPreference="pref-quickAccessCtrl"/>
-					<menulist class="smallindent" keyset="quickAccess" delayPreference="pref-quickAccessKeycode"/>
-				</hbox>
-				<hbox jump="nextGroupKeycode,&opt.nextGroupKeyset.label;">
-					<label class="stretch" value="&opt.nextGroupKeyset.label;" flex="1"/>
-					<checkbox class="smallindent" keysetAccel="nextGroup" delayPreference="pref-nextGroupAccel"/>
-					<checkbox class="smallindent" keysetAlt="nextGroup" delayPreference="pref-nextGroupAlt"/>
-					<checkbox class="smallindent" keysetShift="nextGroup" delayPreference="pref-nextGroupShift"/>
-					<checkbox class="smallindent" keysetCtrl="nextGroup" delayPreference="pref-nextGroupCtrl"/>
-					<menulist class="smallindent" keyset="nextGroup" delayPreference="pref-nextGroupKeycode"/>
-				</hbox>
-				<hbox jump="previousGroupKeycode,&opt.previousGroupKeyset.label;">
-					<label class="stretch" value="&opt.previousGroupKeyset.label;" flex="1"/>
-					<checkbox class="smallindent" keysetAccel="previousGroup" delayPreference="pref-previousGroupAccel"/>
-					<checkbox class="smallindent" keysetAlt="previousGroup" delayPreference="pref-previousGroupAlt"/>
-					<checkbox class="smallindent" keysetShift="previousGroup" delayPreference="pref-previousGroupShift"/>
-					<checkbox class="smallindent" keysetCtrl="previousGroup" delayPreference="pref-previousGroupCtrl"/>
-					<menulist class="smallindent" keyset="previousGroup" delayPreference="pref-previousGroupKeycode"/>
-				</hbox>
-			</vbox>
-		</groupbox>
-
-		<groupbox align="start" id="paneTabGroups-sessionRestore" collapsed="true" data-category="paneTabGroups">
-			<caption label="&sessionRestore.caption;"/>
-			<vbox jump="sessionRestore">
-				<description>&sessionRestore.description;</description>
-				<vbox align="center">
-					<checkbox label="&opt.noWarningsAboutSession.label;"
-						helptext="&opt.noWarningsAboutSession.tooltip;"
-						jump="noWarningsAboutSession"
-						delayPreference="pref-noWarningsAboutSession"/>
-					<button id="paneTabGroups-sessionRestore-button"
-						class="content-cell-item"
-						label="&sessionRestore.button.label;"
-						helpbox="paneTabGroups-sessionRestore-helptext"/>
-				</vbox>
-			</vbox>
-			<vbox id="paneTabGroups-sessionRestore-helptext" collapsed="true">
-				<description>&sessionRestore.button.tooltip.a;</description>
-				<description>&sessionRestore.button.tooltip.b;</description>
-			</vbox>
-		</groupbox>
-	</prefpane>
-</overlay>
diff --git a/chrome/content/quickAccess.xul b/chrome/content/quickAccess.xul
deleted file mode 100644
index 8e1d731..0000000
--- a/chrome/content/quickAccess.xul
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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/. -->
-
-<?xml-stylesheet href="chrome://tabgroups/skin/quickAccess.css" type="text/css"?>
-<?xml-stylesheet href="chrome://tabgroups-os/skin/quickAccess.css" type="text/css"?>
-<!DOCTYPE overlay SYSTEM "chrome://tabgroups/locale/TabView.dtd">
-
-<overlay id="quickAccess-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<popupset id="mainPopupSet">
-		<panel id="objName-quickaccess-panel"
-			type="arrow"
-			class="objName-quickaccess cui-widget-panel cui-widget-panelview cui-widget-panelWithFooter PanelUI-subView">
-			<textbox id="objName-quickaccess-panel-find" placeholder="&searchForTab.label;"/>
-			<vbox id="objName-quickaccess-panel-contents" class="quickaccess-contents cui-widget-panelview PanelUI-subView" flex="1"/>
-			<hbox class="objName-quickaccess-panel-footer">
-				<toolbarbutton label="&manageTabGroups.label;"
-					tooltiptext="&manageTabGroups.tooltip;"
-					class="subviewbutton panel-subview-footer objName-icon objName-quickaccess-panel-manage"
-					flex="1"
-					command="objName:ToggleTabView"/>
-				<toolbarseparator/>
-				<toolbarbutton tooltiptext="&buttonOptionsTabGroups.label;"
-					class="subviewbutton panel-subview-footer objName-quickaccess-panel-settings"
-					command="objName:TabViewSettings"/>
-			</hbox>
-		</panel>
-	</popupset>
-
-	<panelmultiview id="PanelUI-multiView">
-		<panelview id="objName-quickaccess-panelView"
-			flex="1"
-			class="objName-quickaccess PanelUI-subView">
-				<label class="panel-subview-header" value="&viewTabGroups.label;"/>
-				<textbox id="objName-quickaccess-panelView-find" placeholder="&searchForTab.label;"/>
-				<vbox id="objName-quickaccess-panelView-contents" class="quickaccess-contents cui-widget-panelview PanelUI-subView" flex="1"/>
-				<hbox class="objName-quickaccess-panel-footer">
-					<toolbarbutton label="&manageTabGroups.label;"
-						tooltiptext="&manageTabGroups.tooltip;"
-						class="subviewbutton panel-subview-footer objName-icon objName-quickaccess-panel-manage"
-						flex="1"
-						command="objName:ToggleTabView"/>
-					<toolbarseparator/>
-					<toolbarbutton tooltiptext="&buttonOptionsTabGroups.label;"
-						class="subviewbutton panel-subview-footer objName-quickaccess-panel-settings"
-						command="objName:TabViewSettings"/>
-				</hbox>
-		</panelview>
-	</panelmultiview>
-
-</overlay>
diff --git a/chrome/content/utils/about.xul b/chrome/content/utils/about.xul
deleted file mode 100644
index 9612392..0000000
--- a/chrome/content/utils/about.xul
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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/. -->
-
-<?xml-stylesheet href="chrome://objPathString/skin/utils/about.css"?>
-<!DOCTYPE html [
-  <!ENTITY % htmlDTD
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "DTD/xhtml1-strict.dtd">
-  %htmlDTD;
-  <!ENTITY % about SYSTEM "chrome://tabgroups/locale/utils-about.dtd" >
-  %about;
-  <!ENTITY % addon SYSTEM "chrome://tabgroups/locale/defaults.dtd" >
-  %addon;
-]>
-
-<overlay	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-			xmlns:html="http://www.w3.org/1999/xhtml">
-
-	<richlistbox id="categories">
-		<richlistitem id="category-about"
-			class="category"
-			value="paneAbout"
-			tooltiptext="&about.paneTitle;"
-			position="99"
-			align="center">
-
-			<image class="category-icon"/>
-			<label class="category-name" flex="1" value="&about.paneTitle;"/>
-		</richlistitem>
-	</richlistbox>
-
-	<prefpane id="mainPrefPane">
-		<preferences>
-			<preference id="pref-showTabOnUpdates" name="extensions.tabgroups.showTabOnUpdates" type="bool"/>
-			<preference id="pref-silentUpdates" name="extensions.tabgroups.silentUpdates" type="bool"/>
-		</preferences>
-
-		<hbox id="header-about" class="header" collapsed="true" data-category="paneAbout">
-			<image id="logo"/>
-			<vbox>
-				<label class="header-name">&about.name;</label>
-				<hbox id="version" invisible="true">
-					<label id="currentVersion">&about.version;</label>
-					<label id="uptodate" hidden="true">&nbsp;-&nbsp;&about.uptodate;</label>
-					<label id="needsupdate" hidden="true">&nbsp;-&nbsp;<html:a id="openAddonsMgr" href="#">&about.needsupdate;</html:a></label>
-				</hbox>
-			</vbox>
-		</hbox>
-
-		<vbox id="paneAbout-wrapper" flex="1" collapsed="true" data-category="paneAbout">
-			<html:div class="row">
-				<html:div id="general" class="main-column">
-					<hbox id="notifyOnUpdates" class="header">
-						<vbox class="notifyOnUpdates-checkbox-container">
-                            <checkbox label="&about.silentUpdates;" delayPreference="pref-silentUpdates"/>
-                            <checkbox label="&about.notifyOnUpdates;" delayPreference="pref-showTabOnUpdates" dependson="!pref-silentUpdates"/>
-						</vbox>
-					</hbox>
-					<html:p>&about.description;</html:p>
-					<html:p>&about.descriptionB;</html:p>
-					<html:p id="promo-matchhead-desc" hidden="true">&about.descriptionC;</html:p>
-					<html:p class="signature">&about.signature;</html:p>
-				</html:div>
-				<html:div id="bank" class="banked negative" invisible="true">
-					<html:div class="header">&about.development;</html:div>
-					<html:div class="topbank">
-						<html:div class="innerbank">
-							<html:div class="hours">
-								<html:div id="balance" class="balance">0</html:div>
-								<html:div class="label banked">HOURS BANKED</html:div>
-								<html:div class="label owed">HOURS LOANED</html:div>
-							</html:div>
-						</html:div>
-						<html:div class="outerbank">
-							<image class="happy"/>
-							<html:div class="hourglasswrapper">
-								<html:div class="hourglass">
-									<image/>
-									<html:div id="banked" class="visualbanked"/>
-									<html:div id="owed" class="visualowed"/>
-								</html:div>
-							</html:div>
-							<image class="sad"/>
-						</html:div>
-					</html:div>
-					<html:div class="coding">&lt;!coding right now<html:span class="blink">|</html:span>/&gt;</html:div>
-					<html:a id="paneAbout-development" target="_blank" href="">&about.helpdevelopment;</html:a>
-				</html:div>
-			</html:div>
-			<html:div id="bottomwrapper" class="row">
-				<html:div id="releases" class="main-column">
-					<html:div id="notes"/>
-					<html:div id="divAllVersions"><html:a id="allVersions" hidden="true" href="#">&about.allVersions;</html:a></html:div>
-				</html:div>
-				<html:div id="sidebar">
-					<html:div id="info">
-						<html:h5>&about.information;</html:h5>
-						<html:p><html:a id="paneAbout-homepage" target="_blank" href="">&about.home;</html:a></html:p>
-						<html:p><html:a id="paneAbout-fullchangelog" target="_blank" href="">&about.fullchangelog;</html:a></html:p>
-					</html:div>
-					<html:div id="problems">
-						<html:h5>&about.problems;</html:h5>
-						<html:ul>
-							<html:li><html:a id="paneAbout-support" target="_blank" href="">&about.tech;</html:a></html:li>
-							<html:li><html:a id="paneAbout-email" href="">&about.email;</html:a></html:li>
-						</html:ul>
-					</html:div>
-					<html:div id="author">
-						<html:h5>&about.author;</html:h5>
-						<html:p>
-							&about.trymore;<html:br/><html:br/>
-							<html:a id="paneAbout-profile" target="_blank" href="">&about.profile;</html:a>
-						</html:p>
-					</html:div>
-					<html:div id="share" hidden="true">
-						<html:h5>&about.share;</html:h5>
-						<html:p>&about.friends;</html:p>
-						<html:div id="share-links" linkname="&about.tryit;">
-							<html:a class="share-link"
-								href="https://www.facebook.com/sharer/sharer.php"
-								target="objPathStringFacebook"
-								title="Facebook"><html:div class="share-image share-facebook"/></html:a>
-							<html:a class="share-link"
-								href="https://twitter.com/intent/tweet"
-								target="objPathStringTwitter"
-								title="Twitter"><html:div class="share-image share-twitter"/></html:a>
-							<html:a class="share-link"
-								href="https://plus.google.com/share"
-								target="objPathStringGooglePlus"
-								title="Google+"><html:div class="share-image share-googleplus"/></html:a>
-						</html:div>
-					</html:div>
-				</html:div>
-			</html:div>
-		</vbox>
-	</prefpane>
-
-	<vbox id="main-wrapper">
-		<html:div id="promo-matchhead" hidden="true">
-			<html:a target="_blank" id="promo-matchhead-tab"/>
-			<html:div id="promo-matchhead-container">
-				<html:a id="promo-matchhead-anchor" target="_blank">
-					<html:div id="promo-matchhead-image"/>
-				</html:a>
-				<html:a id="promo-matchhead-hashtag" target="_blank">#matchhead</html:a>
-				<html:a id="promo-matchhead-clicktowatch" target="_blank">&about.clicktowatch;</html:a>
-				<html:div id="promo-matchhead-actions">
-					<html:a id="promo-matchhead-close" href="#">&about.hidePromo;</html:a>
-					<html:a id="promo-matchhead-hideThisPromo" href="#" hidden="true">&about.hideThisPromo;</html:a>
-					<html:a id="promo-matchhead-hideAllPromos" href="#" hidden="true">&about.hideAllPromos;</html:a>
-				</html:div>
-			</html:div>
-		</html:div>
-	</vbox>
-
-</overlay>
diff --git a/chrome/content/utils/helptext.xul b/chrome/content/utils/helptext.xul
deleted file mode 100644
index 1d24bf4..0000000
--- a/chrome/content/utils/helptext.xul
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!-- 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/. -->
-
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-	<popupset id="mainPopupSet">
-		<panel id="objName-helptext"
-			class="helptext-panel"
-			type="arrow"
-			level="parent"
-			ignorekeys="true"
-			noautofocus="true"
-			noautohide="true">
-			<vbox id="objName-helptext-contents" class="helptext-contents" />
-		</panel>
-	</popupset>
-
-</overlay>
diff --git a/chrome/content/utils/preferences.xul b/chrome/content/utils/preferences.xul
deleted file mode 100644
index 715d55d..0000000
--- a/chrome/content/utils/preferences.xul
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0"?>
-<!-- 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/. -->
-
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-<?xml-stylesheet href="chrome://global/skin/in-content/common.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/preferences.css"?>
-<?xml-stylesheet href="chrome://tabgroups/skin/utils/preferences.css"?>
-<?xml-stylesheet href="chrome://tabgroups/skin/defaults.css"?>
-<!DOCTYPE prefs [
-  <!ENTITY % defaults SYSTEM "chrome://tabgroups/locale/defaults.dtd" >
-  %defaults;
-  <!ENTITY % preferences SYSTEM "chrome://tabgroups/locale/utils-preferences.dtd" >
-  %preferences;
-]>
-
-<page	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-		id="objName-preferences"
-		title="&preferences.title;">
-
-	<keyset id="mainKeyset">
-		<key id="key-jumpto"
-			key="F"
-			modifiers="accel"
-			oncommand="objName.controllers.focusJumpto();" />
-	</keyset>
-
-	<stack flex="1">
-		<hbox flex="1">
-			<richlistbox id="categories"/>
-
-			<vbox id="main-wrapper" class="main-wrapper" flex="1">
-				<vbox class="main-content" flex="1">
-					<prefpane id="mainPrefPane"/>
-				</vbox>
-
-				<vbox id="main-footer" align="start">
-					<hbox helpbox="main-footer-helptext">
-						<button label="&preferences.button;" type="menu">
-							<menupopup>
-								<menuitem id="undoButton" label="&preferences.undo.label;"/>
-								<menuitem id="redoButton" label="&preferences.redo.label;"/>
-								<menuseparator/>
-								<menuitem id="importButton" label="&preferences.import.label;"/>
-								<menuitem id="exportButton" label="&preferences.export.label;"/>
-								<menuseparator/>
-								<menuitem id="resetButton" label="&preferences.reset.label;"/>
-							</menupopup>
-						</button>
-						<textbox id="jumpto" placeholder="&preferences.jumpto.label;" size="20" />
-					</hbox>
-				</vbox>
-				<vbox id="main-footer-helptext" collapsed="true">
-					<description style="font-weight:bold;">&preferences.undo.label; / &preferences.redo.label;</description>
-					<description>&preferences.undoredo.tooltip;</description>
-					<description style="font-weight:bold; margin-top:1em;">&preferences.import.label;</description>
-					<description>&preferences.import.tooltip;</description>
-					<description style="font-weight:bold; margin-top:1em;">&preferences.export.label;</description>
-					<description>&preferences.export.tooltip;</description>
-					<description style="font-weight:bold; margin-top:1em;">&preferences.reset.label;</description>
-					<description>&preferences.reset.tooltip.a;</description>
-					<description>&preferences.reset.tooltip.b;</description>
-					<description style="font-weight:bold; margin-top:1em;">&preferences.jumpto.label;</description>
-					<description>&preferences.jumpto.tooltip;</description>
-				</vbox>
-			</vbox>
-		</hbox>
-	</stack>
-</page>