diff --git a/Library/0BDFDB.plugin.js b/Library/0BDFDB.plugin.js
index 208d5ea2ea..6fc9343f43 100644
--- a/Library/0BDFDB.plugin.js
+++ b/Library/0BDFDB.plugin.js
@@ -13,13 +13,13 @@ module.exports = (_ => {
 		"info": {
 			"name": "BDFDB",
 			"author": "DevilBro",
-			"version": "1.0.8",
+			"version": "1.0.9",
 			"description": "Give other plugins utility functions"
 		},
 		"rawUrl": "https://mwittrien.github.io/BetterDiscordAddons/Library/0BDFDB.plugin.js",
 		"changeLog": {
 			"fixed": {
-				"Switches": "Switches for all my plugins work again"
+				"BD Beta": "Fixed some issues with the beta"
 			}
 		}
 	};
@@ -5792,7 +5792,7 @@ module.exports = (_ => {
 									tooltipConfig: {zIndex: 3001},
 									onClick: _ => {if (this.state.offset > 0) this.jump(0);},
 									children: BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.Clickable, {
-										className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN.searchresultspaginationbutton, this.state.offset <= 0 && BDFDB.disCN.searchresultspaginationdisabled, BDFDB.disCN.focusable),
+										className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN.searchresultspaginationbutton, this.state.offset <= 0 && BDFDB.disCN.searchresultspaginationdisabled),
 										children: BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.SvgIcon, {
 											className: BDFDB.disCN.searchresultspaginationicon,
 											name: InternalComponents.LibraryComponents.SvgIcon.Names.LEFT_DOUBLE_CARET
@@ -5807,7 +5807,7 @@ module.exports = (_ => {
 										if (this.state.offset > 0) this.jump(this.state.offset - 1);
 									},
 									children: BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.Clickable, {
-										className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN.searchresultspaginationbutton, this.state.offset <= 0 && BDFDB.disCN.searchresultspaginationdisabled, BDFDB.disCN.focusable),
+										className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN.searchresultspaginationbutton, this.state.offset <= 0 && BDFDB.disCN.searchresultspaginationdisabled),
 										children: BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.SvgIcon, {
 											className: BDFDB.disCN.searchresultspaginationicon,
 											name: InternalComponents.LibraryComponents.SvgIcon.Names.LEFT_CARET
@@ -5821,7 +5821,7 @@ module.exports = (_ => {
 									tooltipConfig: {zIndex: 3001},
 									onClick: _ => {if (this.state.offset < maxOffset) this.jump(this.state.offset + 1);},
 									children: BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.Clickable, {
-										className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN.searchresultspaginationbutton, this.state.offset >= maxOffset && BDFDB.disCN.searchresultspaginationdisabled, BDFDB.disCN.focusable),
+										className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN.searchresultspaginationbutton, this.state.offset >= maxOffset && BDFDB.disCN.searchresultspaginationdisabled),
 										children: BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.SvgIcon, {
 											className: BDFDB.disCN.searchresultspaginationicon,
 											name: InternalComponents.LibraryComponents.SvgIcon.Names.RIGHT_CARET
@@ -5834,7 +5834,7 @@ module.exports = (_ => {
 									tooltipConfig: {zIndex: 3001},
 									onClick: _ => {if (this.state.offset < maxOffset) this.jump(maxOffset);},
 									children: BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.Clickable, {
-										className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN.searchresultspaginationbutton, this.state.offset >= maxOffset && BDFDB.disCN.searchresultspaginationdisabled, BDFDB.disCN.focusable),
+										className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN.searchresultspaginationbutton, this.state.offset >= maxOffset && BDFDB.disCN.searchresultspaginationdisabled),
 										children: BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.SvgIcon, {
 											className: BDFDB.disCN.searchresultspaginationicon,
 											name: InternalComponents.LibraryComponents.SvgIcon.Names.RIGHT_DOUBLE_CARET
@@ -7156,16 +7156,17 @@ module.exports = (_ => {
 					let checkbox = card.querySelector(BDFDB.dotCN._reposwitch);
 					if (!checkbox) return;
 					let props = BDFDB.ObjectUtils.get(BDFDB.ReactUtils.getInstance(card), "return.stateNode.props");
-					if (props && !props.hasCustomControls && props.addon && props.addon.plugin && (props.addon.plugin == libraryInstance || props.addon.plugin.name && props.addon.plugin.name && PluginStores.loaded[props.addon.plugin.name] && PluginStores.loaded[props.addon.plugin.name] == props.addon.plugin)) {
+					let plugin = props && props.addon && (props.addon.plugin || props.addon.instance);
+					if (plugin && !props.hasCustomControls && (plugin == libraryInstance || plugin.name && plugin.name && PluginStores.loaded[plugin.name] && PluginStores.loaded[plugin.name] == plugin)) {
 						props.hasCustomControls = true;
-						let url = props.addon.plugin.rawUrl ||`https://mwittrien.github.io/BetterDiscordAddons/Plugins/${props.addon.plugin.name}/${props.addon.plugin.name}.plugin.js`;
+						let url = plugin.rawUrl ||`https://mwittrien.github.io/BetterDiscordAddons/Plugins/${plugin.name}/${plugin.name}.plugin.js`;
 						let controls = [];
-						if (props.addon.plugin.changeLog) controls.push(InternalBDFDB.createCustomControl(BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.TooltipContainer, {
+						if (plugin.changeLog) controls.push(InternalBDFDB.createCustomControl(BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.TooltipContainer, {
 							text: BDFDB.LanguageUtils.LanguageStrings.CHANGE_LOG,
 							children: BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.SvgIcon, {
 								className: BDFDB.disCN._repoicon,
 								name: InternalComponents.LibraryComponents.SvgIcon.Names.CHANGELOG,
-								onClick: _ => {BDFDB.PluginUtils.openChangeLog(props.addon.plugin);}
+								onClick: _ => {BDFDB.PluginUtils.openChangeLog(plugin);}
 							})
 						})));
 						if (window.PluginUpdates && window.PluginUpdates.plugins && window.PluginUpdates.plugins[url] && window.PluginUpdates.plugins[url].outdated) controls.push(InternalBDFDB.createCustomControl(BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.TooltipContainer, {
@@ -7173,7 +7174,7 @@ module.exports = (_ => {
 							children: BDFDB.ReactUtils.createElement(InternalComponents.LibraryComponents.SvgIcon, {
 								className: BDFDB.disCN._repoicon,
 								name: InternalComponents.LibraryComponents.SvgIcon.Names.DOWNLOAD,
-								onClick: _ => {BDFDB.PluginUtils.downloadUpdate(props.addon.plugin.name, url);}
+								onClick: _ => {BDFDB.PluginUtils.downloadUpdate(plugin.name, url);}
 							})
 						})));
 						for (let control of controls) checkbox.parentElement.insertBefore(control, checkbox.parentElement.firstElementChild);
diff --git a/Library/_res/BDFDB.data.json b/Library/_res/BDFDB.data.json
index a96e374697..3d148ab219 100644
--- a/Library/_res/BDFDB.data.json
+++ b/Library/_res/BDFDB.data.json
@@ -749,7 +749,6 @@
 		"Flex": {"props": ["alignBaseline", "alignCenter"]},
 		"FlexChild": {"props": ["flexChild", "flex"]},
 		"FlowerStar": {"props": ["flowerStarContainer", "flowerStar"]},
-		"Focusable": {"props": ["focusable"]},
 		"FormText": {"props": ["description", "modeDefault"]},
 		"Game": {"props": ["game", "gameName"]},
 		"GameIcon": {"props": ["gameIcon", "small", "xsmall"]},
@@ -1494,7 +1493,6 @@
 		"flowerstar": ["FlowerStar", "flowerStar"],
 		"flowerstarchild": ["FlowerStar", "childContainer"],
 		"flowerstarcontainer": ["FlowerStar", "flowerStarContainer"],
-		"focusable": ["Focusable", "focusable"],
 		"formtext": ["FormText", "formText"],
 		"game": ["Game", "game"],
 		"gameicon": ["GameIcon", "gameIcon"],
diff --git a/Plugins/BetterSearchPage/BetterSearchPage.plugin.js b/Plugins/BetterSearchPage/BetterSearchPage.plugin.js
index 8d3942dc2f..e63763fcdd 100644
--- a/Plugins/BetterSearchPage/BetterSearchPage.plugin.js
+++ b/Plugins/BetterSearchPage/BetterSearchPage.plugin.js
@@ -13,7 +13,7 @@ module.exports = (_ => {
 		"info": {
 			"name": "BetterSearchPage",
 			"author": "DevilBro",
-			"version": "1.1.5",
+			"version": "1.1.6",
 			"description": "Add some extra controls to the search results page"
 		}
 	};
@@ -133,7 +133,7 @@ module.exports = (_ => {
 								"aria-label": BDFDB.LanguageUtils.LibraryStrings.first,
 								onClick: _ => {if (currentPage != 1) doJump(1);},
 								children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Clickable, {
-									className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN.searchresultspaginationbutton, currentPage == 1 && BDFDB.disCN.searchresultspaginationdisabled, BDFDB.disCN.focusable),
+									className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN.searchresultspaginationbutton, currentPage == 1 && BDFDB.disCN.searchresultspaginationdisabled),
 									children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SvgIcon, {
 										className: BDFDB.disCN.searchresultspaginationicon,
 										name: BDFDB.LibraryComponents.SvgIcon.Names.LEFT_DOUBLE_CARET
@@ -146,7 +146,7 @@ module.exports = (_ => {
 								"aria-label": BDFDB.LanguageUtils.LibraryStrings.last,
 								onClick: _ => {if (currentPage != maxPage) doJump(maxPage);},
 								children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Clickable, {
-									className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN.searchresultspaginationbutton, currentPage >= maxPage && BDFDB.disCN.searchresultspaginationdisabled, BDFDB.disCN.focusable),
+									className: BDFDB.DOMUtils.formatClassName(BDFDB.disCN.searchresultspaginationbutton, currentPage >= maxPage && BDFDB.disCN.searchresultspaginationdisabled),
 									children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.SvgIcon, {
 										className: BDFDB.disCN.searchresultspaginationicon,
 										name: BDFDB.LibraryComponents.SvgIcon.Names.RIGHT_DOUBLE_CARET