diff --git a/xmc.user.css b/xmc.user.css
index 97dd952..bd2cc3d 100644
--- a/xmc.user.css
+++ b/xmc.user.css
@@ -1707,9 +1707,7 @@ html.platform-win:not(.app-focused) [class*="winButton-"] {
   > svg
   > svg[class^="cursorDefault-"]
   > svg[class^="dots-"],
-[class^="autocompleteRowIcon-"]
-  > [class^="wrapper-"]
-  > svg,
+[class^="autocompleteRowIcon-"] > [class^="wrapper-"] > svg,
 [class^="userInfo-"] [class^="avatar-"] > svg,
 [class^="panels-"] [class*="avatar-"] > svg > svg,
 [class^="modal-"] > [class^="inner-"] [class^="avatar-"] > svg,
@@ -1717,7 +1715,10 @@ html.platform-win:not(.app-focused) [class*="winButton-"] {
   > [class^="root-"]
   [class^="avatar-"]
   > svg,
-[class^="userPopoutInner-"] [class^="avatarHoverTarget-"] > [class^="wrapper-"] > svg {
+[class^="userPopoutInner-"]
+  [class^="avatarHoverTarget-"]
+  > [class^="wrapper-"]
+  > svg {
   overflow: visible;
 }
 
@@ -1817,7 +1818,13 @@ html.platform-win:not(.app-focused) [class*="winButton-"] {
   [class*="wrapper-"]
   > svg
   > svg[class^="cursorDefault-"]
-  > rect[fill^="var(--status-"] {
+  > rect[fill^="var(--status-"],
+[class^="member-"]
+  [class^="avatar-"]
+  [class*="wrapper-"]
+  > svg
+  > svg[class^="cursorDefault-"]
+  > rect[fill^="#"] {
   mask: none !important;
   x: -18.5;
   y: -17;
@@ -1828,8 +1835,15 @@ html.platform-win:not(.app-focused) [class*="winButton-"] {
 [class^="panels-"]
   [class*="avatar-"]
   > svg
-  > svg
-  > rect[fill^="var(--status-"] {
+  > rect[mask^="url(#svg-mask-status"] {
+  mask: none !important;
+  x: 32;
+  y: 0;
+  width: 4px;
+  height: 32px;
+}
+[class^="panels-"] [class*="avatar-"] > svg > svg > rect[fill^="var(--status-"],
+[class^="panels-"] [class*="avatar-"] > svg > svg > rect[fill^="#"] {
   mask: none !important;
   x: 17.5;
   y: -17;
@@ -1865,7 +1879,10 @@ html.platform-win:not(.app-focused) [class*="winButton-"] {
   y: 0;
 }
 
-[class^="userInfo-"] [class^="avatar-"] > svg rect[mask^="url(#svg-mask-status-"] {
+[class^="userInfo-"]
+  [class^="avatar-"]
+  > svg
+  rect[mask^="url(#svg-mask-status-"] {
   mask: none !important;
   width: 4px;
   height: 32px;
@@ -1873,7 +1890,11 @@ html.platform-win:not(.app-focused) [class*="winButton-"] {
   y: 0;
 }
 
-[class^="userProfileModalInner-"] [class^="header-"] [class*="avatar-"] > svg rect[mask^="url(#svg-mask-status-"] {
+[class^="userProfileModalInner-"]
+  [class^="header-"]
+  [class*="avatar-"]
+  > svg
+  rect[mask^="url(#svg-mask-status-"] {
   mask: none !important;
   width: 8px;
   height: 120px;
@@ -1881,10 +1902,26 @@ html.platform-win:not(.app-focused) [class*="winButton-"] {
   y: 0;
 }
 
-[class^="userPopoutInner-"] [class^="avatarHoverTarget-"] > [class^="wrapper-"] > svg circle,
-[class^="userPopoutInner-"] [class^="avatarHoverTarget-"] > [class^="wrapper-"] > svg > rect[fill="black"],
-[class^="userProfileModalInner-"] [class^="header-"] [class^="wrapper-"] > svg circle,
-[class^="userProfileModalInner-"] [class^="header-"] [class^="wrapper-"] > svg > rect[fill="black"] {
+[class^="userPopoutInner-"]
+  [class^="avatarHoverTarget-"]
+  > [class^="wrapper-"]
+  > svg
+  circle,
+[class^="userPopoutInner-"]
+  [class^="avatarHoverTarget-"]
+  > [class^="wrapper-"]
+  > svg
+  > rect[fill="black"],
+[class^="userProfileModalInner-"]
+  [class^="header-"]
+  [class^="wrapper-"]
+  > svg
+  circle,
+[class^="userProfileModalInner-"]
+  [class^="header-"]
+  [class^="wrapper-"]
+  > svg
+  > rect[fill="black"] {
   display: none;
 }
 
@@ -1892,7 +1929,11 @@ html.platform-win:not(.app-focused) [class*="winButton-"] {
   [class*="avatar-"]
   > svg
   rect[mask^="url(#svg-mask-status-"],
-[class^="userPopoutInner-"] [class^="avatarHoverTarget-"] > [class^="wrapper-"] > svg rect[mask^="url(#svg-mask-status-"] {
+[class^="userPopoutInner-"]
+  [class^="avatarHoverTarget-"]
+  > [class^="wrapper-"]
+  > svg
+  rect[mask^="url(#svg-mask-status-"] {
   mask: none !important;
   width: 8px;
   height: 80px;
@@ -2046,6 +2087,13 @@ div[class*="cozyMessage-"] div[class^="repliedMessage-"]:before {
   border-bottom: 0 solid var(--interactive-active);
   border-right: 0 solid var(--interactive-active);
   border-top: var(--spine-width) solid var(--interactive-active);
+}
+
+[class*="cozyMessage-"] [class^="avatarDecoration-"] {
+  margin-top: calc(24px - 20px * var(--decoration-to-avatar-ratio));
+  left: calc(38px - 20px * var(--decoration-to-avatar-ratio));
+  width: calc(20px * var(--decoration-to-avatar-ratio));
+  height: calc(20px * var(--decoration-to-avatar-ratio));
 }`,
 }
 @var select xmc_unread 'Unread Indicators' {
@@ -3237,7 +3285,8 @@ strong {
   [class*="wrapper-"] svg[class*="mask-"] > foreignObject,
   [class*="callAvatarWrapper-"] svg[class*="callAvatarMask-"] > foreignObject,
   div[class^="listItem-"] [class^="wrapper-"] > svg > foreignObject,
-  [class^="bannerSVGWrapper-"] > foreignObject {
+  [class^="bannerSVGWrapper-"] > foreignObject,
+  [class^="avatarDecoration-"] > foreignObject {
     mask: none !important;
     mask-image: none !important;
     -webkit-mask-image: none !important;
@@ -4532,28 +4581,36 @@ strong {
   .hljs-ansi-style-bold {
     font-weight: 0;
   }
-  .hljs-ansi-foreground-black .hljs-ansi-style-bold {
+  .hljs-ansi-foreground-black .hljs-ansi-style-bold,
+  .hljs-ansi-foreground-black.hljs-ansi-style-bold {
     color: var(--_color8) !important;
   }
-  .hljs-ansi-foreground-red .hljs-ansi-style-bold {
+  .hljs-ansi-foreground-red .hljs-ansi-style-bold,
+  .hljs-ansi-foreground-red.hljs-ansi-style-bold {
     color: var(--_color9) !important;
   }
-  .hljs-ansi-foreground-green .hljs-ansi-style-bold {
+  .hljs-ansi-foreground-green .hljs-ansi-style-bold,
+  .hljs-ansi-foreground-green.hljs-ansi-style-bold {
     color: var(--_color10) !important;
   }
-  .hljs-ansi-foreground-yellow .hljs-ansi-style-bold {
+  .hljs-ansi-foreground-yellow .hljs-ansi-style-bold,
+  .hljs-ansi-foreground-yellow.hljs-ansi-style-bold {
     color: var(--_color11) !important;
   }
-  .hljs-ansi-foreground-blue .hljs-ansi-style-bold {
+  .hljs-ansi-foreground-blue .hljs-ansi-style-bold,
+  .hljs-ansi-foreground-blue.hljs-ansi-style-bold {
     color: var(--_color12) !important;
   }
-  .hljs-ansi-foreground-magenta .hljs-ansi-style-bold {
+  .hljs-ansi-foreground-magenta .hljs-ansi-style-bold,
+  .hljs-ansi-foreground-magenta.hljs-ansi-style-bold {
     color: var(--_color13) !important;
   }
-  .hljs-ansi-foreground-cyan .hljs-ansi-style-bold {
+  .hljs-ansi-foreground-cyan .hljs-ansi-style-bold,
+  .hljs-ansi-foreground-cyan.hljs-ansi-style-bold {
     color: var(--_color14) !important;
   }
-  .hljs-ansi-foreground-white .hljs-ansi-style-bold {
+  .hljs-ansi-foreground-white .hljs-ansi-style-bold,
+  .hljs-ansi-foreground-white.hljs-ansi-style-bold {
     color: var(--_color15) !important;
   }
   .hljs-ansi-background-black {