diff --git a/Library/0BDFDB.plugin.js b/Library/0BDFDB.plugin.js
index 18d589ce47..87b5651de7 100644
--- a/Library/0BDFDB.plugin.js
+++ b/Library/0BDFDB.plugin.js
@@ -2,7 +2,7 @@
  * @name BDFDB
  * @author DevilBro
  * @authorId 278543574059057154
- * @version 2.0.8
+ * @version 2.0.9
  * @description Required Library for DevilBro's Plugins
  * @invite Jx3TjNS
  * @donate https://www.paypal.me/MircoWittrien
@@ -19,7 +19,7 @@ module.exports = (_ => {
 		"info": {
 			"name": "BDFDB",
 			"author": "DevilBro",
-			"version": "2.0.8",
+			"version": "2.0.9",
 			"description": "Required Library for DevilBro's Plugins"
 		},
 		"rawUrl": `https://mwittrien.github.io/BetterDiscordAddons/Library/0BDFDB.plugin.js`
@@ -8201,13 +8201,25 @@ module.exports = (_ => {
 					if (e.returnValue && e.returnValue.props.children && e.returnValue.props.children.type && e.returnValue.props.children.type.displayName) {
 						let name = e.returnValue.props.children.type.displayName;
 						BDFDB.PatchUtils.patch(plugin, e.returnValue.props.children, "type", {after: e2 => {
-							if (e2.returnValue && typeof plugin[`on${type}`] == "function") plugin[`on${type}`]({
-								instance: {props: e2.methodArguments[0]},
-								returnvalue: e2.returnValue,
-								component: module,
-								methodname: "default",
-								type: name
-							});
+							if (!e2.returnValue || typeof plugin[`on${type}`] != "function") return;
+							else {
+								if (e2.returnValue.props && e2.returnValue.props.children) plugin[`on${type}`]({
+									instance: {props: e2.methodArguments[0]},
+									returnvalue: e2.returnValue,
+									component: module,
+									methodname: "default",
+									type: name
+								});
+								else if (typeof e2.returnValue.type == "function") BDFDB.PatchUtils.patch(plugin, e2.returnValue, "type", {after: e3 => {
+									if (e3.returnValue && typeof plugin[`on${type}`] == "function") plugin[`on${type}`]({
+										instance: {props: e.methodArguments[0]},
+										returnvalue: e3.returnValue,
+										component: module,
+										methodname: "default",
+										type: name
+									});
+								}}, {name: name, noCache: true});
+							}
 						}}, {name: name, noCache: true});
 					}
 				}}, {name: type});
@@ -8252,10 +8264,11 @@ module.exports = (_ => {
 						
 						let found = false, funcString = exports && exports.default && typeof exports.default == "function" && exports.default.toString();
 						if (funcString && funcString.indexOf(".page") > -1 && funcString.indexOf(".section") > -1 && funcString.indexOf(".objectType") > -1) {
-							const returnValue = exports.default();
+							const returnValue = exports.default({});
 							if (returnValue && returnValue.props && returnValue.props.object == BDFDB.DiscordConstants.AnalyticsObjects.CONTEXT_MENU) {
 								for (const type in PluginStores.contextChunkObserver) {
 									if (PluginStores.contextChunkObserver[type].filter(returnValue.props.children.type)) {
+										found = true;
 										if (PluginStores.contextChunkObserver[type].modules.indexOf(exports) == -1) PluginStores.contextChunkObserver[type].modules.push(exports);
 										for (const plugin of PluginStores.contextChunkObserver[type].query) InternalBDFDB.patchContextMenu(plugin, type, exports);
 										break;
diff --git a/Themes/BasicBackground/BasicBackground.css b/Themes/BasicBackground/BasicBackground.css
index 5a07bd3a5a..4c5c35d41f 100644
--- a/Themes/BasicBackground/BasicBackground.css
+++ b/Themes/BasicBackground/BasicBackground.css
@@ -2634,6 +2634,14 @@ body::after {
 .container-20TyK0[style*="background-color: rgba(32, 34, 37"] {
 	background-color: rgba(var(--transparencycolor), .7) !important;
 }
+.container-20TyK0[style*="background-color: rgba(248, 249, 249"] .message-3C6JQ1,
+.container-20TyK0[style*="background-color: rgba(32, 34, 37"] .message-3C6JQ1 {
+	color: var(--header-primary) !important;
+}
+.container-20TyK0[style*="background-color: rgba(248, 249, 249"] .resetButton-jFzA0U span[style],
+.container-20TyK0[style*="background-color: rgba(32, 34, 37"] .resetButton-jFzA0U span[style] {
+	color: var(--header-primary) !important;
+}
 .container-20TyK0::before {
 	content: "";
 	position: absolute;