diff --git a/src/nitro.less b/src/nitro.less
index 2b84eb3..97f6922 100644
--- a/src/nitro.less
+++ b/src/nitro.less
@@ -8,6 +8,7 @@
 [class*="perks-"],
 [class*="nitro"],
 [class^="upsell"],
+[class*="Upsell"],
 [class^="availabilityIndicator-"],
 div[class^="serverBoostTabItem-"],
 div[class*="hero"],
diff --git a/src/profile.less b/src/profile.less
index c8d3742..d62e746 100644
--- a/src/profile.less
+++ b/src/profile.less
@@ -24,7 +24,7 @@ div[class^="accountProfileCard-"] div[class^="userInfo-"] {
   [class^="profileBadges-"],
   { &:extend(.nitro); }
 }
-.profile() when (@no-banner = true) {
+.profile() { // banners
   div[class^="listItemContents-"] div[class^="userInfo"] {
     padding-top: 0;
     div[class^="avatar-"] {
@@ -53,6 +53,10 @@ div[class^="accountProfileCard-"] div[class^="userInfo-"] {
 }
 .profile();
 
+div[class^="pencilContainer-"] {
+  z-index: 1; // fix edit button in profile
+}
+
 // Profile card in settings
 div[class^="accountProfileCard-"] {
   div[class^="field-"]:nth-child(1) {
@@ -67,15 +71,15 @@ div[class^="accountProfileCard-"] {
   }
 }
 
-div[class^="banner-"] {
+div[class^="banner"] {
   position: absolute;
   width: inherit;
-  max-height: 84px;
+  max-height: 72px;
   &:extend(.rounder);
+  div[class^="profileBannerPreview-"] &,
   &[class*="popoutBanner"] {
-    position: relative;
-    max-height: 128px;
     .bottom-border();
+    width: 100%;
   }
 }
 
@@ -110,7 +114,7 @@ div[class^="focusLock-"]:not([aria-labelledby]) > div[class^="root-"][class*="sm
     div[class^="nameTag"] {
       width: 64px;
       position: absolute;
-      margin-top: -84px;
+      margin-top: -64px;
       margin-left: 130px;
     }
 
diff --git a/src/settings.less b/src/settings.less
index e4ed5f6..3ec4f6b 100644
--- a/src/settings.less
+++ b/src/settings.less
@@ -108,12 +108,20 @@ div[class^="baseLayout-"] {
 
 #connections-tab div[class^="children-"] {
   flex-direction: row;
+  flex-flow: row wrap;
   div[class^="accountList-"] {
     margin-right: @div-width;
+    width: 33%;
     height: 100%; // decreases height? 0_0
+
+    // auto detect
+    & + div[class^="container-"] {
+      order: -1;
+      width: 100%;
+    }
   }
   div[class^="connectionList-"] {
-    width: 100%;
+    flex-grow: 1;
   }
 }
 
diff --git a/src/style.less b/src/style.less
index e2d3ed7..4d7d095 100644
--- a/src/style.less
+++ b/src/style.less
@@ -4,27 +4,6 @@
 // Space between sidebar and chat
 div[class^="sidebar-"] {
   margin-right: @div-width;
-
-  &, li, li div {
-    transition: ease-out 0.25s;
-  }
-
-  &:not(:hover) {
-    width: 48px;
-    overflow: hidden;
-    li {
-      margin-left: -4px;
-      div[class^="interactive-"] {
-        margin-left: 8px;
-      }
-      div[class^="layout-"] {
-        padding-left: 2px;
-      }
-      a + div[class^="children-"] {
-        display: none;
-      }
-    }
-  }
 }
 
 // Old-school
@@ -57,6 +36,12 @@ div[class^="role-"] {
   background: unset;
 }
 
+div[class^="statusItem-"] foreignObject,
+rect[class^="pointerEvents-"],
+{
+  mask: url(#svg-mask-status-online);
+}
+
 // Round
   // UI parts
   li[class^="channel-"],
@@ -144,6 +129,11 @@ div[class^="attachedBars-"]
 { position: relative; }
 
 div[class^="channelTextArea-"] {
+  &[class*="channelTextAreaDisabled-"]
+  button[class^="attachButton-"] {
+    display: none;
+  }
+
   & > div[class^="scrollableContainer-"] {
     background-color: unset;
     opacity: 1;
@@ -163,11 +153,12 @@ div[class^="channelTextArea-"] {
       padding: 8px;
       width: auto;
       height: auto;
+      margin-right: 8px;
     }
 
     div[class^="textArea-"] {
-      margin-left: 8px;
-      .right-border();
+      &:not([class*="textAreaDisabled-"])
+      { .right-border(); }
 
       div > * { left: (@roundest / 2); }
     }