diff --git a/data/menu/nullifiedcat/aimbot.xml b/data/menu/nullifiedcat/aimbot.xml
index a41f2ea1..0bc5fe7b 100755
--- a/data/menu/nullifiedcat/aimbot.xml
+++ b/data/menu/nullifiedcat/aimbot.xml
@@ -2,6 +2,7 @@
     <Box padding="12 6 6 6" width="content" height="content" name="Aimbot">
         <List width="150">
             <AutoVariable width="fill" target="aimbot.enable" label="Enable Aimbot"/>
+            <AutoVariable width="fill" target="aimbot.aimkey.button" label="Aim Key"/>
             <LabeledObject width="fill" label="Aim Key Mode">
                 <Select target="aimbot.aimkey.mode">
                     <Option name="Disable" value="0"/>
@@ -10,12 +11,11 @@
                     <Option name="Toggle" value="3"/>
                 </Select>
             </LabeledObject>
-            <AutoVariable width="fill" target="aimbot.aimkey.button" label="Aim Key"/>
             <AutoVariable width="fill" target="aimbot.silent" label="Silent"/>
-            <AutoVariable width="fill" target="aimbot.fov-circle.enable" label="FOV Circle"/>
+            <AutoVariable width="fill" target="aimbot.slow" label="Slow Aimbot" min="0" max="30"/>
             <AutoVariable width="fill" target="aimbot.fov" label="FOV"/>
-            <AutoVariable width="fill" target="aimbot.fov-circle.opacity" label="FOV Opacity"/>
-            <AutoVariable width="fill" target="aimbot.slow" label="Slow Aimbot"/>
+            <AutoVariable width="fill" target="aimbot.fov-circle.enable" label="FOV Circle"/>
+            <AutoVariable width="fill" target="aimbot.fov-circle.opacity" label="FOV Opacity" min="0" max="1"/>
             <AutoVariable width="fill" target="aimbot.can-shoot-only" label="Only Shoot When Able"/>
             <AutoVariable width="fill" target="aimbot.miss-chance" label="Miss chance"/>
             <AutoVariable width="fill" target="aimbot.extrapolate" label="Extrapolate"/>
diff --git a/data/menu/nullifiedcat/antiaim.xml b/data/menu/nullifiedcat/antiaim.xml
index dfd1d3a7..cdcbaef8 100755
--- a/data/menu/nullifiedcat/antiaim.xml
+++ b/data/menu/nullifiedcat/antiaim.xml
@@ -5,14 +5,15 @@
             <AutoVariable width="fill" target="antiaim.draw-fakes" label="Draw fakes"/>
             <AutoVariable width="fill" target="antiaim.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="misc.fakelag" label="Fakelag" min="0" max="14"/>
+            <AutoVariable width="fill" target="antiaim.spin-speed" label="Spin speed" min="-45" max="45"/>
             <AutoVariable width="fill" target="antiaim.roll" label="Roll"/>
-            <AutoVariable width="fill" target="antiaim.pitch.static" label="Static pitch"/>
-	    <AutoVariable width="fill" target="misc.fakelag" label="Fakelag"/>
+            <AutoVariable width="fill" target="antiaim.pitch.static" label="Custom Pitch"/>
+            <AutoVariable width="fill" target="antiaim.yaw.static" label="Custom Yaw"/>
             <LabeledObject width="fill" label="Pitch mode">
                 <Select target="antiaim.pitch.mode">
                     <Option name="Disable" value="0"/>
-                    <Option name="Static" value="1"/>
+                    <Option name="Custom" value="1"/>
                     <Option name="Jitter" value="2"/>
                     <Option name="Random" value="3"/>
                     <Option name="Flip" value="4"/>
@@ -25,16 +26,15 @@
                     <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="Custom" value="1"/>
+                    <Option name="Custom Offset" value="6"/>
                     <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"/>