diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index 2de4b64..ac87d1f 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -67,7 +67,7 @@ void ClientMiscInitialize() {
         0,
         "",
         nullptr,
-        4,
+        GAME,
         false,
         nullptr,
         false
diff --git a/src/client/ClientServices.cpp b/src/client/ClientServices.cpp
index 1b81588..81fda49 100644
--- a/src/client/ClientServices.cpp
+++ b/src/client/ClientServices.cpp
@@ -92,7 +92,7 @@ const char* ClientServices::GetSelectedRealmName() {
             0,
             "",
             nullptr,
-            6,
+            NET,
             false,
             nullptr,
             false
diff --git a/src/console/CVar.hpp b/src/console/CVar.hpp
index 83f7284..72a88fb 100644
--- a/src/console/CVar.hpp
+++ b/src/console/CVar.hpp
@@ -1,6 +1,7 @@
 #ifndef CONSOLE_C_VAR_HPP
 #define CONSOLE_C_VAR_HPP
 
+#include "console/Types.hpp"
 #include <common/String.hpp>
 #include <storm/Hash.hpp>
 #include <cstdint>
@@ -17,7 +18,7 @@ class CVar : public TSHashObject<CVar, HASHKEY_STRI> {
         static int32_t Load(const char* filename);
         static CVar* Lookup(const char* name);
         static CVar* LookupRegistered(const char* name);
-        static CVar* Register(const char*, const char*, uint32_t, const char*, bool (*)(CVar*, const char*, const char*, void*), uint32_t, bool, void*, bool);
+        static CVar* Register(const char* name, const char* help, uint32_t flags, const char* value, bool (*fcn)(CVar*, const char*, const char*, void*), uint32_t category, bool a7, void* arg, bool a9);
 
         // Member variables
         uint32_t m_category = 0;
diff --git a/src/console/Device.cpp b/src/console/Device.cpp
index ebb169a..a33d809 100644
--- a/src/console/Device.cpp
+++ b/src/console/Device.cpp
@@ -42,7 +42,7 @@ void RegisterGxCVars() {
         0x0,
         "1",
         nullptr,
-        1,
+        GRAPHICS,
         false,
         nullptr,
         false
@@ -54,10 +54,10 @@ void RegisterGxCVars() {
         0x1 | 0x2,
         v1 ? "1" : "0",
         &CVGxWindowCallback,
-        1,
-        0,
-        0,
-        0
+        GRAPHICS,
+        false,
+        nullptr,
+        false
     );
 
     s_cvGxMaximize = CVar::Register(
@@ -66,10 +66,10 @@ void RegisterGxCVars() {
         0x1 | 0x2,
         v1 ? "1" : "0",
         &CVGxMaximizeCallback,
-        1,
-        0,
-        0,
-        0
+        GRAPHICS,
+        false,
+        nullptr,
+        false
     );
 
     // TODO s_cvGxColorBits
@@ -83,7 +83,7 @@ void RegisterGxCVars() {
         0x1 | 0x2,
         resolution,
         &CVGxResolutionCallback,
-        1,
+        GRAPHICS,
         false,
         nullptr,
         false
diff --git a/src/model/Model2.cpp b/src/model/Model2.cpp
index 31f012f..93de7f4 100644
--- a/src/model/Model2.cpp
+++ b/src/model/Model2.cpp
@@ -149,7 +149,7 @@ uint32_t M2RegisterCVars() {
         0,
         "1",
         nullptr,
-        1,
+        GRAPHICS,
         false,
         nullptr,
         false
@@ -161,7 +161,7 @@ uint32_t M2RegisterCVars() {
         0,
         "1",
         nullptr,
-        1,
+        GRAPHICS,
         false,
         nullptr,
         false
@@ -173,7 +173,7 @@ uint32_t M2RegisterCVars() {
         0,
         "1",
         nullptr,
-        1,
+        GRAPHICS,
         false,
         nullptr,
         false
@@ -185,7 +185,7 @@ uint32_t M2RegisterCVars() {
         0,
         "1",
         BatchDoodadsCallback,
-        1,
+        GRAPHICS,
         false,
         nullptr,
         false
@@ -197,7 +197,7 @@ uint32_t M2RegisterCVars() {
         0,
         "1",
         BatchParticlesCallback,
-        1,
+        GRAPHICS,
         false,
         nullptr,
         false
@@ -209,7 +209,7 @@ uint32_t M2RegisterCVars() {
         0,
         "0",
         ForceAdditiveParticleSortCallback,
-        1,
+        GRAPHICS,
         false,
         nullptr,
         false
@@ -233,7 +233,7 @@ uint32_t M2RegisterCVars() {
         0,
         "0",
         M2DebugFasterChanged,
-        1,
+        GRAPHICS,
         false,
         nullptr,
         false