diff --git a/layout/hud/cgaz.xml b/layout/hud/cgaz.xml
index 435de46a..6a710567 100644
--- a/layout/hud/cgaz.xml
+++ b/layout/hud/cgaz.xml
@@ -4,6 +4,7 @@
 	</styles>
 	<scripts>
 		<include src="file://{scripts}/common/gamemodes.js" />
+		<include src="file://{scripts}/util/register-for-gamemodes.js" />
 		<include src="file://{scripts}/util/math.js" />
 		<include src="file://{scripts}/util/colors.js" />
 		<include src="file://{scripts}/hud/cgaz.js" />
diff --git a/scripts/hud/cgaz.js b/scripts/hud/cgaz.js
index b2fa552e..668e0bb2 100644
--- a/scripts/hud/cgaz.js
+++ b/scripts/hud/cgaz.js
@@ -124,25 +124,14 @@ class Cgaz {
 	static updateHandle = null;
 
 	static onLoad() {
-		if (GameModeAPI.GetCurrentGameMode() === GameMode.DEFRAG) {
-			this.updateHandle = $.RegisterEventHandler(
-				'HudProcessInput',
-				$.GetContextPanel(),
-				this.onUpdate.bind(this)
-			);
-
-			this.onAccelConfigChange();
-			this.onSnapConfigChange();
-			this.onPrimeConfigChange();
-			this.onProjectionChange();
-			this.onHudFovChange();
-			this.onSnapConfigChange();
-			this.onWindicatorConfigChange();
-			this.onCompassConfigChange();
-		} else if (this.updateHandle) {
-			$.UnregisterEventHandler('HudProcessInput', $.GetContextPanel(), this.updateHandle);
-			this.updateHandle = null;
-		}
+		this.onAccelConfigChange();
+		this.onSnapConfigChange();
+		this.onPrimeConfigChange();
+		this.onProjectionChange();
+		this.onHudFovChange();
+		this.onSnapConfigChange();
+		this.onWindicatorConfigChange();
+		this.onCompassConfigChange();
 	}
 
 	static onProjectionChange() {
@@ -1267,7 +1256,20 @@ class Cgaz {
 	}
 
 	static {
-		$.RegisterForUnhandledEvent('LevelInitPostEntity', this.onLoad.bind(this));
+		RegisterHUDPanelForGamemode({
+			gamemodes: [GameMode.DEFRAG],
+			context: this,
+			contextPanel: $.GetContextPanel(),
+			onLoad: this.onLoad,
+			handledEvents: [
+				{
+					event: 'HudProcessInput',
+					contextPanel: $.GetContextPanel(),
+					callback: this.onUpdate
+				}
+			]
+		});
+
 		$.RegisterForUnhandledEvent('OnDefragHUDProjectionChange', this.onProjectionChange.bind(this));
 		$.RegisterForUnhandledEvent('OnDefragHUDFOVChange', this.onHudFovChange.bind(this));
 		$.RegisterForUnhandledEvent('OnDefragHUDAccelChange', this.onAccelConfigChange.bind(this));