diff --git a/src/dimmer.less b/src/dimmer.less
index 9721da8..ff46c3f 100644
--- a/src/dimmer.less
+++ b/src/dimmer.less
@@ -16,7 +16,7 @@
   --input-background:     #1e1e1e;
   color: var(--header-primary);
 
-  & [class*="close-"] {
+  & .close-1mLglB {
     color: var(--interactive-normal);
 
     &:hover
@@ -24,24 +24,22 @@
   }
 }
 
-div[class^="layer-"] div.theme-light,
-div[class^="downloadApps-"] {
+div.layer-1Ixpg3 div.theme-light,
+div.downloadApps-14IgKV {
   &:extend(.theme-dimmer all);
 
-  div[class*="root-"] {
+  div.root-g14mjS {
     background-color: var(--background-secondary);
   }
 
-  div[class*="footer-"] {
+  div.footer-31IekZ {
     background-color: var(--background-primary);
   }
 }
 
-div[class^="downloadApps"] {
-  & {
-    background-color: var(--background-secondary) !important;
-  }
-  h3, div[class*="footer-"] {
+div.downloadApps-14IgKV {
+  background-color: var(--background-secondary) !important;
+  h3, div.footer-2TRYcZ {
     color: var(--header-primary);
   }
 }
diff --git a/src/fixes.less b/src/fixes.less
index 9a6e06a..6fe94ec 100644
--- a/src/fixes.less
+++ b/src/fixes.less
@@ -1,5 +1,5 @@
 // fix guild selector at left part
-ul[data-list-id="guildsnav"] div[class^="scroller-"] {
+ul[data-list-id="guildsnav"] div.scroller-3X7KbA {
   display: flex;
   flex-direction: column;
   overflow: hidden !important;
@@ -30,7 +30,7 @@ ul[data-list-id="guildsnav"] div[class^="scroller-"] {
   margin-bottom: 8px;
 }
 
-div[class^="messagesWrapper-"] div {
+div.messagesWrapper-RpOMA3 > div {
   scrollbar-width: thin;
 }
 
@@ -42,18 +42,18 @@ div[class^="messagesWrapper-"] div {
     top: 0; bottom: 0;
     left: 0; right: 0;
   }
-  div[class^="wrapper-"] {
+  div.wrapper-22rqw6 {
     top: 0;
     border-radius: 8px;
   }
 }
 
-div[class*="fullscreenOnMobile"] div[class^="flex"] * {
+div.fullscreenOnMobile-ixj0e3 div.flex-3BkGQD * {
   // fix overflow
   overflow: hidden;
 }
 
-div[class*="templatesList-"] {
+div.templatesList-uohY49 {
   // fix tempates list (it was removed)
   height: 128px;
 }
diff --git a/src/nitro.less b/src/nitro.less
index 97f6922..4a174a0 100644
--- a/src/nitro.less
+++ b/src/nitro.less
@@ -22,6 +22,7 @@ div[class^="characterCount-"] div[class^="root-"], // at many characters
 [class^="clickableSticker-"], // stickers
 nav[class^="privateChannels-"] div div // Nitro tab at DM
  [data-list-item-id$="nitro"],
+#account-style-your-profile,
 { &:extend(.nitro); }
 
 #channels > ul {
diff --git a/src/profile.less b/src/profile.less
index 44351c0..eeaddfe 100644
--- a/src/profile.less
+++ b/src/profile.less
@@ -92,8 +92,10 @@ div[class^="banner"] {
   }
 }
 
-div[class^="avatarWrapper-"] {
+div.container-YkUktl div.avatarWrapper-1B9FTW {
   margin-right: auto; // make some space after avatar (sidebar at bottom)
+  min-width: unset;
+  padding: unset;
 }
 
 // Redesigned profile page
@@ -157,3 +159,8 @@ div.root-8LYsGj { // I not love fixed classes, but this selects only modal page
     .left-border(@round);
   }
 }
+
+#account-info div.headerTop-3GPUSF {
+  padding-top: 108px;
+}
+
diff --git a/src/style.less b/src/style.less
index 62b66ea..2adeaf8 100644
--- a/src/style.less
+++ b/src/style.less
@@ -193,33 +193,27 @@ div.popoutContainer-2wbmiM,
 }
 
 // status picker
-#status-picker > div {
+#account-status-picker + div.layer-2aCOJ3 div.scroller-1bVxF5 {
   display: flex;
   flex-flow: row wrap;
   justify-content: space-around;
-  #status-picker-online,
-  #status-picker-idle,
-  #status-picker-dnd,
-  #status-picker-invisible {
+
+  & > div.item-1OdjEX {
     padding: 8px;
+    margin: 0;
+
     & > div {
       padding: 0;
 
-      // & > because svg has status- div
-      & > div[class^="status-"],
-      & > div[class^="description-"] {
-        display: none;
-      }
-    }
-    svg {
-      width: 16px;
-      height: 16px;
-      margin-left: 4px;
+      & > div.status-2xYiEF,
+      & > div.description-1Dd2kv,
+      { &:extend(.hide); }
     }
   }
-  #status-picker-custom-status,
-  div[class^="submenuContainer-"] {
-    width: 100%;
+  svg {
+    width: 16px;
+    height: 16px;
+    margin-left: 4px;
   }
 }