diff --git a/Library/_res/BDFDB.data.json b/Library/_res/BDFDB.data.json
index 4968fdf296..c354b89555 100644
--- a/Library/_res/BDFDB.data.json
+++ b/Library/_res/BDFDB.data.json
@@ -1069,11 +1069,6 @@
 		"accountinfobuttonenabled": ["AccountDetailsButtons", "enabled"],
 		"accountinfodetails": ["AccountDetails", "usernameContainer"],
 		"accountinfonametag": ["AccountDetails", "nameTag"],
-		"alignbaseline": ["Flex", "alignBaseline"],
-		"aligncenter": ["Flex", "alignCenter"],
-		"alignend": ["Flex", "alignEnd"],
-		"alignstart": ["Flex", "alignStart"],
-		"alignstretch": ["Flex", "alignStretch"],
 		"anchor": ["Anchor", "anchor"],
 		"anchorunderlineonhover": ["Anchor", "anchorUnderlineOnHover"],
 		"animationcontainerbottom": ["AnimationContainer", "animatorBottom"],
@@ -1370,12 +1365,9 @@
 		"customstatusicon": ["CustomStatusIcon", "icon"],
 		"defaultcolor": ["Text", "defaultColor"],
 		"description": ["FormText", "description"],
-		"directioncolumn": ["Flex", "directionColumn"],
 		"directiondown": ["IconDirection", "directionDown"],
 		"directionleft": ["IconDirection", "directionLeft"],
 		"directionright": ["IconDirection", "directionRight"],
-		"directionrow": ["Flex", "directionRow"],
-		"directionrowreverse": ["Flex", "directionRowReverse"],
 		"directionup": ["IconDirection", "directionUp"],
 		"directiontransition": ["IconDirection", "transition"],
 		"discriminator": ["NameTag", "discriminator"],
@@ -1474,10 +1466,27 @@
 		"filenamewrapper": ["File", "filenameWrapper"],
 		"flex": ["FlexChild", "flex"],
 		"flex2": ["Flex", "flex"],
+		"flexalignbaseline": ["Flex", "alignBaseline"],
+		"flexaligncenter": ["Flex", "alignCenter"],
+		"flexalignend": ["Flex", "alignEnd"],
+		"flexalignstart": ["Flex", "alignStart"],
+		"flexalignstretch": ["Flex", "alignStretch"],
 		"flexcenter": ["Flex", "flexCenter"],
 		"flexchild": ["FlexChild", "flexChild"],
+		"flexdirectioncolumn": ["Flex", "directionColumn"],
+		"flexdirectionrow": ["Flex", "directionRow"],
+		"flexdirectionrowreverse": ["Flex", "directionRowReverse"],
+		"flexhorizontal": ["FlexChild", "horizontal"],
+		"flexhorizontalreverse": ["FlexChild", "horizontalReverse"],
+		"flexjustifycenter": ["Flex", "justifyCenter"],
+		"flexjustifyend": ["Flex", "justifyEnd"],
+		"flexjustifystart": ["Flex", "justifyStart"],
 		"flexmarginreset": ["FlexChild", "flexMarginReset"],
+		"flexnowrap": ["Flex", "noWrap"],
 		"flexspacer": ["Flex", "spacer"],
+		"flexvertical": ["Flex", "vertical"],
+		"flexwrap": ["Flex", "wrap"],
+		"flexwrapreverse": ["Flex", "wrapReverse"],
 		"flowerstar": ["FlowerStar", "flowerStar"],
 		"flowerstarchild": ["FlowerStar", "childContainer"],
 		"flowerstarcontainer": ["FlowerStar", "flowerStarContainer"],
@@ -1620,17 +1629,9 @@
 		"highlight": ["NotFound", "highlight"],
 		"homebuttonicon": ["HomeIcon", "homeIcon"],
 		"homebuttonpill": ["HomeIcon", "pill"],
-		"horizontal": ["FlexChild", "horizontal"],
-		"horizontal2": ["NotFound", "_"],
-		"horizontalreverse": ["FlexChild", "horizontalReverse"],
-		"horizontalreverse2": ["NotFound", "_"],
-		"hotkeybase": ["NotFound", "_"],
 		"hotkeybutton": ["HotKeyRecorder", "button"],
-		"hotkeybutton2": ["NotFound", "_"],
 		"hotkeycontainer": ["HotKeyRecorder", "container"],
-		"hotkeycontainer2": ["NotFound", "_"],
 		"hotkeydisabled": ["HotKeyRecorder", "disabled"],
-		"hotkeydisabled2": ["NotFound", "_"],
 		"hotkeyediticon": ["HotKeyRecorder", "editIcon"],
 		"hotkeyhasvalue": ["HotKeyRecorder", "hasValue"],
 		"hotkeyinput": ["HotKeyRecorder", "input"],
@@ -1724,9 +1725,6 @@
 		"invitestatusonline": ["GuildInvite", "statusOnline"],
 		"inviteuserselectnone": ["GuildInvite", "userSelectNone"],
 		"italics": ["TextStyle", "italics"],
-		"justifycenter": ["Flex", "justifyCenter"],
-		"justifyend": ["Flex", "justifyEnd"],
-		"justifystart": ["Flex", "justifyStart"],
 		"layermodal": ["LayerModal", "root"],
 		"layermodallarge": ["LayerModal", "large"],
 		"layermodalmedium": ["LayerModal", "medium"],
@@ -2037,7 +2035,6 @@
 		"noticesuccess": ["Notice", "colorSuccess"],
 		"noticetextlink": ["NoticePlatform", "textLink"],
 		"noticewrapper": ["BDFDB", "noticeWrapper"],
-		"nowrap": ["Flex", "noWrap"],
 		"overflowellipsis": ["BDFDB", "overflowEllipsis"],
 		"paginationlist": ["BDFDB", "paginationList"],
 		"paginationlistalphabet": ["BDFDB", "paginationListAlphabet"],
@@ -2447,7 +2444,6 @@
 		"usersummaryemptyuser": ["UserSummaryItem", "emptyUser"],
 		"usersummaryicon": ["UserSummaryItem", "icon"],
 		"usersummarymoreUsers": ["UserSummaryItem", "moreUsers"],
-		"vertical": ["Flex", "vertical"],
 		"voiceavatar": ["VoiceChannel", "avatar"],
 		"voiceavatarcontainer": ["VoiceChannel", "avatarContainer"],
 		"voiceavatarlarge": ["VoiceChannel", "avatarLarge"],
@@ -2497,9 +2493,7 @@
 		"webhookcard": ["WebhookCard", "card"],
 		"webhookcardbody": ["WebhookCard", "body"],
 		"webhookcardcopybutton": ["WebhookCard", "copyButton"],
-		"webhookcardheader": ["WebhookCard", "header"],
-		"wrap": ["Flex", "wrap"],
-		"wrapreverse": ["Flex", "wrapReverse"]
+		"webhookcardheader": ["WebhookCard", "header"]
 	},
 	"myId": "278543574059057154",
 	"myGuildId": "410787888507256842",
diff --git a/Library/_res/BDFDB.raw.css b/Library/_res/BDFDB.raw.css
index 578283c674..9abd1d95b6 100644
--- a/Library/_res/BDFDB.raw.css
+++ b/Library/_res/BDFDB.raw.css
@@ -72,7 +72,7 @@ img:not([src]), img[src=""], img[src="null"] {
 [REPLACE_CLASS_settingsrowcontainer][REPLACE_CLASS_marginbottom60] {
 	margin-bottom: 60px;
 }
-[REPLACE_CLASS_settingsrowcontainer] + [REPLACE_CLASS_settingsrowcontainer] {
+[REPLACE_CLASS_flexdirectionrow] > [REPLACE_CLASS_settingsrowcontainer] + [REPLACE_CLASS_settingsrowcontainer] {
 	margin-left: 8px;
 }
 [REPLACE_CLASS_settingsrowcontainer] [REPLACE_CLASS_settingsrowlabel] {