diff --git a/data/menu/nullifiedcat/aimbot.xml b/data/menu/nullifiedcat/aimbot.xml
index 63552a8b..11cc328b 100644
--- a/data/menu/nullifiedcat/aimbot.xml
+++ b/data/menu/nullifiedcat/aimbot.xml
@@ -30,7 +30,13 @@
             <AutoVariable width="fill" target="aimbot.target.other-buildings" label="Other buildings"/>
             <AutoVariable width="fill" target="aimbot.target.sentry" label="Sentry guns"/>
             <AutoVariable width="fill" target="aimbot.target.stickybomb" label="Stickybombs"/>
-            <AutoVariable width="fill" target="aimbot.target.teammates" label="Teammates"/>
+            <LabeledObject width="fill" label="Teammates">
+                <Select target="aimbot.target.teammates">
+                    <Option name="Disable" value="0"/>
+                    <Option name="Enable" value="1"/>
+                    <Option name="Teammates only" value="2"/>
+                </Select>
+            </LabeledObject>
             <AutoVariable width="fill" target="aimbot.target.max-range" label="Max Range" min="0" max="4096"/>
 
             <AutoVariable width="fill" target="aimbot.projectile.enable" label="Enable"/>
diff --git a/data/menu/nullifiedcat/antiaim.xml b/data/menu/nullifiedcat/antiaim.xml
index 2df600c1..6aed4f5a 100644
--- a/data/menu/nullifiedcat/antiaim.xml
+++ b/data/menu/nullifiedcat/antiaim.xml
@@ -1,5 +1,77 @@
-<Tab name="Anti-Aim">
-    <List width="150">
-        <AutoVariable width="fill" target="antiaim.enable" label="Enable"/>
-    </List>
+<Tab name="Anti-*-Aim" padding="4 4 4 4">
+    <Box padding="12 6 6 6" name="Anti-Aim" width="content" height="content">
+        <List width="150">
+            <AutoVariable width="fill" target="antiaim.enable" label="Enable"/>
+            <AutoVariable width="fill" target="antiaim.draw-fakes" label="Draw fakes"/>
+            <AutoVariable width="fill" target="antiaim.fake-crouch" label="Fake crouch"/>
+            <AutoVariable width="fill" target="antiaim.no-clamp" label="No clamping"/>
+            <AutoVariable width="fill" target="antiaim.spin-speed" label="Spin speed"/>
+            <AutoVariable width="fill" target="antiaim.roll" label="Roll"/>
+            <AutoVariable width="fill" target="antiaim.pitch.static" label="Static pitch"/>
+            <LabeledObject width="fill" label="Pitch mode">
+                <Select target="antiaim.pitch.mode">
+                    <Option name="Disable" value="0"/>
+                    <Option name="Static" value="1"/>
+                    <Option name="Jitter" value="2"/>
+                    <Option name="Random" value="3"/>
+                    <Option name="Flip" value="4"/>
+                    <Option name="Fakeflip" value="5"/>
+                    <Option name="Fakeup" value="6"/>
+                    <Option name="Fakedown" value="7"/>
+                    <Option name="Fakecenter" value="8"/>
+                    <Option name="Up" value="9"/>
+                    <Option name="Down" value="10"/>
+                    <Option name="Heck" value="11"/>
+                </Select>
+            </LabeledObject>
+            <AutoVariable width="fill" target="antiaim.yaw.static" label="Static yaw"/>
+            <LabeledObject width="fill" label="Yaw mode">
+                <Select target="antiaim.yaw.mode">
+                    <Option name="Disable" value="0"/>
+                    <Option name="Static" value="1"/>
+                    <Option name="Jitter" value="2"/>
+                    <Option name="BigRandom" value="3"/>
+                    <Option name="Random" value="4"/>
+                    <Option name="Spin" value="5"/>
+                    <Option name="Offset" value="6"/>
+                    <Option name="Edge" value="7"/>
+                    <Option name="Heck" value="8"/>
+                    <Option name="Fake" value="9"/>
+                    <Option name="FakeStatic" value="10"/>
+                    <Option name="FakeJitter" value="11"/>
+                    <Option name="FakeBRandom" value="12"/>
+                    <Option name="FakeRandom" value="13"/>
+                    <Option name="FakeSpin" value="14"/>
+                    <Option name="FakeOffset" value="15"/>
+                    <Option name="FakeEdge" value="16"/>
+                    <Option name="FakeHeck" value="17"/>
+                    <Option name="FakeSide" value="18"/>
+                    <Option name="FakeLeft" value="19"/>
+                    <Option name="FakeRight" value="20"/>
+                    <Option name="FakeREdge" value="21"/>
+                </Select>
+            </LabeledObject>
+        </List>
+    </Box>
+    <Box padding="12 6 6 6" name="Anti-Anti-Aim" width="content" height="content" x="170" y="140">
+        <List width="150">
+            <AutoVariable width="fill" target="anti-anti-aim.enable" label="Enable"/>
+        </List>
+    </Box>
+    <Box padding="12 6 6 6" name="Anti-Anti-Anti-Aim" width="content" height="content" x="170">
+        <List width="150">
+            <AutoVariable width="fill" target="antiaim.aaaa.enable" label="Enable"/>
+            <AutoVariable width="fill" target="antiaim.aaaa.flip-key" label="Flip key"/>
+            <AutoVariable width="fill" target="antiaim.aaaa.interval.seconds" label="Enable"/>
+            <AutoVariable width="fill" target="antiaim.aaaa.interval.random-low" label="Random low"/>
+            <AutoVariable width="fill" target="antiaim.aaaa.interval.random-high" label="Random high"/>
+            <LabeledObject width="fill" label="Mode">
+                <Select target="antiaim.aaaa.mode">
+                    <Option name="(Fake)up" value="0"/>
+                    <Option name="(Fake)down" value="1"/>
+                    <Option name="(Fake)center" value="2"/>
+                </Select>
+            </LabeledObject>
+        </List>
+    </Box>
 </Tab>
\ No newline at end of file
diff --git a/src/hacks/Aimbot.cpp b/src/hacks/Aimbot.cpp
index dc01249e..f9f78274 100644
--- a/src/hacks/Aimbot.cpp
+++ b/src/hacks/Aimbot.cpp
@@ -60,7 +60,7 @@ static settings::Bool buildings_sentry{ "aimbot.target.sentry", "1" };
 static settings::Bool buildings_other{ "aimbot.target.other-buildings", "1" };
 static settings::Bool stickybot{ "aimbot.target.stickybomb", "0" };
 static settings::Bool rageonly{ "aimbot.target.ignore-non-rage", "0" };
-static settings::Bool teammates{ "aimbot.target.teammates", "0" };
+static settings::Int teammates{ "aimbot.target.teammates", "0" };
 
 #if ENABLE_VISUALS
 static settings::Bool fov_draw{ "aimbot.fov-circle.enable", "0" };
diff --git a/src/hacks/AntiAim.cpp b/src/hacks/AntiAim.cpp
index 27fd56bd..e838f1bc 100644
--- a/src/hacks/AntiAim.cpp
+++ b/src/hacks/AntiAim.cpp
@@ -28,8 +28,8 @@ static settings::Float spin{ "antiaim.spin-speed", "10" };
 
 static settings::Bool aaaa_enable{ "antiaim.aaaa.enable", "0" };
 static settings::Float aaaa_interval{ "antiaim.aaaa.interval.seconds", "0" };
-static settings::Float aaaa_interval_random_high{ "antiaim.aaaa.interval.random-high"};
-static settings::Float aaaa_interval_random_low{ "antiaim.aaaa.interval.random-low"};
+static settings::Float aaaa_interval_random_high{ "antiaim.aaaa.interval.random-high", "10"};
+static settings::Float aaaa_interval_random_low{ "antiaim.aaaa.interval.random-low", "2" };
 static settings::Int aaaa_mode{ "antiaim.aaaa.mode", "0" };
 static settings::Button aaaa_flip_key{ "antiaim.aaaa.flip-key", "<null>" };