diff --git a/Library/0BDFDB.plugin.js b/Library/0BDFDB.plugin.js
index 18f728659d..013a788fe4 100644
--- a/Library/0BDFDB.plugin.js
+++ b/Library/0BDFDB.plugin.js
@@ -1096,7 +1096,7 @@ module.exports = (_ => {
 						for (let word of text.split(" ")) {
 							let encodedWord = BDFDB.StringUtils.htmlEscape(word);
 							link.href = word;
-							newText.push(link.host && link.host !== window.location.host ? `<label class="${BDFDB.disCN.textlink}">${encodedWord}</label>` : encodedWord);
+							newText.push(link.host && link.host !== window.location.host ? `<label class="${BDFDB.disCN.noticetextlink}">${encodedWord}</label>` : encodedWord);
 						}
 						noticeMessage.innerHTML = newText.join(" ");
 					}
diff --git a/Library/_res/BDFDB.data.json b/Library/_res/BDFDB.data.json
index ca6f0fea7c..10d569c6da 100644
--- a/Library/_res/BDFDB.data.json
+++ b/Library/_res/BDFDB.data.json
@@ -818,6 +818,7 @@
 		"NitroStore": {"props": ["applicationStore", "marketingHeader"]},
 		"NoteTextarea": {"props": ["textarea"], "length": 1},
 		"Notice": {"props": ["notice", "platformIcon"]},
+		"NoticePlatform": {"props": ["iconAndroid", "textLink"]},
 		"PeopleItem": {"props": ["peopleListItem", "active"]},
 		"PeopleItemInfo": {"props": ["listItemContents", "actions"], "length": 2},
 		"Peoples": {"props": ["peopleColumn", "tabBar"]},
@@ -1605,8 +1606,6 @@
 		"h5defaultmargin": ["Text", "defaultMarginh5"],
 		"headertitle": ["Text", "title"],
 		"height12": ["UserPopout", "height12"],
-		"height16": ["File", "height16"],
-		"height36": ["Notice", "height36"],
 		"highlight": ["NotFound", "highlight"],
 		"homebuttonicon": ["HomeIcon", "homeIcon"],
 		"homebuttonpill": ["HomeIcon", "pill"],
@@ -2000,29 +1999,31 @@
 		"notice": ["Notice", "notice"],
 		"noticebrand": ["Notice", "noticeBrand"],
 		"noticebutton": ["Notice", "button"],
+		"noticecustom": ["Notice", "colorCustom"],
 		"noticedanger": ["Notice", "noticeDanger"],
+		"noticedark": ["Notice", "colorDark"],
 		"noticedefault": ["Notice", "noticeDefault"],
 		"noticedownload": ["Notice", "noticeDownload"],
 		"noticedismiss": ["Notice", "dismiss"],
-		"noticefacebook": ["Notice", "noticeFacebook"],
-		"noticeicon": ["Notice", "icon"],
-		"noticeiconandroid": ["Notice", "iconAndroid"],
-		"noticeiconapple": ["Notice", "iconApple"],
-		"noticeiconwindows": ["Notice", "iconWindows"],
+		"noticeicon": ["NoticePlatform", "icon"],
+		"noticeiconandroid": ["NoticePlatform", "iconAndroid"],
+		"noticeiconapple": ["NoticePlatform", "iconApple"],
+		"noticeiconwindows": ["NoticePlatform", "iconWindows"],
 		"noticeinfo": ["Notice", "noticeInfo"],
+		"noticeneutral": ["Notice", "colorNeutral"],
 		"noticenotification": ["Notice", "noticeNotification"],
 		"noticeplatformicon": ["Notice", "platformIcon"],
 		"noticepremium": ["Notice", "noticePremium"],
-		"noticepremiumaction": ["Notice", "premiumAction"],
-		"noticepremiumlogo": ["Notice", "premiumLogo"],
-		"noticepremiumtext": ["Notice", "premiumText"],
+		"noticepremiumaction": ["NoticePlatform", "premiumAction"],
+		"noticepremiumicon": ["NoticePlatform", "premiumIcon"],
+		"noticepremiumlogo": ["NoticePlatform", "premiumLogo"],
+		"noticepremiumtext": ["NoticePlatform", "premiumText"],
 		"noticepremiumtier1": ["Notice", "noticePremiumTier1"],
 		"noticepremiumtier2": ["Notice", "noticePremiumTier2"],
-		"noticerichpresence": ["Notice", "noticeRichPresence"],
 		"noticespotify": ["Notice", "noticeSpotify"],
 		"noticestreamer": ["Notice", "noticeStreamerMode"],
 		"noticesuccess": ["Notice", "noticeSuccess"],
-		"noticesurvey": ["Notice", "noticeSurvey"],
+		"noticetextlink": ["NoticePlatform", "textLink"],
 		"noticewrapper": ["BDFDB", "noticeWrapper"],
 		"note": ["SettingsItems", "note"],
 		"nowrap": ["Flex", "noWrap"],
@@ -2299,7 +2300,6 @@
 		"textareawrapall": ["ChannelTextArea", "channelTextArea"],
 		"textareawrapchat": ["ChatWindow", "channelTextArea"],
 		"textareawrapdisabled": ["ChannelTextArea", "channelTextAreaDisabled"],
-		"textlink": ["Notice", "textLink"],
 		"textrow": ["PopoutActivity", "textRow"],
 		"textscroller": ["BDFDB", "textScroller"],
 		"themedark": ["NotFound", "themeDark"],