diff --git a/CSS/themes/xbackbone/xbackbone-base.css b/CSS/themes/xbackbone/xbackbone-base.css
index ee62b533..cbcdfea2 100644
--- a/CSS/themes/xbackbone/xbackbone-base.css
+++ b/CSS/themes/xbackbone/xbackbone-base.css
@@ -107,7 +107,6 @@ code {
 /* LINKS */
 a {
     color: var(--link-color);
-    text-decoration: underline;
 }
 
 a:hover {
@@ -140,6 +139,10 @@ a:hover {
     -o-background-size: auto, cover;
 }
 
+.dropdown-header {
+    color: var(--text-hover);
+}
+
 .dropdown-item:focus,
 .dropdown-item:hover {
     color: var(--text-hover);
@@ -251,8 +254,98 @@ a:hover {
 .btn-outline-info.dropdown-toggle.show:focus,
 .btn-outline-info:active:focus {
     box-shadow: 0 0 0 0.25rem rgb(var(--accent-color), .5);
+    color: var(--button-text-hover);
+    border-color: var(--button-color-hover);
+    background-color: var(--button-color-hover);
 }
 
+.btn-outline-info:not(:disabled):not(.disabled).active:focus,
+.btn-outline-info:not(:disabled):not(.disabled):active:focus,
+.show>.btn-outline-info.dropdown-toggle:focus {
+    box-shadow: 0 0 0 0.2rem rgb(var(--accent-color) / 50%);
+}
+
+.btn-outline-info:not(:disabled):not(.disabled).active,
+.btn-outline-info:not(:disabled):not(.disabled):active,
+.show>.btn-outline-info.dropdown-toggle {
+    color: var(--button-text-hover);
+    border-color: var(--button-color-hover);
+    background-color: var(--button-color-hover);
+}
+
+.btn-outline-primary {
+    color: var(--button-color);
+    border-color: var(--button-color);
+}
+
+.btn-outline-primary:hover {
+    color: var(--button-text-hover);
+    border-color: var(--button-color-hover);
+    background-color: var(--button-color-hover);
+}
+
+.btn-outline-primary.focus,
+.btn-outline-primary:focus {
+    box-shadow: 0 0 0 .2rem rgba(0, 123, 255, .5)
+}
+
+.btn-outline-primary.disabled,
+.btn-outline-primary:disabled {
+    color: var(--button-color);
+    background-color: transparent
+}
+
+.btn-outline-primary:not(:disabled):not(.disabled).active,
+.btn-outline-primary:not(:disabled):not(.disabled):active,
+.show>.btn-outline-primary.dropdown-toggle {
+    color: var(--button-text-hover);
+    border-color: var(--button-color-hover);
+    background-color: var(--button-color-hover);
+}
+
+.btn-outline-primary:not(:disabled):not(.disabled).active:focus,
+.btn-outline-primary:not(:disabled):not(.disabled):active:focus,
+.show>.btn-outline-primary.dropdown-toggle:focus {
+    box-shadow: 0 0 0 .2rem rgba(var(--accent-color), .5)
+}
+
+.btn-outline-dark {
+    color: var(--button-text);
+    border-color: var(--button-color);
+}
+
+.btn-outline-dark:hover {
+    color: var(--button-text-hover);
+    border-color: var(--button-color-hover);
+    background-color: var(--button-color-hover);
+}
+
+.btn-outline-dark.focus,
+.btn-outline-dark:focus {
+    box-shadow: 0 0 0 .2rem rgba(var(--accent-color), .5)
+}
+
+.btn-outline-dark.disabled,
+.btn-outline-dark:disabled {
+    color: var(--button-color);
+    background-color: transparent
+}
+
+.btn-outline-dark:not(:disabled):not(.disabled).active,
+.btn-outline-dark:not(:disabled):not(.disabled):active,
+.show>.btn-outline-dark.dropdown-toggle {
+    color: var(--button-text-hover);
+    border-color: var(--button-color-hover);
+    background-color: var(--button-color-hover);
+}
+
+.btn-outline-dark:not(:disabled):not(.disabled).active:focus,
+.btn-outline-dark:not(:disabled):not(.disabled):active:focus,
+.show>.btn-outline-dark.dropdown-toggle:focus {
+    box-shadow: 0 0 0 .2rem rgba(52, 58, 64, .5)
+}
+
+
 /* FORMS */
 .form-control {
     color: #fff;