diff --git a/Plugins/EditUsers/EditUsers.plugin.js b/Plugins/EditUsers/EditUsers.plugin.js
index c04beec6c0..06cccbe969 100644
--- a/Plugins/EditUsers/EditUsers.plugin.js
+++ b/Plugins/EditUsers/EditUsers.plugin.js
@@ -3,7 +3,7 @@
 class EditUsers {
 	getName () {return "EditUsers";}
 
-	getVersion () {return "3.4.3";}
+	getVersion () {return "3.4.4";}
 
 	getAuthor () {return "DevilBro";}
 
@@ -59,7 +59,7 @@ class EditUsers {
 			${BDFDB.dotCNC.userpopoutheaderbottag + BDFDB.dotCN.userpopoutheaderbottagwithnickname} {
 				bottom: 4px;
 			}
-			${BDFDB.dotCNS.userpopoutheadertagwithnickname + BDFDB.dotCN.userpopoutheaderbottagwithnickname} {
+			${BDFDB.dotCNS.userpopoutheadertagnonickname + BDFDB.dotCNC.userpopoutheaderbottag + BDFDB.dotCNS.userpopoutheadertagwithnickname + BDFDB.dotCN.userpopoutheaderbottagwithnickname} {
 				bottom: 0px;
 			}
 			${BDFDB.dotCN.userprofilebottag} {
@@ -1076,7 +1076,7 @@ class EditUsers {
 		else if (BDFDB.getParentEle(BDFDB.dotCN.textareawrapchat, wrapper)) key = "changeInChatTextarea";
 		else if (BDFDB.getParentEle(BDFDB.dotCN.voiceuser, wrapper)) key = "changeInVoiceChat";
 		else if (BDFDB.getParentEle(BDFDB.dotCN.members, wrapper)) key = "changeInMemberList";
-		else if (BDFDB.getParentEle(BDFDB.dotCN.dmguild, wrapper)) key = "changeInRecentDms";
+		else if (BDFDB.getParentEle(BDFDB.dotCN.guildouter, wrapper)) key = "changeInRecentDms";
 		else if (BDFDB.getParentEle(BDFDB.dotCN.dmchannels, wrapper)) key = "changeInDmsList";
 		else if (BDFDB.getParentEle(BDFDB.dotCN.channelheaderheaderbar, wrapper)) key = "changeInDmHeader";
 		else if (BDFDB.getParentEle(BDFDB.dotCN.callavatarwrapper, wrapper) || BDFDB.getParentEle(BDFDB.dotCN.callincoming, wrapper) || BDFDB.getParentEle(BDFDB.dotCN.callcurrentcontainer, wrapper) || BDFDB.getParentEle(BDFDB.dotCN.pictureinpicture, wrapper)) key = "changeInDmCalls";
diff --git a/Plugins/ServerFolders/ServerFolders.plugin.js b/Plugins/ServerFolders/ServerFolders.plugin.js
index 5053b05b64..ca47cc2dd9 100644
--- a/Plugins/ServerFolders/ServerFolders.plugin.js
+++ b/Plugins/ServerFolders/ServerFolders.plugin.js
@@ -3,7 +3,7 @@
 class ServerFolders {
 	getName () {return "ServerFolders";}
 
-	getVersion () {return "6.3.0";}
+	getVersion () {return "6.3.1";}
 
 	getAuthor () {return "DevilBro";}
 
@@ -11,8 +11,7 @@ class ServerFolders {
 
 	initConstructor () {
 		this.changelog = {
-			"fixed":[["Mentions","Fixed mentions not updating properly"],["AutoPlayGifs","Now works properly with AutoPlayGifs"]],
-			"improved":[["BD Guild classes","Added the BD classes for folders"]]
+			"fixed":[["Settings","Fixed collision between ForceCloseAllFolders and ForceOpenFolderOfSelectedServer Settings"]],
 		};
 		
 		this.labels = {};
@@ -603,9 +602,12 @@ class ServerFolders {
 					this.updateCopyInFolderContent(wrapper, folderdiv);
 					this.updateFolderNotifications(folderdiv);
 				}
-				BDFDB.addEventListener(this, wrapper, "click", () => {
-					if (BDFDB.getData("closeAllFolders", this, "settings")) document.querySelectorAll(BDFDB.dotCNS.guildswrapper + BDFDB.dotCN.guildouter + ".folder.open").forEach(openFolder => {this.openCloseFolder(openFolder);});
-				});
+				BDFDB.addEventListener(this, wrapper, "click", () => {setImmediate(() => {
+					var newsettings = BDFDB.getAllData(this, "settings")
+					if (newsettings.closeAllFolders) document.querySelectorAll(BDFDB.dotCNS.guildswrapper + BDFDB.dotCN.guildouter + ".folder.open").forEach(openFolder => {
+						if (!newsettings.forceOpenFolder || !this.foldercontent.querySelector(`${BDFDB.dotCN.guildouter}[folder="${openFolder.id}"][guild="${this.CurrentGuildStore.getGuildId()}"]`)) this.openCloseFolder(openFolder);
+					});
+				})});
 				BDFDB.addEventListener(this, wrapper, "mousedown", e => {
 					if (BDFDB.pressedKeys.includes(17)) {
 						BDFDB.stopEvent(e);
@@ -1265,8 +1267,7 @@ class ServerFolders {
 			if (BDFDB.pressedKeys.includes(46)) this.removeServerFromFolder(info, folderdiv);
 			else {
 				let settings = BDFDB.getAllData(this, "settings");
-				if (settings.closeAllFolders) document.querySelectorAll(BDFDB.dotCNS.guildswrapper + BDFDB.dotCN.guildouter + ".folder.open").forEach(openFolder => {this.openCloseFolder(openFolder);});
-				else if (settings.closeTheFolder) this.openCloseFolder(folderdiv);
+				if (!settings.closeAllFolders && settings.closeTheFolder) this.openCloseFolder(folderdiv);
 				guilddiv.querySelector("a").click();
 			}
 		});
@@ -1389,11 +1390,12 @@ class ServerFolders {
 			let folderdivbadges = folderdiv.querySelector(BDFDB.dotCN.guildbadgewrapper);
 			let masks = folderdiv.querySelectorAll("mask rect");
 			
-			let mentions = 0, unread = false, audioenabled = false, videoenabled = false;
+			let mentions = 0, unread = false, selected = false, audioenabled = false, videoenabled = false;
 
 			includedServers.forEach(div => {
 				let props = BDFDB.getReactValue(div, "return.stateNode.props");
 				mentions += parseInt(props.badge);
+				if (props.selected) selected = true;
 				if (props.unread) unread = true;
 				if (props.audio) audioenabled = true;
 				if (props.video) videoenabled = true;