diff --git a/theme/gnome-theme.css b/theme/gnome-theme.css
index 954cee6..ddd106e 100644
--- a/theme/gnome-theme.css
+++ b/theme/gnome-theme.css
@@ -5,7 +5,7 @@
 @import "parts/csd.css";
 @import "parts/tabsbar.css";
 @import "parts/findbar.css";
-/*@import "parts/sidebar.css";*/
+@import "parts/sidebar.css";
 @import "parts/popups.css";
 @import "parts/remove-white-flash.css";
 @import "parts/scrollbars.css";
@@ -14,35 +14,8 @@
 @import "colors/dark.css";
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
-:root {
-	--space-above-tabbar: 0 !important;
-}
-
-/* Sidebar */
-#sidebar-box, .sidebar-panel {
-	background: var(--gnome-sidebar-background) !important;
-}
-#sidebar-box:-moz-window-inactive, .sidebar-panel:-moz-window-inactive {
-	background: var(--gnome-inactive-sidebar-background) !important;
-}
-#sidebar-box:-moz-window-inactive label, #sidebar-box:-moz-window-inactive image,
-.sidebar-panel:-moz-window-inactive label, .sidebar-panel:-moz-window-inactive image,
-.sidebar-placesTreechildren:-moz-window-inactive {
-	opacity: 0.7 !important;
-}
-#sidebar-splitter {
-	background: var(--gnome-toolbar-border-color) !important;
-	border: 0 !important;
-	width: 1px !important;
-}
-#sidebar-splitter:-moz-window-inactive {
-	background: var(--gnome-inactive-toolbar-border-color) !important;
-}
-
-#sidebar-header {
-	padding: 6px !important;
-	border-bottom: 1px solid var(--gnome-toolbar-border-color) !important;
-}
-#sidebar-search-container {
-	padding: 6px !important;
+/* Set theme version text in customization panel */
+#customization-footer::before {
+	content: "Firefox GNOME theme v0.9";
+	padding: 9px;
 }
diff --git a/theme/parts/sidebar.css b/theme/parts/sidebar.css
new file mode 100644
index 0000000..8ac1126
--- /dev/null
+++ b/theme/parts/sidebar.css
@@ -0,0 +1,32 @@
+/* Sidebar */
+
+@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
+
+#sidebar-box, .sidebar-panel {
+	background: var(--gnome-sidebar-background) !important;
+}
+#sidebar-box:-moz-window-inactive, .sidebar-panel:-moz-window-inactive {
+	background: var(--gnome-inactive-sidebar-background) !important;
+}
+#sidebar-box:-moz-window-inactive label, #sidebar-box:-moz-window-inactive image,
+.sidebar-panel:-moz-window-inactive label, .sidebar-panel:-moz-window-inactive image,
+.sidebar-placesTreechildren:-moz-window-inactive {
+	opacity: 0.7 !important;
+}
+#sidebar-splitter {
+	background: var(--gnome-toolbar-border-color) !important;
+	border: 0 !important;
+	width: 1px !important;
+}
+#sidebar-splitter:-moz-window-inactive {
+	background: var(--gnome-inactive-toolbar-border-color) !important;
+}
+
+#sidebar-header {
+	padding: 6px !important;
+	border-bottom: 1px solid var(--gnome-toolbar-border-color) !important;
+}
+#sidebar-search-container {
+	padding: 6px !important;
+}
+
diff --git a/theme/parts/tabsbar.css b/theme/parts/tabsbar.css
index 2e25132..5b33ebc 100644
--- a/theme/parts/tabsbar.css
+++ b/theme/parts/tabsbar.css
@@ -2,6 +2,10 @@
 
 @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
 
+:root {
+	--space-above-tabbar: 0 !important;
+}
+
 /* Tabs bar height */
 #tabbrowser-tabs,
 #tabbrowser-tabs arrowscrollbox {