diff --git a/client/src/styles/partials/bdsettings/button.scss b/client/src/styles/partials/bdsettings/button.scss
index d2e9e4cc..8460d59c 100644
--- a/client/src/styles/partials/bdsettings/button.scss
+++ b/client/src/styles/partials/bdsettings/button.scss
@@ -81,16 +81,3 @@
         z-index: 3001;
     }
 }
-
-@keyframes bd-settingsButtonPulse {
-    0% {
-        filter: grayscale(100%);
-    }
-    50% {
-        filter: grayscale(0%);
-        opacity: 1;
-    }
-    100% {
-        filter: grayscale(100%);
-    }
-}
diff --git a/client/src/styles/partials/bdsettings/e2ee.scss b/client/src/styles/partials/bdsettings/e2ee.scss
index 978527f0..62b5a2bb 100644
--- a/client/src/styles/partials/bdsettings/e2ee.scss
+++ b/client/src/styles/partials/bdsettings/e2ee.scss
@@ -153,37 +153,30 @@
     }
 }
 
-.bd-encryptedImage::before {
+.bd-encryptedImage::before,
+.bd-decryptedImage::before {
     content: "";
     position: absolute;
-    background: $colbdgreen;
+    background-color: $colbdgreen;
+    background-image: $lockIcon;
+    background-repeat: no-repeat;
+}
+
+.bd-encryptedImage::before {
     width: 100%;
     height: 100%;
     border-radius: 3px;
     display: flex;
-    // justify-content: center;
-    // align-items: flex-start;
-    // font-size: 1.2em;
-    // font-weight: 700;
-    // color: #2c2c2c;
-    // line-height: 30px;
-    background-image: $lockIcon;
     background-size: calc(100% / 2);
-    background-repeat: no-repeat;
     background-position: center;
 }
 
 .bd-decryptedImage::before {
-    content: "";
-    background-image: $lockIcon;
     width: 11px;
     height: 11px;
-    position: absolute;
     z-index: 1;
     display: block;
     background-size: cover;
-    background-color: $colbdgreen;
-    background-repeat: no-repeat;
     border-radius: 100%;
     border: 2px solid $colbdgreen;
     top: 5px;
diff --git a/client/src/styles/partials/bdsettings/remotecard.scss b/client/src/styles/partials/bdsettings/remotecard.scss
index c877e8fd..96d72006 100644
--- a/client/src/styles/partials/bdsettings/remotecard.scss
+++ b/client/src/styles/partials/bdsettings/remotecard.scss
@@ -1,16 +1,13 @@
 .bd-remoteCard {
     display: flex;
     flex-direction: column;
-    // background: rgba(0,0,0,.1);
     margin-top: 10px;
     padding: 10px 0;
     border-radius: 0;
     border-bottom: 1px solid rgba(114, 118, 126, 0.3);
 
     &:hover {
-        // background: rgba(0,0,0,.2);
         transform: scale(1.005);
-        // box-shadow: 0px 0px 5px rgba(0,0,0,.5);
     }
 
     .bd-remoteCardTitle {
diff --git a/client/src/styles/partials/bdsettings/settings-schemes.scss b/client/src/styles/partials/bdsettings/settings-schemes.scss
index a325a142..e6c8662f 100644
--- a/client/src/styles/partials/bdsettings/settings-schemes.scss
+++ b/client/src/styles/partials/bdsettings/settings-schemes.scss
@@ -56,7 +56,7 @@
         cursor: default;
 
         .bd-settingsSchemeIcon {
-            border-color: $colbdblue;
+            border-color: $colbdgreen;
         }
     }
 }
diff --git a/client/src/styles/partials/bdsettings/updater.scss b/client/src/styles/partials/bdsettings/updater.scss
index 3013f784..cd44d124 100644
--- a/client/src/styles/partials/bdsettings/updater.scss
+++ b/client/src/styles/partials/bdsettings/updater.scss
@@ -1,6 +1,6 @@
 .bd-updaterview {
     p {
         margin: 0 0 10px;
-        color: #ffffff;
+        color: #FFF;
     }
 }
diff --git a/client/src/styles/partials/badges.scss b/client/src/styles/partials/generic/badges.scss
similarity index 75%
rename from client/src/styles/partials/badges.scss
rename to client/src/styles/partials/generic/badges.scss
index 66c98337..976484c3 100644
--- a/client/src/styles/partials/badges.scss
+++ b/client/src/styles/partials/generic/badges.scss
@@ -49,18 +49,3 @@
         }
     }
 }
-
-// .member-username .bd-profileBadges {
-//     display: inline-block;
-//     height: 17px;
-//     width: 14px;
-//
-//     .bd-badge,
-//     .bd-badge {
-//         width: 14px;
-//         height: 16px;
-//         background-position: center;
-//         background-size: 12px 12px;
-//         background-repeat: no-repeat;
-//     }
-// }
diff --git a/client/src/styles/partials/generic/buttons.scss b/client/src/styles/partials/generic/buttons.scss
index 9bb2a19a..30601a0e 100644
--- a/client/src/styles/partials/generic/buttons.scss
+++ b/client/src/styles/partials/generic/buttons.scss
@@ -10,11 +10,11 @@
     text-align: center;
     user-select: none;
     font-weight: 500;
-    background: $colbdblue;
+    background: $colbdgreen;
 
 
     &:not(.bd-disabled):hover {
-        background: darken($colbdblue, 5%);
+        background: darken($colbdgreen, 5%);
     }
 
     &.bd-disabled {
diff --git a/client/src/styles/partials/generic/forms/colourpickers.scss b/client/src/styles/partials/generic/forms/colourpickers.scss
index b665d18c..3473bda4 100644
--- a/client/src/styles/partials/generic/forms/colourpickers.scss
+++ b/client/src/styles/partials/generic/forms/colourpickers.scss
@@ -40,13 +40,3 @@
         }
     }
 }
-
-@keyframes bd-colourpickerSlidein {
-    0% {
-        right: 20px;
-    }
-
-    100% {
-        right: 0;
-    }
-}
diff --git a/client/src/styles/partials/generic/forms/guilds.scss b/client/src/styles/partials/generic/forms/guilds.scss
index b9b53b43..b6451635 100644
--- a/client/src/styles/partials/generic/forms/guilds.scss
+++ b/client/src/styles/partials/generic/forms/guilds.scss
@@ -25,7 +25,7 @@
 
         &:hover {
             border-radius: 30%;
-            background-color: $colbdblue;
+            background-color: $colbdgreen;
 
             &.bd-guildHasIcon {
                 background-color: rgb(47, 49, 54);
@@ -33,8 +33,8 @@
         }
 
         &.bd-active {
-            background-color: $colbdblue;
-            box-shadow: 0 0 7px 2px $colbdblue;
+            background-color: $colbdgreen;
+            box-shadow: 0 0 7px 2px $colbdgreen;
 
             &.bd-guildHasIcon {
                 background-color: rgb(47, 49, 54);
diff --git a/client/src/styles/partials/generic/forms/keybinds.scss b/client/src/styles/partials/generic/forms/keybinds.scss
index a4bf66a1..1ec32f70 100644
--- a/client/src/styles/partials/generic/forms/keybinds.scss
+++ b/client/src/styles/partials/generic/forms/keybinds.scss
@@ -1,7 +1,6 @@
 .bd-keybind {
     padding: 10px;
     display: flex;
-    // width: 180px;
     margin-top: 10px;
     background-color: rgba(0,0,0,.1);
     border: 1px solid rgba(0,0,0,.3);
@@ -44,9 +43,3 @@
         }
     }
 }
-
-@keyframes bd-keybindPulse {
-    0% { box-shadow: 0 0 6px rgba(240,71,71,.3) }
-    50% { box-shadow: 0 0 10px rgba(240,71,71,.6) }
-    100% { box-shadow: 0 0 6px rgba(240,71,71,.3) }
-}
diff --git a/client/src/styles/partials/generic/forms/radios.scss b/client/src/styles/partials/generic/forms/radios.scss
index 9210dbf7..f64c94c7 100644
--- a/client/src/styles/partials/generic/forms/radios.scss
+++ b/client/src/styles/partials/generic/forms/radios.scss
@@ -40,12 +40,6 @@
         border: 1px solid #72767d;
 
         .bd-radioControl {
-            // background: rgb(50, 50, 50);
-            // border: 1px solid rgb(114, 118, 125);
-            // border-radius: 50%;
-            // width: 12px;
-            // height: 12px;
-            // transition: background-color .1s;
             margin: 1px;
             opacity: 0;
         }
@@ -67,8 +61,8 @@
     }
 
     &.bd-radioSelected {
-        background-color: $colbdblue;
-        border-color: $colbdblue;
+        background-color: $colbdgreen;
+        border-color: $colbdgreen;
 
         .bd-radioControlWrap {
             border-color: #fff;
diff --git a/client/src/styles/partials/generic/forms/sliders.scss b/client/src/styles/partials/generic/forms/sliders.scss
index a35528a6..d79f8df9 100644
--- a/client/src/styles/partials/generic/forms/sliders.scss
+++ b/client/src/styles/partials/generic/forms/sliders.scss
@@ -33,7 +33,6 @@
             position: relative;
             top: -6px;
             width: 24px;
-
             color: #72767d;
             font-size: 10px;
             font-weight: 700;
@@ -67,7 +66,7 @@
 
         &::before {
             content: "";
-            background-color: $colbdblue;
+            background-color: $colbdgreen;
             height: 8px;
             width: 5px;
             display: block;
@@ -75,7 +74,7 @@
         }
 
         .bd-sliderBarFilled {
-            background-color: $colbdblue;
+            background-color: $colbdgreen;
             height: 8px;
             width: 100%;
             margin-top: -8px;
diff --git a/client/src/styles/partials/generic/forms/switches.scss b/client/src/styles/partials/generic/forms/switches.scss
index 0ce51f5f..7a3349c3 100644
--- a/client/src/styles/partials/generic/forms/switches.scss
+++ b/client/src/styles/partials/generic/forms/switches.scss
@@ -52,7 +52,7 @@
         }
 
         &.bd-checked {
-            background: $colbdblue;
+            background: $colbdgreen;
 
             &::before {
                 transform: translateX(20px);
diff --git a/client/src/styles/partials/generic/forms/text.scss b/client/src/styles/partials/generic/forms/text.scss
index 964240df..ca8dd48e 100644
--- a/client/src/styles/partials/generic/forms/text.scss
+++ b/client/src/styles/partials/generic/forms/text.scss
@@ -27,7 +27,7 @@
 
         &:focus {
             color: #fff;
-            border-color: $colbdblue;
+            border-color: $colbdgreen;
         }
     }
 
diff --git a/client/src/styles/partials/generic/index.scss b/client/src/styles/partials/generic/index.scss
index 97a26971..1d2df6f9 100644
--- a/client/src/styles/partials/generic/index.scss
+++ b/client/src/styles/partials/generic/index.scss
@@ -9,3 +9,6 @@
 @import './preformatted.scss';
 @import './refreshbtn.scss';
 @import './autocomplete.scss';
+@import './layouts.scss';
+@import './toasts.scss';
+@import './badges.scss';
diff --git a/client/src/styles/partials/layouts.scss b/client/src/styles/partials/generic/layouts.scss
similarity index 100%
rename from client/src/styles/partials/layouts.scss
rename to client/src/styles/partials/generic/layouts.scss
diff --git a/client/src/styles/partials/generic/tabs.scss b/client/src/styles/partials/generic/tabs.scss
index 44bc94dc..937ca8aa 100644
--- a/client/src/styles/partials/generic/tabs.scss
+++ b/client/src/styles/partials/generic/tabs.scss
@@ -27,7 +27,7 @@
         &:hover,
         &.bd-active {
             background: transparent;
-            border-bottom-color: $colbdblue;
+            border-bottom-color: $colbdgreen;
             color: #fff;
 
             .bd-materialDesignIcon {
@@ -87,12 +87,10 @@
     }
 
     .bd-settingswrapHeader & {
-        // margin-top: -17px;
         margin-bottom: -20px;
 
         .bd-button {
             font-size: 16px;
-           // padding: 18px 0 17px;
         }
 
         .bd-materialButton {
diff --git a/client/src/styles/partials/toasts.scss b/client/src/styles/partials/generic/toasts.scss
similarity index 89%
rename from client/src/styles/partials/toasts.scss
rename to client/src/styles/partials/generic/toasts.scss
index 9e65e2b4..c9d93da0 100644
--- a/client/src/styles/partials/toasts.scss
+++ b/client/src/styles/partials/generic/toasts.scss
@@ -26,19 +26,19 @@
         margin-top: 10px;
 
         &.bd-toastError {
-            background: #f04747;
+            background: $colerr;
         }
 
         &.bd-toastInfo {
-            background: #4a90e2;
+            background: $colbdblue;
         }
 
         &.bd-toastWarning {
-            background: #FFA600;
+            background: $colwarn;
         }
 
         &.bd-toastSuccess {
-            background: #43b581;
+            background: $colbdgreen;
         }
 
         &.bd-toastHasIcon {
diff --git a/client/src/styles/partials/index.scss b/client/src/styles/partials/index.scss
index c45015c8..4fa884bb 100644
--- a/client/src/styles/partials/index.scss
+++ b/client/src/styles/partials/index.scss
@@ -1,16 +1,12 @@
 @import './variables/index.scss';
 @import './mixins/index.scss';
-@import './animations.scss';
-@import './layouts.scss';
 
 @import './sidebarview/index.scss';
 @import './bdsettings/index.scss';
 @import './generic/index.scss';
 @import './modals/index.scss';
-@import './badges.scss';
 
 @import './discordoverrides.scss';
 @import './helpers.scss';
 @import './misc.scss';
 @import './emotes.scss';
-@import './toasts.scss';
diff --git a/client/src/styles/partials/modals/modals.scss b/client/src/styles/partials/modals/modals.scss
index d9f4b824..a7ec57aa 100644
--- a/client/src/styles/partials/modals/modals.scss
+++ b/client/src/styles/partials/modals/modals.scss
@@ -69,11 +69,11 @@
 
     .bd-modalTitlelink {
         cursor: pointer;
-        color: $colbdblue;
+        color: $colbdgreen;
 
         &:hover {
             text-decoration: underline;
-            color: lighten($colbdblue, 5%);
+            color: lighten($colbdgreen, 5%);
         }
     }
 
diff --git a/client/src/styles/partials/sidebarview/settingswrap.scss b/client/src/styles/partials/sidebarview/settingswrap.scss
index 3451079d..4afdb92d 100644
--- a/client/src/styles/partials/sidebarview/settingswrap.scss
+++ b/client/src/styles/partials/sidebarview/settingswrap.scss
@@ -38,7 +38,7 @@
             flex: 0 0 auto;
 
             .bd-settingswrapHeaderText {
-                color: $colbdblue;
+                color: $colbdgreen;
                 text-transform: uppercase;
                 font-weight: 600;
                 font-size: 16px;
diff --git a/client/src/styles/partials/sidebarview/sidebar.scss b/client/src/styles/partials/sidebarview/sidebar.scss
index 6d1ee455..bdc71d60 100644
--- a/client/src/styles/partials/sidebarview/sidebar.scss
+++ b/client/src/styles/partials/sidebarview/sidebar.scss
@@ -40,7 +40,7 @@
 
         &:hover,
         &.active {
-            background: $colbdblue;
+            background: $colbdgreen;
             color: #fff;
         }
 
diff --git a/client/src/styles/partials/animations.scss b/client/src/styles/partials/variables/animations.scss
similarity index 63%
rename from client/src/styles/partials/animations.scss
rename to client/src/styles/partials/variables/animations.scss
index 04021598..7c3e9cdd 100644
--- a/client/src/styles/partials/animations.scss
+++ b/client/src/styles/partials/variables/animations.scss
@@ -94,22 +94,53 @@
 }
 
 @keyframes bd-modalIn {
-    0% { transform: scale(0.8); opacity: 0; }
-    90% { transform: scale(1.01); opacity: 1; }
-    100% { transform: scale(1); opacity: 1; }
+    0% {
+        transform: scale(0.8);
+        opacity: 0;
+    }
+
+    90% {
+        transform: scale(1.01);
+        opacity: 1;
+    }
+
+    100% {
+        transform: scale(1);
+        opacity: 1;
+    }
 }
+
 @keyframes bd-modalOut {
-    0% { transform: scale(1); opacity: 1; }
-    10% { transform: scale(1.01); opacity: 1; }
-    90% { opacity: 0; }
-    100% { transform: scale(0.8); opacity: 0; }
+    0% {
+        transform: scale(1);
+        opacity: 1;
+    }
+
+    10% {
+        transform: scale(1.01);
+        opacity: 1;
+    }
+
+    90% {
+        opacity: 0;
+    }
+
+    100% {
+        transform: scale(0.8);
+        opacity: 0;
+    }
 }
 
 @keyframes bd-backdropIn {
-    0% { opacity: 0; }
+    0% {
+        opacity: 0;
+    }
 }
+
 @keyframes bd-backdropOut {
-    100% { opacity: 0; }
+    100% {
+        opacity: 0;
+    }
 }
 
 @keyframes bd-warnShake {
@@ -143,3 +174,42 @@
         opacity: 1;
     }
 }
+
+@keyframes bd-settingsButtonPulse {
+    0% {
+        filter: grayscale(100%);
+    }
+
+    50% {
+        filter: grayscale(0%);
+        opacity: 1;
+    }
+
+    100% {
+        filter: grayscale(100%);
+    }
+}
+
+@keyframes bd-colourpickerSlidein {
+    0% {
+        right: 20px;
+    }
+
+    100% {
+        right: 0;
+    }
+}
+
+@keyframes bd-keybindPulse {
+    0% {
+        box-shadow: 0 0 6px rgba(240,71,71,.3)
+    }
+
+    50% {
+        box-shadow: 0 0 10px rgba(240,71,71,.6)
+    }
+
+    100% {
+        box-shadow: 0 0 6px rgba(240,71,71,.3)
+    }
+}
diff --git a/client/src/styles/partials/variables/colours.scss b/client/src/styles/partials/variables/colours.scss
index fa44b523..746c3de3 100644
--- a/client/src/styles/partials/variables/colours.scss
+++ b/client/src/styles/partials/variables/colours.scss
@@ -1,6 +1,5 @@
 $colbdgreen: #3ecc9c;
-// $colbdblue: #3e82e5;
-$colbdblue: $colbdgreen;
+$colbdblue: #3e82e5;
 $colerr: #d84040;
 $colwarn: #faa61a;
 $colok: $colbdgreen;
diff --git a/client/src/styles/partials/variables/index.scss b/client/src/styles/partials/variables/index.scss
index dfd679c8..9b22f00f 100644
--- a/client/src/styles/partials/variables/index.scss
+++ b/client/src/styles/partials/variables/index.scss
@@ -1,2 +1,3 @@
 @import './colours.scss';
 @import './images.scss';
+@import './animations.scss';