diff --git a/Library/_res/BDFDB.data.json b/Library/_res/BDFDB.data.json
index 161155577c..7d7382021f 100644
--- a/Library/_res/BDFDB.data.json
+++ b/Library/_res/BDFDB.data.json
@@ -1959,7 +1959,7 @@
 		"emojipicker": ["EmojiPicker", "emojiPicker"],
 		"emojipickerdiversityemojiitem": ["EmojiPickerDiversitySelector", "diversityEmojiItem"],
 		"emojipickerdiversityemojiitemimage": ["EmojiPickerDiversitySelector", "diversityEmojiItemImage"],
-		"emojipickerdiversityselector": ["EmojiPickerDiversitySelector", "diversitySelector"],
+		"emojipickerdiversityselector": ["EmojiPicker", "diversitySelector"],
 		"emojipickerdiversityselectoroptions": ["EmojiPickerDiversitySelector", "diversitySelectorOptions"],
 		"emojipickerdiversityselectorwrapper": ["EmojiPicker", "diversitySelector"],
 		"emojipickeremojispriteimage": ["EmojiPickerItem", "emojiSpriteImage"],
@@ -2062,7 +2062,7 @@
 		"goliveinfo": ["GoLiveDetails", "info"],
 		"golivepanel": ["GoLiveDetails", "panel"],
 		"guild": ["BDFDB", "guild"],
-		"guildbuttoncontainer": ["GuildsItems", "circleButtonMask"],
+		"guildbuttonbase": ["GuildsItems", "circleButtonBase"],
 		"guildbuttoninner": ["GuildsItems", "circleIconButton"],
 		"guildbuttonicon": ["GuildsItems", "circleIcon"],
 		"guildbuttonpill": ["GuildsItems", "pill"],
@@ -2167,7 +2167,7 @@
 		"h5defaultmargin": ["Text", "defaultMarginh5"],
 		"headertitle": ["Text", "title"],
 		"headerwrapper": ["TextColor2", "wrapper"],
-		"height12": ["UserPopoutWrapper", "height12"],
+		"height12": ["UserPopout", "height12"],
 		"highlight": ["NotFound", "highlight"],
 		"homebuttonicon": ["HomeIcon", "homeIcon"],
 		"homebuttonpill": ["HomeIcon", "pill"],
@@ -2467,7 +2467,6 @@
 		"messagespopoutgroupcozy": ["MessagesPopout", "messageGroupCozy"],
 		"messagespopoutgroupwrapper": ["MessagesPopout", "messageGroupWrapper"],
 		"messagespopouthasmore": ["MessagesPopout", "hasMore"],
-		"messagespopouthasmorebutton": ["MessagesPopout", "hasMoreButton"],
 		"messagespopoutheader": ["MessagesPopout", "header"],
 		"messagespopoutimage": ["MessagesPopout", "image"],
 		"messagespopoutjumpbutton": ["MessagesPopout", "jumpButton"],
@@ -2918,10 +2917,10 @@
 		"titlebarwordmark": ["TitleBar", "wordmark"],
 		"titlebarwordmarkmac": ["TitleBar", "wordmarkMacOS"],
 		"titlebarwordmarkwindows": ["TitleBar", "wordmarkWindows"],
-		"titlesize10": ["UserPopoutWrapper", "size10"],
-		"titlesize12": ["UserPopoutWrapper", "size12"],
-		"titlesize14": ["UserPopoutWrapper", "size14"],
-		"titlesize16": ["UserPopoutWrapper", "size16"],
+		"titlesize10": ["UserPopout", "size10"],
+		"titlesize12": ["UserPopout", "size12"],
+		"titlesize14": ["UserPopout", "size14"],
+		"titlesize16": ["UserPopout", "size16"],
 		"toast": ["Toast", "toast"],
 		"toastavatar": ["Toast", "avatar"],
 		"toastbar": ["Toast", "bar"],
@@ -2997,33 +2996,25 @@
 		"userinfotext": ["UserInfo", "text"],
 		"userinfousername": ["UserInfo", "username"],
 		"userpopout": ["UserPopoutWrapper", "userPopout"],
-		"userpopoutavatarhint": ["UserPopoutWrapper", "avatarHint"],
-		"userpopoutavatarhintinner": ["UserPopoutWrapper", "avatarHintInner"],
-		"userpopoutavatarwrapper": ["UserPopoutWrapper", "avatarWrapper"],
-		"userpopoutavatarwrappernormal": ["UserPopoutWrapper", "avatarWrapperNormal"],
+		"userpopoutactivity": ["UserPopout", "activity"],
+		"userpopoutavatar": ["UserPopout", "avatar"],
+		"userpopoutavatarhint": ["UserPopout", "avatarHint"],
+		"userpopoutavatarhintinner": ["UserPopout", "avatarHintInner"],
+		"userpopoutavataravatarposition": ["UserPopout", "avatarPosition"],
+		"userpopoutavataravatarpositionnormal": ["UserPopout", "avatarPositionNormal"],
+		"userpopoutavataravatarpositionpremium": ["UserPopout", "avatarPositionPremium"],
+		"userpopoutavatarwrappernonuserbot": ["UserPopout", "avatarWrapperNonUserBot"],
+		"userpopoutavatarwrapper": ["UserPopout", "avatarWrapper"],
+		"userpopoutavatarwrappernormal": ["UserPopout", "avatarWrapperNormal"],
 		"userpopoutbody": ["UserPopoutWrapper", "body"],
 		"userpopoutbodyinnerwrapper": ["UserPopoutWrapper", "bodyInnerWrapper"],
 		"userpopoutbodytitle": ["UserPopoutWrapper", "bodyTitle"],
-		"userpopoutcustomstatus": ["UserPopoutWrapper", "customStatus"],
-		"userpopoutcustomstatusemoji": ["UserPopoutWrapper", "customStatusEmoji"],
-		"userpopoutcustomstatussoloemoji": ["UserPopoutWrapper", "customStatusSoloEmoji"],
-		"userpopoutcustomstatustext": ["UserPopoutWrapper", "customStatusText"],
+		"userpopoutcustomstatus": ["UserPopout", "customStatus"],
+		"userpopoutcustomstatusemoji": ["UserPopout", "customStatusEmoji"],
+		"userpopoutcustomstatussoloemoji": ["UserPopout", "customStatusSoloEmoji"],
+		"userpopoutcustomstatustext": ["UserPopout", "customStatusText"],
 		"userpopoutendbodysection": ["UserPopoutWrapper", "endBodySection"],
 		"userpopoutfooter": ["UserPopoutWrapper", "footer"],
-		"userpopoutheader": ["UserPopoutWrapper", "header"],
-		"userpopoutheaderbottagwithnickname_old": ["UserPopoutWrapper", "headerBotTagWithNickname"],
-		"userpopoutheadername_old": ["UserPopoutWrapper", "headerName"],
-		"userpopoutheadernamewrapper_old": ["UserPopoutWrapper", "headerNameWrapper"],
-		"userpopoutheadernormal_old": ["UserPopoutWrapper", "headerNormal"],
-		"userpopoutheaderplaying": ["UserPopoutWrapper", "headerPlaying"],
-		"userpopoutheaderspotify": ["UserPopoutWrapper", "headerSpotify"],
-		"userpopoutheaderstreaming": ["UserPopoutWrapper", "headerStreaming"],
-		"userpopoutheadertag_old": ["UserPopoutWrapper", "headerTag"],
-		"userpopoutheadertagnonickname_old": ["UserPopoutWrapper", "headerTagNoNickname"],
-		"userpopoutheadertagusernamenonickname_old": ["UserPopoutWrapper", "headerTagUsernameNoNickname"],
-		"userpopoutheadertagwithnickname_old": ["UserPopoutWrapper", "headerTagWithNickname"],
-		"userpopoutheadertext_old": ["UserPopoutWrapper", "headerText"],
-		"userpopoutheadertop_old": ["UserPopoutWrapper", "headerTop"],
 		"userpopoutheaderbottagwithnickname": ["UserPopout", "headerBotTagWithNickname"],
 		"userpopoutheadertagdiscriminatornonickname": ["UserPopout", "headerTagDiscriminatorNoNickname"],
 		"userpopoutheadername": ["UserPopout", "nickname"],
diff --git a/Plugins/FriendNotifications/FriendNotifications.plugin.js b/Plugins/FriendNotifications/FriendNotifications.plugin.js
index 1dcf7ea0f3..6a96f0ae7f 100644
--- a/Plugins/FriendNotifications/FriendNotifications.plugin.js
+++ b/Plugins/FriendNotifications/FriendNotifications.plugin.js
@@ -938,7 +938,7 @@ module.exports = (_ => {
 						BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Button, {
 							color: BDFDB.LibraryComponents.Button.Colors.RED,
 							size: BDFDB.LibraryComponents.Button.Sizes.TINY,
-							look: BDFDB.LibraryComponents.Button.Looks.GHOST,
+							look: BDFDB.LibraryComponents.Button.Looks.OUTLINE,
 							style: {marginLeft: 6, marginRight: 12},
 							children: BDFDB.LanguageUtils.LanguageStrings.BUILD_OVERRIDE_CLEAR,
 							onClick: _ => BDFDB.ModalUtils.confirm(this, this.labels.clear_log, _ => {