From 34bf10ff061bea9b779a818bfed4c44b010e97ab Mon Sep 17 00:00:00 2001
From: Jeremy Lorelli <jeremy.lorelli.1337@gmail.com>
Date: Tue, 16 Jan 2024 22:31:13 -0800
Subject: [PATCH 1/3] chore: Ignore generated fontconfig file

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 5e282513..b8dae879 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@ node_modules
 learn.vdf
 __types_momentum.js
 script_dist/
+
+# Generated by fontconfig
+.uuid

From c37a051a6c5b3ae5d65dcfd0dd039753a1c95015 Mon Sep 17 00:00:00 2001
From: Jeremy Lorelli <jeremy.lorelli.1337@gmail.com>
Date: Tue, 16 Jan 2024 22:31:55 -0800
Subject: [PATCH 2/3] refactor: Strip 'Chaos' prefix from panel names and
 events

---
 layout/components/player-card.xml             |   2 +-
 layout/components/settings/enum-dropdown.xml  |   4 +-
 layout/components/settings/enum.xml           |   4 +-
 layout/components/settings/keybinder.xml      |   4 +-
 layout/components/settings/slider.xml         |   4 +-
 layout/components/settings/toggle.xml         |   4 +-
 layout/components/show-fps.xml                |   4 +-
 layout/hud/bone-counts.xml                    |   4 +-
 layout/hud/ghost-entities.xml                 |   2 +-
 layout/hud/hint-text.xml                      |   6 +-
 layout/hud/hud.xml                            |  20 +-
 layout/hud/replay-controls.xml                |   2 +-
 layout/hud/show-pos.xml                       |   4 +-
 .../modals/toasts/custom-layout-example.xml   |   2 +-
 layout/pages/controls-library.xml             |  10 +-
 layout/pages/drawer/lobby.xml                 |   4 +-
 layout/pages/intro-movie.xml                  |   4 +-
 layout/pages/leaderboards/entry.xml           |   2 +-
 layout/pages/main-menu/main-menu.xml          |  10 +-
 layout/pages/settings/audio.xml               |  30 +-
 layout/pages/settings/gameplay.xml            | 384 +++++++++---------
 layout/pages/settings/input.xml               | 104 ++---
 layout/pages/settings/interface.xml           | 224 +++++-----
 layout/pages/settings/online.xml              |  44 +-
 layout/pages/settings/video.xml               | 106 ++---
 layout/util/global-popups.xml                 |   8 +-
 layout/util/popup-manager.xml                 |   4 +-
 scripts/hud/cgaz.js                           |   6 +-
 scripts/hud/df-jump.js                        |   2 +-
 scripts/hud/ground-boost.js                   |   4 +-
 scripts/hud/jump-stats.js                     |   2 +-
 scripts/hud/replay-controls.js                |   2 +-
 scripts/hud/strafe-sync.js                    |   2 +-
 scripts/hud/synchronizer.js                   |   4 +-
 scripts/hud/timer.js                          |   2 +-
 scripts/pages/intro-movie.js                  |   4 +-
 scripts/pages/learn.js                        |   4 +-
 scripts/pages/main-menu/main-menu.js          |  16 +-
 scripts/pages/settings/page.js                |  22 +-
 scripts/pages/settings/settings.js            |  16 +-
 styles/components/settings.scss               |   8 +-
 styles/hud/hud.scss                           |   2 +-
 styles/pages/intro-movie.scss                 |   2 +-
 43 files changed, 549 insertions(+), 549 deletions(-)

diff --git a/layout/components/player-card.xml b/layout/components/player-card.xml
index 57216dae..d11ff604 100644
--- a/layout/components/player-card.xml
+++ b/layout/components/player-card.xml
@@ -10,7 +10,7 @@
 		<Image class="playercard__background-image" src="file://{images}/playercards/card_bg.png" scaling="stretch-to-cover-preserve-aspect" />
 		<!-- <Panel class="playercard__black-overlay" /> 50% opacity black overlay to make the white text readable -->
 		<Panel class="playercard__main">
-			<ChaosAvatarImage class="playercard__player-avatar" steamid="local" />
+			<AvatarImage class="playercard__player-avatar" steamid="local" />
 			<Panel class="playercard__details-panel">
 				<Label id="PlayerName" class="playercard__player-name" text="{s:name}" />
 				<Panel id="Units" class="playercard__units">
diff --git a/layout/components/settings/enum-dropdown.xml b/layout/components/settings/enum-dropdown.xml
index fb6ee3f8..adb0b7e1 100644
--- a/layout/components/settings/enum-dropdown.xml
+++ b/layout/components/settings/enum-dropdown.xml
@@ -3,12 +3,12 @@
 		<include src="file://{resources}/styles/main.scss" />
 	</styles>
 
-	<ChaosSettingsEnumDropDown class="settings-enum-dropdown">
+	<SettingsEnumDropDown class="settings-enum-dropdown">
 		<Panel class="settings-enum-dropdown__title-container">
 			<Label class="settings-enum-dropdown__title" id="Title" />
 		</Panel>
 		<Panel class="settings-enum-dropdown__input-container">
 			<DropDown id="DropDown" class="dropdown settings-enum-dropdown__dropdown" menuclass="dropdown-menu" />
 		</Panel>
-	</ChaosSettingsEnumDropDown>
+	</SettingsEnumDropDown>
 </root>
diff --git a/layout/components/settings/enum.xml b/layout/components/settings/enum.xml
index fdf3a099..f0fdc27d 100644
--- a/layout/components/settings/enum.xml
+++ b/layout/components/settings/enum.xml
@@ -3,10 +3,10 @@
 		<include src="file://{resources}/styles/main.scss" />
 	</styles>
 
-	<ChaosSettingsEnum class="settings-enum">
+	<SettingsEnum class="settings-enum">
 		<Panel class="settings-enum__title-container">
 			<Label id="title" class="settings-enum__title" />
 		</Panel>
 		<Panel id="values" class="settings-enum__values" />
-	</ChaosSettingsEnum>
+	</SettingsEnum>
 </root>
diff --git a/layout/components/settings/keybinder.xml b/layout/components/settings/keybinder.xml
index 050207a0..acd9dbb8 100644
--- a/layout/components/settings/keybinder.xml
+++ b/layout/components/settings/keybinder.xml
@@ -3,7 +3,7 @@
 		<include src="file://{resources}/styles/main.scss" />
 	</styles>
 
-	<ChaosSettingsKeyBinder class="settings-keybinder">
+	<SettingsKeyBinder class="settings-keybinder">
 		<Panel class="settings-keybinder__title-container">
 			<Label id="title" class="settings-keybinder__title" />
 		</Panel>
@@ -13,5 +13,5 @@
 			</Panel>
 			<Button id="clearkeybinding" class="settings-keybinder__clear" />
 		</Panel>
-	</ChaosSettingsKeyBinder>
+	</SettingsKeyBinder>
 </root>
diff --git a/layout/components/settings/slider.xml b/layout/components/settings/slider.xml
index 3a53bf55..88d48455 100644
--- a/layout/components/settings/slider.xml
+++ b/layout/components/settings/slider.xml
@@ -4,7 +4,7 @@
 	</styles>
 
 
-	<ChaosSettingsSlider class="settings-slider">
+	<SettingsSlider class="settings-slider">
 		<Panel class="settings-slider__title-container">
 			<Label class="settings-slider__title" id="Title" />
 		</Panel>
@@ -15,5 +15,5 @@
 			</TooltipPanel>
 			<TextEntry class="textentry settings-slider__textentry" maxchars="6" textmode="numeric" id="Value" />
 		</Panel>
-	</ChaosSettingsSlider>
+	</SettingsSlider>
 </root>
diff --git a/layout/components/settings/toggle.xml b/layout/components/settings/toggle.xml
index db3421cd..45e39d19 100644
--- a/layout/components/settings/toggle.xml
+++ b/layout/components/settings/toggle.xml
@@ -5,13 +5,13 @@
 
 	<!-- Unused, doesn't have styling -->
 
-	<ChaosSettingsToggle>
+	<SettingsToggle>
 		<Panel class="flow-right vertical-align-center full-width">
 			<Panel id="TitleContainer">
 				<Label id="Title" />
 			</Panel>
 			<ToggleButton id="Toggle" />
 		</Panel>
-	</ChaosSettingsToggle>
+	</SettingsToggle>
 
 </root>
diff --git a/layout/components/show-fps.xml b/layout/components/show-fps.xml
index d4a5598a..97f0ab4b 100644
--- a/layout/components/show-fps.xml
+++ b/layout/components/show-fps.xml
@@ -3,7 +3,7 @@
 		<include src="file://{resources}/styles/main.scss" />
 	</styles>
 
-	<ChaosFPSMeter class="fpsmeter">
+	<FPSMeter class="fpsmeter">
 		<Label id="FPSLabel" class="fpsmeter__label" />
-	</ChaosFPSMeter>
+	</FPSMeter>
 </root>
diff --git a/layout/hud/bone-counts.xml b/layout/hud/bone-counts.xml
index 8d93573e..2ff53f22 100644
--- a/layout/hud/bone-counts.xml
+++ b/layout/hud/bone-counts.xml
@@ -3,8 +3,8 @@
 		<include src="file://{resources}/styles/main.scss" />
 	</styles>
 
-	<ChaosHudBoneCounts class="bonecounts">
+	<HudBoneCounts class="bonecounts">
 		<Label class="bonecounts__label" text="All computed bones: {d:bones}" />
 		<Label class="bonecounts__label" text="Blending rules only: {d:blendingonly}" />
-	</ChaosHudBoneCounts>
+	</HudBoneCounts>
 </root>
diff --git a/layout/hud/ghost-entities.xml b/layout/hud/ghost-entities.xml
index c956c6eb..8077041e 100644
--- a/layout/hud/ghost-entities.xml
+++ b/layout/hud/ghost-entities.xml
@@ -9,7 +9,7 @@
 	<snippets>
 		<snippet name="ghost-ent-panel">
 			<Panel class="ghost-ent">
-				<ChaosAvatarImage id="GhostAvatar" class="ghost-ent__avatar" />
+				<AvatarImage id="GhostAvatar" class="ghost-ent__avatar" />
 				<Panel id="NamePanel" class="ghost-ent__namepanel ghost-ent-namepanel">
 					<Image class="full-width full-height" src="file://{images}/playercards/card_bg.png" scaling="stretch-to-cover-preserve-aspect" />
 					<Label id="GhostName" class="ghost-ent-namepanel__label text-l" text="" />
diff --git a/layout/hud/hint-text.xml b/layout/hud/hint-text.xml
index ea1b4bbb..df34b207 100644
--- a/layout/hud/hint-text.xml
+++ b/layout/hud/hint-text.xml
@@ -1,5 +1,5 @@
 <!--
-	Purpose: hard-coded layout file for <ChaosHudHintText />
+	Purpose: hard-coded layout file for <HudHintText />
 
 	Label with id HintLabel is required
 	.hud-hint-\-visible class will be set when the panel should be visible, otherwise it should be invisible
@@ -10,11 +10,11 @@
 		<include src="file://{resources}/styles/main.scss" />
 	</styles>
 
-	<ChaosHudHintText hittest="false" class="hud-hint">
+	<HudHintText hittest="false" class="hud-hint">
 		<Panel class="hud-hint__text">
 			<Panel class="vertical-center top-bottom-flow">
 				<Label id="HintLabel" html="true" class="hud-hint__label mono-spaced-font-bold" />
 			</Panel>
 		</Panel>
-	</ChaosHudHintText>
+	</HudHintText>
 </root>
diff --git a/layout/hud/hud.xml b/layout/hud/hud.xml
index 19769a36..694ce0b2 100644
--- a/layout/hud/hud.xml
+++ b/layout/hud/hud.xml
@@ -3,7 +3,7 @@
 		<include src="file://{resources}/styles/main.scss" />
 	</styles>
 
-	<ChaosHud hittest="false">
+	<Hud hittest="false">
 		<!-- Non-interactive HUD elements have hit test disabled for efficiency -->
 
 		<!-- In world UI is first to make sure it shows up behind all "screen-looking" UI -->
@@ -39,7 +39,7 @@
 			<MomHudTimer />
 			<MomHudStrafeSync />
 			<MomHudGroundboost />
-			<ChaosHudHintText id="HudHintText" />
+			<HudHintText id="HudHintText" />
 		</Panel>
 
 		<!-- Anchored to the bottom-left corner of the screen, laid out from top to bottom -->
@@ -63,9 +63,9 @@
 			<MomHudWeaponSelection />
 		</Panel>
 
-		<ChaosHudBlurTarget id="HudBlur" blurrects="Leaderboards TrickList" class="hud-blur" hittest="false" hittestchildren="false">
-			<ChaosBackbufferImagePanel class="full" />
-		</ChaosHudBlurTarget>
+		<HudBlurTarget id="HudBlur" blurrects="Leaderboards TrickList" class="hud-blur" hittest="false" hittestchildren="false">
+			<BackbufferImagePanel class="full" />
+		</HudBlurTarget>
 
 		<!-- HUD anchored to top center of screen, laid out vertically top-to-bottom
 		-  NOTE: Not really set up properly - HudTeamCounter should dynamically move
@@ -74,8 +74,8 @@
 		-        while HudTeamCounter is visible
 		-->
 		<Panel id="HudTopCenter" hittest="false">
-			<ChaosHudShowPos />
-			<ChaosHudBoneCounts />
+			<HudShowPos />
+			<HudBoneCounts />
 			<MomHudSpectate id="Spectator" />
 			<MomHudJumpStats />
 		</Panel>
@@ -89,13 +89,13 @@
 
 		<!-- Make sure these are at the bottom to get the z-order right -->
 		<ToastManager />
-		<ChaosPopupManager id="PopupManager" onpopupsdismissed="" />
+		<PopupManager id="PopupManager" onpopupsdismissed="" />
 		<ContextMenuManager id="ContextMenuManager" />
-		<ChaosTooltipManager id="TooltipManager" hittest="false" />
+		<TooltipManager id="TooltipManager" hittest="false" />
 
 		<!-- Console notifications should always draw above anything else! -->
 		<Panel id="HudNotify" hittest="false" hittestchildren="false">
 			<Frame src="file://{resources}/layout/hud/console-notify.xml" />
 		</Panel>
-	</ChaosHud>
+	</Hud>
 </root>
diff --git a/layout/hud/replay-controls.xml b/layout/hud/replay-controls.xml
index 162de317..45811afa 100644
--- a/layout/hud/replay-controls.xml
+++ b/layout/hud/replay-controls.xml
@@ -21,7 +21,7 @@
 				<TextEntry class="textentry replaycontrols__gototick" id="ReplayControlsGotoTick" placeholder="Goto tick" oninputsubmit="ReplayControls.gotoTick()" clearaftersubmit="true" />
 			</Panel>
 			<Label text="Time: {g:time:curr_time}/{g:time:total_time}" />
-			<ChaosSettingsSlider text="#Replay_Timescale" min="0" max="10" percentage="true" value100percent="1" convar="mom_replay_timescale" />
+			<SettingsSlider text="#Replay_Timescale" min="0" max="10" percentage="true" value100percent="1" convar="mom_replay_timescale" />
 		</Panel>
 		<Panel class="flow-right">
 			<Button class="button" onactivate="GameInterfaceAPI.ConsoleCommand('mom_replay_restart');">
diff --git a/layout/hud/show-pos.xml b/layout/hud/show-pos.xml
index eddceb6a..4fc83cb4 100644
--- a/layout/hud/show-pos.xml
+++ b/layout/hud/show-pos.xml
@@ -12,6 +12,6 @@
 		</snippet>
 	</snippets>
 
-	<ChaosHudShowPos class="showpos">
-	</ChaosHudShowPos>
+	<HudShowPos class="showpos">
+	</HudShowPos>
 </root>
diff --git a/layout/modals/toasts/custom-layout-example.xml b/layout/modals/toasts/custom-layout-example.xml
index e3c21cc7..7ab8735c 100644
--- a/layout/modals/toasts/custom-layout-example.xml
+++ b/layout/modals/toasts/custom-layout-example.xml
@@ -8,7 +8,7 @@
 	</script>
 
 	<Panel class="toast flow-right p-3 bg-gray-100" onload="onLoad()">
-		<ChaosAvatarImage class="vertical-align-center mr-5" style="width: 32px; height: 32px;" steamid="local" />
+		<AvatarImage class="vertical-align-center mr-5" style="width: 32px; height: 32px;" steamid="local" />
 		<Panel class="flow-down">
 			<Label class="toast__title" text="Custom Toast Example" />
 			<Label class="toast__message" text="you can put whatever stupid panels in here" />
diff --git a/layout/pages/controls-library.xml b/layout/pages/controls-library.xml
index a446e33b..e21a1a99 100644
--- a/layout/pages/controls-library.xml
+++ b/layout/pages/controls-library.xml
@@ -747,15 +747,15 @@
 
 			<Label class="text-h3 mt-3" text="Settings" />
 			<Panel class="flow-down half-width">
-				<ChaosSettingsEnum text="ChaosSettingsEnum">
+				<SettingsEnum text="SettingsEnum">
 					<RadioButton group="settingsenum" text="1" value="0" />
 					<RadioButton group="settingsenum" text="2" value="1" />
-				</ChaosSettingsEnum>
-				<ChaosSettingsEnumDropDown text="ChaosSettingsEnumDropDown">
+				</SettingsEnum>
+				<SettingsEnumDropDown text="SettingsEnumDropDown">
 					<Label text="1" value="0" id="settingsenumdropdown1" />
 					<Label text="2" value="1" id="settingsenumdropdown2" />
-				</ChaosSettingsEnumDropDown>
-				<ChaosSettingsSlider text="ChaosSettingsSlider" min="0.1" max="10" />
+				</SettingsEnumDropDown>
+				<SettingsSlider text="SettingsSlider" min="0.1" max="10" />
 			</Panel>
 
 			<Label class="text-h1 mt-3 overflow-noclip" text="THIS LETS ME SEE THE STUFF AT THE BOTTOM IN WINDOWED MODE :)" />
diff --git a/layout/pages/drawer/lobby.xml b/layout/pages/drawer/lobby.xml
index 058dab7f..33b5e795 100644
--- a/layout/pages/drawer/lobby.xml
+++ b/layout/pages/drawer/lobby.xml
@@ -10,7 +10,7 @@
 			<Panel class="lobby-lobbies__wrapper" acceptsinput="true">
 				<Panel id="LobbyOrigin" class="lobby-lobbies__origin" />
 				<Panel class="lobby-lobbies__entry">
-					<ChaosAvatarImage id="LobbyPlayerAvatar" class="lobby-lobbies__avatar" acceptsinput="true" />
+					<AvatarImage id="LobbyPlayerAvatar" class="lobby-lobbies__avatar" acceptsinput="true" />
 					<Image id="LobbyType" class="lobby-lobbies__type" textureheight="64" onmouseout="UiToolkitAPI.HideTitleImageTextTooltip();" />
 					<Label id="LobbyTitle" class="lobby-lobbies__text lobby-lobbies__title" text="{s:lobbyTitle}" />
 					<Label id="LobbyPlayerNumbers" class="text-h lobby-lobbies__text lobby-lobbies__players" text="{s:lobbyPlayerCount}" />
@@ -24,7 +24,7 @@
 		</snippet>
 		<snippet name="lobby-member-entry">
 			<Panel class="lobby-members__entry" acceptsinput="true">
-				<ChaosAvatarImage id="MemberAvatar" class="lobby-members__avatar" />
+				<AvatarImage id="MemberAvatar" class="lobby-members__avatar" />
 				<Label id="MemberName" class="lobby-members__text lobby-members__name" text="{s:memberName}" />
 				<!--<Label id="MemberPrestige" /> -->
 				<Panel class="lobby-members__map-container">
diff --git a/layout/pages/intro-movie.xml b/layout/pages/intro-movie.xml
index 8b1b0b05..113bbc39 100644
--- a/layout/pages/intro-movie.xml
+++ b/layout/pages/intro-movie.xml
@@ -6,8 +6,8 @@
 		<include src="file://{scripts}/pages/intro-movie.js" />
 	</scripts>
 
-	<ChaosIntroMovie hittest="false">
+	<IntroMovie hittest="false">
 		<!-- Doesn't actually include the notifications, but we use its position to figure out where to show them -->
 		<Panel id="SteamNotificationsPlaceholder" hittest="false" />
-	</ChaosIntroMovie>
+	</IntroMovie>
 </root>
diff --git a/layout/pages/leaderboards/entry.xml b/layout/pages/leaderboards/entry.xml
index d49cdde9..9ad6d1a4 100644
--- a/layout/pages/leaderboards/entry.xml
+++ b/layout/pages/leaderboards/entry.xml
@@ -10,7 +10,7 @@
 		<Label class="leaderboard-entry__item leaderboard-entry__rank" text="{d:rank}" />
 
 		<Panel class="leaderboard-entry__item leaderboard-entry__item leaderboard-entry__player">
-			<ChaosAvatarImage id="LeaderboardEntryAvatarPanel" class="leaderboard-entry__item leaderboard-entry__avatar" />
+			<AvatarImage id="LeaderboardEntryAvatarPanel" class="leaderboard-entry__item leaderboard-entry__avatar" />
 			<Label class="leaderboard-entry__item leaderboard-entry__name" text="{s:player}" />
 		</Panel>
 
diff --git a/layout/pages/main-menu/main-menu.xml b/layout/pages/main-menu/main-menu.xml
index e4b4e0b1..3b80ae25 100644
--- a/layout/pages/main-menu/main-menu.xml
+++ b/layout/pages/main-menu/main-menu.xml
@@ -21,7 +21,7 @@
 		</snippet>
 	</snippets>
 
-	<ChaosMainMenu class="InitialDisplay MainMenuRootPanel" hittest="false" onload="MainMenu.onMainMenuLoaded()">
+	<MainMenu class="InitialDisplay MainMenuRootPanel" hittest="false" onload="MainMenu.onMainMenuLoaded()">
 
 		<Panel id="MainMenuInput" class="mainmenu">
 			<!-- Topnav -->
@@ -115,7 +115,7 @@
 						<!-- Backbuffer blur: used to blur the backbuffer in the pause menu -->
 						<BaseBlurTarget id="PauseMenuMainMenuBlur" class="mainmenu__pause-blur" blurrects="PauseMenuMainMenuContent">
 							<!-- Backbuffer background -->
-							<ChaosBackbufferImagePanel class="mainmenu__background PauseMenuModeOnly" />
+							<BackbufferImagePanel class="mainmenu__background PauseMenuModeOnly" />
 						</BaseBlurTarget>
 					</BaseBlurTarget>
 					<!-- /Backgrounds -->
@@ -174,12 +174,12 @@
 
 		<!-- Make sure these are at the bottom to get the z-order right -->
 		<ToastManager />
-		<ChaosPopupManager id="PopupManager" onpopupsdismissed="" />
+		<PopupManager id="PopupManager" onpopupsdismissed="" />
 		<ContextMenuManager id="ContextMenuManager" />
-		<ChaosTooltipManager id="TooltipManager" hittest="false" />
+		<TooltipManager id="TooltipManager" hittest="false" />
 
 		<!-- Doesn't actually include the notifications, but we use its position to figure out where to show them -->
 		<Panel id="SteamNotificationsPlaceholder" hittest="false" />
 
-	</ChaosMainMenu>
+	</MainMenu>
 </root>
diff --git a/layout/pages/settings/audio.xml b/layout/pages/settings/audio.xml
index 20523442..50bb5b99 100644
--- a/layout/pages/settings/audio.xml
+++ b/layout/pages/settings/audio.xml
@@ -31,19 +31,19 @@
 					</Panel>
 				</Panel>
 
-				<ChaosSettingsSlider text="#Settings_Volume_Master" min="0" max="1" percentage="true" convar="volume" hasdocspage="false" />
+				<SettingsSlider text="#Settings_Volume_Master" min="0" max="1" percentage="true" convar="volume" hasdocspage="false" />
 
-				<ChaosSettingsSlider text="#Settings_Volume_Music" min="0" max="1" percentage="true" convar="snd_volume_music" tags="music" hasdocspage="false" />
+				<SettingsSlider text="#Settings_Volume_Music" min="0" max="1" percentage="true" convar="snd_volume_music" tags="music" hasdocspage="false" />
 
-				<ChaosSettingsSlider text="#Settings_Volume_Ambient" min="0" max="1" percentage="true" convar="snd_volume_ambient" tags="ambient" hasdocspage="false" />
+				<SettingsSlider text="#Settings_Volume_Ambient" min="0" max="1" percentage="true" convar="snd_volume_ambient" tags="ambient" hasdocspage="false" />
 
-				<ChaosSettingsSlider text="#Settings_Volume_Weapon" min="0" max="1" percentage="true" convar="snd_volume_weapon" tags="weapon" hasdocspage="false" />
+				<SettingsSlider text="#Settings_Volume_Weapon" min="0" max="1" percentage="true" convar="snd_volume_weapon" tags="weapon" hasdocspage="false" />
 
-				<ChaosSettingsSlider text="#Settings_Volume_Movement" min="0" max="1" percentage="true" convar="snd_volume_footsteps" tags="movement,footsteps" hasdocspage="false" />
+				<SettingsSlider text="#Settings_Volume_Movement" min="0" max="1" percentage="true" convar="snd_volume_footsteps" tags="movement,footsteps" hasdocspage="false" />
 
-				<ChaosSettingsSlider text="#Settings_Volume_Ghosts" min="0" max="1" percentage="true" convar="mom_snd_volume_ghosts" infomessage="#Settings_Volume_Ghost_Info" tags="ghosts" hasdocspage="false" />
+				<SettingsSlider text="#Settings_Volume_Ghosts" min="0" max="1" percentage="true" convar="mom_snd_volume_ghosts" infomessage="#Settings_Volume_Ghost_Info" tags="ghosts" hasdocspage="false" />
 
-				<ChaosSettingsSlider text="#Settings_Volume_UI" min="0" max="1" percentage="true" convar="snd_volume_ui" tags="ui,interface" hasdocspage="false" />
+				<SettingsSlider text="#Settings_Volume_UI" min="0" max="1" percentage="true" convar="snd_volume_ui" tags="ui,interface" hasdocspage="false" />
 
 			</Panel>
 
@@ -59,14 +59,14 @@
 					</TooltipPanel>
 				</Panel>
 
-				<ChaosSettingsEnumDropDown text="#Settings_AudioDevices_Speaker" convar="snd_surround_speakers" oninputsubmit="BaseSpeakerConfigurationChanged()" hasdocspage="false">
+				<SettingsEnumDropDown text="#Settings_AudioDevices_Speaker" convar="snd_surround_speakers" oninputsubmit="BaseSpeakerConfigurationChanged()" hasdocspage="false">
 					<Label text="#Settings_AudioDevices_Speaker_StereoHeadphones" id="speakerconfig1" value="0" />
 					<Label text="#Settings_AudioDevices_Speaker_StereoSpeakers" id="speakerconfig2" value="2" />
 					<Label text="#Settings_AudioDevices_Speaker_Quad" id="speakerconfig3" value="4" />
 					<Label text="#Settings_AudioDevices_Speaker_51" id="speakerconfig4" value="5" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_AudioDevices_Device" id="DeviceConfigurationEnum" convar="sound_device_override" oninputsubmit="BaseAudioDeviceConfigurationChanged()" hasdocspage="false">
+				<SettingsEnumDropDown text="#Settings_AudioDevices_Device" id="DeviceConfigurationEnum" convar="sound_device_override" oninputsubmit="BaseAudioDeviceConfigurationChanged()" hasdocspage="false">
 					<!--placeholder labels that will be modified in cui_audiosettingsscreen-->
 					<Label id="device1" text="XXXXXX 1" />
 					<Label id="device2" text="XXXXXX 2" />
@@ -76,17 +76,17 @@
 					<Label id="device6" text="XXXXXX 6" />
 					<Label id="device7" text="XXXXXX 7" />
 					<Label id="device8" text="XXXXXX 8" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnum text="#Settings_AudioDevices_HWCompat" convar="snd_hwcompat" hasdocspage="false">
+				<SettingsEnum text="#Settings_AudioDevices_HWCompat" convar="snd_hwcompat" hasdocspage="false">
 					<RadioButton group="hwcompat" text="#Common_Off" value="0" />
 					<RadioButton group="hwcompat" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_AudioDevices_Background" convar="snd_mute_losefocus" hasdocspage="false">
+				<SettingsEnum text="#Settings_AudioDevices_Background" convar="snd_mute_losefocus" hasdocspage="false">
 					<RadioButton group="losefocus" text="#Common_Off" value="0" />
 					<RadioButton group="losefocus" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
 			</Panel>
 		</BaseAudioSettings>
diff --git a/layout/pages/settings/gameplay.xml b/layout/pages/settings/gameplay.xml
index 1e18d167..1a529457 100644
--- a/layout/pages/settings/gameplay.xml
+++ b/layout/pages/settings/gameplay.xml
@@ -30,32 +30,32 @@
 					</Panel>
 				</Panel>
 
-				<ChaosSettingsSlider text="#Settings_Gameplay_YawSpeed" min="0" max="360" convar="cl_yawspeed" tags="yawspeed,turnbind,spin" infomessage="#Settings_Gameplay_YawSpeed_Info" hasdocspage="false" />
+				<SettingsSlider text="#Settings_Gameplay_YawSpeed" min="0" max="360" convar="cl_yawspeed" tags="yawspeed,turnbind,spin" infomessage="#Settings_Gameplay_YawSpeed_Info" hasdocspage="false" />
 
-				<ChaosSettingsEnum text="#Settings_Gameplay_OverlappingKeys" convar="mom_enable_overlapping_keys" infomessage="#Settings_Gameplay_OverlappingKeys_Info" tags="overlapping,nulls">
+				<SettingsEnum text="#Settings_Gameplay_OverlappingKeys" convar="mom_enable_overlapping_keys" infomessage="#Settings_Gameplay_OverlappingKeys_Info" tags="overlapping,nulls">
 					<RadioButton group="allowoverlap" text="#Settings_Gameplay_OverlappingKeys_Off" value="0" />
 					<RadioButton group="allowoverlap" text="#Settings_Gameplay_OverlappingKeys_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Gameplay_ReleaseForwardOnJump" convar="mom_release_forward_on_jump" infomessage="#Settings_Gameplay_ReleaseForwardOnJump_Info" tags="jump,forward">
+				<SettingsEnum text="#Settings_Gameplay_ReleaseForwardOnJump" convar="mom_release_forward_on_jump" infomessage="#Settings_Gameplay_ReleaseForwardOnJump_Info" tags="jump,forward">
 					<RadioButton group="releaseforward" text="#Common_Off" value="0" />
 					<RadioButton group="releaseforward" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Gameplay_DrawViewmodel" convar="r_drawviewmodel" hasdocspage="false" infomessage="#Settings_Gameplay_DrawViewmodel_Info" tags="viewmodel,weaponmodel">
+				<SettingsEnum text="#Settings_Gameplay_DrawViewmodel" convar="r_drawviewmodel" hasdocspage="false" infomessage="#Settings_Gameplay_DrawViewmodel_Info" tags="viewmodel,weaponmodel">
 					<RadioButton group="showviewmodel" text="#Common_Off" value="0" />
 					<RadioButton group="showviewmodel" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
 				<ConVarEnabler convar="r_drawviewmodel" class="flow-down">
-					<ChaosSettingsSlider text="#Settings_Gameplay_ViewmodelFOV" convar="fov_viewmodel" infomessage="#Settings_Gameplay_ViewmodelFOV_Info" tags="viewmodel,weaponmodel,fov" min="45" max="135" />
+					<SettingsSlider text="#Settings_Gameplay_ViewmodelFOV" convar="fov_viewmodel" infomessage="#Settings_Gameplay_ViewmodelFOV_Info" tags="viewmodel,weaponmodel,fov" min="45" max="135" />
 				</ConVarEnabler>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Gameplay_WeaponDesirability" convar="mom_player_weapon_spawn_desirability" infomessage="#Settings_Gameplay_WeaponDesirability_Info" tags="weapon,spawn,desirability">
+				<SettingsEnumDropDown text="#Settings_Gameplay_WeaponDesirability" convar="mom_player_weapon_spawn_desirability" infomessage="#Settings_Gameplay_WeaponDesirability_Info" tags="weapon,spawn,desirability">
 					<Label id="wepdes1" text="#Settings_Gameplay_WeaponDesirability_Required" value="0" />
 					<Label id="wepdes2" text="#Settings_Gameplay_WeaponDesirability_Recommended" value="1" />
 					<Label id="wepdes3" text="#Settings_Gameplay_WeaponDesirability_All" value="2" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
 			</Panel>
 
@@ -83,22 +83,22 @@
 					<Panel class="fill-width flow-down">
 						<ConVarColorDisplay convar="mom_paint_color" text="#Settings_Paint_Color" oncolorchange="SettingsShared.updatePaintPreview();" tags="color" />
 
-						<ChaosSettingsSlider text="#Settings_Paint_Scale" min="0.001" max="1" percentage="true" convar="mom_paint_scale" tags="color,size,scale" onvaluechanged="SettingsShared.updatePaintPreview();" />
+						<SettingsSlider text="#Settings_Paint_Scale" min="0.001" max="1" percentage="true" convar="mom_paint_scale" tags="color,size,scale" onvaluechanged="SettingsShared.updatePaintPreview();" />
 
-						<ChaosSettingsEnum text="#Settings_Paint_ApplySound" convar="mom_paint_apply_sound" tags="paint,sound,noise">
+						<SettingsEnum text="#Settings_Paint_ApplySound" convar="mom_paint_apply_sound" tags="paint,sound,noise">
 							<RadioButton group="paintsound" text="#Common_Off" value="0" />
 							<RadioButton group="paintsound" text="#Common_On" value="1" />
-						</ChaosSettingsEnum>
+						</SettingsEnum>
 
-						<ChaosSettingsEnum text="#Settings_Paint_LimitToWorld" convar="mom_paint_limit_to_world" infomessage="#Settings_Paint_LimitToWorld_Info" tags="world">
+						<SettingsEnum text="#Settings_Paint_LimitToWorld" convar="mom_paint_limit_to_world" infomessage="#Settings_Paint_LimitToWorld_Info" tags="world">
 							<RadioButton group="paintlimit" text="#Common_Off" value="0" />
 							<RadioButton group="paintlimit" text="#Common_On" value="1" />
-						</ChaosSettingsEnum>
+						</SettingsEnum>
 
-						<ChaosSettingsEnum text="#Settings_Paint_ColorFromNormal" convar="mom_paint_color_from_normal" infomessage="#Settings_Paint_ColorFromNormal_Info" tags="color,angle">
+						<SettingsEnum text="#Settings_Paint_ColorFromNormal" convar="mom_paint_color_from_normal" infomessage="#Settings_Paint_ColorFromNormal_Info" tags="color,angle">
 							<RadioButton group="paintanglecolor" text="#Common_Off" value="0" />
 							<RadioButton group="paintanglecolor" text="#Common_On" value="1" />
-						</ChaosSettingsEnum>
+						</SettingsEnum>
 					</Panel>
 				</Panel>
 			</Panel>
@@ -122,50 +122,50 @@
 
 				<!-- TODO: infomessages here in the future. Not doing now because of future safeguard changes -->
 
-				<ChaosSettingsEnumDropDown text="#Settings_Safeguards_PracticeMode" convar="mom_run_safeguard_practicemode" tags="practice">
+				<SettingsEnumDropDown text="#Settings_Safeguards_PracticeMode" convar="mom_run_safeguard_practicemode" tags="practice">
 					<Label id="colorize1" text="#Settings_Safeguards_ModesNone" value="0" />
 					<Label id="colorize2" text="#Settings_Safeguards_Modes1" value="1" />
 					<Label id="colorize3" text="#Settings_Safeguards_Modes2" value="2" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Safeguards_RestartMap" convar="mom_run_safeguard_restart" tags="restart">
+				<SettingsEnumDropDown text="#Settings_Safeguards_RestartMap" convar="mom_run_safeguard_restart" tags="restart">
 					<Label id="colorize1" text="#Settings_Safeguards_ModesNone" value="0" />
 					<Label id="colorize2" text="#Settings_Safeguards_Modes1" value="1" />
 					<Label id="colorize3" text="#Settings_Safeguards_Modes2" value="2" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Safeguards_SavestateTele" convar="mom_run_safeguard_saveloc_tele" tags="teleport">
+				<SettingsEnumDropDown text="#Settings_Safeguards_SavestateTele" convar="mom_run_safeguard_saveloc_tele" tags="teleport">
 					<Label id="colorize1" text="#Settings_Safeguards_ModesNone" value="0" />
 					<Label id="colorize2" text="#Settings_Safeguards_Modes1" value="1" />
 					<Label id="colorize3" text="#Settings_Safeguards_Modes2" value="2" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Safeguards_OpenChat" convar="mom_run_safeguard_chat_open" tags="chat">
+				<SettingsEnumDropDown text="#Settings_Safeguards_OpenChat" convar="mom_run_safeguard_chat_open" tags="chat">
 					<Label id="colorize1" text="#Settings_Safeguards_ModesNone" value="0" />
 					<Label id="colorize2" text="#Settings_Safeguards_Modes1" value="1" />
 					<Label id="colorize3" text="#Settings_Safeguards_Modes2" value="2" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Safeguards_RestartStage" convar="mom_run_safeguard_restart_stage" tags="stage">
+				<SettingsEnumDropDown text="#Settings_Safeguards_RestartStage" convar="mom_run_safeguard_restart_stage" tags="stage">
 					<Label id="colorize1" text="#Settings_Safeguards_ModesNone" value="0" />
 					<Label id="colorize2" text="#Settings_Safeguards_Modes1" value="1" />
 					<Label id="colorize3" text="#Settings_Safeguards_Modes2" value="2" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnum text="#Settings_Safeguards_ChangeMap" convar="mom_run_safeguard_change_map" tags="change,level,map">
+				<SettingsEnum text="#Settings_Safeguards_ChangeMap" convar="mom_run_safeguard_change_map" tags="change,level,map">
 					<RadioButton group="safeguardchangemap" text="#Common_Off" value="0" />
 					<RadioButton group="safeguardchangemap" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Safeguards_QuitMap" convar="mom_run_safeguard_quit_map" tags="map,level,quit">
+				<SettingsEnum text="#Settings_Safeguards_QuitMap" convar="mom_run_safeguard_quit_map" tags="map,level,quit">
 					<RadioButton group="safeguardquitmap" text="#Common_Off" value="0" />
 					<RadioButton group="safeguardquitmap" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Safeguards_QuitGame" convar="mom_run_safeguard_quit_game" tags="quit,exit">
+				<SettingsEnum text="#Settings_Safeguards_QuitGame" convar="mom_run_safeguard_quit_game" tags="quit,exit">
 					<RadioButton group="safeguardquitgame" text="#Common_Off" value="0" />
 					<RadioButton group="safeguardquitgame" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 			</Panel>
 
 			<Panel class="settings-page__spacer" />
@@ -187,44 +187,44 @@
 
 				<ConVarColorDisplay text="#Settings_Zones_StartOutlineColor" convar="mom_zone_start_draw_color" />
 
-				<ChaosSettingsEnumDropDown text="#Settings_Zones_StartOutlineStyle" convar="mom_zone_start_draw_mode" tags="color,outline,edge">
+				<SettingsEnumDropDown text="#Settings_Zones_StartOutlineStyle" convar="mom_zone_start_draw_mode" tags="color,outline,edge">
 					<Label id="colorize1" text="#Common_Off" value="0" />
 					<Label id="colorize2" text="#Settings_Zones_Style_Outlines" value="1" />
 					<Label id="colorize3" text="#Settings_Zones_Style_OutlineOverlays" value="2" />
 					<Label id="colorize4" text="#Settings_Zones_Style_Sides" value="3" />
 					<Label id="colorize5" text="#Settings_Zones_Style_SideOverlays" value="4" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
 				<ConVarColorDisplay text="#Settings_Zones_StageOutlineColor" convar="mom_zone_stage_draw_color" tags="color,outline,edge" />
 
-				<ChaosSettingsEnumDropDown text="#Settings_Zones_StageOutlineStyle" convar="mom_zone_stage_draw_mode" tags="color,outline,edge">
+				<SettingsEnumDropDown text="#Settings_Zones_StageOutlineStyle" convar="mom_zone_stage_draw_mode" tags="color,outline,edge">
 					<Label id="colorize1" text="#Common_Off" value="0" />
 					<Label id="colorize2" text="#Settings_Zones_Style_Outlines" value="1" />
 					<Label id="colorize3" text="#Settings_Zones_Style_OutlineOverlays" value="2" />
 					<Label id="colorize4" text="#Settings_Zones_Style_Sides" value="3" />
 					<Label id="colorize5" text="#Settings_Zones_Style_SideOverlays" value="4" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
 				<ConVarColorDisplay text="#Settings_Zones_CheckpointOutlineColor" convar="mom_zone_checkpoint_draw_color" tags="color,outline,edge" />
 
-				<ChaosSettingsEnumDropDown text="#Settings_Zones_CheckpointOutlineStyle" convar="mom_zone_checkpoint_draw_mode" tags="color,outline,edge">
+				<SettingsEnumDropDown text="#Settings_Zones_CheckpointOutlineStyle" convar="mom_zone_checkpoint_draw_mode" tags="color,outline,edge">
 					<Label id="colorize1" text="#Common_Off" value="0" />
 					<Label id="colorize2" text="#Settings_Zones_Style_Outlines" value="1" />
 					<Label id="colorize3" text="#Settings_Zones_Style_OutlineOverlays" value="2" />
 					<Label id="colorize4" text="#Settings_Zones_Style_Sides" value="3" />
 					<Label id="colorize5" text="#Settings_Zones_Style_SideOverlays" value="4" />
 
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
 				<ConVarColorDisplay text="#Settings_Zones_EndOutlineColor" convar="mom_zone_end_draw_color" tags="color,outline,edge" />
 
-				<ChaosSettingsEnumDropDown text="#Settings_Zones_EndOutlineStyle" convar="mom_zone_end_draw_mode" tags="color,outline,edge">
+				<SettingsEnumDropDown text="#Settings_Zones_EndOutlineStyle" convar="mom_zone_end_draw_mode" tags="color,outline,edge">
 					<Label id="colorize1" text="#Common_Off" value="0" />
 					<Label id="colorize2" text="#Settings_Zones_Style_Outlines" value="1" />
 					<Label id="colorize3" text="#Settings_Zones_Style_OutlineOverlays" value="2" />
 					<Label id="colorize4" text="#Settings_Zones_Style_Sides" value="3" />
 					<Label id="colorize5" text="#Settings_Zones_Style_SideOverlays" value="4" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
 			</Panel>
 
@@ -245,43 +245,43 @@
 					</Panel>
 				</Panel>
 
-				<ChaosSettingsEnum text="#Settings_RJ_TrailParticle" convar="mom_rj_particle_trail_enable" infomessage="#Settings_RJ_TrailParticle_Info" tags="particle,trail">
+				<SettingsEnum text="#Settings_RJ_TrailParticle" convar="mom_rj_particle_trail_enable" infomessage="#Settings_RJ_TrailParticle_Info" tags="particle,trail">
 					<RadioButton group="rjtrailparticle" text="#Common_Off" value="0" tags="particle" />
 					<RadioButton group="rjtrailparticle" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_RJ_ExplosionParticle" convar="mom_rj_particle_explosion_enable" infomessage="#Settings_RJ_ExplosionParticle_Info" tags="particle,explosion">
+				<SettingsEnum text="#Settings_RJ_ExplosionParticle" convar="mom_rj_particle_explosion_enable" infomessage="#Settings_RJ_ExplosionParticle_Info" tags="particle,explosion">
 					<RadioButton group="rjexplodeparticle" text="#Common_Off" value="0" />
 					<RadioButton group="rjexplodeparticle" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_RJ_ShootSound" convar="mom_rj_sound_shoot_enable" infomessage="#Settings_RJ_ShootSound_Info" tags="sound">
+				<SettingsEnum text="#Settings_RJ_ShootSound" convar="mom_rj_sound_shoot_enable" infomessage="#Settings_RJ_ShootSound_Info" tags="sound">
 					<RadioButton group="rjshootsound" text="#Common_Off" value="0" />
 					<RadioButton group="rjshootsound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_RJ_TrailSound" convar="mom_rj_sound_trail_enable" infomessage="#Settings_RJ_TrailSound_Info" tags="sound,trail">
+				<SettingsEnum text="#Settings_RJ_TrailSound" convar="mom_rj_sound_trail_enable" infomessage="#Settings_RJ_TrailSound_Info" tags="sound,trail">
 					<RadioButton group="rjtrailsound" text="#Common_Off" value="0" />
 					<RadioButton group="rjtrailsound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_RJ_ExplosionSound" convar="mom_rj_sound_explosion_enable" infomessage="#Settings_RJ_ExplosionSound_Info" tags="explosion,sound">
+				<SettingsEnum text="#Settings_RJ_ExplosionSound" convar="mom_rj_sound_explosion_enable" infomessage="#Settings_RJ_ExplosionSound_Info" tags="explosion,sound">
 					<RadioButton group="rjexplosionsoud" text="#Common_Off" value="0" />
 					<RadioButton group="rjexplosionsoud" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_RJ_RocketDecals" convar="mom_rj_decals_enable" infomessage="#Settings_RJ_RocketDecals_Info" tags="decals,explosion">
+				<SettingsEnum text="#Settings_RJ_RocketDecals" convar="mom_rj_decals_enable" infomessage="#Settings_RJ_RocketDecals_Info" tags="decals,explosion">
 					<RadioButton group="rjdecals" text="#Common_Off" value="0" />
 					<RadioButton group="rjdecals" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnumDropDown text="#Settings_RJ_CenterFire" convar="mom_rj_fire_angle" infomessage="#Settings_RJ_CenterFire_Info" tags="center,centre,middle,original">
+				<SettingsEnumDropDown text="#Settings_RJ_CenterFire" convar="mom_rj_fire_angle" infomessage="#Settings_RJ_CenterFire_Info" tags="center,centre,middle,original">
 					<Label id="rjfireangle1" text="#Settings_RJ_CenterFire_Type_1" value="0" />
 					<Label id="rjfireangle2" text="#Settings_RJ_CenterFire_Type_2" value="1" />
 					<Label id="rjfireangle3" text="#Settings_RJ_CenterFire_Type_3" value="2" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsSlider text="#Settings_RJ_RocketDrawDelayEntry" min="0" max="1" displayprecision="2" convar="mom_rj_rocket_drawdelay" infomessage="#Settings_RJ_RocketDrawDelayEntry_Info" />
+				<SettingsSlider text="#Settings_RJ_RocketDrawDelayEntry" min="0" max="1" displayprecision="2" convar="mom_rj_rocket_drawdelay" infomessage="#Settings_RJ_RocketDrawDelayEntry_Info" />
 			</Panel>
 
 			<Panel class="settings-page__spacer" />
@@ -301,65 +301,65 @@
 					</Panel>
 				</Panel>
 
-				<ChaosSettingsEnum text="#Settings_SJ_TrailParticle" convar="mom_sj_particle_trail_enable" infomessage="#Settings_SJ_TrailParticle_Info" tags="particle,trail">
+				<SettingsEnum text="#Settings_SJ_TrailParticle" convar="mom_sj_particle_trail_enable" infomessage="#Settings_SJ_TrailParticle_Info" tags="particle,trail">
 					<RadioButton group="sjtrailparticle" text="#Common_Off" value="0" />
 					<RadioButton group="sjtrailparticle" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_SJ_ExplosionParticle" convar="mom_sj_particle_explosion_enable" infomessage="#Settings_SJ_ExplosionParticle_Info" tags="particle,explosion">
+				<SettingsEnum text="#Settings_SJ_ExplosionParticle" convar="mom_sj_particle_explosion_enable" infomessage="#Settings_SJ_ExplosionParticle_Info" tags="particle,explosion">
 					<RadioButton group="sjexplodeparticle" text="#Common_Off" value="0" />
 					<RadioButton group="sjexplodeparticle" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_SJ_StickybombDecals" convar="mom_sj_decals_enable" infomessage="#Settings_SJ_StickybombDecals_Info" tags="decal,explosion">
+				<SettingsEnum text="#Settings_SJ_StickybombDecals" convar="mom_sj_decals_enable" infomessage="#Settings_SJ_StickybombDecals_Info" tags="decal,explosion">
 					<RadioButton group="sjdecals" text="#Common_Off" value="0" />
 					<RadioButton group="sjdecals" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_SJ_ExplosionSound" convar="mom_sj_sound_explosion_enable" infomessage="#Settings_SJ_ExplosionSound_Info" tags="explosion,sound">
+				<SettingsEnum text="#Settings_SJ_ExplosionSound" convar="mom_sj_sound_explosion_enable" infomessage="#Settings_SJ_ExplosionSound_Info" tags="explosion,sound">
 					<RadioButton group="sjexplodesound" text="#Common_Off" value="0" />
 					<RadioButton group="sjexplodesound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_SJ_DetonationFailSound" convar="mom_sj_sound_detonate_fail_enable" infomessage="#Settings_SJ_DetonationFailSound_Info" tags="detonation,sound">
+				<SettingsEnum text="#Settings_SJ_DetonationFailSound" convar="mom_sj_sound_detonate_fail_enable" infomessage="#Settings_SJ_DetonationFailSound_Info" tags="detonation,sound">
 					<RadioButton group="sjfailsound" text="#Common_Off" value="0" />
 					<RadioButton group="sjfailsound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_SJ_DetonationSuccessSound" convar="mom_sj_sound_detonate_success_enable" infomessage="#Settings_SJ_DetonationSuccessSound_Info" tags="detonation,sound">
+				<SettingsEnum text="#Settings_SJ_DetonationSuccessSound" convar="mom_sj_sound_detonate_success_enable" infomessage="#Settings_SJ_DetonationSuccessSound_Info" tags="detonation,sound">
 					<RadioButton group="sjsuccesssound" text="#Common_Off" value="0" />
 					<RadioButton group="sjsuccesssound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_SJ_ChargeSound" convar="mom_sj_sound_charge_enable" infomessage="#Settings_SJ_ChargeSound_Info" tags="charge,sound">
+				<SettingsEnum text="#Settings_SJ_ChargeSound" convar="mom_sj_sound_charge_enable" infomessage="#Settings_SJ_ChargeSound_Info" tags="charge,sound">
 					<RadioButton group="sjchargesound" text="#Common_Off" value="0" />
 					<RadioButton group="sjchargesound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_SJ_ShootSound" convar="mom_sj_sound_shot_enable" infomessage="#Settings_SJ_ShootSound_Info" tags="shoot,sound">
+				<SettingsEnum text="#Settings_SJ_ShootSound" convar="mom_sj_sound_shot_enable" infomessage="#Settings_SJ_ShootSound_Info" tags="shoot,sound">
 					<RadioButton group="sjshootsound" text="#Common_Off" value="0" />
 					<RadioButton group="sjshootsound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsSlider text="#Settings_SJ_ChargedShotSoundTheshold" min="0" max="5" displayprecision="1" convar="mom_sj_sound_shot_charged_threshold" infomessage="#Settings_SJ_ChargedShotSoundTheshold_Info" tags="charge,sound" />
+				<SettingsSlider text="#Settings_SJ_ChargedShotSoundTheshold" min="0" max="5" displayprecision="1" convar="mom_sj_sound_shot_charged_threshold" infomessage="#Settings_SJ_ChargedShotSoundTheshold_Info" tags="charge,sound" />
 
-				<ChaosSettingsEnum text="#Settings_SJ_ChargeMeter" convar="mom_hud_sj_chargemeter_enable" infomessage="#Settings_SJ_ChargeMeter_Info" tags="charge,meter">
+				<SettingsEnum text="#Settings_SJ_ChargeMeter" convar="mom_hud_sj_chargemeter_enable" infomessage="#Settings_SJ_ChargeMeter_Info" tags="charge,meter">
 					<RadioButton group="chargemeter" text="#Common_Off" value="0" />
 					<RadioButton group="chargemeter" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_SJ_StickyCounter" convar="mom_hud_sj_stickycount_enable" infomessage="#Settings_SJ_StickyCounter_Info" tags="counter">
+				<SettingsEnum text="#Settings_SJ_StickyCounter" convar="mom_hud_sj_stickycount_enable" infomessage="#Settings_SJ_StickyCounter_Info" tags="counter">
 					<RadioButton group="stickycounter" text="#Common_Off" value="0" />
 					<RadioButton group="stickycounter" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnumDropDown text="#Settings_SJ_ChargeMeterUnits" convar="mom_hud_sj_chargemeter_units" tags="charge,meter">
+				<SettingsEnumDropDown text="#Settings_SJ_ChargeMeterUnits" convar="mom_hud_sj_chargemeter_units" tags="charge,meter">
 					<Label id="sjunits1" text="#Settings_SJ_ChargeMeterUnits_Type_None" value="0" />
 					<Label id="sjunits2" text="#Settings_SJ_ChargeMeterUnits_Type_1" value="1" />
 					<Label id="sjunits3" text="#Settings_SJ_ChargeMeterUnits_Type_2" value="2" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsSlider text="#Settings_SJ_DrawDelayEntry" min="0" max="1" displayprecision="2" convar="mom_sj_stickybomb_drawdelay" infomessage="#Settings_SJ_DrawDelayEntry_Info" tags="delay" />
+				<SettingsSlider text="#Settings_SJ_DrawDelayEntry" min="0" max="1" displayprecision="2" convar="mom_sj_stickybomb_drawdelay" infomessage="#Settings_SJ_DrawDelayEntry_Info" tags="delay" />
 			</Panel>
 
 			<Panel class="settings-page__spacer" />
@@ -379,50 +379,50 @@
 					</Panel>
 				</Panel>
 
-				<ChaosSettingsEnum text="#Settings_Conc_TrailParticle" convar="mom_conc_particle_trail_enable" infomessage="#Settings_Conc_TrailParticle_Info" tags="trail,particle">
+				<SettingsEnum text="#Settings_Conc_TrailParticle" convar="mom_conc_particle_trail_enable" infomessage="#Settings_Conc_TrailParticle_Info" tags="trail,particle">
 					<RadioButton group="conctrailparticle" text="#Common_Off" value="0" />
 					<RadioButton group="conctrailparticle" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Conc_ExplosionParticle" convar="mom_conc_particle_explosion_enable" infomessage="#Settings_Conc_ExplosionParticle_Info" tags="explosion,particle">
+				<SettingsEnum text="#Settings_Conc_ExplosionParticle" convar="mom_conc_particle_explosion_enable" infomessage="#Settings_Conc_ExplosionParticle_Info" tags="explosion,particle">
 					<RadioButton group="concexplodeparticle" text="#Common_Off" value="0" />
 					<RadioButton group="concexplodeparticle" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Conc_BounceSound" convar="mom_conc_sound_bounce_enable" infomessage="#Settings_Conc_BounceSound_Info" tags="bounce,sound">
+				<SettingsEnum text="#Settings_Conc_BounceSound" convar="mom_conc_sound_bounce_enable" infomessage="#Settings_Conc_BounceSound_Info" tags="bounce,sound">
 					<RadioButton group="concshootsound" text="#Common_Off" value="0" />
 					<RadioButton group="concshootsound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Conc_ExplosionSound" convar="mom_conc_sound_explosion_enable" infomessage="#Settings_Conc_ExplosionSound_Info" tags="explosion,sound">
+				<SettingsEnum text="#Settings_Conc_ExplosionSound" convar="mom_conc_sound_explosion_enable" infomessage="#Settings_Conc_ExplosionSound_Info" tags="explosion,sound">
 					<RadioButton group="concexplosionsoud" text="#Common_Off" value="0" />
 					<RadioButton group="concexplosionsoud" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Conc_TimerSound" convar="mom_conc_sound_timer_enable" infomessage="#Settings_Conc_TimerSound_Info" tags="timer,sound">
+				<SettingsEnum text="#Settings_Conc_TimerSound" convar="mom_conc_sound_timer_enable" infomessage="#Settings_Conc_TimerSound_Info" tags="timer,sound">
 					<RadioButton group="conctrailsound" text="#Common_Off" value="0" />
 					<RadioButton group="conctrailsound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Conc_FizzleSound" convar="mom_conc_sound_fizzle_enable" infomessage="#Settings_Conc_FizzleSound_Info" tags="fizzle,sound">
+				<SettingsEnum text="#Settings_Conc_FizzleSound" convar="mom_conc_sound_fizzle_enable" infomessage="#Settings_Conc_FizzleSound_Info" tags="fizzle,sound">
 					<RadioButton group="concfizzlesound" text="#Common_Off" value="0" />
 					<RadioButton group="concfizzlesound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Conc_TimerBar" convar="mom_hud_conc_timer_enable" infomessage="#Settings_Conc_TimerBar_Info" tags="timer,bar">
+				<SettingsEnum text="#Settings_Conc_TimerBar" convar="mom_hud_conc_timer_enable" infomessage="#Settings_Conc_TimerBar_Info" tags="timer,bar">
 					<RadioButton group="conctimerpanel" text="#Common_Off" value="0" />
 					<RadioButton group="conctimerpanel" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Conc_IngameTimer" convar="mom_hud_conc_entpanels_enable" infomessage="#Settings_Conc_IngameTimer_Info" tags="timer">
+				<SettingsEnum text="#Settings_Conc_IngameTimer" convar="mom_hud_conc_entpanels_enable" infomessage="#Settings_Conc_IngameTimer_Info" tags="timer">
 					<RadioButton group="conccountdown" text="#Common_Off" value="0" />
 					<RadioButton group="conccountdown" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Conc_NumericalTimer" convar="mom_hud_conc_timer_countdown" infomessage="#Settings_Conc_NumericalTimer_Info" tags="timer">
+				<SettingsEnum text="#Settings_Conc_NumericalTimer" convar="mom_hud_conc_timer_countdown" infomessage="#Settings_Conc_NumericalTimer_Info" tags="timer">
 					<RadioButton group="concentpanels" text="#Common_Off" value="0" />
 					<RadioButton group="concentpanels" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
 			</Panel>
 
@@ -443,62 +443,62 @@
 					</Panel>
 				</Panel>
 
-				<ChaosSettingsEnum text="#Settings_DefragShootSound" convar="mom_df_sound_shoot_enable" infomessage="#Settings_DefragShootSound_Info" tags="sound,shoot">
+				<SettingsEnum text="#Settings_DefragShootSound" convar="mom_df_sound_shoot_enable" infomessage="#Settings_DefragShootSound_Info" tags="sound,shoot">
 					<RadioButton group="defragshootsound" text="#Common_Off" value="0" />
 					<RadioButton group="defragshootsound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_DefragTrailSound" convar="mom_df_sound_trail_enable" infomessage="#Settings_DefragTrailSound_Info" tags="sound,trail">
+				<SettingsEnum text="#Settings_DefragTrailSound" convar="mom_df_sound_trail_enable" infomessage="#Settings_DefragTrailSound_Info" tags="sound,trail">
 					<RadioButton group="defragtrailsound" text="#Common_Off" value="0" />
 					<RadioButton group="defragtrailsound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_DefragFizzleSound" convar="mom_df_sound_fizzle_enable" infomessage="#Settings_DefragFizzleSound_Info" tags="sound,fizzle">
+				<SettingsEnum text="#Settings_DefragFizzleSound" convar="mom_df_sound_fizzle_enable" infomessage="#Settings_DefragFizzleSound_Info" tags="sound,fizzle">
 					<RadioButton group="defragfizzlesound" text="#Common_Off" value="0" />
 					<RadioButton group="defragfizzlesound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_DefragExplosionSound" convar="mom_df_sound_explosion_enable" infomessage="#Settings_DefragExlosionSound_Info" tags="sound,explosion">
+				<SettingsEnum text="#Settings_DefragExplosionSound" convar="mom_df_sound_explosion_enable" infomessage="#Settings_DefragExlosionSound_Info" tags="sound,explosion">
 					<RadioButton group="defragexplosionsound" text="#Common_Off" value="0" />
 					<RadioButton group="defragexplosionsound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_DefragExplosionParticle" convar="mom_df_particle_explosion_enable" infomessage="#Settings_DefragExplosionParticle_Info" tags="explosion,particle">
+				<SettingsEnum text="#Settings_DefragExplosionParticle" convar="mom_df_particle_explosion_enable" infomessage="#Settings_DefragExplosionParticle_Info" tags="explosion,particle">
 					<RadioButton group="defragexplosionparticle" text="#Common_Off" value="0" />
 					<RadioButton group="defragexplosionparticle" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_DefragWeaponDecals" convar="mom_df_decals_enable" infomessage="#Settings_DefragWeaponDecals_Info" tags="decal">
+				<SettingsEnum text="#Settings_DefragWeaponDecals" convar="mom_df_decals_enable" infomessage="#Settings_DefragWeaponDecals_Info" tags="decal">
 					<RadioButton group="defragweapondecals" text="#Common_Off" value="0" />
 					<RadioButton group="defragweapondecals" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_DefragProjectileTrail" convar="mom_df_particle_trail_enable" infomessage="#Settings_DefragProjectileTrail_Info" tags="particle,trail">
+				<SettingsEnum text="#Settings_DefragProjectileTrail" convar="mom_df_particle_trail_enable" infomessage="#Settings_DefragProjectileTrail_Info" tags="particle,trail">
 					<RadioButton group="defragprojectiletrail" text="#Common_Off" value="0" />
 					<RadioButton group="defragprojectiletrail" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnumDropDown text="#Settings_DefragAutoswitch" convar="mom_df_autoswitch" infomessage="#Settings_DefragAutoswitch_Info" tags="weapon,autoswitch">
+				<SettingsEnumDropDown text="#Settings_DefragAutoswitch" convar="mom_df_autoswitch" infomessage="#Settings_DefragAutoswitch_Info" tags="weapon,autoswitch">
 					<Label id="autoswitch0" text="#Settings_Defrag_AutoswitchMode_Type0" value="0" />
 					<Label id="autoswitch1" text="#Settings_Defrag_AutoswitchMode_Type1" value="1" />
 					<Label id="autoswitch2" text="#Settings_Defrag_AutoswitchMode_Type2" value="2" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
 				<Panel class="settings-group__combo">
 
 					<Label class="settings-group__combo-header" text="#Settings_Defrag_CGAZ_Title" />
 
-					<ChaosSettingsEnum text="#Settings_Defrag_CGAZ_Enable" convar="mom_df_hud_accel_enable" infomessage="#Settings_Defrag_CGAZ_Enable_Info" tags="cgaz">
+					<SettingsEnum text="#Settings_Defrag_CGAZ_Enable" convar="mom_df_hud_accel_enable" infomessage="#Settings_Defrag_CGAZ_Enable_Info" tags="cgaz">
 						<RadioButton group="accelenable" text="#Common_Off" value="0" />
 						<RadioButton group="accelenable" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
 					<ConVarEnabler convar="mom_df_hud_accel_enable" class="flow-down">
-						<ChaosSettingsSlider text="#Settings_Defrag_CGAZ_Height" min="1" max="50" convar="mom_df_hud_accel_height" displayprecision="0" infomessage="#Settings_Defrag_CGAZ_Height_Info" tags="cgaz" />
+						<SettingsSlider text="#Settings_Defrag_CGAZ_Height" min="1" max="50" convar="mom_df_hud_accel_height" displayprecision="0" infomessage="#Settings_Defrag_CGAZ_Height_Info" tags="cgaz" />
 
-						<ChaosSettingsSlider text="#Settings_Defrag_CGAZ_Offset" min="-200" max="200" convar="mom_df_hud_accel_offset" displayprecision="0" infomessage="#Settings_Defrag_CGAZ_Offset_Info" tags="cgaz" />
+						<SettingsSlider text="#Settings_Defrag_CGAZ_Offset" min="-200" max="200" convar="mom_df_hud_accel_offset" displayprecision="0" infomessage="#Settings_Defrag_CGAZ_Offset_Info" tags="cgaz" />
 
-						<ChaosSettingsSlider text="#Settings_Defrag_CGAZ_MinSpeed" min="1" max="1000" convar="mom_df_hud_accel_min_speed" displayprecision="0" infomessage="#Settings_Defrag_CGAZ_MinSpeed_Info" tags="cgaz" />
+						<SettingsSlider text="#Settings_Defrag_CGAZ_MinSpeed" min="1" max="1000" convar="mom_df_hud_accel_min_speed" displayprecision="0" infomessage="#Settings_Defrag_CGAZ_MinSpeed_Info" tags="cgaz" />
 
 						<ConVarColorDisplay text="#Settings_Defrag_CGAZ_SlowColor" convar="mom_df_hud_accel_slow_color" infomessage="#Settings_Defrag_CGAZ_SlowColor_Info" tags="cgaz" />
 
@@ -508,19 +508,19 @@
 
 						<ConVarColorDisplay text="#Settings_Defrag_CGAZ_DeadzoneColor" convar="mom_df_hud_accel_dz_color" infomessage="#Settings_Defrag_CGAZ_DeadzoneColor_Info" tags="cgaz" />
 
-						<ChaosSettingsEnum text="#Settings_Defrag_CGAZ_Mirrored" convar="mom_df_hud_accel_mirror_enable" infomessage="#Settings_Defrag_CGAZ_Mirrored_Info" tags="cgaz">
+						<SettingsEnum text="#Settings_Defrag_CGAZ_Mirrored" convar="mom_df_hud_accel_mirror_enable" infomessage="#Settings_Defrag_CGAZ_Mirrored_Info" tags="cgaz">
 							<RadioButton group="accelmirrorenable" text="#Common_Off" value="0" />
 							<RadioButton group="accelmirrorenable" text="#Common_On" value="1" />
-						</ChaosSettingsEnum>
+						</SettingsEnum>
 
 						<ConVarEnabler convar="mom_df_hud_accel_mirror_enable" class="flow-down">
-							<ChaosSettingsSlider text="#Settings_Defrag_CGAZ_MirrorBorder" min="0" max="10" convar="mom_df_hud_accel_mirror_border" displayprecision="0" infomessage="#Settings_Defrag_CGAZ_MirrorBorder_Info" tags="cgaz" />
+							<SettingsSlider text="#Settings_Defrag_CGAZ_MirrorBorder" min="0" max="10" convar="mom_df_hud_accel_mirror_border" displayprecision="0" infomessage="#Settings_Defrag_CGAZ_MirrorBorder_Info" tags="cgaz" />
 						</ConVarEnabler>
 
-						<ChaosSettingsEnum text="#Settings_Defrag_CGAZ_True" convar="mom_df_hud_accel_scale_enable" infomessage="#Settings_Defrag_CGAZ_True_Info" tags="cgaz">
+						<SettingsEnum text="#Settings_Defrag_CGAZ_True" convar="mom_df_hud_accel_scale_enable" infomessage="#Settings_Defrag_CGAZ_True_Info" tags="cgaz">
 							<RadioButton group="accelscaleenable" text="#Common_Off" value="0" />
 							<RadioButton group="accelscaleenable" text="#Common_On" value="1" />
-						</ChaosSettingsEnum>
+						</SettingsEnum>
 					</ConVarEnabler>
 
 				</Panel>
@@ -529,27 +529,27 @@
 
 					<Label class="settings-group__combo-header" text="#Settings_Defrag_Snaps_Title" />
 
-					<ChaosSettingsEnum text="#Settings_Defrag_Snaps_Enable" convar="mom_df_hud_snap_enable" infomessage="#Settings_Defrag_Snaps_Enable_Info" tags="snaps">
+					<SettingsEnum text="#Settings_Defrag_Snaps_Enable" convar="mom_df_hud_snap_enable" infomessage="#Settings_Defrag_Snaps_Enable_Info" tags="snaps">
 						<RadioButton group="snapenable" text="#Common_Off" value="0" />
 						<RadioButton group="snapenable" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
 					<ConVarEnabler convar="mom_df_hud_snap_enable" class="flow-down">
-						<ChaosSettingsSlider text="#Settings_Defrag_Snaps_Height" min="1" max="50" convar="mom_df_hud_snap_height" displayprecision="0" infomessage="#Settings_Defrag_Snaps_Height_Info" tags="snaps" />
+						<SettingsSlider text="#Settings_Defrag_Snaps_Height" min="1" max="50" convar="mom_df_hud_snap_height" displayprecision="0" infomessage="#Settings_Defrag_Snaps_Height_Info" tags="snaps" />
 
-						<ChaosSettingsSlider text="#Settings_Defrag_Snaps_Offset" min="-200" max="200" convar="mom_df_hud_snap_offset" displayprecision="0" infomessage="#Settings_Defrag_Snaps_Offset_Info" tags="snaps" />
+						<SettingsSlider text="#Settings_Defrag_Snaps_Offset" min="-200" max="200" convar="mom_df_hud_snap_offset" displayprecision="0" infomessage="#Settings_Defrag_Snaps_Offset_Info" tags="snaps" />
 
-						<ChaosSettingsSlider text="#Settings_Defrag_Snaps_MinSpeed" min="0" max="1000" convar="mom_df_hud_snap_min_speed" displayprecision="0" infomessage="#Settings_Defrag_Snaps_MinSpeed_Info" tags="snaps" />
+						<SettingsSlider text="#Settings_Defrag_Snaps_MinSpeed" min="0" max="1000" convar="mom_df_hud_snap_min_speed" displayprecision="0" infomessage="#Settings_Defrag_Snaps_MinSpeed_Info" tags="snaps" />
 
 						<ConVarColorDisplay text="#Settings_Defrag_Snaps_Color" convar="mom_df_hud_snap_color" infomessage="#Settings_Defrag_Snaps_Color_Info" tags="snaps" />
 
 						<ConVarColorDisplay text="#Settings_Defrag_Snaps_AltColor" convar="mom_df_hud_snap_alt_color" infomessage="#Settings_Defrag_Snaps_AltColor_Info" tags="snaps" />
 
-						<ChaosSettingsEnumDropDown text="#Settings_Defrag_Snaps_Highlight" convar="mom_df_hud_snap_hl_mode" infomessage="#Settings_Defrag_Snaps_Highlight_Info" tags="snaps">
+						<SettingsEnumDropDown text="#Settings_Defrag_Snaps_Highlight" convar="mom_df_hud_snap_hl_mode" infomessage="#Settings_Defrag_Snaps_Highlight_Info" tags="snaps">
 							<Label id="highlight1" text="#Settings_Defrag_Snaps_Highlight_Mode0" value="0" />
 							<Label id="highlight2" text="#Settings_Defrag_Snaps_Highlight_Type1" value="1" />
 							<Label id="highlight3" text="#Settings_Defrag_Snaps_Highlight_Type2" value="2" />
-						</ChaosSettingsEnumDropDown>
+						</SettingsEnumDropDown>
 
 						<ConVarEnabler convar="mom_df_hud_snap_hl_mode" class="flow-down">
 							<ConVarColorDisplay text="#Settings_Defrag_Snaps_HighlightColor" convar="mom_df_hud_snap_hl_color" infomessage="#Settings_Defrag_Snaps_HighlightColor_Info" tags="snaps" />
@@ -557,10 +557,10 @@
 							<ConVarColorDisplay text="#Settings_Defrag_Snaps_HighlightAltColor" convar="mom_df_hud_snap_hl_alt_color" infomessage="#Settings_Defrag_Snaps_HighlightAltColor_Info" tags="snaps" />
 						</ConVarEnabler>
 
-						<ChaosSettingsEnum text="#Settings_Defrag_Snaps_ColorByAccel" convar="mom_df_hud_snap_color_mode" infomessage="#Settings_Defrag_Snaps_ColorByAccel_Info" tags="snaps">
+						<SettingsEnum text="#Settings_Defrag_Snaps_ColorByAccel" convar="mom_df_hud_snap_color_mode" infomessage="#Settings_Defrag_Snaps_ColorByAccel_Info" tags="snaps">
 							<RadioButton group="snapcolormode" text="#Common_Off" value="0" />
 							<RadioButton group="snapcolormode" text="#Common_On" value="1" />
-						</ChaosSettingsEnum>
+						</SettingsEnum>
 
 						<ConVarEnabler convar="mom_df_hud_snap_color_mode" class="flow-down">
 							<ConVarColorDisplay text="#Settings_Defrag_Snaps_SlowColor" convar="mom_df_hud_snap_slow_color" infomessage="#Settings_Defrag_Snaps_SlowColor_Info" tags="snaps" />
@@ -568,10 +568,10 @@
 							<ConVarColorDisplay text="#Settings_Defrag_Snaps_FastColor" convar="mom_df_hud_snap_fast_color" infomessage="#Settings_Defrag_Snaps_FastColor_Info" tags="snaps" />
 						</ConVarEnabler>
 
-						<ChaosSettingsEnum text="#Settings_Defrag_Snaps_SizeByAccel" convar="mom_df_hud_snap_heightgain_enable" infomessage="#Settings_Defrag_Snaps_SizeByAccel_Info" tags="snaps">
+						<SettingsEnum text="#Settings_Defrag_Snaps_SizeByAccel" convar="mom_df_hud_snap_heightgain_enable" infomessage="#Settings_Defrag_Snaps_SizeByAccel_Info" tags="snaps">
 							<RadioButton group="snapheightenable" text="#Common_Off" value="0" />
 							<RadioButton group="snapheightenable" text="#Common_On" value="1" />
-						</ChaosSettingsEnum>
+						</SettingsEnum>
 					</ConVarEnabler>
 
 				</Panel>
@@ -580,43 +580,43 @@
 
 					<Label class="settings-group__combo-header" text="#Settings_Defrag_PrimeSight_Title" />
 
-					<ChaosSettingsEnum text="#Settings_Defrag_PrimeSight_Enable" convar="mom_df_hud_prime_enable" infomessage="#Settings_Defrag_PrimeSight_Enable_Info" tags="prime,sight">
+					<SettingsEnum text="#Settings_Defrag_PrimeSight_Enable" convar="mom_df_hud_prime_enable" infomessage="#Settings_Defrag_PrimeSight_Enable_Info" tags="prime,sight">
 						<RadioButton group="primeenable" text="#Common_Off" value="0" />
 						<RadioButton group="primeenable" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
 					<ConVarEnabler convar="mom_df_hud_prime_enable"  class="flow-down">
-						<ChaosSettingsSlider text="#Settings_Defrag_PrimeSight_Height" min="1" max="50" convar="mom_df_hud_prime_height" displayprecision="0" infomessage="#Settings_Defrag_PrimeSight_Height_Info" tags="prime,sight" />
+						<SettingsSlider text="#Settings_Defrag_PrimeSight_Height" min="1" max="50" convar="mom_df_hud_prime_height" displayprecision="0" infomessage="#Settings_Defrag_PrimeSight_Height_Info" tags="prime,sight" />
 
-						<ChaosSettingsSlider text="#Settings_Defrag_PrimeSight_Offset" min="-200" max="200" convar="mom_df_hud_prime_offset" displayprecision="0" infomessage="#Settings_Defrag_PrimeSight_Offset_Info" tags="prime,sight" />
+						<SettingsSlider text="#Settings_Defrag_PrimeSight_Offset" min="-200" max="200" convar="mom_df_hud_prime_offset" displayprecision="0" infomessage="#Settings_Defrag_PrimeSight_Offset_Info" tags="prime,sight" />
 
-						<ChaosSettingsSlider text="#Settings_Defrag_PrimeSight_MinSpeed" min="1" max="1000" convar="mom_df_hud_prime_min_speed" displayprecision="0" infomessage="#Settings_Defrag_PrimeSight_MinSpeed_Info" tags="prime,sight" />
+						<SettingsSlider text="#Settings_Defrag_PrimeSight_MinSpeed" min="1" max="1000" convar="mom_df_hud_prime_min_speed" displayprecision="0" infomessage="#Settings_Defrag_PrimeSight_MinSpeed_Info" tags="prime,sight" />
 
-						<ChaosSettingsEnum text="#Settings_Defrag_PrimeSight_SizeByGain" convar="mom_df_hud_prime_heightgain_enable" infomessage="#Settings_Defrag_PrimeSight_SizeByGain_Info" tags="prime,sight">
+						<SettingsEnum text="#Settings_Defrag_PrimeSight_SizeByGain" convar="mom_df_hud_prime_heightgain_enable" infomessage="#Settings_Defrag_PrimeSight_SizeByGain_Info" tags="prime,sight">
 							<RadioButton group="primeheightgain" text="#Common_Off" value="0" />
 							<RadioButton group="primeheightgain" text="#Common_On" value="1" />
-						</ChaosSettingsEnum>
+						</SettingsEnum>
 
-						<ChaosSettingsEnum text="#Settings_Defrag_PrimeSight_ColorByGain" convar="mom_df_hud_prime_colorgain_enable" infomessage="#Settings_Defrag_PrimeSight_ColorByGain_Info" tags="prime,sight">
+						<SettingsEnum text="#Settings_Defrag_PrimeSight_ColorByGain" convar="mom_df_hud_prime_colorgain_enable" infomessage="#Settings_Defrag_PrimeSight_ColorByGain_Info" tags="prime,sight">
 							<RadioButton group="primecolorgain" text="#Common_Off" value="0" />
 							<RadioButton group="primecolorgain" text="#Common_On" value="1" />
-						</ChaosSettingsEnum>
+						</SettingsEnum>
 
-						<ChaosSettingsEnum text="#Settings_Defrag_PrimeSight_HighlightEnable" convar="mom_df_hud_prime_hl_enable" infomessage="#Settings_Defrag_PrimeSight_HighlightEnable_Info" tags="prime,sight">
+						<SettingsEnum text="#Settings_Defrag_PrimeSight_HighlightEnable" convar="mom_df_hud_prime_hl_enable" infomessage="#Settings_Defrag_PrimeSight_HighlightEnable_Info" tags="prime,sight">
 							<RadioButton group="primehlenable" text="#Common_Off" value="0" />
 							<RadioButton group="primehlenable" text="#Common_On" value="1" />
-						</ChaosSettingsEnum>
+						</SettingsEnum>
 
 						<ConVarEnabler convar="mom_df_hud_prime_hl_enable" class="flow-down">
 							<ConVarColorDisplay text="#Settings_Defrag_PrimeSight_HighlightColor" convar="mom_df_hud_prime_hl_color" infomessage="#Settings_Defrag_PrimeSight_HighlightColor_Info" tags="prime,sight" />
 
-							<ChaosSettingsSlider text="#Settings_Defrag_PrimeSight_HighlightBorder" min="0" max="10" convar="mom_df_hud_prime_hl_border" displayprecision="0" infomessage="#Settings_Defrag_PrimeSight_HighlightBorder_Info" tags="prime,sight" />
+							<SettingsSlider text="#Settings_Defrag_PrimeSight_HighlightBorder" min="0" max="10" convar="mom_df_hud_prime_hl_border" displayprecision="0" infomessage="#Settings_Defrag_PrimeSight_HighlightBorder_Info" tags="prime,sight" />
 						</ConVarEnabler>
 
-						<ChaosSettingsEnum text="#Settings_Defrag_PrimeSight_InactiveEnable" convar="mom_df_hud_prime_inactive_enable" infomessage="#Settings_Defrag_PrimeSight_InactiveEnable_Info" tags="prime,sight">
+						<SettingsEnum text="#Settings_Defrag_PrimeSight_InactiveEnable" convar="mom_df_hud_prime_inactive_enable" infomessage="#Settings_Defrag_PrimeSight_InactiveEnable_Info" tags="prime,sight">
 							<RadioButton group="primeinactiveenable" text="#Common_Off" value="0" />
 							<RadioButton group="primeinactiveenable" text="#Common_On" value="1" />
-						</ChaosSettingsEnum>
+						</SettingsEnum>
 
 						<ConVarEnabler convar="mom_df_hud_prime_inactive_enable">
 							<ConVarColorDisplay text="#Settings_Defrag_PrimeSight_AltColor" convar="mom_df_hud_prime_alt_color" infomessage="#Settings_Defrag_PrimeSight_AltColor_Info" tags="prime,sight" />
@@ -626,42 +626,42 @@
 
 						<ConVarColorDisplay text="#Settings_Defrag_PrimeSight_LossColor" convar="mom_df_hud_prime_loss_color" infomessage="#Settings_Defrag_PrimeSight_LossColor_Info" tags="prime,sight" />
 
-						<ChaosSettingsEnum text="#Settings_Defrag_PrimeSight_ArrowEnable" convar="mom_df_hud_prime_arrow_enable" infomessage="#Settings_Defrag_PrimeSight_ArrowEnable_Info" tags="prime,sight">
+						<SettingsEnum text="#Settings_Defrag_PrimeSight_ArrowEnable" convar="mom_df_hud_prime_arrow_enable" infomessage="#Settings_Defrag_PrimeSight_ArrowEnable_Info" tags="prime,sight">
 							<RadioButton group="primearrowenable" text="#Common_Off" value="0" />
 							<RadioButton group="primearrowenable" text="#Common_On" value="1" />
-						</ChaosSettingsEnum>
+						</SettingsEnum>
 						
 						<ConVarEnabler convar="mom_df_hud_prime_arrow_enable"  class="flow-down">
-							<ChaosSettingsSlider text="#Settings_Defrag_PrimeSight_ArrowSize" min="1" max="10" convar="mom_df_hud_prime_arrow_size" displayprecision="0" infomessage="#Settings_Defrag_PrimeSight_ArrowSize_Info" tags="prime,sight" />
+							<SettingsSlider text="#Settings_Defrag_PrimeSight_ArrowSize" min="1" max="10" convar="mom_df_hud_prime_arrow_size" displayprecision="0" infomessage="#Settings_Defrag_PrimeSight_ArrowSize_Info" tags="prime,sight" />
 
 							<ConVarColorDisplay text="#Settings_Defrag_PrimeSight_ArrowColor" convar="mom_df_hud_prime_arrow_color" infomessage="#Settings_Defrag_PrimeSight_ArrowColor_Info" tags="prime,sight" />
 						</ConVarEnabler>
 
 						<!-- Trueness Mode -->
 
-						<ChaosSettingsEnum text="#Settings_Defrag_PrimeSight_OneLineEnable" convar="mom_df_hud_prime_one_line_enable" infomessage="#Settings_Defrag_PrimeSight_OneLineEnable_Info" tags="prime,sight">
+						<SettingsEnum text="#Settings_Defrag_PrimeSight_OneLineEnable" convar="mom_df_hud_prime_one_line_enable" infomessage="#Settings_Defrag_PrimeSight_OneLineEnable_Info" tags="prime,sight">
 							<RadioButton group="primeonelineenable" text="#Common_Off" value="0" />
 							<RadioButton group="primeonelineenable" text="#Common_On" value="1" />
-						</ChaosSettingsEnum>
+						</SettingsEnum>
 					</ConVarEnabler>
 
 				</Panel>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Defrag_ProjectionMode" convar="mom_df_hud_projection" infomessage="#Settings_Defrag_ProjectionMode_Info">
+				<SettingsEnumDropDown text="#Settings_Defrag_ProjectionMode" convar="mom_df_hud_projection" infomessage="#Settings_Defrag_ProjectionMode_Info">
 					<Label id="projection0" text="#Settings_Defrag_ProjectionMode_Type0" value="0" />
 					<Label id="projection1" text="#Settings_Defrag_ProjectionMode_Type1" value="1" />
 					<Label id="projection2" text="#Settings_Defrag_ProjectionMode_Type2" value="2" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
 				<Panel class="settings-group__combo">
 
-					<ChaosSettingsEnum text="#Settings_Defrag_HUDFOVEnable" convar="mom_df_hud_fov_override_enable" infomessage="#Settings_Defrag_HUDFOV_Info" tags="fov">
+					<SettingsEnum text="#Settings_Defrag_HUDFOVEnable" convar="mom_df_hud_fov_override_enable" infomessage="#Settings_Defrag_HUDFOV_Info" tags="fov">
 						<RadioButton group="hudfovenable" text="#Common_Off" value="0" />
 						<RadioButton group="hudfovenable" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
 					<ConVarEnabler convar="mom_df_hud_fov_override_enable">
-						<ChaosSettingsSlider text="#Settings_Defrag_HUDFOV" min="50" max="130" convar="mom_df_hud_fov_override" displayprecision="0" infomessage="#Settings_Defrag_HUDFOV_Info" />
+						<SettingsSlider text="#Settings_Defrag_HUDFOV" min="50" max="130" convar="mom_df_hud_fov_override" displayprecision="0" infomessage="#Settings_Defrag_HUDFOV_Info" />
 					</ConVarEnabler>
 
 				</Panel>
@@ -670,41 +670,41 @@
 
 					<Label class="settings-group__combo-header" text="#Settings_Defrag_Compass_Title" />
 
-					<ChaosSettingsEnumDropDown text="#Settings_Defrag_Compass" convar="mom_df_hud_compass_mode" infomessage="#Settings_Defrag_Compass_Info" tags="compass">
+					<SettingsEnumDropDown text="#Settings_Defrag_Compass" convar="mom_df_hud_compass_mode" infomessage="#Settings_Defrag_Compass_Info" tags="compass">
 						<Label id="compass0" text="#Settings_Defrag_CompassMode_Type0" value="0" />
 						<Label id="compass1" text="#Settings_Defrag_CompassMode_Type1" value="1" />
 						<Label id="compass2" text="#Settings_Defrag_CompassMode_Type2" value="2" />
 						<Label id="compass3" text="#Settings_Defrag_CompassMode_Type3" value="3" />
-					</ChaosSettingsEnumDropDown>
+					</SettingsEnumDropDown>
 
 					<ConVarEnabler convar="mom_df_hud_compass_mode" class="flow-down">
-						<ChaosSettingsSlider text="#Settings_Defrag_CompassArrowSize" min="0" max="25" convar="mom_df_hud_compass_arrow_size" displayprecision="0" infomessage="#Settings_Defrag_CompassArrowSize_Info" tags="compass" />
+						<SettingsSlider text="#Settings_Defrag_CompassArrowSize" min="0" max="25" convar="mom_df_hud_compass_arrow_size" displayprecision="0" infomessage="#Settings_Defrag_CompassArrowSize_Info" tags="compass" />
 
-						<ChaosSettingsSlider text="#Settings_Defrag_CompassTickSize" min="0" max="50" convar="mom_df_hud_compass_tick_size" displayprecision="0" infomessage="#Settings_Defrag_CompassTickSize_Info" tags="compass" />
+						<SettingsSlider text="#Settings_Defrag_CompassTickSize" min="0" max="50" convar="mom_df_hud_compass_tick_size" displayprecision="0" infomessage="#Settings_Defrag_CompassTickSize_Info" tags="compass" />
 						
-						<ChaosSettingsSlider text="#Settings_Defrag_CompassOffset" min="-200" max="200" convar="mom_df_hud_compass_offset" displayprecision="0" infomessage="#Settings_Defrag_CompassOffset_Info" tags="compass" />
+						<SettingsSlider text="#Settings_Defrag_CompassOffset" min="-200" max="200" convar="mom_df_hud_compass_offset" displayprecision="0" infomessage="#Settings_Defrag_CompassOffset_Info" tags="compass" />
 
 					</ConVarEnabler>
 
-					<ChaosSettingsEnum text="#Settings_Defrag_Pitch" convar="mom_df_hud_pitch_enable" infomessage="#Settings_Defrag_Pitch_Info" tags="pitch">
+					<SettingsEnum text="#Settings_Defrag_Pitch" convar="mom_df_hud_pitch_enable" infomessage="#Settings_Defrag_Pitch_Info" tags="pitch">
 						<RadioButton group="pitchenable" text="#Common_Off" value="0" />
 						<RadioButton group="pitchenable" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
 					<ConVarEnabler convar="mom_df_hud_pitch_enable" class="flow-down">
-						<ChaosSettingsSlider text="#Settings_Defrag_PitchTarget" min="-90" max="90" convar="mom_df_hud_pitch_target" displayprecision="1" infomessage="#Settings_Defrag_PitchTarget_Info" tags="compass,pitch" />
+						<SettingsSlider text="#Settings_Defrag_PitchTarget" min="-90" max="90" convar="mom_df_hud_pitch_target" displayprecision="1" infomessage="#Settings_Defrag_PitchTarget_Info" tags="compass,pitch" />
 
-						<ChaosSettingsSlider text="#Settings_Defrag_PitchWidth" min="10" max="200" convar="mom_df_hud_pitch_width" displayprecision="1" infomessage="#Settings_Defrag_PitchWidth_Info" tags="compass,pitch" />
+						<SettingsSlider text="#Settings_Defrag_PitchWidth" min="10" max="200" convar="mom_df_hud_pitch_width" displayprecision="1" infomessage="#Settings_Defrag_PitchWidth_Info" tags="compass,pitch" />
 
-						<ChaosSettingsSlider text="#Settings_Defrag_PitchOffset" min="-200" max="200" convar="mom_df_hud_pitch_offset" displayprecision="1" infomessage="#Settings_Defrag_PitchOffset_Info" tags="compass,pitch" />
+						<SettingsSlider text="#Settings_Defrag_PitchOffset" min="-200" max="200" convar="mom_df_hud_pitch_offset" displayprecision="1" infomessage="#Settings_Defrag_PitchOffset_Info" tags="compass,pitch" />
 					</ConVarEnabler>
 
-					<ChaosSettingsEnumDropDown text="#Settings_Defrag_Compass_Stat_Mode" convar="mom_df_hud_compass_stat_mode" infomessage="#Settings_Defrag_Compass_Stat_Mode_Info" tags="compass">
+					<SettingsEnumDropDown text="#Settings_Defrag_Compass_Stat_Mode" convar="mom_df_hud_compass_stat_mode" infomessage="#Settings_Defrag_Compass_Stat_Mode_Info" tags="compass">
 						<Label id="compassstat0" text="#Settings_Defrag_Compass_StatMode_Type0" value="0" />
 						<Label id="compassstat1" text="#Settings_Defrag_Compass_StatMode_Type1" value="1" />
 						<Label id="compassstat2" text="#Settings_Defrag_Compass_StatMode_Type2" value="2" />
 						<Label id="compassstat3" text="#Settings_Defrag_Compass_StatMode_Type3" value="3" />
-					</ChaosSettingsEnumDropDown>
+					</SettingsEnumDropDown>
 
 					<ConVarColorDisplay text="#Settings_Defrag_CompassColor" convar="mom_df_hud_compass_color" infomessage="#Settings_Defrag_CompassColor_Info" tags="compass" />
 
@@ -714,39 +714,39 @@
 
 				<Panel class="settings-group__combo">
 
-					<ChaosSettingsEnum text="#Settings_Defrag_WIndicator" convar="mom_df_hud_windicator_enable" infomessage="#Settings_Defrag_WIndicator_Info">
+					<SettingsEnum text="#Settings_Defrag_WIndicator" convar="mom_df_hud_windicator_enable" infomessage="#Settings_Defrag_WIndicator_Info">
 						<RadioButton group="windicatorenable" text="#Common_Off" value="0" />
 						<RadioButton group="windicatorenable" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
 					<ConVarEnabler convar="mom_df_hud_windicator_enable" class="flow-down">
-						<ChaosSettingsSlider text="#Settings_Defrag_WIndicatorZoneHeight" min="0" max="50" convar="mom_df_hud_windicator_height" displayprecision="0" infomessage="#Settings_Defrag_WIndicatorZoneHeight_Info" />
+						<SettingsSlider text="#Settings_Defrag_WIndicatorZoneHeight" min="0" max="50" convar="mom_df_hud_windicator_height" displayprecision="0" infomessage="#Settings_Defrag_WIndicatorZoneHeight_Info" />
 
-						<ChaosSettingsSlider text="#Settings_Defrag_WIndicatorZoneOffset" min="-200" max="200" convar="mom_df_hud_windicator_offset" displayprecision="0" infomessage="#Settings_Defrag_WIndicatorZoneOffset_Info" />
+						<SettingsSlider text="#Settings_Defrag_WIndicatorZoneOffset" min="-200" max="200" convar="mom_df_hud_windicator_offset" displayprecision="0" infomessage="#Settings_Defrag_WIndicatorZoneOffset_Info" />
 
-						<ChaosSettingsSlider text="#Settings_Defrag_WIndicatorArrowSize" min="0" max="25" convar="mom_df_hud_windicator_size" displayprecision="0" infomessage="#Settings_Defrag_WIndicatorArrowSize_Info" />
+						<SettingsSlider text="#Settings_Defrag_WIndicatorArrowSize" min="0" max="25" convar="mom_df_hud_windicator_size" displayprecision="0" infomessage="#Settings_Defrag_WIndicatorArrowSize_Info" />
 
 						<ConVarColorDisplay text="#Settings_Defrag_WIndicatorArrowColor" convar="mom_df_hud_windicator_color" infomessage="#Settings_Defrag_WIndicatorArrowColor_Info" />
 					
-						<ChaosSettingsSlider text="#Settings_Defrag_WIndicatorBorder" min="0" max="10" convar="mom_df_hud_windicator_border" displayprecision="0" infomessage="#Settings_Defrag_WIndicatorBorder_Info" />
+						<SettingsSlider text="#Settings_Defrag_WIndicatorBorder" min="0" max="10" convar="mom_df_hud_windicator_border" displayprecision="0" infomessage="#Settings_Defrag_WIndicatorBorder_Info" />
 					</ConVarEnabler>
 
 				</Panel>
 
 				<Panel class="settings-group__combo">
 
-					<ChaosSettingsEnum text="Display jump visualizer" convar="mom_df_hud_jump_enable" infomessage="Display jump visualizer. Draws an upward bar to show how long +jump was held after leaving the ground, and a downward bar to show how early/late +jump was pressed before jumping.">
+					<SettingsEnum text="Display jump visualizer" convar="mom_df_hud_jump_enable" infomessage="Display jump visualizer. Draws an upward bar to show how long +jump was held after leaving the ground, and a downward bar to show how early/late +jump was pressed before jumping.">
 						<RadioButton group="dfjumpenable" text="#Common_Off" value="0" />
 						<RadioButton group="dfjumpenable" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
 					<ConVarEnabler convar="mom_df_hud_jump_enable" class="flow-down">
-						<ChaosSettingsSlider text="Maximum delay time (ms)" min="50" max="1000" convar="mom_df_hud_jump_max_delay" displayprecision="0" infomessage="Length of time (in milliseconds) corresponding to 100% full press or release bars" />
+						<SettingsSlider text="Maximum delay time (ms)" min="50" max="1000" convar="mom_df_hud_jump_max_delay" displayprecision="0" infomessage="Length of time (in milliseconds) corresponding to 100% full press or release bars" />
 
-						<ChaosSettingsEnum text="Display time labels" convar="mom_df_hud_jump_text_enable" infomessage="Display times (in milliseconds) next to jump sync bars. At the top is late release time, at the bottom early/late press time, and in the middle is combined time for a single jump.">
+						<SettingsEnum text="Display time labels" convar="mom_df_hud_jump_text_enable" infomessage="Display times (in milliseconds) next to jump sync bars. At the top is late release time, at the bottom early/late press time, and in the middle is combined time for a single jump.">
 							<RadioButton group="dfjumptextenable" text="#Common_Off" value="0" />
 							<RadioButton group="dfjumptextenable" text="#Common_On" value="1" />
-						</ChaosSettingsEnum>
+						</SettingsEnum>
 					</ConVarEnabler>
 
 				</Panel>
@@ -755,35 +755,35 @@
 
 					<Label class="settings-group__combo-header" text="#Settings_Defrag_Groundboost_Title" />
 
-					<ChaosSettingsEnum text="#Settings_Defrag_Groundboost" convar="mom_df_hud_gb_enable" infomessage="#Settings_Defrag_Groundboost_Info" tags="groundboost">
+					<SettingsEnum text="#Settings_Defrag_Groundboost" convar="mom_df_hud_gb_enable" infomessage="#Settings_Defrag_Groundboost_Info" tags="groundboost">
 						<RadioButton group="gbenable" text="#Common_Off" value="0" />
 						<RadioButton group="gbenable" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
 					<ConVarEnabler convar="mom_df_hud_gb_enable" class="flow-down">
-						<ChaosSettingsEnumDropDown text="#Settings_Defrag_Groundboost_TextMode" convar="mom_df_hud_gb_text_mode" infomessage="#Settings_Defrag_Groundboost_TextMode_Info" tags="groundboost">
+						<SettingsEnumDropDown text="#Settings_Defrag_Groundboost_TextMode" convar="mom_df_hud_gb_text_mode" infomessage="#Settings_Defrag_Groundboost_TextMode_Info" tags="groundboost">
 							<Label id="gblabel0" text="#Settings_Defrag_Groundboost_TextMode_Type0" value="0" />
 							<Label id="gblabel1" text="#Settings_Defrag_Groundboost_TextMode_Type1" value="1" />
 							<Label id="gblabel2" text="#Settings_Defrag_Groundboost_TextMode_Type2" value="2" />
-						</ChaosSettingsEnumDropDown>
+						</SettingsEnumDropDown>
 						
 						<ConVarEnabler convar="mom_df_hud_gb_text_mode" class="flow-down">
-							<ChaosSettingsEnumDropDown text="#Settings_Defrag_Groundboost_TextColorMode" convar="mom_df_hud_gb_text_color_mode" infomessage="#Settings_Defrag_Groundboost_TextColorMode_Info" tags="groundboost">
+							<SettingsEnumDropDown text="#Settings_Defrag_Groundboost_TextColorMode" convar="mom_df_hud_gb_text_color_mode" infomessage="#Settings_Defrag_Groundboost_TextColorMode_Info" tags="groundboost">
 								<Label id="gbcolor0" text="#Settings_Defrag_Groundboost_TextColorMode_Type0" value="0" />
 								<Label id="gbcolor1" text="#Settings_Defrag_Groundboost_TextColorMode_Type1" value="1" />
 								<Label id="gbcolor2" text="#Settings_Defrag_Groundboost_TextColorMode_Type2" value="2" />
-							</ChaosSettingsEnumDropDown>
+							</SettingsEnumDropDown>
 						</ConVarEnabler>
 						
-						<ChaosSettingsEnum text="#Settings_Defrag_Groundboost_Overshoot" convar="mom_df_hud_gb_overshoot_enable" infomessage="#Settings_Defrag_Groundboost_Overshoot_Info" tags="groundboost">
+						<SettingsEnum text="#Settings_Defrag_Groundboost_Overshoot" convar="mom_df_hud_gb_overshoot_enable" infomessage="#Settings_Defrag_Groundboost_Overshoot_Info" tags="groundboost">
 							<RadioButton group="gbovershootenable" text="#Common_Off" value="0" />
 							<RadioButton group="gbovershootenable" text="#Common_On" value="1" />
-						</ChaosSettingsEnum>
+						</SettingsEnum>
 						
-						<ChaosSettingsEnum text="#Settings_Defrag_Groundboost_CrashHighlight" convar="mom_df_hud_gb_crash_hl_enable" infomessage="#Settings_Defrag_Groundboost_CrashHighlight_Info" tags="groundboost">
+						<SettingsEnum text="#Settings_Defrag_Groundboost_CrashHighlight" convar="mom_df_hud_gb_crash_hl_enable" infomessage="#Settings_Defrag_Groundboost_CrashHighlight_Info" tags="groundboost">
 							<RadioButton group="gbcrashhlenable" text="#Common_Off" value="0" />
 							<RadioButton group="gbcrashhlenable" text="#Common_On" value="1" />
-						</ChaosSettingsEnum>
+						</SettingsEnum>
 					</ConVarEnabler>
 
 				</Panel>
diff --git a/layout/pages/settings/input.xml b/layout/pages/settings/input.xml
index eaa0798f..13782b96 100644
--- a/layout/pages/settings/input.xml
+++ b/layout/pages/settings/input.xml
@@ -32,7 +32,7 @@
 				</Panel>
 				
 				<Panel class="settings-group__combo">
-					<ChaosSettingsSlider text="#Settings_Mouse_Sens" min="0.1" max="10" displayprecision="2" convar="sensitivity" tags="sensitivity" hasdocspage="false" />
+					<SettingsSlider text="#Settings_Mouse_Sens" min="0.1" max="10" displayprecision="2" convar="sensitivity" tags="sensitivity" hasdocspage="false" />
 				
 					<Panel class="settings-enum__values pr-2 pl-4 mb-1" onload="MouseSensitivity.loadSettings()">
 						<Label text="#Settings_DPI_Input" class="settings-enum__title" />
@@ -47,31 +47,31 @@
 				</Panel>
 
 				<Panel class="settings-group__combo">
-					<ChaosSettingsEnum text="#Settings_Mouse_Accel" convar="m_customaccel" hasdocspage="false" tags="acceleration">
+					<SettingsEnum text="#Settings_Mouse_Accel" convar="m_customaccel" hasdocspage="false" tags="acceleration">
 						<RadioButton group="maccel" text="#Common_Off" value="0" />
 						<RadioButton group="maccel" text="#Common_On" value="3" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
 					<ConVarEnabler convar="m_customaccel" hasdocspage="false">
-						<ChaosSettingsSlider text="" min="0.1" max="10" displayprecision="2" convar="m_customaccel_exponent" tags="acceleration" />
+						<SettingsSlider text="" min="0.1" max="10" displayprecision="2" convar="m_customaccel_exponent" tags="acceleration" />
 					</ConVarEnabler>
 				</Panel>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Mouse_Raw" convar="m_rawinput" infomessage="#Settings_Mouse_Raw_Info" hasdocspage="false" tags="raw,direct">
+				<SettingsEnumDropDown text="#Settings_Mouse_Raw" convar="m_rawinput" infomessage="#Settings_Mouse_Raw_Info" hasdocspage="false" tags="raw,direct">
 					<Label id="rawinput0" text="#Common_Off" value="0" />
 					<Label id="rawinput1" text="#Settings_Mouse_Raw_On_Old" value="1" />
 					<Label id="rawinput2" text="#Settings_Mouse_Raw_On_New" value="2" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnum text="#Settings_Mouse_Reverse" convar="m_pitch_inverse" infomessage="#Settings_Mouse_Reverse_Info" hasdocspage="false" tags="inverse">
+				<SettingsEnum text="#Settings_Mouse_Reverse" convar="m_pitch_inverse" infomessage="#Settings_Mouse_Reverse_Info" hasdocspage="false" tags="inverse">
 					<RadioButton group="reverse" text="#Common_Off" value="0" />
 					<RadioButton group="reverse" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Mouse_Filter" convar="m_filter" infomessage="#Settings_Mouse_Filter_Info" hasdocspage="false" tags="filter">
+				<SettingsEnum text="#Settings_Mouse_Filter" convar="m_filter" infomessage="#Settings_Mouse_Filter_Info" hasdocspage="false" tags="filter">
 					<RadioButton group="filter" text="#Common_Off" value="0" />
 					<RadioButton group="filter" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
 			</Panel>
 
@@ -90,66 +90,66 @@
 
 				<Label class="settings-group__subtitle" text="#Settings_Keybinds_Movement" />
 
-				<ChaosSettingsKeyBinder text="#Keybind_Move_Forward" bind="+forward" tags="forward" />
-				<ChaosSettingsKeyBinder text="#Keybind_Move_Back" bind="+back" tags="backwards" />
-				<ChaosSettingsKeyBinder text="#Keybind_Move_Left" bind="+moveleft" tags="left,strafe" />
-				<ChaosSettingsKeyBinder text="#Keybind_Move_Right" bind="+moveright" tags="right,strafe" />
-				<ChaosSettingsKeyBinder text="#Keybind_Turn_Right" bind="+right" tags="right,turnbind" />
-				<ChaosSettingsKeyBinder text="#Keybind_Turn_Left" bind="+left" tags="left,turnbind" />
-				<ChaosSettingsKeyBinder text="#Keybind_Jump" bind="+jump" tags="jump" />
-				<ChaosSettingsKeyBinder text="#Keybind_Toggle_Jump" bind="toggle_jump" tags="toggle,jump" />
-				<ChaosSettingsKeyBinder text="#Keybind_Duck" bind="+duck" tags="duck,crouch" />
-				<ChaosSettingsKeyBinder text="#Keybind_Toggle_Duck" bind="toggle_duck" tags="toggle,duck,crouch" />
-				<ChaosSettingsKeyBinder text="#Keybind_Sprint" bind="+speed" tags="sprint,run,speed" />
-				<ChaosSettingsKeyBinder text="#Keybind_Toggle_Sprint" bind="toggle_speed" tags="toggle,sprint,run,speed" />
-				<ChaosSettingsKeyBinder text="#Keybind_Walk" bind="+walk" tags="walk" />
-				<ChaosSettingsKeyBinder text="#Keybind_Toggle_Walk" bind="toggle_walk" tags="toggle,walk" />
+				<SettingsKeyBinder text="#Keybind_Move_Forward" bind="+forward" tags="forward" />
+				<SettingsKeyBinder text="#Keybind_Move_Back" bind="+back" tags="backwards" />
+				<SettingsKeyBinder text="#Keybind_Move_Left" bind="+moveleft" tags="left,strafe" />
+				<SettingsKeyBinder text="#Keybind_Move_Right" bind="+moveright" tags="right,strafe" />
+				<SettingsKeyBinder text="#Keybind_Turn_Right" bind="+right" tags="right,turnbind" />
+				<SettingsKeyBinder text="#Keybind_Turn_Left" bind="+left" tags="left,turnbind" />
+				<SettingsKeyBinder text="#Keybind_Jump" bind="+jump" tags="jump" />
+				<SettingsKeyBinder text="#Keybind_Toggle_Jump" bind="toggle_jump" tags="toggle,jump" />
+				<SettingsKeyBinder text="#Keybind_Duck" bind="+duck" tags="duck,crouch" />
+				<SettingsKeyBinder text="#Keybind_Toggle_Duck" bind="toggle_duck" tags="toggle,duck,crouch" />
+				<SettingsKeyBinder text="#Keybind_Sprint" bind="+speed" tags="sprint,run,speed" />
+				<SettingsKeyBinder text="#Keybind_Toggle_Sprint" bind="toggle_speed" tags="toggle,sprint,run,speed" />
+				<SettingsKeyBinder text="#Keybind_Walk" bind="+walk" tags="walk" />
+				<SettingsKeyBinder text="#Keybind_Toggle_Walk" bind="toggle_walk" tags="toggle,walk" />
 
 				<Label class="settings-group__subtitle" text="#Settings_Keybinds_Weapons" />
 
-				<ChaosSettingsKeyBinder text="#Keybind_Attack_Primary" bind="+attack" tags="attack,primary,fire" />
-				<ChaosSettingsKeyBinder text="#Keybind_Attack_Secondary" bind="+attack2" tags="secondary,fire" />
-				<ChaosSettingsKeyBinder text="#Keybind_Use_Items" bind="+use" tags="use,interact" />
-				<ChaosSettingsKeyBinder text="#Keybind_Drop" bind="drop" tags="drop" />
-				<ChaosSettingsKeyBinder text="#Keybind_Weapon_Category_1" bind="slot1" tags="slot1" />
-				<ChaosSettingsKeyBinder text="#Keybind_Weapon_Category_2" bind="slot2" tags="slot2" />
-				<ChaosSettingsKeyBinder text="#Keybind_Weapon_Category_3" bind="slot3" tags="slot3" />
-				<ChaosSettingsKeyBinder text="#Keybind_Weapon_Category_4" bind="slot4" tags="slot4" />
-				<ChaosSettingsKeyBinder text="#Keybind_Weapon_Category_5" bind="slot5" tags="slot5" />
+				<SettingsKeyBinder text="#Keybind_Attack_Primary" bind="+attack" tags="attack,primary,fire" />
+				<SettingsKeyBinder text="#Keybind_Attack_Secondary" bind="+attack2" tags="secondary,fire" />
+				<SettingsKeyBinder text="#Keybind_Use_Items" bind="+use" tags="use,interact" />
+				<SettingsKeyBinder text="#Keybind_Drop" bind="drop" tags="drop" />
+				<SettingsKeyBinder text="#Keybind_Weapon_Category_1" bind="slot1" tags="slot1" />
+				<SettingsKeyBinder text="#Keybind_Weapon_Category_2" bind="slot2" tags="slot2" />
+				<SettingsKeyBinder text="#Keybind_Weapon_Category_3" bind="slot3" tags="slot3" />
+				<SettingsKeyBinder text="#Keybind_Weapon_Category_4" bind="slot4" tags="slot4" />
+				<SettingsKeyBinder text="#Keybind_Weapon_Category_5" bind="slot5" tags="slot5" />
 
 				<Label class="settings-group__subtitle" text="#Common_Timer" />
 
-				<ChaosSettingsKeyBinder text="#Keybind_Restart" bind="mom_restart" tags="restart,reset" />
-				<ChaosSettingsKeyBinder text="#Keybind_RestartStage" bind="mom_restart_stage" tags="restart,reset,stage" />
-				<ChaosSettingsKeyBinder text="#Keybind_StopTimer" bind="mom_timer_stop" tags="stop" />
+				<SettingsKeyBinder text="#Keybind_Restart" bind="mom_restart" tags="restart,reset" />
+				<SettingsKeyBinder text="#Keybind_RestartStage" bind="mom_restart_stage" tags="restart,reset,stage" />
+				<SettingsKeyBinder text="#Keybind_StopTimer" bind="mom_timer_stop" tags="stop" />
 
 				<Label class="settings-group__subtitle" text="#Settings_Keybinds_Savestates" />
 
-				<ChaosSettingsKeyBinder text="#Keybind_Savestate_Create" bind="mom_saveloc_create" tags="saveloc,savestate" />
-				<ChaosSettingsKeyBinder text="#Keybind_Savestate_Goto" bind="+mom_saveloc_current" tags="saveloc,savestate" />
-				<ChaosSettingsKeyBinder text="#Keybind_Savestate_Menu" bind="chaos_hud_menu_show savelocmenu" tags="saveloc,savestate" />
-				<ChaosSettingsKeyBinder text="#Keybind_StartMark_Create" bind="mom_start_mark_create" tags="saveloc,savestate" />
-				<ChaosSettingsKeyBinder text="#Keybind_StartMark_Clear" bind="mom_start_mark_clear" tags="saveloc,savestate" />
+				<SettingsKeyBinder text="#Keybind_Savestate_Create" bind="mom_saveloc_create" tags="saveloc,savestate" />
+				<SettingsKeyBinder text="#Keybind_Savestate_Goto" bind="+mom_saveloc_current" tags="saveloc,savestate" />
+				<SettingsKeyBinder text="#Keybind_Savestate_Menu" bind="hud_menu_show savelocmenu" tags="saveloc,savestate" />
+				<SettingsKeyBinder text="#Keybind_StartMark_Create" bind="mom_start_mark_create" tags="saveloc,savestate" />
+				<SettingsKeyBinder text="#Keybind_StartMark_Clear" bind="mom_start_mark_clear" tags="saveloc,savestate" />
 
 				<Label class="settings-group__subtitle" text="#Common_Multiplayer" />
 
-				<ChaosSettingsKeyBinder text="#Keybind_ToggleTimes" bind="+showtimes" tags="leaderboard,tab,times" />
-				<ChaosSettingsKeyBinder text="#Keybind_Chat_Message" bind="chat_open" tags="chat,talk" />
+				<SettingsKeyBinder text="#Keybind_ToggleTimes" bind="+showtimes" tags="leaderboard,tab,times" />
+				<SettingsKeyBinder text="#Keybind_Chat_Message" bind="chat_open" tags="chat,talk" />
 
 				<Label class="settings-group__subtitle" text="#Settings_Keybinds_Utility" />
 
-				<ChaosSettingsKeyBinder text="#Keybind_Practice" bind="mom_practice" tags="practice,noclip" />
-				<ChaosSettingsKeyBinder text="#Keybind_MapCommands" bind="chaos_hud_menu_show mapcmdsmenu" />
-				<ChaosSettingsKeyBinder text="#Keybind_Ruler" bind="chaos_hud_menu_show rulermenu" tags="ruler,measure,distance" />
-				<ChaosSettingsKeyBinder text="#Keybind_Paint" bind="+paint" tags="paint" />
-				<ChaosSettingsKeyBinder text="#Keybind_Flashlight" bind="impulse 100" tags="flashlight" />
+				<SettingsKeyBinder text="#Keybind_Practice" bind="mom_practice" tags="practice,noclip" />
+				<SettingsKeyBinder text="#Keybind_MapCommands" bind="hud_menu_show mapcmdsmenu" />
+				<SettingsKeyBinder text="#Keybind_Ruler" bind="hud_menu_show rulermenu" tags="ruler,measure,distance" />
+				<SettingsKeyBinder text="#Keybind_Paint" bind="+paint" tags="paint" />
+				<SettingsKeyBinder text="#Keybind_Flashlight" bind="impulse 100" tags="flashlight" />
 
 				<Label class="settings-group__subtitle" text="#Settings_Input_Keybinds_Misc" />
 
-				<ChaosSettingsKeyBinder text="#Keybind_Console" bind="toggleconsole" tags="console" />
-				<ChaosSettingsKeyBinder text="#Keybind_Screenshot" bind="jpeg" tags="screenshot" />
-				<ChaosSettingsKeyBinder text="#Keybind_Quit_Prompt" bind="quit_prompt" tags="quit,close" />
-				<ChaosSettingsKeyBinder text="#Keybind_Quit" bind="quit" tags="quit,close" />
+				<SettingsKeyBinder text="#Keybind_Console" bind="toggleconsole" tags="console" />
+				<SettingsKeyBinder text="#Keybind_Screenshot" bind="jpeg" tags="screenshot" />
+				<SettingsKeyBinder text="#Keybind_Quit_Prompt" bind="quit_prompt" tags="quit,close" />
+				<SettingsKeyBinder text="#Keybind_Quit" bind="quit" tags="quit,close" />
 
 			</Panel>
 		</Panel>
diff --git a/layout/pages/settings/interface.xml b/layout/pages/settings/interface.xml
index dc82a07d..5e044b9b 100644
--- a/layout/pages/settings/interface.xml
+++ b/layout/pages/settings/interface.xml
@@ -116,20 +116,20 @@
 					</TooltipPanel>
 				</Panel>
 
-				<ChaosSettingsEnum text="#Settings_Menu_Console" convar="con_enable" hasdocspage="false" tags="console">
+				<SettingsEnum text="#Settings_Menu_Console" convar="con_enable" hasdocspage="false" tags="console">
 					<RadioButton group="enableconsole" text="#Common_Off" value="0" />
 					<RadioButton group="enableconsole" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Menu_Movie" psvar="settings.mainMenuMovie" infomessage="#Settings_Menu_Movie_Info" tags="background,video,movie">
+				<SettingsEnum text="#Settings_Menu_Movie" psvar="settings.mainMenuMovie" infomessage="#Settings_Menu_Movie_Info" tags="background,video,movie">
 					<RadioButton group="mainmenuvideo" text="#Common_Off" value="0" activateoverride="$.DispatchEvent('ReloadBackground');" />
 					<RadioButton group="mainmenuvideo" text="#Common_On" value="1" activateoverride="$.DispatchEvent('ReloadBackground');" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Menu_Type" psvar="settings.mainMenuBackground" submitoverride="$.DispatchEvent('ReloadBackground');" infomessage="#Settings_Menu_Type_Info" tags="background,video,movie">
+				<SettingsEnumDropDown text="#Settings_Menu_Type" psvar="settings.mainMenuBackground" submitoverride="$.DispatchEvent('ReloadBackground');" infomessage="#Settings_Menu_Type_Info" tags="background,video,movie">
 					<Label text="#Settings_Menu_Type0" value="0" id="bgtype0" />
 					<Label text="#Settings_Menu_Type1" value="1" id="bgtype1" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
 				<Panel class="settings-group__combo">
 					<Button class="horizontal-align-center button my-2" onactivate="UiToolkitAPI.ShowCustomLayoutPopup('', 'file://{resources}/layout/modals/popups/dont-show-again-settings.xml')">
@@ -144,13 +144,13 @@
 				<Panel class="settings-group__header">
 					<Label class="settings-group__title" text="#Settings_Speedometer_Title" tags="speedometer" />
 				</Panel>
-				<ChaosSettingsEnum text="#Settings_Speedometer_Enable" convar="mom_hud_speedometer_enable" infomessage="#Settings_Speedometer_Enable_Info" tags="speedometer">
+				<SettingsEnum text="#Settings_Speedometer_Enable" convar="mom_hud_speedometer_enable" infomessage="#Settings_Speedometer_Enable_Info" tags="speedometer">
 					<RadioButton group="speedometer" text="#Common_Off" value="0" />
 					<RadioButton group="speedometer" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
 				<ConVarEnabler convar="mom_hud_speedometer_enable" togglevisibility="true" class="flow-down">
-					<ChaosSettingsSlider text="#Settings_Speedometer_FPS" min="0" max="400" convar="mom_hud_speedometer_fps" infomessage="#Settings_Speedometer_FPS_Info" hasdocspage="true" tags="speedometer" />
+					<SettingsSlider text="#Settings_Speedometer_FPS" min="0" max="400" convar="mom_hud_speedometer_fps" infomessage="#Settings_Speedometer_FPS_Info" hasdocspage="true" tags="speedometer" />
 
 					<Panel id="SpeedometersContainer" class="flow-down full-width" infotitle="#Settings_Speedometer_Gamemode_Long" infomessage="#Settings_Speedometer_Container_Info" tags="speedometer">
 						<Panel class="settings-group__header">
@@ -239,32 +239,32 @@
 					</ConVarEnabler>
 					<Panel class="fill-width flow-down">
 						<Panel class="settings-group__combo" style="margin-bottom: 0px;">							<!-- TODO: fix when sass specificity is fixed -->
-							<ChaosSettingsEnum text="#Settings_Crosshair_Enable" convar="crosshair" hasdocspage="false">
+							<SettingsEnum text="#Settings_Crosshair_Enable" convar="crosshair" hasdocspage="false">
 								<RadioButton group="xhairenable" text="#Common_Off" value="0" />
 								<RadioButton group="xhairenable" text="#Common_On" value="1" />
-							</ChaosSettingsEnum>
+							</SettingsEnum>
 
 							<ConVarEnabler convar="crosshair" class="flow-down">
 								<ConVarColorDisplay text="#Settings_Crosshair_Color" convar="cl_crosshair_color" hasdocspage="false" />
 
-								<ChaosSettingsSlider text="#Settings_Crosshair_Size" min="0" max="20" convar="cl_crosshair_size" displayprecision="2" infomessage="" hasdocspage="false" tags="color,size" />
+								<SettingsSlider text="#Settings_Crosshair_Size" min="0" max="20" convar="cl_crosshair_size" displayprecision="2" infomessage="" hasdocspage="false" tags="color,size" />
 
-								<ChaosSettingsSlider text="#Settings_Crosshair_Gap" min="0" max="10" convar="cl_crosshair_gap" displayprecision="2" infomessage="" hasdocspage="false" tags="gap" />
+								<SettingsSlider text="#Settings_Crosshair_Gap" min="0" max="10" convar="cl_crosshair_gap" displayprecision="2" infomessage="" hasdocspage="false" tags="gap" />
 
-								<ChaosSettingsSlider text="#Settings_Crosshair_Thickness" min="0" max="10" convar="cl_crosshair_thickness" displayprecision="2" infomessage="" hasdocspage="false" tags="thickness,tasteful" />
+								<SettingsSlider text="#Settings_Crosshair_Thickness" min="0" max="10" convar="cl_crosshair_thickness" displayprecision="2" infomessage="" hasdocspage="false" tags="thickness,tasteful" />
 
-								<ChaosSettingsEnum text="#Settings_Crosshair_CenterDot" convar="cl_crosshair_dot" hasdocspage="false" tags="center,centre">
+								<SettingsEnum text="#Settings_Crosshair_CenterDot" convar="cl_crosshair_dot" hasdocspage="false" tags="center,centre">
 									<RadioButton group="xhairdot" text="#Common_Off" value="0" />
 									<RadioButton group="xhairdot" text="#Common_On" value="1" />
-								</ChaosSettingsEnum>
+								</SettingsEnum>
 
-								<ChaosSettingsEnum text="#Settings_Crosshair_Outline" convar="cl_crosshair_drawoutline" infomessage="" hasdocspage="false" tags="outline">
+								<SettingsEnum text="#Settings_Crosshair_Outline" convar="cl_crosshair_drawoutline" infomessage="" hasdocspage="false" tags="outline">
 									<RadioButton group="xhairoutline" text="#Common_Off" value="0" />
 									<RadioButton group="xhairoutline" text="#Common_On" value="1" />
-								</ChaosSettingsEnum>
+								</SettingsEnum>
 
 								<ConVarEnabler convar="cl_crosshair_drawoutline">
-									<ChaosSettingsSlider style="margin-bottom: 0px;" text="#Settings_Crosshair_OutlineThickness" min="0" max="3" convar="cl_crosshair_outlinethickness" displayprecision="2" infomessage="" hasdocspage="false" tags="outline" />
+									<SettingsSlider style="margin-bottom: 0px;" text="#Settings_Crosshair_OutlineThickness" min="0" max="3" convar="cl_crosshair_outlinethickness" displayprecision="2" infomessage="" hasdocspage="false" tags="outline" />
 								</ConVarEnabler>
 							</ConVarEnabler>
 						</Panel>
@@ -289,30 +289,30 @@
 					</Panel>
 				</Panel>
 
-				<ChaosSettingsEnum text="#Settings_Timer_Show" convar="mom_hud_timer_enable" infomessage="#Settings_Timer_Show_Info">
+				<SettingsEnum text="#Settings_Timer_Show" convar="mom_hud_timer_enable" infomessage="#Settings_Timer_Show_Info">
 					<RadioButton group="timerenable" text="#Common_Off" value="0" />
 					<RadioButton group="timerenable" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Timer_SoundStart" convar="mom_hud_timer_sound_start_enable" infomessage="#Settings_Timer_SoundStart_Info" tags="sound">
+				<SettingsEnum text="#Settings_Timer_SoundStart" convar="mom_hud_timer_sound_start_enable" infomessage="#Settings_Timer_SoundStart_Info" tags="sound">
 					<RadioButton group="timerstartsound" text="#Common_Off" value="0" />
 					<RadioButton group="timerstartsound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Timer_SoundFinish" convar="mom_hud_timer_sound_finish_enable" infomessage="#Settings_Timer_SoundStop_Info" tags="sound">
+				<SettingsEnum text="#Settings_Timer_SoundFinish" convar="mom_hud_timer_sound_finish_enable" infomessage="#Settings_Timer_SoundStop_Info" tags="sound">
 					<RadioButton group="timerfinishsound" text="#Common_Off" value="0" />
 					<RadioButton group="timerfinishsound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Timer_SoundFinish" convar="mom_hud_timer_sound_stop_enable" infomessage="#Settings_Timer_SoundFinish_Info" tags="sound">
+				<SettingsEnum text="#Settings_Timer_SoundFinish" convar="mom_hud_timer_sound_stop_enable" infomessage="#Settings_Timer_SoundFinish_Info" tags="sound">
 					<RadioButton group="timerstopsound" text="#Common_Off" value="0" />
 					<RadioButton group="timerstopsound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_Timer_SoundFail" convar="mom_hud_timer_sound_fail_enable" infomessage="#Settings_Timer_SoundFail_Info" tags="sound">
+				<SettingsEnum text="#Settings_Timer_SoundFail" convar="mom_hud_timer_sound_fail_enable" infomessage="#Settings_Timer_SoundFail_Info" tags="sound">
 					<RadioButton group="timerfailsound" text="#Common_Off" value="0" />
 					<RadioButton group="timerfailsound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 			</Panel>
 
 			<Panel class="settings-page__spacer" />
@@ -326,10 +326,10 @@
 						</Button>
 					</TooltipPanel>
 				</Panel>
-				<ChaosSettingsEnum text="#Settings_HUDStatus_Enable" convar="mom_hud_status_enable" infomessage="#Settings_HUDStatus_Enable_Info">
+				<SettingsEnum text="#Settings_HUDStatus_Enable" convar="mom_hud_status_enable" infomessage="#Settings_HUDStatus_Enable_Info">
 					<RadioButton group="playerstatusenable" text="#Common_Off" value="0" />
 					<RadioButton group="playerstatusenable" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 			</Panel>
 
 			<Panel class="settings-page__spacer" />
@@ -344,10 +344,10 @@
 					</TooltipPanel>
 				</Panel>
 
-				<ChaosSettingsEnum text="#Settings_KeypressHUD_Enable" convar="mom_hud_keypress_enable" infomessage="#Settings_KeypressHUD_Enable_Info">
+				<SettingsEnum text="#Settings_KeypressHUD_Enable" convar="mom_hud_keypress_enable" infomessage="#Settings_KeypressHUD_Enable_Info">
 					<RadioButton group="showkeys" text="#Common_Off" value="0" />
 					<RadioButton group="showkeys" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 			</Panel>
 
 			<Panel class="settings-page__spacer" />
@@ -362,10 +362,10 @@
 					</TooltipPanel>
 				</Panel>
 
-				<ChaosSettingsEnum text="#Settings_ComparisonsHUD_Enable" convar="mom_hud_comparisons_enable" infomessage="#Settings_ComparisonsHUD_Enable_Info">
+				<SettingsEnum text="#Settings_ComparisonsHUD_Enable" convar="mom_hud_comparisons_enable" infomessage="#Settings_ComparisonsHUD_Enable_Info">
 					<RadioButton group="showcomparisons" text="#Common_Off" value="0" />
 					<RadioButton group="showcomparisons" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 			</Panel>
 
 			<Panel class="settings-page__spacer" />
@@ -386,22 +386,22 @@
 					</Panel>
 				</Panel>
 
-				<ChaosSettingsEnum text="#Settings_WeaponSelection_Enable" convar="mom_hud_weaponselection_enable" infomessage="#Settings_WeaponSelection_Enable_Info">
+				<SettingsEnum text="#Settings_WeaponSelection_Enable" convar="mom_hud_weaponselection_enable" infomessage="#Settings_WeaponSelection_Enable_Info">
 					<RadioButton group="showwepsel" text="#Common_Off" value="0" />
 					<RadioButton group="showwepsel" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
 				<ConVarEnabler convar="mom_hud_weaponselection_enable" togglevisibility="true" class="flow-down">
-					<ChaosSettingsEnum text="#Settings_WeaponSelection_ShowKeybind" convar="mom_hud_weaponselection_keybind_enable" infomessage="#Settings_WeaponSelection_ShowKeybind_Info">
+					<SettingsEnum text="#Settings_WeaponSelection_ShowKeybind" convar="mom_hud_weaponselection_keybind_enable" infomessage="#Settings_WeaponSelection_ShowKeybind_Info">
 						<RadioButton group="showwepselkb" text="#Common_Off" value="0" />
 						<RadioButton group="showwepselkb" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 				</ConVarEnabler>
 
-				<ChaosSettingsEnum text="#Settings_WeaponSelection_Sound" convar="mom_hud_weaponselection_sound_enable" infomessage="#Settings_WeaponSelection_Sound_Info" tags="sound">
+				<SettingsEnum text="#Settings_WeaponSelection_Sound" convar="mom_hud_weaponselection_sound_enable" infomessage="#Settings_WeaponSelection_Sound_Info" tags="sound">
 					<RadioButton group="showwepselsound" text="#Common_Off" value="0" />
 					<RadioButton group="showwepselsound" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 			</Panel>
 
 			<Panel class="settings-page__spacer" />
@@ -421,72 +421,72 @@
 					</Panel>
 				</Panel>
 
-				<ChaosSettingsEnum text="#Settings_JumpStats_Enable" convar="mom_hud_jstats_enable" infomessage="#Settings_JumpStats_Enable_Info">
+				<SettingsEnum text="#Settings_JumpStats_Enable" convar="mom_hud_jstats_enable" infomessage="#Settings_JumpStats_Enable_Info">
 					<RadioButton group="jumpstatsenable" text="#Common_Off" value="0" />
 					<RadioButton group="jumpstatsenable" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
 				<ConVarEnabler convar="mom_hud_jstats_enable" class="flow-down">
-					<ChaosSettingsSlider text="#Settings_JumpStats_First" min="1" max="10" convar="mom_hud_jstats_first" displayprecision="0" infomessage="#Settings_JumpStats_First_Info" hasdocspage="false" />
+					<SettingsSlider text="#Settings_JumpStats_First" min="1" max="10" convar="mom_hud_jstats_first" displayprecision="0" infomessage="#Settings_JumpStats_First_Info" hasdocspage="false" />
 
-					<ChaosSettingsSlider text="#Settings_JumpStats_Interval" min="0" max="10" convar="mom_hud_jstats_interval" displayprecision="0" infomessage="#Settings_JumpStats_Interval_Info" hasdocspage="false" />
+					<SettingsSlider text="#Settings_JumpStats_Interval" min="0" max="10" convar="mom_hud_jstats_interval" displayprecision="0" infomessage="#Settings_JumpStats_Interval_Info" hasdocspage="false" />
 
-					<ChaosSettingsSlider text="#Settings_JumpStats_Log" min="1" max="10" convar="mom_hud_jstats_log" displayprecision="0" infomessage="#Settings_JumpStats_Log_Info" hasdocspage="false" />
+					<SettingsSlider text="#Settings_JumpStats_Log" min="1" max="10" convar="mom_hud_jstats_log" displayprecision="0" infomessage="#Settings_JumpStats_Log_Info" hasdocspage="false" />
 
-					<ChaosSettingsEnum text="#Settings_JumpStats_TakeoffSpeed" convar="mom_hud_jstats_takeoff_speed_enable" infomessage="#Settings_JumpStats_TakeoffSpeed_Info">
+					<SettingsEnum text="#Settings_JumpStats_TakeoffSpeed" convar="mom_hud_jstats_takeoff_speed_enable" infomessage="#Settings_JumpStats_TakeoffSpeed_Info">
 						<RadioButton group="takeoffspeed" text="#Common_Off" value="0" />
 						<RadioButton group="takeoffspeed" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
-					<ChaosSettingsEnum text="#Settings_JumpStats_SpeedDelta" convar="mom_hud_jstats_speed_delta_enable" infomessage="#Settings_JumpStats_SpeedDelta_Info">
+					<SettingsEnum text="#Settings_JumpStats_SpeedDelta" convar="mom_hud_jstats_speed_delta_enable" infomessage="#Settings_JumpStats_SpeedDelta_Info">
 						<RadioButton group="deltaspeed" text="#Common_Off" value="0" />
 						<RadioButton group="deltaspeed" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
-					<ChaosSettingsEnum text="#Settings_JumpStats_TakeoffTime" convar="mom_hud_jstats_takeoff_time_enable" infomessage="#Settings_JumpStats_TakeoffTime_Info">
+					<SettingsEnum text="#Settings_JumpStats_TakeoffTime" convar="mom_hud_jstats_takeoff_time_enable" infomessage="#Settings_JumpStats_TakeoffTime_Info">
 						<RadioButton group="jumptime" text="#Common_Off" value="0" />
 						<RadioButton group="jumptime" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
-					<ChaosSettingsEnum text="#Settings_JumpStats_TimeDelta" convar="mom_hud_jstats_time_delta_enable" infomessage="#Settings_JumpStats_TimeDelta_Info">
+					<SettingsEnum text="#Settings_JumpStats_TimeDelta" convar="mom_hud_jstats_time_delta_enable" infomessage="#Settings_JumpStats_TimeDelta_Info">
 						<RadioButton group="jumptimedelta" text="#Common_Off" value="0" />
 						<RadioButton group="jumptimedelta" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
-					<ChaosSettingsEnum text="#Settings_JumpStats_StrafeSync" convar="mom_hud_jstats_strafe_sync_enable" infomessage="#Settings_JumpStats_StrafeSync_Info">
+					<SettingsEnum text="#Settings_JumpStats_StrafeSync" convar="mom_hud_jstats_strafe_sync_enable" infomessage="#Settings_JumpStats_StrafeSync_Info">
 						<RadioButton group="syncratio" text="#Common_Off" value="0" />
 						<RadioButton group="syncratio" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
-					<ChaosSettingsEnum text="#Settings_JumpStats_StrafeCount" convar="mom_hud_jstats_strafe_count_enable" infomessage="#Settings_JumpStats_StrafeCount_Info">
+					<SettingsEnum text="#Settings_JumpStats_StrafeCount" convar="mom_hud_jstats_strafe_count_enable" infomessage="#Settings_JumpStats_StrafeCount_Info">
 						<RadioButton group="jumpstrafes" text="#Common_Off" value="0" />
 						<RadioButton group="jumpstrafes" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
-					<ChaosSettingsEnum text="#Settings_JumpStats_SpeedGain" convar="mom_hud_jstats_speed_gain_enable" infomessage="#Settings_JumpStats_SpeedGain_Info">
+					<SettingsEnum text="#Settings_JumpStats_SpeedGain" convar="mom_hud_jstats_speed_gain_enable" infomessage="#Settings_JumpStats_SpeedGain_Info">
 						<RadioButton group="speedgain" text="#Common_Off" value="0" />
 						<RadioButton group="speedgain" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
-					<ChaosSettingsEnum text="#Settings_JumpStats_YawRatio" convar="mom_hud_jstats_yaw_ratio_enable" infomessage="#Settings_JumpStats_YawRatio_Info">
+					<SettingsEnum text="#Settings_JumpStats_YawRatio" convar="mom_hud_jstats_yaw_ratio_enable" infomessage="#Settings_JumpStats_YawRatio_Info">
 						<RadioButton group="yawratio" text="#Common_Off" value="0" />
 						<RadioButton group="yawratio" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
-					<ChaosSettingsEnum text="#Settings_JumpStats_HeightDelta" convar="mom_hud_jstats_height_delta_enable" infomessage="#Settings_JumpStats_HeightDelta_Info">
+					<SettingsEnum text="#Settings_JumpStats_HeightDelta" convar="mom_hud_jstats_height_delta_enable" infomessage="#Settings_JumpStats_HeightDelta_Info">
 						<RadioButton group="heightdelta" text="#Common_Off" value="0" />
 						<RadioButton group="heightdelta" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
-					<ChaosSettingsEnum text="#Settings_JumpStats_Distance" convar="mom_hud_jstats_distance_enable" infomessage="#Settings_JumpStats_Distance_Info">
+					<SettingsEnum text="#Settings_JumpStats_Distance" convar="mom_hud_jstats_distance_enable" infomessage="#Settings_JumpStats_Distance_Info">
 						<RadioButton group="distance" text="#Common_Off" value="0" />
 						<RadioButton group="distance" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
-					<ChaosSettingsEnum text="#Settings_JumpStats_Efficiency" convar="mom_hud_jstats_efficiency_enable" infomessage="#Settings_JumpStats_Efficiency_Info">
+					<SettingsEnum text="#Settings_JumpStats_Efficiency" convar="mom_hud_jstats_efficiency_enable" infomessage="#Settings_JumpStats_Efficiency_Info">
 						<RadioButton group="efficiency" text="#Common_Off" value="0" />
 						<RadioButton group="efficiency" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 				</ConVarEnabler>
 			</Panel>
 
@@ -507,26 +507,26 @@
 					</Panel>
 				</Panel>
 
-				<ChaosSettingsEnum text="#Settings_TotalSync_Enable" convar="mom_hud_strafesync_draw" infomessage="#Settings_TotalSync_Enable_Info">
+				<SettingsEnum text="#Settings_TotalSync_Enable" convar="mom_hud_strafesync_draw" infomessage="#Settings_TotalSync_Enable_Info">
 					<RadioButton group="showsyncdata" text="#Common_Off" value="0" />
 					<RadioButton group="showsyncdata" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_TotalSync_Bar" convar="mom_hud_strafesync_drawbar" infomessage="#Settings_TotalSync_Bar_Info">
+				<SettingsEnum text="#Settings_TotalSync_Bar" convar="mom_hud_strafesync_drawbar" infomessage="#Settings_TotalSync_Bar_Info">
 					<RadioButton group="showsyncbar" text="#Common_Off" value="0" />
 					<RadioButton group="showsyncbar" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnumDropDown text="#Settings_TotalSync_Type" convar="mom_hud_strafesync_type" infomessage="#Settings_TotalSync_Type_Info">
+				<SettingsEnumDropDown text="#Settings_TotalSync_Type" convar="mom_hud_strafesync_type" infomessage="#Settings_TotalSync_Type_Info">
 					<Label id="synctype1" text="#Settings_TotalSync_Type1" value="1" />
 					<Label id="synctype2" text="#Settings_TotalSync_Type2" value="2" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_TotalSync_ColorType" convar="mom_hud_strafesync_colorize" infomessage="#Settings_TotalSync_ColorType_Info">
+				<SettingsEnumDropDown text="#Settings_TotalSync_ColorType" convar="mom_hud_strafesync_colorize" infomessage="#Settings_TotalSync_ColorType_Info">
 					<Label id="colorize1" text="#Settings_TotalSync_Color_Type0" value="0" />
 					<Label id="colorize2" text="#Settings_TotalSync_Color_Type1" value="1" />
 					<Label id="colorize3" text="#Settings_TotalSync_Color_Type2" value="2" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 			</Panel>
 			<Panel class="settings-page__spacer" />
 
@@ -552,28 +552,28 @@
 
 				</Panel>
 
-				<ChaosSettingsEnum text="#Settings_DamageIndicator_Enable" convar="mom_hud_damageindicator_enable" infomessage="#Settings_DamageIndicator_Enable_Info">
+				<SettingsEnum text="#Settings_DamageIndicator_Enable" convar="mom_hud_damageindicator_enable" infomessage="#Settings_DamageIndicator_Enable_Info">
 					<RadioButton group="damageindicatorenable" text="#Common_Off" value="0" />
 					<RadioButton group="damageindicatorenable" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
 				<ConVarEnabler convar="mom_hud_damageindicator_enable" class="flow-down">
 
 					<ConVarColorDisplay convar="mom_hud_damageindicator_color" text="#Settings_DamageIndicator_Color" tags="color" />
 
-					<ChaosSettingsSlider text="#Settings_DamageIndicator_MinHeight" min="1" max="500" convar="mom_hud_damageindicator_minheight" displayprecision="0" infomessage="#Settings_DamageIndicator_MinHeight_Info" hasdocspage="false" />
+					<SettingsSlider text="#Settings_DamageIndicator_MinHeight" min="1" max="500" convar="mom_hud_damageindicator_minheight" displayprecision="0" infomessage="#Settings_DamageIndicator_MinHeight_Info" hasdocspage="false" />
 
-					<ChaosSettingsSlider text="#Settings_DamageIndicator_MaxHeight" min="1" max="500" convar="mom_hud_damageindicator_maxheight" displayprecision="0" infomessage="#Settings_DamageIndicator_MaxHeight_Info" hasdocspage="false" />
+					<SettingsSlider text="#Settings_DamageIndicator_MaxHeight" min="1" max="500" convar="mom_hud_damageindicator_maxheight" displayprecision="0" infomessage="#Settings_DamageIndicator_MaxHeight_Info" hasdocspage="false" />
 
-					<ChaosSettingsSlider text="#Settings_DamageIndicator_MinWidth" min="1" max="500" convar="mom_hud_damageindicator_minwidth" displayprecision="0" infomessage="#Settings_DamageIndicator_MinWidth_Info" hasdocspage="false" />
+					<SettingsSlider text="#Settings_DamageIndicator_MinWidth" min="1" max="500" convar="mom_hud_damageindicator_minwidth" displayprecision="0" infomessage="#Settings_DamageIndicator_MinWidth_Info" hasdocspage="false" />
 
-					<ChaosSettingsSlider text="#Settings_DamageIndicator_MaxWidth" min="1" max="500" convar="mom_hud_damageindicator_maxwidth" displayprecision="0" infomessage="#Settings_DamageIndicator_MaxWidth_Info" hasdocspage="false" />
+					<SettingsSlider text="#Settings_DamageIndicator_MaxWidth" min="1" max="500" convar="mom_hud_damageindicator_maxwidth" displayprecision="0" infomessage="#Settings_DamageIndicator_MaxWidth_Info" hasdocspage="false" />
 
-					<ChaosSettingsSlider text="#Settings_DamageIndicator_MinLifetime" min="1" max="5" convar="mom_hud_damageindicator_minlifetime" displayprecision="1" infomessage="#Settings_DamageIndicator_MinLifetime_Info" hasdocspage="false" />
+					<SettingsSlider text="#Settings_DamageIndicator_MinLifetime" min="1" max="5" convar="mom_hud_damageindicator_minlifetime" displayprecision="1" infomessage="#Settings_DamageIndicator_MinLifetime_Info" hasdocspage="false" />
 
-					<ChaosSettingsSlider text="#Settings_DamageIndicator_MaxLifetime" min="1" max="5" convar="mom_hud_damageindicator_maxlifetime" displayprecision="1" infomessage="#Settings_DamageIndicator_MaxLifetime_Info" hasdocspage="false" />
+					<SettingsSlider text="#Settings_DamageIndicator_MaxLifetime" min="1" max="5" convar="mom_hud_damageindicator_maxlifetime" displayprecision="1" infomessage="#Settings_DamageIndicator_MaxLifetime_Info" hasdocspage="false" />
 
-					<ChaosSettingsSlider text="#Settings_DamageIndicator_Radius" min="0" max="500" convar="mom_hud_damageindicator_radius" displayprecision="0" infomessage="#Settings_DamageIndicator_Radius_Info" hasdocspage="false" />
+					<SettingsSlider text="#Settings_DamageIndicator_Radius" min="0" max="500" convar="mom_hud_damageindicator_radius" displayprecision="0" infomessage="#Settings_DamageIndicator_Radius_Info" hasdocspage="false" />
 
 				</ConVarEnabler>
 			</Panel>
@@ -595,49 +595,49 @@
 					</Panel>
 				</Panel>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Synchronizer_DisplayMode" convar="mom_hud_synchro_mode" infomessage="#Settings_Synchronizer_DisplayMode_Info">
+				<SettingsEnumDropDown text="#Settings_Synchronizer_DisplayMode" convar="mom_hud_synchro_mode" infomessage="#Settings_Synchronizer_DisplayMode_Info">
 					<Label id="mode0" text="#Settings_Synchronizer_DisplayMode_Mode0" value="0" />
 					<Label id="mode1" text="#Settings_Synchronizer_DisplayMode_Mode1" value="1" />
 					<Label id="mode2" text="#Settings_Synchronizer_DisplayMode_Mode2" value="2" />
 					<Label id="mode3" text="#Settings_Synchronizer_DisplayMode_Mode3" value="3" />
 					<Label id="mode4" text="#Settings_Synchronizer_DisplayMode_Mode4" value="4" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
 				<ConVarEnabler convar="mom_hud_synchro_mode" class="flow-down">
-					<ChaosSettingsEnum text="#Settings_Synchronizer_Color" convar="mom_hud_synchro_color_enable" infomessage="#Settings_Synchronizer_Color_Info" tags="color">
+					<SettingsEnum text="#Settings_Synchronizer_Color" convar="mom_hud_synchro_color_enable" infomessage="#Settings_Synchronizer_Color_Info" tags="color">
 						<RadioButton group="synchrocolor" text="#Common_Off" value="0" />
 						<RadioButton group="synchrocolor" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
-					<ChaosSettingsEnum text="Settings_Synchronizer_Dynamic_Mode" convar="mom_hud_synchro_dynamic_enable" infomessage="#Settings_Synchronizer_Dynamic_Mode_Info">
+					<SettingsEnum text="Settings_Synchronizer_Dynamic_Mode" convar="mom_hud_synchro_dynamic_enable" infomessage="#Settings_Synchronizer_Dynamic_Mode_Info">
 						<RadioButton group="synchrodynamic" text="#Common_Off" value="0" />
 						<RadioButton group="synchrodynamic" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
-					<ChaosSettingsEnum text="#Settings_Synchronizer_Direction" convar="mom_hud_synchro_flip_enable" infomessage="#Settings_Synchronizer_Direction_Info">
+					<SettingsEnum text="#Settings_Synchronizer_Direction" convar="mom_hud_synchro_flip_enable" infomessage="#Settings_Synchronizer_Direction_Info">
 						<RadioButton group="synchrodirection" text="#Settings_Synchronizer_Direction_Normal" value="0" />
 						<RadioButton group="synchrodirection" text="#Settings_Synchronizer_Direction_Flipped" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
-					<ChaosSettingsEnumDropDown text="#Settings_Synchronizer_AveragingWindow" convar="mom_hud_synchro_buffer_size" infomessage="#Settings_Synchronizer_AveragingWindow_Info">
+					<SettingsEnumDropDown text="#Settings_Synchronizer_AveragingWindow" convar="mom_hud_synchro_buffer_size" infomessage="#Settings_Synchronizer_AveragingWindow_Info">
 						<Label text="#Settings_Synchronizer_AveragingWindow_Mode1" value="1" id="buffer0" />
 						<Label text="#Settings_Synchronizer_AveragingWindow_Mode2" value="5" id="buffer1" />
 						<Label text="#Settings_Synchronizer_AveragingWindow_Mode3" value="10" id="buffer2" />
 						<Label text="#Settings_Synchronizer_AveragingWindow_Mode4" value="20" id="buffer3" />
-					</ChaosSettingsEnumDropDown>
+					</SettingsEnumDropDown>
 
-					<ChaosSettingsSlider text="#Settings_Synchronizer_MinSpeed" min="50" max="250" convar="mom_hud_synchro_min_speed" displayprecision="0" infomessage="#Settings_Synchronizer_MinSpeed_Info" />
+					<SettingsSlider text="#Settings_Synchronizer_MinSpeed" min="50" max="250" convar="mom_hud_synchro_min_speed" displayprecision="0" infomessage="#Settings_Synchronizer_MinSpeed_Info" />
 
-					<ChaosSettingsEnumDropDown text="#Settings_Synchronizer_Stats_Mode" convar="mom_hud_synchro_stat_mode" infomessage="#Settings_Synchronizer_Stats_Mode_Info">
+					<SettingsEnumDropDown text="#Settings_Synchronizer_Stats_Mode" convar="mom_hud_synchro_stat_mode" infomessage="#Settings_Synchronizer_Stats_Mode_Info">
 						<Label id="mode0" text="#Common_Off" value="0" />
 						<Label id="mode1" text="#Settings_Synchronizer_StatsMode_Mode1" value="1" />
 						<Label id="mode2" text="#Settings_Synchronizer_StatsMode_Mode2" value="2" />
-					</ChaosSettingsEnumDropDown>
+					</SettingsEnumDropDown>
 
-					<ChaosSettingsEnum text="#Settings_Synchronizer_StatColor" convar="mom_hud_synchro_stat_color_enable" infomessage="#Settings_Synchronizer_StatColor_Info" tags="color">
+					<SettingsEnum text="#Settings_Synchronizer_StatColor" convar="mom_hud_synchro_stat_color_enable" infomessage="#Settings_Synchronizer_StatColor_Info" tags="color">
 						<RadioButton group="synchrostatcolor" text="#Common_Off" value="0" />
 						<RadioButton group="synchrostatcolor" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 				</ConVarEnabler>
 
 			</Panel>
@@ -659,37 +659,37 @@
 					</Panel>
 				</Panel>
 
-				<ChaosSettingsEnum text="#Settings_MapInfo_Enable" convar="mom_hud_mapinfo_enable" infomessage="#Settings_MapInfo_Enable_Info">
+				<SettingsEnum text="#Settings_MapInfo_Enable" convar="mom_hud_mapinfo_enable" infomessage="#Settings_MapInfo_Enable_Info">
 					<RadioButton group="mapinfoenable" text="#Common_Off" value="0" />
 					<RadioButton group="mapinfoenable" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
 				<ConVarEnabler convar="mom_hud_mapinfo_enable" togglevisibility="true" class="flow-down">
 
-					<ChaosSettingsEnum text="#Settings_MapInfo_MapName" convar="mom_hud_mapinfo_mapname_enable" infomessage="#Settings_MapInfo_MapName_Info">
+					<SettingsEnum text="#Settings_MapInfo_MapName" convar="mom_hud_mapinfo_mapname_enable" infomessage="#Settings_MapInfo_MapName_Info">
 						<RadioButton group="mapinfonameenable" text="#Common_Off" value="0" />
 						<RadioButton group="mapinfonameenable" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
-					<ChaosSettingsEnum text="#Settings_MapInfo_MapAuthor" convar="mom_hud_mapinfo_author_enable" infomessage="#Settings_MapInfo_MapAuthor_Info">
+					<SettingsEnum text="#Settings_MapInfo_MapAuthor" convar="mom_hud_mapinfo_author_enable" infomessage="#Settings_MapInfo_MapAuthor_Info">
 						<RadioButton group="mapinfoauthorenable" text="#Common_Off" value="0" />
 						<RadioButton group="mapinfoauthorenable" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
-					<ChaosSettingsEnum text="#Settings_MapInfo_MapDifficulty" convar="mom_hud_mapinfo_tier_enable" infomessage="#Settings_MapInfo_MapDifficulty_Info">
+					<SettingsEnum text="#Settings_MapInfo_MapDifficulty" convar="mom_hud_mapinfo_tier_enable" infomessage="#Settings_MapInfo_MapDifficulty_Info">
 						<RadioButton group="mapinfotierenable" text="#Common_Off" value="0" />
 						<RadioButton group="mapinfotierenable" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
-					<ChaosSettingsEnum text="#Settings_MapInfo_ZoneType" convar="mom_hud_mapinfo_zonetype_enable" infomessage="#Settings_MapInfo_ZoneType_Info">
+					<SettingsEnum text="#Settings_MapInfo_ZoneType" convar="mom_hud_mapinfo_zonetype_enable" infomessage="#Settings_MapInfo_ZoneType_Info">
 						<RadioButton group="mapinfozonetypeenable" text="#Common_Off" value="0" />
 						<RadioButton group="mapinfozonetypeenable" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
-					<ChaosSettingsEnum text="#Settings_MapInfo_ZoneNum" convar="mom_hud_mapinfo_numzones_enable" infomessage="#Settings_MapInfo_ZoneNum_Info">
+					<SettingsEnum text="#Settings_MapInfo_ZoneNum" convar="mom_hud_mapinfo_numzones_enable" infomessage="#Settings_MapInfo_ZoneNum_Info">
 						<RadioButton group="mapinfonumzonesenable" text="#Common_Off" value="0" />
 						<RadioButton group="mapinfonumzonesenable" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
 				</ConVarEnabler>
 			</Panel>
diff --git a/layout/pages/settings/online.xml b/layout/pages/settings/online.xml
index 487f0072..8804e68c 100644
--- a/layout/pages/settings/online.xml
+++ b/layout/pages/settings/online.xml
@@ -31,35 +31,35 @@
 				</Panel>
 
 				<Panel class="settings-group__combo">
-					<ChaosSettingsEnum text="#Settings_OnlineGhost_OverrideAlphaEnable" convar="mom_ghost_online_alpha_override_enable" infomessage="#Settings_OnlineGhost_OverrideAlphaEnable_Info" tags="alpha,transparency">
+					<SettingsEnum text="#Settings_OnlineGhost_OverrideAlphaEnable" convar="mom_ghost_online_alpha_override_enable" infomessage="#Settings_OnlineGhost_OverrideAlphaEnable_Info" tags="alpha,transparency">
 						<RadioButton group="ghostalpha" text="#Common_Off" value="0" />
 						<RadioButton group="ghostalpha" text="#Common_On" value="1" />
-					</ChaosSettingsEnum>
+					</SettingsEnum>
 
 					<ConVarEnabler convar="mom_ghost_online_alpha_override_enable">
-						<ChaosSettingsSlider text="" min="0" max="255" percentage="true" convar="mom_ghost_online_alpha_override" infotitle="#Settings_OnlineGhost_OverrideAlphaEnable" infomessage="#Settings_OnlineGhost_OverrideAlphaAmount_Info" tags="alpha,transparency" />
+						<SettingsSlider text="" min="0" max="255" percentage="true" convar="mom_ghost_online_alpha_override" infotitle="#Settings_OnlineGhost_OverrideAlphaEnable" infomessage="#Settings_OnlineGhost_OverrideAlphaAmount_Info" tags="alpha,transparency" />
 					</ConVarEnabler>
 				</Panel>
 
-				<ChaosSettingsEnum text="#Settings_OnlineGhost_Rotations" convar="mom_ghost_online_rotations" infomessage="#Settings_OnlineGhost_Rotations_Info">
+				<SettingsEnum text="#Settings_OnlineGhost_Rotations" convar="mom_ghost_online_rotations" infomessage="#Settings_OnlineGhost_Rotations_Info">
 					<RadioButton group="ghostrotation" text="#Common_Off" value="0" />
 					<RadioButton group="ghostrotation" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_OnlineGhost_Sounds" convar="mom_ghost_online_flashlights_enable" infomessage="#Settings_OnlineGhost_Sounds_Info" tags="sound">
+				<SettingsEnum text="#Settings_OnlineGhost_Sounds" convar="mom_ghost_online_flashlights_enable" infomessage="#Settings_OnlineGhost_Sounds_Info" tags="sound">
 					<RadioButton group="ghostsounds" text="#Common_Off" value="0" />
 					<RadioButton group="ghostsounds" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_OnlineGhost_Panels" convar="mom_hud_ghost_entpanels_enable" infomessage="#Settings_OnlineGhost_Panels_Info" tags="panel">
+				<SettingsEnum text="#Settings_OnlineGhost_Panels" convar="mom_hud_ghost_entpanels_enable" infomessage="#Settings_OnlineGhost_Panels_Info" tags="panel">
 					<RadioButton group="ghostpanels" text="#Common_Off" value="0" />
 					<RadioButton group="ghostpanels" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_OnlineGhost_Trails" convar="mom_ghost_online_trail_enable" infomessage="#Settings_OnlineGhost_Trails_Info" tags="trail">
+				<SettingsEnum text="#Settings_OnlineGhost_Trails" convar="mom_ghost_online_trail_enable" infomessage="#Settings_OnlineGhost_Trails_Info" tags="trail">
 					<RadioButton group="ghosttrail" text="#Common_Off" value="0" />
 					<RadioButton group="ghosttrail" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
 				<!--
 				TODO: We should probably merge these two at some point.
@@ -67,9 +67,9 @@
 				to localisation preemptively. - Tom
 				-->
 
-				<ChaosSettingsSlider text="#Settings_OnlineGhost_StickyAlpha" min="10" max="255" percentage="false" convar="mom_ghost_online_sticky_alpha" infomessage="#Settings_OnlineGhost_StickyAlpha_Info" tags="alpha,transparency" />
+				<SettingsSlider text="#Settings_OnlineGhost_StickyAlpha" min="10" max="255" percentage="false" convar="mom_ghost_online_sticky_alpha" infomessage="#Settings_OnlineGhost_StickyAlpha_Info" tags="alpha,transparency" />
 
-				<ChaosSettingsSlider text="#Settings_OnlineGhost_ConcAlpha" min="10" max="255" percentage="false" convar="mom_ghost_online_conc_alpha" infomessage="#Settings_OnlineGhost_ConcAlpha_Info" tags="alpha,transparency" />
+				<SettingsSlider text="#Settings_OnlineGhost_ConcAlpha" min="10" max="255" percentage="false" convar="mom_ghost_online_conc_alpha" infomessage="#Settings_OnlineGhost_ConcAlpha_Info" tags="alpha,transparency" />
 
 			</Panel>
 
@@ -95,7 +95,7 @@
 					<ModelPanel id="GhostModelPreview" class="settings__ghost" src="models/player/player_shape_base.mdl" mouse_rotate="true" antialias="true" />
 
 					<Panel class="fill-width flow-down">
-						<ChaosSettingsEnumDropDown text="#Settings_OnlinePlayer_Body" convar="mom_ghost_bodygroup" oninputsubmit="SettingsShared.onlineSettingsUpdateModel()" infomessage="#Settings_OnlinePlayer_Body_Info" tags="shape,model">
+						<SettingsEnumDropDown text="#Settings_OnlinePlayer_Body" convar="mom_ghost_bodygroup" oninputsubmit="SettingsShared.onlineSettingsUpdateModel()" infomessage="#Settings_OnlinePlayer_Body_Info" tags="shape,model">
 							<Label text="#Settings_OnlinePlayer_Bodygroup_0" value="0" id="bodygroup0" />
 							<Label text="#Settings_OnlinePlayer_Bodygroup_1" value="1" id="bodygroup1" />
 							<Label text="#Settings_OnlinePlayer_Bodygroup_2" value="2" id="bodygroup2" />
@@ -111,18 +111,18 @@
 							<Label text="#Settings_OnlinePlayer_Bodygroup_12" value="12" id="bodygroup12" />
 							<Label text="#Settings_OnlinePlayer_Bodygroup_13" value="13" id="bodygroup13" />
 							<Label text="#Settings_OnlinePlayer_Bodygroup_14" value="14" id="bodygroup14" />
-						</ChaosSettingsEnumDropDown>
+						</SettingsEnumDropDown>
 
 						<ConVarColorDisplay text="#Settings_OnlinePlayer_Color" convar="mom_ghost_color" oncolorchange="SettingsShared.onlineSettingsUpdateModel()" infomessage="#Settings_OnlinePlayer_Color_Info" tags="model,color" />
 
-						<ChaosSettingsEnum text="#Settings_OnlinePlayer_Trail" convar="mom_trail_enable" infomessage="#Settings_OnlinePlayer_Trail_Info" tags="trail">
+						<SettingsEnum text="#Settings_OnlinePlayer_Trail" convar="mom_trail_enable" infomessage="#Settings_OnlinePlayer_Trail_Info" tags="trail">
 							<RadioButton group="playertrail" text="#Common_Off" value="0" />
 							<RadioButton group="playertrail" text="#Common_On" value="1" />
-						</ChaosSettingsEnum>
+						</SettingsEnum>
 
 						<ConVarColorDisplay text="#Settings_OnlinePlayer_TrailColor" convar="mom_trail_color" infomessage="#Settings_OnlinePlayer_TrailColor_Info" tags="trail,color" />
 
-						<ChaosSettingsSlider text="#Settings_OnlinePlayer_TrailLength" min="0.1" max="10" displayprecision="1" convar="mom_trail_length" infomessage="#Settings_OnlinePlayer_TrailLength_Info" tags="trail,length" />
+						<SettingsSlider text="#Settings_OnlinePlayer_TrailLength" min="0.1" max="10" displayprecision="1" convar="mom_trail_length" infomessage="#Settings_OnlinePlayer_TrailLength_Info" tags="trail,length" />
 
 					</Panel>
 				</Panel>
@@ -141,15 +141,15 @@
 					</TooltipPanel>
 				</Panel>
 
-				<ChaosSettingsEnum text="#Settings_RichPresence_Discord" convar="mom_discord_enable" infomessage="#Settings_RichPresence_Discord_Info" tags="discord,richard,presence">
+				<SettingsEnum text="#Settings_RichPresence_Discord" convar="mom_discord_enable" infomessage="#Settings_RichPresence_Discord_Info" tags="discord,richard,presence">
 					<RadioButton group="enablediscordrp" text="#Common_Off" value="0" />
 					<RadioButton group="enablediscordrp" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 
-				<ChaosSettingsEnum text="#Settings_RichPresence_Steam" convar="mom_steam_rich_presence" infomessage="#Settings_RichPresence_Steam_Info" tags="steam,richard,presence">
+				<SettingsEnum text="#Settings_RichPresence_Steam" convar="mom_steam_rich_presence" infomessage="#Settings_RichPresence_Steam_Info" tags="steam,richard,presence">
 					<RadioButton group="steamrichpresence" text="#Common_Off" value="0" />
 					<RadioButton group="steamrichpresence" text="#Common_On" value="1" />
-				</ChaosSettingsEnum>
+				</SettingsEnum>
 			</Panel>
 		</Panel>
 	</Panel>
diff --git a/layout/pages/settings/video.xml b/layout/pages/settings/video.xml
index 8dd2fc52..06eb998f 100644
--- a/layout/pages/settings/video.xml
+++ b/layout/pages/settings/video.xml
@@ -25,53 +25,53 @@
 			</Panel>
 		</Panel>
 
-		<ChaosVideoSettings id="SettingsPageContainer" class="settings-page__container">
+		<VideoSettings id="SettingsPageContainer" class="settings-page__container">
 			<Panel id="VideoSubSection" class="settings-group">
 				<Panel class="settings-group__header">
 					<Label class="settings-group__title" text="#Settings_Video" />
 				</Panel>
 
-				<ChaosSettingsSlider text="#Settings_Video_FOV" min="50" max="130" convar="fov_desired" hasdocspage="false" />
+				<SettingsSlider text="#Settings_Video_FOV" min="50" max="130" convar="fov_desired" hasdocspage="false" />
 
-				<ChaosSettingsSlider text="#Settings_Video_MaxFPS" min="0" max="400" convar="fps_max" infomessage="#Settings_Video_MaxFPS_Info" hasdocspage="false" />
+				<SettingsSlider text="#Settings_Video_MaxFPS" min="0" max="400" convar="fps_max" infomessage="#Settings_Video_MaxFPS_Info" hasdocspage="false" />
 
-				<ChaosSettingsEnumDropDown text="#Settings_Video_ColorMode" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="ColorMode">
+				<SettingsEnumDropDown text="#Settings_Video_ColorMode" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="ColorMode">
 					<Label text="#Settings_Video_ColorMode_Monitor" value="0" id="tvmode0" />
 					<Label text="#Settings_Video_ColorMode_TV" value="1" id="tvmode1" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsSlider id="brightness" text="#Settings_Video_Brightness" min="0.7" max="1.3" percentage="true" invert="false" value100percent="1.0" convar="mat_brightness" infomessage="#Settings_Video_Brightness_Info" hasdocspage="false" />
+				<SettingsSlider id="brightness" text="#Settings_Video_Brightness" min="0.7" max="1.3" percentage="true" invert="false" value100percent="1.0" convar="mat_brightness" infomessage="#Settings_Video_Brightness_Info" hasdocspage="false" />
 
-				<ChaosSettingsEnumDropDown text="#Settings_Video_AspectRatio" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="AspectRatioEnum" oninputsubmit="ChaosAspectRatioSelectionChanged()">
+				<SettingsEnumDropDown text="#Settings_Video_AspectRatio" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="AspectRatioEnum" oninputsubmit="AspectRatioSelectionChanged()">
 					<Label text="#Settings_Video_AspectRatio_Normal" value="0" id="aspectratio0" />
 					<Label text="#Settings_Video_AspectRatio_16x9" value="1" id="aspectratio1" />
 					<Label text="#Settings_Video_AspectRatio_16x10" value="2" id="aspectratio2" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Video_Resolution" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="ResolutionEnum" oninputsubmit="ChaosResolutionSelectionChanged()">
+				<SettingsEnumDropDown text="#Settings_Video_Resolution" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="ResolutionEnum" oninputsubmit="ResolutionSelectionChanged()">
 					<Label value="0" id="resolution0" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Video_DisplayMode" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="DisplayModeEnum" oninputsubmit="ChaosDisplayModeSelectionChanged()">
+				<SettingsEnumDropDown text="#Settings_Video_DisplayMode" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="DisplayModeEnum" oninputsubmit="DisplayModeSelectionChanged()">
 					<Label text="#Settings_Video_DisplayMode_Windowed" value="0" id="displaymode0" />
 					<Label text="#Settings_Video_DisplayMode_Fullscreen" value="1" id="displaymode1" />
 					<Label text="#Settings_Video_DisplayMode_FullscreenWindowed" value="2" id="displaymode2" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Video_TripleMonitor" convar="triple_monitor_mode" infomessage="#Settings_Video_TripleMonitor_Info">
+				<SettingsEnumDropDown text="#Settings_Video_TripleMonitor" convar="triple_monitor_mode" infomessage="#Settings_Video_TripleMonitor_Info">
 					<Label text="#Settings_General_Disabled" value="0" id="triplemonitor0" />
 					<Label text="#Settings_General_Enabled" value="1" id="triplemonitor1" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Video_LaptopPower" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="PowerSavingsMode" infomessage="#Settings_Video_LaptopPower_Info">
+				<SettingsEnumDropDown text="#Settings_Video_LaptopPower" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="PowerSavingsMode" infomessage="#Settings_Video_LaptopPower_Info">
 					<Label text="#Settings_General_Disabled" value="0" id="laptoppower0" />
 					<Label text="#Settings_General_Enabled" value="1" id="laptoppower1" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Video_PreventThreadSleep" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="PreventThreadSleep" convar="sleep_when_meeting_framerate" infomessage="#Settings_Video_PreventThreadSleep_Info">
+				<SettingsEnumDropDown text="#Settings_Video_PreventThreadSleep" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="PreventThreadSleep" convar="sleep_when_meeting_framerate" infomessage="#Settings_Video_PreventThreadSleep_Info">
 					<Label text="#Settings_General_Disabled" value="1" id="preventthreadsleep1" />
 					<Label text="#Settings_General_Enabled" value="0" id="preventthreadsleep0" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 			</Panel>
 
 			<Panel class="settings-page__spacer" />
@@ -81,52 +81,52 @@
 					<Label class="settings-group__title" text="#Settings_Render_Title" />
 				</Panel>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Render_ShadowQuality" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="CSMQualityLevel" infomessage="#Settings_Render_ShadowQuality_Info">
+				<SettingsEnumDropDown text="#Settings_Render_ShadowQuality" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="CSMQualityLevel" infomessage="#Settings_Render_ShadowQuality_Info">
 					<Label text="#Settings_General_Low" value="0" id="csmqualitylevel0" />
 					<Label text="#Settings_General_Medium" value="1" id="csmqualitylevel1" />
 					<Label text="#Settings_General_High" value="2" id="csmqualitylevel2" />
 					<Label text="#Settings_General_VeryHigh" value="3" id="csmqualitylevel3" />
 					<Label text="#Settings_General_Autodetect" value="9999999" id="csmqualitylevel4" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Render_ModelTexture" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="ModelTextureDetail" infomessage="#Settings_Render_ModelTexture_Info">
+				<SettingsEnumDropDown text="#Settings_Render_ModelTexture" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="ModelTextureDetail" infomessage="#Settings_Render_ModelTexture_Info">
 					<Label text="#Settings_General_Low" value="0" id="gpumemlevel0" />
 					<Label text="#Settings_General_Medium" value="1" id="gpumemlevel1" />
 					<Label text="#Settings_General_High" value="2" id="gpumemlevel2" />
 					<Label text="#Settings_General_Autodetect" value="9999999" id="gpumemlevel3" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Render_EffectDetail" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="EffectDetail" infomessage="#Settings_Render_EffectDetail_Info">
+				<SettingsEnumDropDown text="#Settings_Render_EffectDetail" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="EffectDetail" infomessage="#Settings_Render_EffectDetail_Info">
 					<Label text="#Settings_General_Low" value="0" id="cpulevel0" />
 					<Label text="#Settings_General_Medium" value="1" id="cpulevel1" />
 					<Label text="#Settings_General_High" value="2" id="cpulevel2" />
 					<Label text="#Settings_General_Autodetect" value="9999999" id="cpulevel3" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Render_ShaderDetail" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="ShaderDetail" infomessage="#Settings_Render_ShaderDetail_Info">
+				<SettingsEnumDropDown text="#Settings_Render_ShaderDetail" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="ShaderDetail" infomessage="#Settings_Render_ShaderDetail_Info">
 					<Label text="#Settings_General_Low" value="0" id="gpulevel0" />
 					<Label text="#Settings_General_Medium" value="1" id="gpulevel1" />
 					<Label text="#Settings_General_High" value="2" id="gpulevel2" />
 					<Label text="#Settings_General_VeryHigh" value="3" id="gpulevel3" />
 					<Label text="#Settings_General_Autodetect" value="9999999" id="gpulevel4" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Render_Multicore" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="MatQueueMode" infomessage="#Settings_Render_Multicore_Info">
+				<SettingsEnumDropDown text="#Settings_Render_Multicore" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="MatQueueMode" infomessage="#Settings_Render_Multicore_Info">
 					<Label text="#Settings_General_Disabled" value="0" id="multicore0" />
 					<Label text="#Settings_General_Enabled" value="-1" id="multicore1" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Render_AntialiasingMode" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="AAMode" infomessage="#Settings_Render_AntialiasingMode_Info">
+				<SettingsEnumDropDown text="#Settings_Render_AntialiasingMode" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="AAMode" infomessage="#Settings_Render_AntialiasingMode_Info">
 					<Label value="#Settings_General_Disabled" id="antialisaing0" />
 					<Label value="#Settings_General_Enabled" id="antialiasing1" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Render_FXAA" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="FXAA" infomessage="#Settings_Render_FXAA_Info">
+				<SettingsEnumDropDown text="#Settings_Render_FXAA" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="FXAA" infomessage="#Settings_Render_FXAA_Info">
 					<Label text="#Settings_General_Disabled" value="0" id="fxaa0" />
 					<Label text="#Settings_General_Enabled" value="1" id="fxaa1" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Render_FilteringMode" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="FilteringMode" infomessage="#Settings_Render_FilteringMode_Info">
+				<SettingsEnumDropDown text="#Settings_Render_FilteringMode" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="FilteringMode" infomessage="#Settings_Render_FilteringMode_Info">
 					<Label text="#Settings_Render_FilteringMode_Bilinear" value="0" id="matforceaniso0" />
 					<Label text="#Settings_Render_FilteringMode_Trilinear" value="1" id="matforceaniso1" />
 					<Label text="#Settings_Render_FilteringMode_Aniso2X" value="2" id="matforceaniso2" />
@@ -134,33 +134,33 @@
 					<Label text="#Settings_Render_FilteringMode_Aniso8X" value="8" id="matforceaniso4" />
 					<Label text="#Settings_Render_FilteringMode_Aniso16X" value="16" id="matforceaniso5" />
 					<Label text="#Settings_General_Autodetect" value="9999999" id="matforceaniso6" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Render_VSync" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="VSync" infomessage="#Settings_Render_VSync_Info">
+				<SettingsEnumDropDown text="#Settings_Render_VSync" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="VSync" infomessage="#Settings_Render_VSync_Info">
 					<Label text="#Settings_General_Disabled" value="0" id="vsync0" />
 					<Label text="#Settings_Render_VSync_Double" value="1" id="vsync1" />
 					<Label text="#Settings_Render_VSync_Triple" value="2" id="vsync2" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Render_MotionBlur" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="MotionBlur" infomessage="#Settings_Render_MotionBlur_Info">
+				<SettingsEnumDropDown text="#Settings_Render_MotionBlur" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="MotionBlur" infomessage="#Settings_Render_MotionBlur_Info">
 					<Label text="#Settings_General_Disabled" value="0" id="motionblur0" />
 					<Label text="#Settings_General_Enabled" value="1" id="motionblur1" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Render_DynamicTonemapping" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="DynamicTonemapping" infomessage="#Settings_Render_DynamicTonemapping_Info">
+				<SettingsEnumDropDown text="#Settings_Render_DynamicTonemapping" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="DynamicTonemapping" infomessage="#Settings_Render_DynamicTonemapping_Info">
 					<Label text="#Settings_General_Disabled" value="0" id="dynamictonemapping0" />
 					<Label text="#Settings_General_Enabled" value="1" id="dynamictonemapping1" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Render_Bloom" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="DisableBloom" infomessage="#Settings_Render_Bloom_Info">
+				<SettingsEnumDropDown text="#Settings_Render_Bloom" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="DisableBloom" infomessage="#Settings_Render_Bloom_Info">
 					<Label text="#Settings_General_Disabled" value="1" id="disablebloom0" />
 					<Label text="#Settings_General_Enabled" value="0" id="disablebloom1" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 
-				<ChaosSettingsEnumDropDown text="#Settings_Render_ColorCorrection" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="ColorCorrection" infomessage="#Settings_Render_ColorCorrection_Info">
+				<SettingsEnumDropDown text="#Settings_Render_ColorCorrection" onuserinputsubmit="SettingsShared.videoSettingsOnUserInputSubmit()" id="ColorCorrection" infomessage="#Settings_Render_ColorCorrection_Info">
 					<Label text="#Settings_General_Disabled" value="0" id="colorcorrection0" />
 					<Label text="#Settings_General_Enabled" value="1" id="colorcorrection1" />
-				</ChaosSettingsEnumDropDown>
+				</SettingsEnumDropDown>
 			</Panel>
 
 			<Panel class="settings-page__spacer" />
@@ -178,28 +178,28 @@
 						<Image id="TextureReplacePreview" />
 					</Panel>
 					<Panel class="fill-width flow-down">
-						<ChaosSettingsEnumDropDown text="#Settings_TextureReplace_Type" convar="mat_error_texture_type" id="MatErrorType" infomessage="#Settings_TextureReplace_Type_Info">
+						<SettingsEnumDropDown text="#Settings_TextureReplace_Type" convar="mat_error_texture_type" id="MatErrorType" infomessage="#Settings_TextureReplace_Type_Info">
 							<Label text="#Settings_TextureReplace_0" id="materrortype0" value="0" />
 							<Label text="#Settings_TextureReplace_1" id="materrortype1" value="1" />
-						</ChaosSettingsEnumDropDown>
+						</SettingsEnumDropDown>
 
-						<ChaosSettingsEnumDropDown text="#Settings_TextureReplace_TypeCubemap" convar="mat_error_texture_type_cubemap" infomessage="#Settings_TextureReplace_TypeCubemap_Info">
+						<SettingsEnumDropDown text="#Settings_TextureReplace_TypeCubemap" convar="mat_error_texture_type_cubemap" infomessage="#Settings_TextureReplace_TypeCubemap_Info">
 							<Label text="#Settings_TextureReplace_TypeCubemap_0" id="materrortypecubemap0" value="0"/>
 							<Label text="#Settings_TextureReplace_TypeCubemap_1" id="materrortypecubemap1" value="1"/>
 							<Label text="#Settings_TextureReplace_TypeCubemap_2" id="materrortypecubemap2" value="2"/>
-						</ChaosSettingsEnumDropDown>
+						</SettingsEnumDropDown>
 
-						<ChaosSettingsEnumDropDown text="#Settings_TextureReplace_Advanced" convar="mat_error_texture_advanced" infomessage="#Settings_TextureReplace_Advanced_Info">
+						<SettingsEnumDropDown text="#Settings_TextureReplace_Advanced" convar="mat_error_texture_advanced" infomessage="#Settings_TextureReplace_Advanced_Info">
 							<Label text="#Settings_TextureReplace_Advanced_0" id="materroradv0" value="0" />
 							<Label text="#Settings_TextureReplace_Advanced_1" id="materroradv1" value="1" />
 							<Label text="#Settings_TextureReplace_Advanced_2" id="materroradv2" value="2" />
-						</ChaosSettingsEnumDropDown>
+						</SettingsEnumDropDown>
 
-						<ChaosSettingsEnumDropDown text="#Settings_TextureReplace_ReplaceTexture" id="MatErrorReplaceTexture" convar="mat_error_texture_advanced_basetexture" infomessage="#Settings_TextureReplace_ReplaceTexture_Info">
-						</ChaosSettingsEnumDropDown>
+						<SettingsEnumDropDown text="#Settings_TextureReplace_ReplaceTexture" id="MatErrorReplaceTexture" convar="mat_error_texture_advanced_basetexture" infomessage="#Settings_TextureReplace_ReplaceTexture_Info">
+						</SettingsEnumDropDown>
 					</Panel>
 				</Panel>
 			</Panel>
-		</ChaosVideoSettings>
+		</VideoSettings>
 	</Panel>
 </root>
diff --git a/layout/util/global-popups.xml b/layout/util/global-popups.xml
index a1425f86..b5b597bb 100644
--- a/layout/util/global-popups.xml
+++ b/layout/util/global-popups.xml
@@ -3,13 +3,13 @@
 		<include src="file://{resources}/styles/main.scss" />
 	</styles>
 
-	<ChaosGlobalPopups hittest="false">
+	<GlobalPopups hittest="false">
 		<ToastManager />
-		<ChaosPopupManager id="PopupManager" onpopupsdismissed="" />
+		<PopupManager id="PopupManager" onpopupsdismissed="" />
 		<ContextMenuManager id="ContextMenuManager" />
-		<ChaosTooltipManager id="TooltipManager" hittest="false" />
+		<TooltipManager id="TooltipManager" hittest="false" />
 
 		<!-- Doesn't actually include the notifications, but we use its position to figure out where to show them -->
 		<Panel id="SteamNotificationsPlaceholder" hittest="false" />
-	</ChaosGlobalPopups>
+	</GlobalPopups>
 </root>
diff --git a/layout/util/popup-manager.xml b/layout/util/popup-manager.xml
index cdaa3deb..58236f70 100644
--- a/layout/util/popup-manager.xml
+++ b/layout/util/popup-manager.xml
@@ -3,10 +3,10 @@
 		<include src="file://{resources}/styles/main.scss" />
 	</styles>
 
-	<ChaosPopupManager hittest="false">
+	<PopupManager hittest="false">
 		<Button id="DimBackground" onactivate="PopupBackgroundClicked()" />
 		<Button id="BlurBackground" onactivate="PopupBackgroundClicked()" />
 
 		<!-- Popups are added here dynamically -->
-	</ChaosPopupManager>
+	</PopupManager>
 </root>
diff --git a/scripts/hud/cgaz.js b/scripts/hud/cgaz.js
index a7201396..b2fa552e 100644
--- a/scripts/hud/cgaz.js
+++ b/scripts/hud/cgaz.js
@@ -126,7 +126,7 @@ class Cgaz {
 	static onLoad() {
 		if (GameModeAPI.GetCurrentGameMode() === GameMode.DEFRAG) {
 			this.updateHandle = $.RegisterEventHandler(
-				'ChaosHudProcessInput',
+				'HudProcessInput',
 				$.GetContextPanel(),
 				this.onUpdate.bind(this)
 			);
@@ -140,7 +140,7 @@ class Cgaz {
 			this.onWindicatorConfigChange();
 			this.onCompassConfigChange();
 		} else if (this.updateHandle) {
-			$.UnregisterEventHandler('ChaosHudProcessInput', $.GetContextPanel(), this.updateHandle);
+			$.UnregisterEventHandler('HudProcessInput', $.GetContextPanel(), this.updateHandle);
 			this.updateHandle = null;
 		}
 	}
@@ -1267,7 +1267,7 @@ class Cgaz {
 	}
 
 	static {
-		$.RegisterForUnhandledEvent('ChaosLevelInitPostEntity', this.onLoad.bind(this));
+		$.RegisterForUnhandledEvent('LevelInitPostEntity', this.onLoad.bind(this));
 		$.RegisterForUnhandledEvent('OnDefragHUDProjectionChange', this.onProjectionChange.bind(this));
 		$.RegisterForUnhandledEvent('OnDefragHUDFOVChange', this.onHudFovChange.bind(this));
 		$.RegisterForUnhandledEvent('OnDefragHUDAccelChange', this.onAccelConfigChange.bind(this));
diff --git a/scripts/hud/df-jump.js b/scripts/hud/df-jump.js
index 534c0015..aabb2419 100644
--- a/scripts/hud/df-jump.js
+++ b/scripts/hud/df-jump.js
@@ -51,7 +51,7 @@ class DFJump {
 	static {
 		$.RegisterEventHandler('DFJumpDataUpdate', this.container, this.onDFJumpUpdate.bind(this));
 
-		$.RegisterForUnhandledEvent('ChaosLevelInitPostEntity', this.onLoad.bind(this));
+		$.RegisterForUnhandledEvent('LevelInitPostEntity', this.onLoad.bind(this));
 		$.RegisterForUnhandledEvent('DFJumpMaxDelayChanged', this.setMaxDelay.bind(this));
 	}
 }
diff --git a/scripts/hud/ground-boost.js b/scripts/hud/ground-boost.js
index fa1594d6..fd79dc51 100644
--- a/scripts/hud/ground-boost.js
+++ b/scripts/hud/ground-boost.js
@@ -172,8 +172,8 @@ class Groundboost {
 	}
 
 	static {
-		$.RegisterEventHandler('ChaosHudProcessInput', $.GetContextPanel(), this.onUpdate.bind(this));
-		$.RegisterForUnhandledEvent('ChaosLevelInitPostEntity', this.onLoad.bind(this));
+		$.RegisterEventHandler('HudProcessInput', $.GetContextPanel(), this.onUpdate.bind(this));
+		$.RegisterForUnhandledEvent('LevelInitPostEntity', this.onLoad.bind(this));
 		$.RegisterForUnhandledEvent('OnDefragHUDGroundboostChange', this.onConfigChange.bind(this));
 	}
 }
diff --git a/scripts/hud/jump-stats.js b/scripts/hud/jump-stats.js
index 700e4af3..3d9a18ac 100644
--- a/scripts/hud/jump-stats.js
+++ b/scripts/hud/jump-stats.js
@@ -132,7 +132,7 @@ class JumpStats {
 	static {
 		$.RegisterEventHandler('OnJumpStarted', this.container, this.onJump.bind(this));
 
-		$.RegisterForUnhandledEvent('ChaosLevelInitPostEntity', this.onLoad.bind(this));
+		$.RegisterForUnhandledEvent('LevelInitPostEntity', this.onLoad.bind(this));
 		$.RegisterForUnhandledEvent('OnJumpStatsCFGChange', this.onConfigChange.bind(this));
 	}
 }
diff --git a/scripts/hud/replay-controls.js b/scripts/hud/replay-controls.js
index a570f7e3..16120d5d 100644
--- a/scripts/hud/replay-controls.js
+++ b/scripts/hud/replay-controls.js
@@ -37,7 +37,7 @@ class ReplayControls {
 	}
 
 	static {
-		$.RegisterEventHandler('ChaosHudProcessInput', $.GetContextPanel(), this.onProcessInput.bind(this));
+		$.RegisterEventHandler('HudProcessInput', $.GetContextPanel(), this.onProcessInput.bind(this));
 		$.RegisterEventHandler('SliderValueChanged', $.GetContextPanel(), this.onSliderValueChanged.bind(this));
 	}
 }
diff --git a/scripts/hud/strafe-sync.js b/scripts/hud/strafe-sync.js
index 9be2cb25..d60c3f03 100644
--- a/scripts/hud/strafe-sync.js
+++ b/scripts/hud/strafe-sync.js
@@ -60,7 +60,7 @@ class StrafeSync {
 	}
 
 	static {
-		$.RegisterEventHandler('ChaosHudProcessInput', $.GetContextPanel(), this.onUpdate.bind(this));
+		$.RegisterEventHandler('HudProcessInput', $.GetContextPanel(), this.onUpdate.bind(this));
 
 		/** @type {ProgressBar} @static */
 		this.bar = $('#SyncProgressBar');
diff --git a/scripts/hud/synchronizer.js b/scripts/hud/synchronizer.js
index 2bf5128b..ed1b53dc 100644
--- a/scripts/hud/synchronizer.js
+++ b/scripts/hud/synchronizer.js
@@ -256,7 +256,7 @@ class Synchronizer {
 	}
 
 	static {
-		$.RegisterEventHandler('ChaosHudProcessInput', $.GetContextPanel(), this.onUpdate.bind(this));
+		$.RegisterEventHandler('HudProcessInput', $.GetContextPanel(), this.onUpdate.bind(this));
 
 		$.RegisterForUnhandledEvent('OnSynchroModeChanged', this.setDisplayMode.bind(this));
 		$.RegisterForUnhandledEvent('OnSynchroColorModeChanged', this.setColorMode.bind(this));
@@ -267,6 +267,6 @@ class Synchronizer {
 		$.RegisterForUnhandledEvent('OnSynchroStatModeChanged', this.setStatMode.bind(this));
 		$.RegisterForUnhandledEvent('OnSynchroStatColorModeChanged', this.setStatColorMode.bind(this));
 		$.RegisterForUnhandledEvent('OnJumpStarted', this.onJump.bind(this));
-		$.RegisterForUnhandledEvent('ChaosLevelInitPostEntity', this.onLoad.bind(this));
+		$.RegisterForUnhandledEvent('LevelInitPostEntity', this.onLoad.bind(this));
 	}
 }
diff --git a/scripts/hud/timer.js b/scripts/hud/timer.js
index 75d3450a..63c7c9e7 100644
--- a/scripts/hud/timer.js
+++ b/scripts/hud/timer.js
@@ -146,7 +146,7 @@ class HudTimer {
 	}
 
 	static {
-		$.RegisterEventHandler('ChaosHudProcessInput', $.GetContextPanel(), this.onUpdate.bind(this));
+		$.RegisterEventHandler('HudProcessInput', $.GetContextPanel(), this.onUpdate.bind(this));
 		$.RegisterForUnhandledEvent('OnMomentumTimerStateChange', this.onTimerEvent.bind(this));
 		$.RegisterForUnhandledEvent('OnMomentumZoneChange', this.onZoneChange.bind(this));
 		$.RegisterForUnhandledEvent('OnSaveStateUpdate', this.onSaveStateChange.bind(this));
diff --git a/scripts/pages/intro-movie.js b/scripts/pages/intro-movie.js
index b2c04f2c..eafec315 100644
--- a/scripts/pages/intro-movie.js
+++ b/scripts/pages/intro-movie.js
@@ -1,9 +1,9 @@
 class IntroMovie {
 	static {
-		$.RegisterForUnhandledEvent('ChaosShowIntroMovie', this.showIntroMovie.bind(this));
+		$.RegisterForUnhandledEvent('ShowIntroMovie', this.showIntroMovie.bind(this));
 	}
 
 	static showIntroMovie() {
-		$.DispatchEvent('ChaosHideIntroMovie'); // Disable intro movie for Momentum
+		$.DispatchEvent('HideIntroMovie'); // Disable intro movie for Momentum
 	}
 }
diff --git a/scripts/pages/learn.js b/scripts/pages/learn.js
index 408d3c23..a39db4ed 100644
--- a/scripts/pages/learn.js
+++ b/scripts/pages/learn.js
@@ -156,7 +156,7 @@ class Learn {
 
 	static launchMapThenTeleport() {
 		const onMapLoad = () => {
-			$.UnregisterForUnhandledEvent('ChaosLevelInitPostEntity', onLoadHandle);
+			$.UnregisterForUnhandledEvent('LevelInitPostEntity', onLoadHandle);
 
 			if (MapCacheAPI.GetMapName() !== this.currentLessonData['Map'])
 				$.Warning(
@@ -167,7 +167,7 @@ class Learn {
 			else this.teleportToLessonStart();
 		};
 
-		const onLoadHandle = $.RegisterForUnhandledEvent('ChaosLevelInitPostEntity', onMapLoad);
+		const onLoadHandle = $.RegisterForUnhandledEvent('LevelInitPostEntity', onMapLoad);
 
 		const map = this.currentLessonData['Map'];
 
diff --git a/scripts/pages/main-menu/main-menu.js b/scripts/pages/main-menu/main-menu.js
index 1e08bff6..f4ba8412 100644
--- a/scripts/pages/main-menu/main-menu.js
+++ b/scripts/pages/main-menu/main-menu.js
@@ -29,10 +29,10 @@ class MainMenu {
 	static activeTab = '';
 
 	static {
-		$.RegisterForUnhandledEvent('ChaosShowMainMenu', this.onShowMainMenu.bind(this));
-		$.RegisterForUnhandledEvent('ChaosHideMainMenu', this.onHideMainMenu.bind(this));
-		$.RegisterForUnhandledEvent('ChaosShowPauseMenu', this.onShowPauseMenu.bind(this));
-		$.RegisterForUnhandledEvent('ChaosHidePauseMenu', this.onHidePauseMenu.bind(this));
+		$.RegisterForUnhandledEvent('ShowMainMenu', this.onShowMainMenu.bind(this));
+		$.RegisterForUnhandledEvent('HideMainMenu', this.onHideMainMenu.bind(this));
+		$.RegisterForUnhandledEvent('ShowPauseMenu', this.onShowPauseMenu.bind(this));
+		$.RegisterForUnhandledEvent('HidePauseMenu', this.onHidePauseMenu.bind(this));
 		$.RegisterForUnhandledEvent('MapSelector_OnLoaded', this.onMapSelectorLoaded.bind(this));
 		$.RegisterForUnhandledEvent('Safeguard_Disconnect', this.onSafeguardDisconnect.bind(this));
 		$.RegisterForUnhandledEvent('Safeguard_Quit', this.onSafeguardQuit.bind(this));
@@ -47,12 +47,12 @@ class MainMenu {
 			(outcome) => outcome && this.onHomeButtonPressed()
 		);
 
-		$.DispatchEvent('ChaosHideIntroMovie');
+		$.DispatchEvent('HideIntroMovie');
 	}
 
 	/**
 	 * General onLoad initialisations.
-	 * Fired when ChaosMainMenu fires its onload event.
+	 * Fired when MainMenu fires its onload event.
 	 */
 	static onMainMenuLoaded() {
 		// These aren't accessible until the page has loaded fully, find them now
@@ -344,7 +344,7 @@ class MainMenu {
 	static onQuitPrompt(toDesktop = true) {
 		if (!toDesktop) return; // currently don't handle disconnect prompts
 
-		$.DispatchEvent('ChaosMainMenuPauseGame'); // make sure game is paused so we can see the popup if hit from a keybind in-game
+		$.DispatchEvent('MainMenuPauseGame'); // make sure game is paused so we can see the popup if hit from a keybind in-game
 
 		UiToolkitAPI.ShowGenericPopupTwoOptionsBgStyle(
 			$.Localize('#Action_Quit'),
@@ -411,7 +411,7 @@ class MainMenu {
 	static onEscapeKeyPressed(_eSource, _nRepeats, _focusPanel) {
 		// Resume game in pause menu mode, OTHERWISE close the active menu menu page
 		if (GameInterfaceAPI.GetGameUIState() === GameUIState.PAUSEMENU) {
-			$.DispatchEvent('ChaosMainMenuResumeGame');
+			$.DispatchEvent('MainMenuResumeGame');
 		} else {
 			this.onHomeButtonPressed();
 		}
diff --git a/scripts/pages/settings/page.js b/scripts/pages/settings/page.js
index 3d74bc8c..0ed0c1fa 100644
--- a/scripts/pages/settings/page.js
+++ b/scripts/pages/settings/page.js
@@ -18,7 +18,7 @@ class SettingsShared {
 				discardVideoSettingsButton.enabled = false;
 
 				// Tell C++ to init controls from convars
-				$.DispatchEvent('ChaosVideoSettingsInit');
+				$.DispatchEvent('VideoSettingsInit');
 
 				this.initTextureReplacementDropdown();
 
@@ -51,9 +51,9 @@ class SettingsShared {
 
 	static resetSettingsRecursive(panel) {
 		// TODO: Add support for Enums and Colours here, then include
-		if (panel.paneltype === 'ChaosSettingsSlider' || panel.paneltype === 'ChaosSettingsEnumDropDown') {
+		if (panel.paneltype === 'SettingsSlider' || panel.paneltype === 'SettingsEnumDropDown') {
 			panel.RestoreCVarDefault();
-		} else if (panel.paneltype === 'ChaosSettingsKeyBinder') {
+		} else if (panel.paneltype === 'SettingsKeyBinder') {
 			// OptionsMenuAPI has already handled this, just refresh
 			panel.OnShow?.();
 		} else {
@@ -80,7 +80,7 @@ class SettingsShared {
 	static resetVideoSettings() {
 		// For future: use same localisation string as above
 		this.showConfirmResetSettings($.Localize('#Settings_General_ResetSomething'), () => {
-			$.DispatchEvent('ChaosVideoSettingsResetDefault');
+			$.DispatchEvent('VideoSettingsResetDefault');
 			this.resetSettingsRecursive($.GetContextPanel());
 			this.videoSettingsOnUserInputSubmit();
 		});
@@ -118,13 +118,13 @@ class SettingsShared {
 	static videoSettingsDiscardChanges() {
 		// Discard dialogue seems unnecessary here
 		// this.showConfirmResetSettings('Are you sure you want to discard your changes to video settings?', () => {
-		$.DispatchEvent('ChaosVideoSettingsInit');
+		$.DispatchEvent('VideoSettingsInit');
 		this.videoSettingsResetUserInput();
 		// });
 	}
 
 	static videoSettingsApplyChanges() {
-		$.DispatchEvent('ChaosApplyVideoSettings');
+		$.DispatchEvent('ApplyVideoSettings');
 		this.videoSettingsResetUserInput();
 	}
 
@@ -262,11 +262,11 @@ class SettingsShared {
 
 	static isSettingsPanel(panel) {
 		return [
-			'ChaosSettingsEnum',
-			'ChaosSettingsSlider',
-			'ChaosSettingsEnumDropDown',
-			'ChaosSettingsKeyBinder',
-			'ChaosSettingsToggle',
+			'SettingsEnum',
+			'SettingsSlider',
+			'SettingsEnumDropDown',
+			'SettingsKeyBinder',
+			'SettingsToggle',
 			'ConVarColorDisplay'
 		].includes(panel.paneltype);
 	}
diff --git a/scripts/pages/settings/settings.js b/scripts/pages/settings/settings.js
index 8e7e0f2d..4f3ed864 100644
--- a/scripts/pages/settings/settings.js
+++ b/scripts/pages/settings/settings.js
@@ -252,9 +252,9 @@ class MainMenuSettings {
 		// Only Enum and EnumDropDown are currently supported, others can be added when/if needed
 		const psVar = panel.GetAttributeString('psvar', '');
 		if (psVar) {
-			if (panel.paneltype === 'ChaosSettingsEnum') {
+			if (panel.paneltype === 'SettingsEnum') {
 				this.initPersistentStorageEnum(panel, psVar);
-			} else if (panel.paneltype === 'ChaosSettingsEnumDropDown') {
+			} else if (panel.paneltype === 'SettingsEnumDropDown') {
 				this.initPersistentStorageEnumDropdown(panel, psVar);
 			}
 		}
@@ -337,7 +337,7 @@ class MainMenuSettings {
 
 		// Get convar display option from PS
 		const showConvar = Boolean(convar);
-		const isKeybinder = paneltype === 'ChaosSettingsKeyBinder';
+		const isKeybinder = paneltype === 'SettingsKeyBinder';
 
 		// If the panel has a message OR a convar and the convar display option is on, show the info panel
 		if (message || showConvar) {
@@ -430,11 +430,11 @@ class MainMenuSettings {
 
 	static isSettingsPanel(panel) {
 		return [
-			'ChaosSettingsEnum',
-			'ChaosSettingsSlider',
-			'ChaosSettingsEnumDropDown',
-			'ChaosSettingsKeyBinder',
-			'ChaosSettingsToggle',
+			'SettingsEnum',
+			'SettingsSlider',
+			'SettingsEnumDropDown',
+			'SettingsKeyBinder',
+			'SettingsToggle',
 			'ConVarColorDisplay'
 		].includes(panel.paneltype);
 	}
diff --git a/styles/components/settings.scss b/styles/components/settings.scss
index ba57ee5c..0533655d 100644
--- a/styles/components/settings.scss
+++ b/styles/components/settings.scss
@@ -224,7 +224,7 @@ ConVarEnabler > .colordisplay {
 // Toggle - I don't know where this is from or how it's supposed
 // to work so not going to style it
 
-// ChaosSettingsToggle {
+// SettingsToggle {
 // 	height: 48px;
 // 	flow-children: right;
 // 	padding: 0 4px 0 12px;
@@ -232,18 +232,18 @@ ConVarEnabler > .colordisplay {
 // 	vertical-align: middle;
 // }
 
-// ChaosSettingsToggle #TitleContainer {
+// SettingsToggle #TitleContainer {
 // 	vertical-align: middle;
 // 	width: 35%;
 // 	padding-right: 50px;
 // }
 
-// ChaosSettingsToggle #Title {
+// SettingsToggle #Title {
 // 	vertical-align: middle;
 // 	horizontal-align: left;
 // }
 
-// ChaosSettingsToggle #Toggle {
+// SettingsToggle #Toggle {
 // 	vertical-align: middle;
 // 	horizontal-align: right;
 // }
diff --git a/styles/hud/hud.scss b/styles/hud/hud.scss
index 006615b9..ad427d0c 100644
--- a/styles/hud/hud.scss
+++ b/styles/hud/hud.scss
@@ -1,6 +1,6 @@
 /* styles for the Chaos Hud */
 
-ChaosHud,
+Hud,
 #PopupManager,
 #TooltipManager,
 #ContextMenuManager {
diff --git a/styles/pages/intro-movie.scss b/styles/pages/intro-movie.scss
index 3b86039c..a473f4ef 100644
--- a/styles/pages/intro-movie.scss
+++ b/styles/pages/intro-movie.scss
@@ -1,4 +1,4 @@
-ChaosIntroMovie {
+IntroMovie {
 	width: 100%;
 	height: 100%;
 }

From 35a24757c63415e48a298f92df2a48dccd73162f Mon Sep 17 00:00:00 2001
From: Jeremy Lorelli <jeremy.lorelli.1337@gmail.com>
Date: Wed, 17 Jan 2024 18:23:59 -0800
Subject: [PATCH 3/3] chore: bump types submodule

---
 scripts/types | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/types b/scripts/types
index adf3cd79..0b545d56 160000
--- a/scripts/types
+++ b/scripts/types
@@ -1 +1 @@
-Subproject commit adf3cd79893ba64d0cb30d91f10db60c29343e98
+Subproject commit 0b545d56f1c4e7882d7b731214d76f9d2e8891c9