diff --git a/arc-inspired.xpi b/arc-inspired.xpi
index 670a0fe..d31f82d 100644
Binary files a/arc-inspired.xpi and b/arc-inspired.xpi differ
diff --git a/source/style.css b/source/custom_style.css
similarity index 51%
rename from source/style.css
rename to source/custom_style.css
index c0ee186..e475d1f 100644
--- a/source/style.css
+++ b/source/custom_style.css
@@ -1,32 +1,38 @@
+/*---- Main toolbar ---*/
+.findbar-button, .toolbarbutton-1:not([type="menu-button"]), .toolbarbutton-1 > .toolbarbutton-menubutton-button, .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
+	border: 1px solid transparent;
+	border-radius: var(--toolbarbutton-border-radius);
+	transition-property: background-color, border-color;
+	transition-duration: unset;
+	background-clip: padding-box;
+}
+
 :root[lwt-tree] #msgHeaderView, :root[lwt-tree] #attachmentView, :root[lwt-tree] #attachmentList {
 	background-color: #EBEBEB !important;
-  color: rgb(92, 97, 108) !important;
+  	color: rgb(92, 97, 108) !important;
 }
 toolbarbutton:-moz-lwtheme:not(:hover):not([checked="true"]):not([open="true"]):not([disabled="true"]) {
 	transition-duration: unset;
 }
 .toolbarbutton-1.msgHeaderView-button:not([type="menu-button"]), .toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-button, .toolbarbutton-1.msgHeaderView-button > .toolbarbutton-menubutton-dropmarker {
 	border-color: rgba(0, 0, 0, .25);
-  transition-duration: unset;
+  	transition-duration: unset;
 }
 .toolbarbutton-1.msgHeaderView-button:not([disabled="true"]):-moz-any(:hover, [open]) > .toolbarbutton-menubutton-button, .toolbarbutton-1.msgHeaderView-button:not([disabled="true"]):-moz-any(:hover, [open]) > .toolbarbutton-menubutton-dropmarker, .toolbarbutton-1.msgHeaderView-button:not([type="menu-button"]):not([disabled="true"]):not([checked="true"]):not([open]):not(:active):hover, .toolbarbutton-1.msgHeaderView-button:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled]) {
 	background: #5294E2;
 	border-color: #5294E2;
-  color: #FFFFFF !important;
-  transition-duration: unset;
+  	color: #FFFFFF !important;
+  	transition-duration: unset;
 }
-#MsgHeadersToolbar[brighttext] .address-pill:not(.editing) {
-  background-color: rgba(0,0,0,0.1);
-  color: #18191a;
-}
-treechildren{
-  background-color: #F5F5F5 !important;
+.address-pill {
+  	background-color: rgba(0,0,0,0.1);
+  	color: #18191a;
 }
 
 /*---- Compose Window ----*/
 :root[lwt-tree] #headers-box{
-  background-color: #EBEBEB !important;
-  color: #18191a !important;
+ 	background-color: #EBEBEB !important;
+  	color: #18191a !important;
 }
 #FormatToolbar menulist:not([disabled="true"]):not([open="true"]):hover {
 	background: var(--toolbarbutton-hover-background);
@@ -41,9 +47,80 @@ treechildren{
 	--toolbarbutton-active-boxshadow: 0 0 0 1px var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .4)) inset;
 	--toolbarbutton-checkedhover-backgroundcolor: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .5));
 }
+.address-container {
+	flex: 1;
+	margin-inline-start: 4px;
+	margin-inline-end: 0;
+	border: solid 1px rgba(0, 0, 0, .25);
+	border-radius: var(--toolbarbutton-border-radius);
+	background-color: -moz-field;
+	transition: border .2s, box-shadow .2s;
+	cursor: text;
+}
+#msgSubject {
+	-moz-appearance: none;
+	margin-top: 0;
+	margin-inline: 4px 8px;
+	background-color: -moz-field;
+	border: 1px solid rgba(0, 0, 0, .25);
+	border-radius: var(--toolbarbutton-border-radius);
+	padding-block: 0;
+	padding-inline: 4px 2px;
+	transition: border .2s, box-shadow .2s;
+}
+:root[lwt-tree] #msgSubject, :root[lwt-tree] .address-container {
+	background-color: var(--lwt-toolbar-field-background-color);
+	color: rgba(92, 97, 108, 1);
+}
+menulist {
+	-moz-appearance: none;
+	min-height: 24px;
+	color: inherit;
+	margin: 1px 4px;
+	padding: 1px 6px;
+	border: 1px solid;
+	border-radius: var(--toolbarbutton-border-radius);
+	border-color: rgba(0, 0, 0, .25);
+	box-shadow: var(--toolbarbutton-hover-boxshadow);
+	transition: background-color 150ms;
+}
 toolbarbutton.formatting-button:not([disabled="true"]):hover {
 	border-color: #5294E2;
 }
+.formatting-button:active {
+	color: white;
+}
 toolbarbutton:hover {
 	color: #FFFFFF;
+}
+
+/*---- Mail folder tree ----*/
+/*
+#folderTree {
+	background: #474D5C !important;
+}
+#folderTree > treechildren::-moz-tree-image {
+	fill: white;
+	opacity: 1;
+  }
+#folderTree > treechildren::-moz-tree-cell-text {
+	padding-inline-start: 3px;
+	color: white !important;
+}
+*/
+slider[orient="vertical"] {
+	background: #383C4A;
+}
+thumb[orient="vertical"] {
+	-moz-appearance: scrollbarthumb-vertical;
+	min-height: 8px;
+	background: rgba(255, 255, 255, 0.25);
+}
+thumb[orient="vertical"]:hover, thumb[orient="vertical"]:active {
+	background-color: #5294E2;
+}
+
+/*---- Mail thread tree ----*/
+#threadPaneBox treechildren {
+	background: #F5F5F5 !important;
 }
\ No newline at end of file
diff --git a/source/manifest.json b/source/manifest.json
index d465019..4366809 100644
--- a/source/manifest.json
+++ b/source/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version":2,
   "name":"Arc Inspired",
-  "version":"0.4.3",
+  "version":"0.4.6",
   "description":"An Arc inspired theme for Thunderbird",
   "author":"kaipee",
   "homepage_url":"https://github.com/kaipee/thunderbird-theme-arc",
@@ -12,7 +12,7 @@
     }
   },
   "theme_experiment":{
-    "stylesheet": "style.css"
+    "stylesheet": "custom_style.css"
   },
   "theme":{
     "colors":{