diff --git a/Library/_res/BDFDB.data.json b/Library/_res/BDFDB.data.json
index de03d93978..cbc13b8461 100644
--- a/Library/_res/BDFDB.data.json
+++ b/Library/_res/BDFDB.data.json
@@ -854,14 +854,14 @@
 		"SearchResultsMessage": {"props": ["after", "messageGroupCozy"]},
 		"Select": {"props": ["select", "error", "errorMessage"]},
 		"SettingsCloseButton": {"props": ["closeButton", "keybind"]},
-		"SettingsItems": {"props": ["dividerMini", "note"]},
+		"SettingsItems": {"props": ["labelRow", "note"]},
 		"SettingsTable": {"props": ["headerOption", "headerName"]},
 		"SettingsWindow": {"props": ["contentRegion", "standardSidebarView"]},
 		"SettingsWindowScroller": {"props": ["sidebarScrollable", "content", "scroller"]},
 		"Slider": {"props": ["slider", "grabber"]},
 		"Spoiler": {"props": ["spoilerContainer", "hidden"]},
 		"SpoilerEmbed": {"props": ["hiddenSpoilers", "spoiler"]},
-		"Switch": {"props": ["switchDisabled", "valueChecked"]},
+		"Switch": {"props": ["container", "slider", "input"]},
 		"Table": {"props": ["stickyHeader", "sortIcon"]},
 		"Text": {"props": ["defaultColor", "defaultMarginh1"]},
 		"TextColor": {"props": ["colorStandard", "colorMuted", "colorError"]},
@@ -1373,11 +1373,9 @@
 		"directionrowreverse": ["Flex", "directionRowReverse"],
 		"directionup": ["IconDirection", "directionUp"],
 		"directiontransition": ["IconDirection", "transition"],
-		"disabled": ["SettingsItems", "disabled"],
 		"discriminator": ["NameTag", "discriminator"],
 		"divider": ["ModalDivider", "divider"],
 		"dividerdefault": ["SettingsItems", "dividerDefault"],
-		"dividermini": ["SettingsItems", "dividerMini"],
 		"dmchannel": ["PrivateChannel", "channel"],
 		"dmchannelactivity": ["PrivateChannel", "activity"],
 		"dmchannelactivityemoji": ["PrivateChannel", "activityEmoji"],
@@ -2034,7 +2032,6 @@
 		"noticesuccess": ["Notice", "colorSuccess"],
 		"noticetextlink": ["NoticePlatform", "textLink"],
 		"noticewrapper": ["BDFDB", "noticeWrapper"],
-		"note": ["SettingsItems", "note"],
 		"nowrap": ["Flex", "noWrap"],
 		"overflowellipsis": ["BDFDB", "overflowEllipsis"],
 		"paginationlist": ["BDFDB", "paginationList"],
@@ -2180,13 +2177,20 @@
 		"settingsitemroleinner": ["ItemRole", "roleInner"],
 		"settingsitemselected": ["Item", "selected"],
 		"settingsitemthemed": ["Item", "themed"],
-		"settingsPanel": ["BDFDB", "settingsPanel"],
+		"settingspanel": ["BDFDB", "settingsPanel"],
 		"settingspanelheader": ["BDFDB", "settingsPanelHeader"],
 		"settingspanelheaderbutton": ["BDFDB", "settingsPanelHeaderButton"],
 		"settingspanelheadercontrols": ["BDFDB", "settingsPanelHeaderControls"],
 		"settingspanelinner": ["BDFDB", "settingsPanelInner"],
 		"settingspanellist": ["BDFDB", "settingsPanelList"],
 		"settingspaneltitle": ["BDFDB", "settingsPanelTitle"],
+		"settingsrow": ["SettingsItems", "labelRow"],
+		"settingsrowcontrol": ["SettingsItems", "control"],
+		"settingsrowdisabled": ["SettingsItems", "disabled"],
+		"settingsrownote": ["SettingsItems", "note"],
+		"settingsrowtitle": ["SettingsItems", "title"],
+		"settingsrowtitledefault": ["SettingsItems", "titleDefault"],
+		"settingsrowtitlemini": ["SettingsItems", "titleMini"],
 		"settingsseparator": ["Item", "separator"],
 		"settingstableheader": ["SettingsTable", "header"],
 		"settingstableheadername": ["SettingsTable", "headerName"],
@@ -2318,7 +2322,6 @@
 		"tipblock": ["Tip", "block"],
 		"tippro": ["Tip", "pro"],
 		"tipinline": ["Tip", "inline"],
-		"title": ["SettingsItems", "title"],
 		"titlebar": ["TitleBar", "titleBar"],
 		"titlebarmac": ["TitleBar", "typeMacOS"],
 		"titlebarmacbutton": ["TitleBar", "macButton"],
@@ -2335,8 +2338,6 @@
 		"titlebarwordmark": ["TitleBar", "wordmark"],
 		"titlebarwordmarkmac": ["TitleBar", "wordmarkMacOS"],
 		"titlebarwordmarkwindows": ["TitleBar", "wordmarkWindows"],
-		"titledefault": ["SettingsItems", "titleDefault"],
-		"titlemini": ["SettingsItems", "titleMini"],
 		"titlesize10": ["UserPopout", "size10"],
 		"titlesize12": ["UserPopout", "size12"],
 		"titlesize14": ["UserPopout", "size14"],