diff --git a/source/template.css b/source/template.css
index 06b415d3..b687458e 100644
--- a/source/template.css
+++ b/source/template.css
@@ -1,7 +1,7 @@
 /* AVATAR-TEMPLATE-BEGIN */
 /* Custom avatar for {id} */
-[style*="https://cdn.discordapp.com/avatars/{id}"],
-[src*="{id}"] {
+div:is([style*="{id}"]),
+img:is([src^="https://cdn.discordapp.com/avatars/{id}"]) {
   content: url({img});
   object-fit: scale-down;
   aspect-ratio: 1;
@@ -11,13 +11,10 @@
 
 /* BADGE-TEMPLATE-BEGIN */
 /* Custom badge for {id} */
-.userProfileInner-1ngKnf:has(.avatar-31d8He:is([src^="https://cdn.discordapp.com/avatars/{id}"]))>.topSection-13QKHs>header>.header-S26rhB>.headerTop-1PNKck>.container-1gYwHN:before,
-.userPopoutInner-nv9Y92:has(.avatar-31d8He:is([src^="https://cdn.discordapp.com/avatars/{id}"]))>.container-1gYwHN:before,
-.userInfo-regn9W:has([src^="https://cdn.discordapp.com/avatars/{id}"])>.wrapper-3Un6-K+div>.container-1gYwHN:before,
-.userPopoutInner-nv9Y92:has(.imageUploaderInner-IIRaFr:is([style*="{id}"]))>.container-1gYwHN:before {
+:is([class^=userPopoutInner], [class^=header_], [class^=userInfo_], [class^=none_]):has(img[src^="https://cdn.discordapp.com/avatars/{id}"]) div:is([class^=profileBadges_], [class^=badgeList_]):before {
   content: "";
   width: 22px;
   height: 22px;
   background: url({img}) center / 100% 100%;
 }
-/* BADGE-TEMPLATE-END */
+/* BADGE-TEMPLATE-END */
\ No newline at end of file
diff --git a/usrpfp.theme.css b/userpfp.theme.css
similarity index 56%
rename from usrpfp.theme.css
rename to userpfp.theme.css
index 85265972..191f050b 100644
--- a/usrpfp.theme.css
+++ b/userpfp.theme.css
@@ -7,3 +7,9 @@
 
 /* Avatar Import */
 @import url("https://userpfp.github.io/UserPFP/import.css");
+[class^=userAvatar_] {
+    border: 3px solid transparent;
+  }
+:not([class^=avatarStack_])>[class*=avatarSpeaking_] {
+    border: 3px solid var(--green-360) !important;
+}
\ No newline at end of file