diff --git a/src/tabbar/_selected_tab.scss b/src/tabbar/_selected_tab.scss
index c397d18..2894fe0 100644
--- a/src/tabbar/_selected_tab.scss
+++ b/src/tabbar/_selected_tab.scss
@@ -1,22 +1,24 @@
 /*= Selected Tab - Color like toolbar ========================================*/
-@include Option("userChrome.tab.connect_to_window") {
+@include Option($tabConnectToWindow) {
   @import "selected_tab/color_like_toolbar";
 }
 
 /*= Multi Selected Color - More Contrast =====================================*/
-@import "selected_tab/multi_selected";
+@include Option($tabMultiSelected) {
+  @import "selected_tab/multi_selected";
+}
 
 /*= Selected Tab - Box Shadow ================================================*/
-@include Option("userChrome.tab.original") {
+@include Option($tabBoxShadow) {
   @import "selected_tab/box_shadow";
 }
 
 /*= Selected Tab - Bottom Rounded Corner =====================================*/
-@include Option("userChrome.tab.original") {
+@include Option($tabBottomRoundedCorner) {
   @import "selected_tab/bottom_rounded_corner";
 }
 
 /*= Selected Tab - Photon like contextline ===================================*/
-@include Option("userChrome.tab.photon") {
+@include Option($tabPhotonLikeContextLine) {
   @import "selected_tab/photon_like_contextline";
 }
diff --git a/src/utils/_option.scss b/src/utils/_option.scss
index 719ae73..12f183c 100644
--- a/src/utils/_option.scss
+++ b/src/utils/_option.scss
@@ -1,4 +1,8 @@
 $tabProton: "userChrome.tab.proton";
+$tabConnectToWindow: "userChrome.tab.connect_to_window";
+$tabBoxShadow: "userChrome.tab.box_shadow";
+$tabBottomRoundedCorner: "userChrome.tab.bottom_rounded_corner"
+$tabPhotonLikeContextLine: "userChrome.tab.photon_like_contextline";
 
 $compatibilityTheme: "userChrome.compatibility.theme";
 $compatibilityOS: "userChrome.compatibility.os";
@@ -14,6 +18,8 @@ $fieldBorder: "userChrome.decoration.field_border";
 $downloadPanel: "userChrome.decoration.download_panel";
 $animate: "userChrome.decoration.animate";
 
+$tabMultiSelected: "userChrome.tab.multi_selected";
+
 @mixin Option($optionName) {
   @supports -moz-bool-pref("#{$optionName}") {
     @content;
diff --git a/user.js b/user.js
index be4fb83..4945e53 100644
--- a/user.js
+++ b/user.js
@@ -27,10 +27,13 @@ user_pref("browser.newtabpage.activity-stream.improvesearch.handoffToAwesomebar"
 // user_pref("layout.css.prefers-color-scheme.content-override", 3);
 
 // ** Theme Related Options ****************************************************
-user_pref("userChrome.tab.original",          true); // Original
-// user_pref("userChrome.tab.photon",            true); // Photon
-// user_pref("userChrome.tab.proton",            true); // Proton
-user_pref("userChrome.tab.connect_to_window", true); // Original, Photon
+user_pref("userChrome.tab.original",                true); // Original
+// user_pref("userChrome.tab.photon",               true); // Photon
+// user_pref("userChrome.tab.proton",               true); // Proton
+user_pref("userChrome.tab.connect_to_window",       true); // Original, Photon
+user_pref("userChrome.tab.box_shadow",              true); // Original
+user_pref("userChrome.tab.bottom_rounded_corner",   true); // Original
+user_pref("userChrome.tab.photon_like_contextline", true); // Photon
 
 user_pref("userChrome.panel.proton", true); // Original, Proton
 // user_pref("userChrome.panel.photon", true); // Photon
@@ -50,6 +53,8 @@ user_pref("userChrome.decoration.field_border", true);
 user_pref("userChrome.decoration.download_panel", true);
 user_pref("userChrome.decoration.animate", true);
 
+user_pref("userChrome.tab.multi_selected", true);
+
 // ** Useful Options ***********************************************************
 // Integrated calculator at urlbar
 user_pref("browser.urlbar.suggest.calculator", true);