diff --git a/Library/0BDFDB.plugin.js b/Library/0BDFDB.plugin.js
index 915a3a2c25..35a237155b 100644
--- a/Library/0BDFDB.plugin.js
+++ b/Library/0BDFDB.plugin.js
@@ -8100,6 +8100,7 @@ module.exports = (_ => {
 							PrivateChannel: ["componentDidMount", "componentDidUpdate"],
 							AnalyticsContext: ["componentDidMount", "componentDidUpdate"],
 							UserPopoutAvatar: "UserPopoutAvatar",
+							UserThemePopoutHeader: "default",
 							DiscordTag: "default"
 						}
 					};
@@ -8284,6 +8285,19 @@ module.exports = (_ => {
 						let [children, index] = BDFDB.ReactUtils.findParent(e.returnvalue, {props: [["className", BDFDB.disCN.userpopoutavatarwrapper]]});
 						if (index > -1) children[index] = Internal._processAvatarRender(e.instance.props.user, children[index], null, e.instance) || children[index];
 					};
+					Internal.processUserThemePopoutHeader = function (e) {
+						if (!e.instance.props.user) return;
+						let avatar = BDFDB.ReactUtils.findChild(e.returnvalue, {filter: n => n && typeof n.type == "function" && n.type.toString().indexOf(".avatarSrc") > -1});
+						if (avatar) {
+							let type = avatar.type;
+							avatar.type = BDFDB.TimeUtils.suppress((...args) => {
+								let returnValue = type(...args);
+								let [children, index] = BDFDB.ReactUtils.findParent(returnValue, {props: [["className", BDFDB.disCN.userpopoutthemedavatarwrapper]]});
+								if (index > -1) children[index] = Internal._processAvatarRender(e.instance.props.user, children[index], null, e.instance) || children[index];
+								return returnValue;
+							}, "Error in Type Render of UserThemePopoutAvatar!");
+						}
+					};
 					Internal.processDiscordTag = function (e) {
 						if (e.instance && e.instance.props && e.returnvalue && e.instance.props.user) e.returnvalue.props.user = e.instance.props.user;
 					};
@@ -8864,8 +8878,6 @@ module.exports = (_ => {
 							if (stringKeys.length) next(languages.shift());
 						};
 						BDFDB.DevUtils.req = Internal.getWebModuleReq();
-						
-						window.BDFDB = BDFDB;
 					}
 					
 					if (libraryCSS) BDFDB.DOMUtils.appendLocalStyle("BDFDB", libraryCSS.replace(/[\n\t\r]/g, "").replace(/\[REPLACE_CLASS_([A-z0-9_]+?)\]/g, (a, b) => BDFDB.dotCN[b]));
diff --git a/Library/_res/0BDFDB.data.json b/Library/_res/0BDFDB.data.json
index 3c0f0ddeac..86b2abddee 100644
--- a/Library/_res/0BDFDB.data.json
+++ b/Library/_res/0BDFDB.data.json
@@ -323,7 +323,8 @@
 			"UserProfileModal": {"lazyLoaded": true},
 			"UserProfileModalHeader": {"lazyLoaded": true},
 			"UserSettingsAppearance": {"class": "usersettingsappearancepreview"},
-			"UserThemeBanner": {"strings": [".showPremiumBadgeUpsell", ".isPremiumAtLeast", "PremiumTypes"]}
+			"UserThemeBanner": {"strings": [".showPremiumBadgeUpsell", ".isPremiumAtLeast", "PremiumTypes"]},
+			"UserThemePopoutHeader": {"strings": [".avatarPositionPremiumNoBanner", "syncProfileThemeWithUserTheme"]}
 		},
 		"LoadedInComponents": {
 			"AutocompleteChannelResult": "LibraryComponents.AutocompleteItems.Channel",
@@ -1455,7 +1456,8 @@
 		"UserBadges": {"props": ["profileBadge", "container"]},
 		"UserBanner": {"props": ["popoutBanner", "popoutBannerPremium"]},
 		"UserPopout": {"props": ["userPopout", "body"]},
-		"UserPopoutAvatar": {"props": ["miniAvatar", "largeAvatar"]},
+		"UserPopoutAvatar": {"props": ["avatarPositionPremiumNoBanner", "avatarWrapperNormal"]},
+		"UserPopoutAvatarOld": {"props": ["miniAvatar", "largeAvatar"]},
 		"UserPopoutBody": {"props": ["rolesList", "note"]},
 		"UserPopoutFooter": {"props": ["wumpusTooltip", "footer"]},
 		"UserPopoutHeader": {"props": ["headerTop", "profileBadges", "aboutMeGuildIcon"]},
@@ -3205,12 +3207,12 @@
 		"userpopoutaboutmetitle": ["UserPopoutHeader", "aboutMeTitle"],
 		"userpopoutactivity": ["UserPopoutBody", "activity"],
 		"userpopoutavatar": ["UserPopoutHeader", "avatar"],
-		"userpopoutavatarbase": ["UserPopoutAvatar", "baseAvatar"],
+		"userpopoutavatarbase": ["UserPopoutAvatarOld", "baseAvatar"],
 		"userpopoutavatarclickable": ["UserPopoutHeader", "clickable"],
 		"userpopoutavatarhint": ["UserPopoutHeader", "avatarHint"],
 		"userpopoutavatarhintinner": ["UserPopoutHeader", "avatarHintInner"],
-		"userpopoutavatarlarge": ["UserPopoutAvatar", "largeAvatar"],
-		"userpopoutavatarmini": ["UserPopoutAvatar", "miniAvatar"],
+		"userpopoutavatarlarge": ["UserPopoutAvatarOld", "largeAvatar"],
+		"userpopoutavatarmini": ["UserPopoutAvatarOld", "miniAvatar"],
 		"userpopoutavatarpositionnormal": ["UserPopoutHeader", "avatarPositionNormal"],
 		"userpopoutavatarpositionpremium": ["UserPopoutHeader", "avatarPositionPremium"],
 		"userpopoutavatarwrappernonuserbot": ["UserPopoutHeader", "avatarWrapperNonUserBot"],
@@ -3249,6 +3251,8 @@
 		"userpopoutsection": ["UserPopoutSection", "section"],
 		"userpopoutsectionlast": ["UserPopoutSection", "lastSection"],
 		"userpopoutsectiontitle": ["UserPopoutSectionTitle", "title"],
+		"userpopoutthemedavatar": ["UserPopoutAvatar", "avatar"],
+		"userpopoutthemedavatarwrapper": ["UserPopoutAvatar", "avatarWrapper"],
 		"userpopoutusernamebottag": ["UserPopoutUsernameSection", "headerBotTag"],
 		"userpopoutusernamebottagwithnickname": ["UserPopoutUsernameSection", "headerBotTagWithNickname"],
 		"userpopoutusernamenickname": ["UserPopoutUsernameSection", "nickname"],
diff --git a/Plugins/EditUsers/EditUsers.plugin.js b/Plugins/EditUsers/EditUsers.plugin.js
index 699e1551e3..e54fb823f5 100644
--- a/Plugins/EditUsers/EditUsers.plugin.js
+++ b/Plugins/EditUsers/EditUsers.plugin.js
@@ -2,7 +2,7 @@
  * @name EditUsers
  * @author DevilBro
  * @authorId 278543574059057154
- * @version 4.6.6
+ * @version 4.6.7
  * @description Allows you to locally edit Users
  * @invite Jx3TjNS
  * @donate https://www.paypal.me/MircoWittrien
@@ -101,6 +101,7 @@ module.exports = (_ => {
 						UserThemeBanner: "default",
 						UserBanner: "default",
 						UserPopoutAvatar: "UserPopoutAvatar",
+						UserThemePopoutHeader: "default",
 						UsernameSection: "default",
 						UserPopoutInfo: "UserPopoutInfo",
 						UserProfileModal: "default",
@@ -617,6 +618,15 @@ module.exports = (_ => {
 			}
 
 			processUserPopoutAvatar (e) {
+				if (this.settings.places.userPopout && e.instance.props.user && changedUsers[e.instance.props.user.id]) e.instance.props.user = this.getUserData(e.instance.props.user.id, true, true);
+				if (e.instance.props.displayProfile && e.instance.props.user && changedUsers[e.instance.props.user.id]) {
+					if (changedUsers[e.instance.props.user.id].removeBanner) e.instance.props.displayProfile.banner = null;
+					else if (changedUsers[e.instance.props.user.id].banner) e.instance.props.displayProfile.banner = changedUsers[e.instance.props.user.id].banner;
+				}
+			}
+
+			processUserThemePopoutHeader (e) {
+				if (this.settings.places.userPopout && e.instance.props.user && changedUsers[e.instance.props.user.id]) e.instance.props.user = this.getUserData(e.instance.props.user.id, true, true);
 				if (e.instance.props.displayProfile && e.instance.props.user && changedUsers[e.instance.props.user.id]) {
 					if (changedUsers[e.instance.props.user.id].removeBanner) e.instance.props.displayProfile.banner = null;
 					else if (changedUsers[e.instance.props.user.id].banner) e.instance.props.displayProfile.banner = changedUsers[e.instance.props.user.id].banner;