diff --git a/content/treestyletab/config.xul b/content/treestyletab/config.xul
index 72d45a62..06bbe06c 100644
--- a/content/treestyletab/config.xul
+++ b/content/treestyletab/config.xul
@@ -334,38 +334,6 @@
 
 </prefpane>
 
-<prefpane id="prefpane-attach" label="&config.tabs.attach;">
-	<preferences>
-		<preference id="extensions.treestyletab.autoAttach.newTabCommand"
-			name="extensions.treestyletab.autoAttach.newTabCommand"
-			type="int"/>
-		<preference id="extensions.treestyletab.autoAttach.searchResult"
-			name="extensions.treestyletab.autoAttach.searchResult"
-			type="int"/>
-	</preferences>
-
-	<groupbox>
-		<caption label="&config.autoAttach.newTabCommand.caption;"/>
-		<radiogroup id="extensions.treestyletab.autoAttach.newTabCommand-radiogroup"
-			orient="vertical"
-			preference="extensions.treestyletab.autoAttach.newTabCommand">
-			<radio value="0" label="&config.autoAttach.newTabCommand.ignore;"/>
-			<radio value="1" label="&config.autoAttach.newTabCommand.current;"/>
-			<radio value="2" label="&config.autoAttach.newTabCommand.parent;"/>
-		</radiogroup>
-	</groupbox>
-	<groupbox>
-		<caption label="&config.autoAttach.searchResult.caption;"/>
-		<radiogroup id="extensions.treestyletab.autoAttach.searchResult-radiogroup"
-			orient="vertical"
-			preference="extensions.treestyletab.autoAttach.searchResult">
-			<radio value="0" label="&config.autoAttach.searchResult.ignore;"/>
-			<radio value="1" label="&config.autoAttach.searchResult.selected;"/>
-			<radio value="2" label="&config.autoAttach.searchResult.always;"/>
-		</radiogroup>
-	</groupbox>
-</prefpane>
-
 <prefpane id="prefpane-tab" label="&config.tabs.tab;"
 	onpaneload="initTabPane();">
 	<preferences>
@@ -454,89 +422,6 @@
 
 </prefpane>
 
-<prefpane id="prefpane-tree" label="&config.tabs.tree;"
-	onpaneload="initTreePane();">
-	<preferences>
-		<preference id="extensions.treestyletab.autoCollapseExpandSubtreeOnSelect"
-			name="extensions.treestyletab.autoCollapseExpandSubtreeOnSelect"
-			type="bool"/>
-		<preference id="extensions.treestyletab.autoCollapseExpandSubtreeOnSelect.onCurrentTabRemove"
-			name="extensions.treestyletab.autoCollapseExpandSubtreeOnSelect.onCurrentTabRemove"
-			type="bool"
-			inverted="true"/>
-		<preference id="extensions.treestyletab.collapseExpandSubtree.dblclick"
-			name="extensions.treestyletab.collapseExpandSubtree.dblclick"
-			type="bool"/>
-		<!--preference id="extensions.treestyletab.autoExpandSubtreeOnAppendChild"
-			name="extensions.treestyletab.autoExpandSubtreeOnAppendChild"
-			type="bool"/-->
-		<preference id="extensions.treestyletab.focusMode"
-			name="extensions.treestyletab.focusMode"
-			type="int"/>
-		<preference id="extensions.treestyletab.closeParentBehavior"
-			name="extensions.treestyletab.closeParentBehavior"
-			type="int"/>
-		<preference id="extensions.treestyletab.closeRootBehavior"
-			name="extensions.treestyletab.closeRootBehavior"
-			type="int"/>
-		<preference id="extensions.treestyletab.insertNewChildAt"
-			name="extensions.treestyletab.insertNewChildAt"
-			type="int"/>
-	</preferences>
-
-	<checkbox id="extensions.treestyletab.autoCollapseExpandSubtreeOnSelect-check"
-		preference="extensions.treestyletab.autoCollapseExpandSubtreeOnSelect"
-		label="&config.autoCollapseExpandSubtreeOnSelect;"/>
-	<hbox align="center">
-		<spacer style="width:1em;"/>
-		<checkbox id="extensions.treestyletab.autoCollapseExpandSubtreeOnSelect.onCurrentTabRemove-check"
-			label="&config.autoCollapseExpandSubtreeOnSelect.onCurrentTabRemove;"
-			preference="extensions.treestyletab.autoCollapseExpandSubtreeOnSelect.onCurrentTabRemove"/>
-	</hbox>
-	<checkbox id="extensions.treestyletab.focusMode-check"
-		preference="extensions.treestyletab.focusMode"
-		label="&config.focusMode;"
-		onsyncfrompreference="return document.getElementById('extensions.treestyletab.focusMode').value == 0;"
-		onsynctopreference="return document.getElementById('extensions.treestyletab.focusMode-check').checked ? 0 : 1 ;"/>
-	<checkbox id="extensions.treestyletab.collapseExpandSubtree.dblclick-check"
-		preference="extensions.treestyletab.collapseExpandSubtree.dblclick"
-		label="&config.collapseExpandSubtree.dblclick;"/>
-	<!--checkbox id="extensions.treestyletab.autoExpandSubtreeOnAppendChild-check"
-		preference="extensions.treestyletab.autoExpandSubtreeOnAppendChild"
-		label="&config.autoExpandSubtreeOnAppendChild;"/-->
-	<groupbox>
-		<caption label="&config.closeParentBehavior.caption;"/>
-		<radiogroup id="extensions.treestyletab.closeParentBehavior-radiogroup"
-			preference="extensions.treestyletab.closeParentBehavior"
-			orient="vertical"
-			oncommand="syncEnabledState(this, this.value == 0);"
-			sync-enabled-state-targets="extensions.treestyletab.closeRootBehavior-check">
-			<radio value="2" label="&config.closeParentBehavior.close;"/>
-			<radio value="3" label="&config.closeParentBehavior.promoteFirst;"/>
-			<radio value="0" label="&config.closeParentBehavior.promoteAll;"/>
-			<hbox align="center">
-				<spacer style="width:1em;"/>
-				<checkbox id="extensions.treestyletab.closeRootBehavior-check"
-					label="&config.closeRootBehavior.promoteFirst;"
-					preference="extensions.treestyletab.closeRootBehavior"
-					onsyncfrompreference="return document.getElementById('extensions.treestyletab.closeRootBehavior').value == 3;"
-					onsynctopreference="return document.getElementById('extensions.treestyletab.closeRootBehavior-check').checked ? 3 : 1 ;"/>
-			</hbox>
-			<radio value="1" label="&config.closeParentBehavior.detach;"/>
-		</radiogroup>
-	</groupbox>
-	<groupbox>
-		<caption label="&config.insertNewChildAt.caption;"/>
-		<radiogroup id="extensions.treestyletab.insertNewChildAt-radiogroup"
-			preference="extensions.treestyletab.insertNewChildAt"
-			orient="horizontal">
-			<radio value="0" label="&config.insertNewChildAt.first;"/>
-			<radio value="1" label="&config.insertNewChildAt.last;"/>
-		</radiogroup>
-	</groupbox>
-
-</prefpane>
-
 <prefpane id="prefpane-autohide" label="&config.tabs.autohide;"
 	onpaneload="initAutoHidePane();">
 	<preferences>
@@ -717,6 +602,122 @@
 
 </prefpane>
 
+
+<prefpane id="prefpane-tree" label="&config.tabs.tree;"
+	onpaneload="initTreePane();">
+	<preferences>
+		<preference id="extensions.treestyletab.autoCollapseExpandSubtreeOnSelect"
+			name="extensions.treestyletab.autoCollapseExpandSubtreeOnSelect"
+			type="bool"/>
+		<preference id="extensions.treestyletab.autoCollapseExpandSubtreeOnSelect.onCurrentTabRemove"
+			name="extensions.treestyletab.autoCollapseExpandSubtreeOnSelect.onCurrentTabRemove"
+			type="bool"
+			inverted="true"/>
+		<preference id="extensions.treestyletab.collapseExpandSubtree.dblclick"
+			name="extensions.treestyletab.collapseExpandSubtree.dblclick"
+			type="bool"/>
+		<!--preference id="extensions.treestyletab.autoExpandSubtreeOnAppendChild"
+			name="extensions.treestyletab.autoExpandSubtreeOnAppendChild"
+			type="bool"/-->
+		<preference id="extensions.treestyletab.focusMode"
+			name="extensions.treestyletab.focusMode"
+			type="int"/>
+		<preference id="extensions.treestyletab.closeParentBehavior"
+			name="extensions.treestyletab.closeParentBehavior"
+			type="int"/>
+		<preference id="extensions.treestyletab.closeRootBehavior"
+			name="extensions.treestyletab.closeRootBehavior"
+			type="int"/>
+		<preference id="extensions.treestyletab.insertNewChildAt"
+			name="extensions.treestyletab.insertNewChildAt"
+			type="int"/>
+	</preferences>
+
+	<checkbox id="extensions.treestyletab.autoCollapseExpandSubtreeOnSelect-check"
+		preference="extensions.treestyletab.autoCollapseExpandSubtreeOnSelect"
+		label="&config.autoCollapseExpandSubtreeOnSelect;"/>
+	<hbox align="center">
+		<spacer style="width:1em;"/>
+		<checkbox id="extensions.treestyletab.autoCollapseExpandSubtreeOnSelect.onCurrentTabRemove-check"
+			label="&config.autoCollapseExpandSubtreeOnSelect.onCurrentTabRemove;"
+			preference="extensions.treestyletab.autoCollapseExpandSubtreeOnSelect.onCurrentTabRemove"/>
+	</hbox>
+	<checkbox id="extensions.treestyletab.focusMode-check"
+		preference="extensions.treestyletab.focusMode"
+		label="&config.focusMode;"
+		onsyncfrompreference="return document.getElementById('extensions.treestyletab.focusMode').value == 0;"
+		onsynctopreference="return document.getElementById('extensions.treestyletab.focusMode-check').checked ? 0 : 1 ;"/>
+	<checkbox id="extensions.treestyletab.collapseExpandSubtree.dblclick-check"
+		preference="extensions.treestyletab.collapseExpandSubtree.dblclick"
+		label="&config.collapseExpandSubtree.dblclick;"/>
+	<!--checkbox id="extensions.treestyletab.autoExpandSubtreeOnAppendChild-check"
+		preference="extensions.treestyletab.autoExpandSubtreeOnAppendChild"
+		label="&config.autoExpandSubtreeOnAppendChild;"/-->
+	<groupbox>
+		<caption label="&config.closeParentBehavior.caption;"/>
+		<radiogroup id="extensions.treestyletab.closeParentBehavior-radiogroup"
+			preference="extensions.treestyletab.closeParentBehavior"
+			orient="vertical"
+			oncommand="syncEnabledState(this, this.value == 0);"
+			sync-enabled-state-targets="extensions.treestyletab.closeRootBehavior-check">
+			<radio value="2" label="&config.closeParentBehavior.close;"/>
+			<radio value="3" label="&config.closeParentBehavior.promoteFirst;"/>
+			<radio value="0" label="&config.closeParentBehavior.promoteAll;"/>
+			<hbox align="center">
+				<spacer style="width:1em;"/>
+				<checkbox id="extensions.treestyletab.closeRootBehavior-check"
+					label="&config.closeRootBehavior.promoteFirst;"
+					preference="extensions.treestyletab.closeRootBehavior"
+					onsyncfrompreference="return document.getElementById('extensions.treestyletab.closeRootBehavior').value == 3;"
+					onsynctopreference="return document.getElementById('extensions.treestyletab.closeRootBehavior-check').checked ? 3 : 1 ;"/>
+			</hbox>
+			<radio value="1" label="&config.closeParentBehavior.detach;"/>
+		</radiogroup>
+	</groupbox>
+	<groupbox>
+		<caption label="&config.insertNewChildAt.caption;"/>
+		<radiogroup id="extensions.treestyletab.insertNewChildAt-radiogroup"
+			preference="extensions.treestyletab.insertNewChildAt"
+			orient="horizontal">
+			<radio value="0" label="&config.insertNewChildAt.first;"/>
+			<radio value="1" label="&config.insertNewChildAt.last;"/>
+		</radiogroup>
+	</groupbox>
+
+</prefpane>
+
+<prefpane id="prefpane-attach" label="&config.tabs.attach;">
+	<preferences>
+		<preference id="extensions.treestyletab.autoAttach.newTabCommand"
+			name="extensions.treestyletab.autoAttach.newTabCommand"
+			type="int"/>
+		<preference id="extensions.treestyletab.autoAttach.searchResult"
+			name="extensions.treestyletab.autoAttach.searchResult"
+			type="int"/>
+	</preferences>
+
+	<groupbox>
+		<caption label="&config.autoAttach.newTabCommand.caption;"/>
+		<radiogroup id="extensions.treestyletab.autoAttach.newTabCommand-radiogroup"
+			orient="vertical"
+			preference="extensions.treestyletab.autoAttach.newTabCommand">
+			<radio value="0" label="&config.autoAttach.newTabCommand.ignore;"/>
+			<radio value="1" label="&config.autoAttach.newTabCommand.current;"/>
+			<radio value="2" label="&config.autoAttach.newTabCommand.parent;"/>
+		</radiogroup>
+	</groupbox>
+	<groupbox>
+		<caption label="&config.autoAttach.searchResult.caption;"/>
+		<radiogroup id="extensions.treestyletab.autoAttach.searchResult-radiogroup"
+			orient="vertical"
+			preference="extensions.treestyletab.autoAttach.searchResult">
+			<radio value="0" label="&config.autoAttach.searchResult.ignore;"/>
+			<radio value="1" label="&config.autoAttach.searchResult.selected;"/>
+			<radio value="2" label="&config.autoAttach.searchResult.always;"/>
+		</radiogroup>
+	</groupbox>
+</prefpane>
+
 <prefpane id="prefpane-advanced" label="&config.tabs.advanced;"
 	onpaneload="initAdvancedPane();">
 	<preferences>
diff --git a/locale/en-US/treestyletab/treestyletab.dtd b/locale/en-US/treestyletab/treestyletab.dtd
index 2823933c..fea76d6e 100644
--- a/locale/en-US/treestyletab/treestyletab.dtd
+++ b/locale/en-US/treestyletab/treestyletab.dtd
@@ -46,20 +46,6 @@
 
 <!ENTITY config.show.tabContextMenu.caption "Add following items to the context menu on tabs">
 
-
-<!ENTITY config.tabs.attach "Attach">
-
-<!ENTITY config.autoAttach.newTabCommand.caption "When a new blank tab is opened manually">
-<!ENTITY config.autoAttach.newTabCommand.ignore  "Open as a root tab">
-<!ENTITY config.autoAttach.newTabCommand.current "Open as a child of the current tab">
-<!ENTITY config.autoAttach.newTabCommand.parent  "Open as a sibling of the current tab">
-
-<!ENTITY config.autoAttach.searchResult.caption  "When the search result is opened in a tab">
-<!ENTITY config.autoAttach.searchResult.ignore   "Do nothing">
-<!ENTITY config.autoAttach.searchResult.selected "Open as a child if the search term is selected in the current page">
-<!ENTITY config.autoAttach.searchResult.always   "Always open as a child">
-
-
 <!ENTITY config.tabs.tab "New Tabs">
 
 <!ENTITY config.openGroupBookmark.caption     "Behavior of &quot;Open All in Tabs&quot; for bookmark folders">
@@ -132,6 +118,20 @@
 <!ENTITY config.undoCloseTabSet.separate "Restore only one tab (Firefox default)">
 
 
+<!ENTITY config.tabs.attach "Attach">
+
+<!ENTITY config.autoAttach.newTabCommand.caption "When a new blank tab is opened manually">
+<!ENTITY config.autoAttach.newTabCommand.ignore  "Open as a root tab">
+<!ENTITY config.autoAttach.newTabCommand.current "Open as a child of the current tab">
+<!ENTITY config.autoAttach.newTabCommand.parent  "Open as a sibling of the current tab">
+
+<!ENTITY config.autoAttach.searchResult.caption  "When the search result is opened in a tab">
+<!ENTITY config.autoAttach.searchResult.ignore   "Do nothing">
+<!ENTITY config.autoAttach.searchResult.selected "Open as a child if the search term is selected in the current page">
+<!ENTITY config.autoAttach.searchResult.always   "Always open as a child">
+
+
+
 <!ENTITY config.tabs.advanced "Advanced">
 
 <!ENTITY config.animation.enabled "Enable Animation Effects">
diff --git a/locale/ja/treestyletab/treestyletab.dtd b/locale/ja/treestyletab/treestyletab.dtd
index ceb146f8..2a51fcfe 100644
--- a/locale/ja/treestyletab/treestyletab.dtd
+++ b/locale/ja/treestyletab/treestyletab.dtd
@@ -47,19 +47,6 @@
 <!ENTITY config.show.tabContextMenu.caption "タブのコンテキストメニューに以下の項目を追加する">
 
 
-<!ENTITY config.tabs.attach "タブのツリー化">
-
-<!ENTITY config.autoAttach.newTabCommand.caption "新しい空のタブを開いた時">
-<!ENTITY config.autoAttach.newTabCommand.ignore  "独立したタブとして開く">
-<!ENTITY config.autoAttach.newTabCommand.current "現在のタブの子として開く">
-<!ENTITY config.autoAttach.newTabCommand.parent  "現在のタブと同階層に開く">
-
-<!ENTITY config.autoAttach.searchResult.caption  "検索結果がタブで開かれた時">
-<!ENTITY config.autoAttach.searchResult.ignore   "何もしない">
-<!ENTITY config.autoAttach.searchResult.selected "現在のページで選択されている語句を検索した時は子タブとして開く">
-<!ENTITY config.autoAttach.searchResult.always   "常に現在のタブの子として開く">
-
-
 <!ENTITY config.tabs.tab "新しいタブ">
 
 <!ENTITY config.tabs.bookmark.tab "ブックマーク">
@@ -136,6 +123,19 @@
 <!ENTITY config.undoCloseTabSet.separate "そのタブだけを開き直す（Firefox初期状態）">
 
 
+<!ENTITY config.tabs.attach "タブのツリー化">
+
+<!ENTITY config.autoAttach.newTabCommand.caption "新しい空のタブを開いた時">
+<!ENTITY config.autoAttach.newTabCommand.ignore  "独立したタブとして開く">
+<!ENTITY config.autoAttach.newTabCommand.current "現在のタブの子として開く">
+<!ENTITY config.autoAttach.newTabCommand.parent  "現在のタブと同階層に開く">
+
+<!ENTITY config.autoAttach.searchResult.caption  "検索結果がタブで開かれた時">
+<!ENTITY config.autoAttach.searchResult.ignore   "何もしない">
+<!ENTITY config.autoAttach.searchResult.selected "現在のページで選択されている語句を検索した時は子タブとして開く">
+<!ENTITY config.autoAttach.searchResult.always   "常に現在のタブの子として開く">
+
+
 <!ENTITY config.tabs.advanced "詳細">
 
 <!ENTITY config.animation.enabled "アニメーション効果を有効にする">