diff --git a/data/menu/nullified-ui.xml b/data/menu/nullified-ui.xml
index 29e8c6da..6f4e951e 100644
--- a/data/menu/nullified-ui.xml
+++ b/data/menu/nullified-ui.xml
@@ -1,7 +1,4 @@
 <ElementGroup>
-    <Window x="100" y="200" name="A" width="300" height="300">
-        <AutoVariable target="aimbot.enable" label="Enable Aimbot"/>
-    </Window>
     <Window x="100" y="300" name="Main Window" width="content" height="content">
         <TabContainer width="600" height="400">
             <Include path="nullifiedcat/aimbot.xml"/>
@@ -17,7 +14,4 @@
             </Tab>
         </TabContainer>
     </Window>
-    <Window x="200" y="300" name="C" width="400" height="300">
-
-    </Window>
-</ElementGroup>
\ No newline at end of file
+</ElementGroup>
diff --git a/data/menu/nullifiedcat/aimbot.xml b/data/menu/nullifiedcat/aimbot.xml
index 11cc328b..a731585b 100644
--- a/data/menu/nullifiedcat/aimbot.xml
+++ b/data/menu/nullifiedcat/aimbot.xml
@@ -1,4 +1,4 @@
-<Tab name="Aimbot">
+<Tab name="Aimbot" padding="6 6 6 6">
     <Box padding="6 6 6 6" width="content" height="content">
         <List width="150">
             <AutoVariable width="fill" target="aimbot.enable" label="Enable Aimbot"/>
@@ -17,33 +17,62 @@
             <AutoVariable width="fill" target="aimbot.wait-for-charge" label="Wait for charge"/>
             <AutoVariable width="fill" target="aimbot.can-shoot-only" label="CanShoot check"/>
             <AutoVariable width="fill" target="aimbot.silent" label="Silent"/>
+	    <AutoVariable width="fill" target="aimbot.fov" label="FOV"/>
+	    <AutoVariable width="fill" target="aimbot.fov-circle.enable" label="FOV Circle"/>
+	    <AutoVariable width="fill" target="aimbot.fov-circle.opacity" label="FOV Opacity"/>
             <AutoVariable width="fill" target="aimbot.zoomed-only" label="Zoomed only"/>
             <AutoVariable width="fill" target="aimbot.auto.spin-up" label="Auto spin-up"/>
             <AutoVariable width="fill" target="aimbot.auto.unzoom" label="Auto unzoom"/>
             <AutoVariable width="fill" target="aimbot.auto.zoom" label="Auto zoom"/>
             <AutoVariable width="fill" target="aimbot.zoomed-only" label="Zoomed only"/>
-
-            <AutoVariable width="fill" target="aimbot.target.ignore-cloaked-spies" label="NOT Cloaked Spies"/>
-            <AutoVariable width="fill" target="aimbot.target.ignore-deadringer" label="NOT Dead Ringer Spies"/>
-            <AutoVariable width="fill" target="aimbot.target.ignore-vaccinator" label="NOT Vaccinator"/>
-            <AutoVariable width="fill" target="aimbot.target.ignore-non-rage" label="Rage only"/>
-            <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"/>
-            <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"/>
+	    <AutoVariable width="fill" target="aimbot.hitbox" label="hitbox"/>
+	    <LabeledObject width="fill" label="Hitbox Mode">
+                <Select target="aimbot.hitbox-mode">
+                    <Option name="Auto" value="0"/>
+                    <Option name="Auto closest" value="1"/>
+                    <Option name="Static" value="2"/>
                 </Select>
             </LabeledObject>
+        </List>
+        <List width="200"x="162">
+      	    <AutoVariable width="fill" target="aimbot.lock-target" label="Lock Target"/>
+	    <AutoVariable width="fill" target="aimbot.miss-chance" label="Miss chance"/>
+	    <AutoVariable width="fill" target="aimbot.multipoint" label="Multipoint"/>
+	    <LabeledObject width="fill" label="Priority Mode">
+                <Select target="aimbot.priority-mode">
+                    <Option name="Smart" value="0"/>
+                    <Option name="FOV" value="1"/>
+                    <Option name="Distance" value="2"/>
+		    <Option name="Health" value="3"/>
+                </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"/>
+            <AutoVariable width="fill" target="aimbot.projectile.enable" label="Enable Projectile Aimbot"/>
             <AutoVariable width="fill" target="aimbot.projectile.huntsman-autoshoot" label="Arrow autoshoot charge"/>
             <AutoVariable width="fill" target="aimbot.projectile.sticky-autoshoot" label="Sticky autoshoot charge"/>
             <AutoVariable width="fill" target="aimbot.projectile.gravity" label="Gravity override"/>
             <AutoVariable width="fill" target="aimbot.projectile.speed" label="Velocity override"/>
+	    <AutoVariable width="fill" target="aimbot.extrapolate" label="Extrapolate"/>
+	    <AutoVariable width="fill" target="aimbot.debug" label="Debug"/>
+	    <AutoVariable width="fill" target="aimbot.debug.engine-pp" label="Debug Engine PP"/>
         </List>
     </Box>
-</Tab>
\ No newline at end of file
+    <Box padding="12 6 6 6" width="content" height="content" name="Target Options" x="380">
+        <List width="150">
+            <AutoVariable width="fill" target="aimbot.target.sentry" label="Sentry guns"/>
+            <AutoVariable width="fill" target="aimbot.target.stickybomb" label="Stickybombs"/>
+	    <LabeledObject width="fill" label="Target Team">
+                <Select target="aimbot.target.teammates">
+                    <Option name="Enemies" value="0"/>
+                    <Option name="Teammates" value="1"/>
+                    <Option name="All" value="2"/>
+                </Select>
+            </LabeledObject>
+	    <AutoVariable width="fill" target="aimbot.target.ignore-cloaked-spies" label="NOT Cloaked Spies"/>
+            <AutoVariable width="fill" target="aimbot.target.ignore-deadringer" label="NOT Dead Ringer Spies"/>
+            <AutoVariable width="fill" target="aimbot.target.ignore-vaccinator" label="NOT Vaccinator"/>
+            <AutoVariable width="fill" target="aimbot.target.ignore-non-rage" label="Rage only"/>
+            <AutoVariable width="fill" target="aimbot.target.other-buildings" label="Other buildings"/>
+	</List>
+    </Box>
+</Tab>
diff --git a/data/menu/nullifiedcat/antiaim.xml b/data/menu/nullifiedcat/antiaim.xml
index 6aed4f5a..24824ec3 100644
--- a/data/menu/nullifiedcat/antiaim.xml
+++ b/data/menu/nullifiedcat/antiaim.xml
@@ -8,6 +8,7 @@
             <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"/>
+	    <AutoVariable width="fill" target="misc.fakelag" label="Fakelag"/>
             <LabeledObject width="fill" label="Pitch mode">
                 <Select target="antiaim.pitch.mode">
                     <Option name="Disable" value="0"/>
@@ -53,7 +54,7 @@
             </LabeledObject>
         </List>
     </Box>
-    <Box padding="12 6 6 6" name="Anti-Anti-Aim" width="content" height="content" x="170" y="140">
+    <Box padding="12 6 6 6" name="Anti-Anti-Aim" width="content" height="content" x="170" y="162">
         <List width="150">
             <AutoVariable width="fill" target="anti-anti-aim.enable" label="Enable"/>
         </List>
@@ -74,4 +75,4 @@
             </LabeledObject>
         </List>
     </Box>
-</Tab>
\ No newline at end of file
+</Tab>
diff --git a/data/menu/nullifiedcat/autoheal.xml b/data/menu/nullifiedcat/autoheal.xml
index bc055fc4..1511bf14 100644
--- a/data/menu/nullifiedcat/autoheal.xml
+++ b/data/menu/nullifiedcat/autoheal.xml
@@ -1,60 +1,62 @@
-<Tab name="AutoHeal">
-    <List width="150">
-        <AutoVariable width="fill" target="autoheal.enable" label="Enable"/>
-        <AutoVariable width="fill" target="autoheal.silent" label="Silent"/>
-        <AutoVariable width="fill" target="autoheal.uber.enable" label="Auto Uber"/>
-        <AutoVariable width="fill" target="autoheal.uber.share" label="Share Uber"/>
-        <AutoVariable width="fill" target="autoheal.uber.health-below-ratio" label="Uber on health" min="0" max="100"/>
-    </List>
-    <Box padding="12 6 6 6" name="Auto Vaccinator" width="content" height="content" y="100">
+<Tab name="AutoHeal" padding="6 6 6 6">
+    <Box padding="6 6 6 6" width="content" height="content">
         <List width="150">
-            <AutoVariable width="fill" target="autoheal.vacc.enable" label="Enable"/>
-            <AutoVariable width="fill" target="autoheal.vacc.reset-timer" label="Reset timer"/>
-            <LabeledObject width="fill" label="Default resist">
-                <Select target="autoheal.vacc.default-resistance">
-                    <Option name="Disable" value="0"/>
-                    <Option name="Bullet" value="1"/>
-                    <Option name="Blast" value="2"/>
-                    <Option name="Fire" value="3"/>
-                </Select>
-            </LabeledObject>
+            <AutoVariable width="fill" target="autoheal.enable" label="Enable"/>
+            <AutoVariable width="fill" target="autoheal.silent" label="Silent"/>
+            <AutoVariable width="fill" target="autoheal.uber.enable" label="Auto Uber"/>
+            <AutoVariable width="fill" target="autoheal.uber.share" label="Share Uber"/>
+            <AutoVariable width="fill" target="autoheal.uber.health-below-ratio" label="Uber on health" min="0" max="100"/>
         </List>
-        <Box padding="12 6 6 6" name="Bullet" width="content" height="content" x="170">
+        <Box padding="12 6 6 6" name="Auto Vaccinator" width="content" height="content" y="100">
             <List width="150">
-                <AutoVariable width="fill" target="autoheal.vacc.bullet.enable" label="Enable"/>
-                <AutoVariable width="fill" target="autoheal.vacc.bullet.min-charges" label="Min. charges" min="0" max="4"/>
-                <LabeledObject width="fill" label="Sniper pop">
-                    <Select target="autoheal.vacc.bullet.sniper-pop">
-                        <Option name="Never" value="0"/>
-                        <Option name="Visible, zoom" value="1"/>
-                        <Option name="Any zoomed" value="2"/>
+                <AutoVariable width="fill" target="autoheal.vacc.enable" label="Enable"/>
+                <AutoVariable width="fill" target="autoheal.vacc.reset-timer" label="Reset timer"/>
+                <LabeledObject width="fill" label="Default resist">
+                    <Select target="autoheal.vacc.default-resistance">
+                        <Option name="Disable" value="0"/>
+                        <Option name="Bullet" value="1"/>
+                        <Option name="Blast" value="2"/>
+                        <Option name="Fire" value="3"/>
                     </Select>
                 </LabeledObject>
             </List>
-        </Box>
-        <Box padding="12 6 6 6" name="Blast" width="content" height="content" y="100">
-            <List width="150">
-                <AutoVariable width="fill" target="autoheal.vacc.blast.enable" label="Enable"/>
-                <AutoVariable width="fill" target="autoheal.vacc.blast.crit-pop" label="Pop on near crit"/>
-                <AutoVariable width="fill" target="autoheal.vacc.blast.danger-range" label="Danger range" min="0" max="1000"/>
-                <AutoVariable width="fill" target="autoheal.vacc.blast.pop-near-rocket-health" label="Rocket health pop" tooltip="Pop ubercharge if rocket is near and health is less than" min="0" max="450"/>
-                <AutoVariable width="fill" target="autoheal.vacc.bullet.min-charges" label="Min. charges" min="0" max="4"/>
-            </List>
-        </Box>
-        <Box padding="12 6 6 6" name="Fire" width="content" height="content" y="100" x="170">
-            <List width="150">
-                <AutoVariable width="fill" target="autoheal.vacc.fire.enable" label="Enable"/>
-                <AutoVariable width="fill" target="autoheal.vacc.fire.prevent-afterburn" label="Prevent afterburn"/>
-                <AutoVariable width="fill" target="autoheal.vacc.fire.pyro-range" label="Danger range"/>
-                <AutoVariable width="fill" target="autoheal.vacc.fire.min-charges" label="Min. charges" min="0" max="4"/>
-                <LabeledObject width="fill" label="Pyro pop">
-                    <Select target="autoheal.vacc.fire.pyro-pop">
-                        <Option name="Never" value="0"/>
-                        <Option name="Near, flames" value="1"/>
-                        <Option name="Near, any wep" value="2"/>
-                    </Select>
-                </LabeledObject>
-            </List>
-        </Box>
+            <Box padding="12 6 6 6" name="Bullet" width="content" height="content" x="170">
+                <List width="150">
+                    <AutoVariable width="fill" target="autoheal.vacc.bullet.enable" label="Enable"/>
+                    <AutoVariable width="fill" target="autoheal.vacc.bullet.min-charges" label="Min. charges" min="0" max="4"/>
+                    <LabeledObject width="fill" label="Sniper pop">
+                        <Select target="autoheal.vacc.bullet.sniper-pop">
+                            <Option name="Never" value="0"/>
+                            <Option name="Visible, zoom" value="1"/>
+                            <Option name="Any zoomed" value="2"/>
+                        </Select>
+                    </LabeledObject>
+                </List>
+            </Box>
+            <Box padding="12 6 6 6" name="Blast" width="content" height="content" y="100">
+                <List width="150">
+                    <AutoVariable width="fill" target="autoheal.vacc.blast.enable" label="Enable"/>
+                    <AutoVariable width="fill" target="autoheal.vacc.blast.crit-pop" label="Pop on near crit"/>
+                    <AutoVariable width="fill" target="autoheal.vacc.blast.danger-range" label="Danger range" min="0" max="1000"/>
+                    <AutoVariable width="fill" target="autoheal.vacc.blast.pop-near-rocket-health" label="Rocket health pop" tooltip="Pop ubercharge if rocket is near and health is less than" min="0" max="450"/>
+                    <AutoVariable width="fill" target="autoheal.vacc.bullet.min-charges" label="Min. charges" min="0" max="4"/>
+                </List>
+            </Box>
+            <Box padding="12 6 6 6" name="Fire" width="content" height="content" y="100" x="170">
+                <List width="150">
+                    <AutoVariable width="fill" target="autoheal.vacc.fire.enable" label="Enable"/>
+                    <AutoVariable width="fill" target="autoheal.vacc.fire.prevent-afterburn" label="Prevent afterburn"/>
+                    <AutoVariable width="fill" target="autoheal.vacc.fire.pyro-range" label="Danger range"/>
+                    <AutoVariable width="fill" target="autoheal.vacc.fire.min-charges" label="Min. charges" min="0" max="4"/>
+                    <LabeledObject width="fill" label="Pyro pop">
+                        <Select target="autoheal.vacc.fire.pyro-pop">
+                            <Option name="Never" value="0"/>
+                            <Option name="Near, flames" value="1"/>
+                            <Option name="Near, any wep" value="2"/>
+                        </Select>
+                    </LabeledObject>
+                </List>
+            </Box>
+    	</Box>
     </Box>
-</Tab>
\ No newline at end of file
+</Tab>
diff --git a/data/menu/nullifiedcat/triggerbot.xml b/data/menu/nullifiedcat/triggerbot.xml
index 7d36543f..666c8361 100644
--- a/data/menu/nullifiedcat/triggerbot.xml
+++ b/data/menu/nullifiedcat/triggerbot.xml
@@ -1,17 +1,35 @@
-<Tab name="Trigger Bot">
-    <List width="150">
-        <AutoVariable width="fill" target="trigger.enable" label="Enable"/>
-        <AutoVariable width="fill" target="trigger.wait-for-charge" label="Wait for charge"/>
-        <AutoVariable width="fill" target="trigger.zoomed-only" label="Zoomed only"/>
-        <AutoVariable width="fill" target="trigger.accuracy" label="Accuracy mode" min="0" max="10"/>
-        <AutoVariable width="fill" target="trigger.delay" label="Delay" min="0" max="1"/>
+<Tab name="Trigger Bot" padding="6 6 6 6">
+    <Box padding="6 6 6 6" width="content" height="content">
+        <List width="150">
+        	<AutoVariable width="fill" target="trigger.enable" label="Enable"/>
+            	<AutoVariable width="fill" target="trigger.key.button" label="Aimkey"/>
+            	<LabeledObject width="fill" label="Triggerkey mode">
+                    <Select target="trigger.key.mode">
+                    	<Option name="Disable" value="0"/>
+                    	<Option name="Pressed" value="1"/>
+                    	<Option name="Not pressed" value="2"/>
+                    	<Option name="Toggle" value="3"/>
+                    </Select>
+            	</LabeledObject>
+          	<LabeledObject width="fill" label="Hitbox mode">
+                    <Select target="trigger.hitbox-mode">
+                    	<Option name="Auto Head" value="0"/>
+                    	<Option name="Auto Closest" value="1"/>
+                    	<Option name="Head Only" value="2"/>
+                    </Select>
+            	</LabeledObject>
+        	<AutoVariable width="fill" target="trigger.wait-for-charge" label="Wait for charge"/>
+        	<AutoVariable width="fill" target="trigger.zoomed-only" label="Zoomed only"/>
+        	<AutoVariable width="fill" target="trigger.accuracy" label="Accuracy mode" min="0" max="10"/>
+        	<AutoVariable width="fill" target="trigger.delay" label="Delay" min="0" max="1"/>
 
-        <AutoVariable width="fill" target="trigger.target.ignore-cloaked-spies" label="NOT Cloaked Spies"/>
-        <AutoVariable width="fill" target="trigger.target.ignore-vaccinator" label="NOT Vaccinator"/>
-        <AutoVariable width="fill" target="trigger.target.buildings-other" label="Other Buildings"/>
-        <AutoVariable width="fill" target="trigger.target.buildings-sentry" label="Sentry Guns"/>
-        <AutoVariable width="fill" target="trigger.target.stickybombs" label="Stickybombs"/>
-        <AutoVariable width="fill" target="trigger.target.teammates" label="Teammates"/>
-        <AutoVariable width="fill" target="trigger.target.max-range" label="Max Range" min="0" max="4096"/>
-    </List>
-</Tab>
\ No newline at end of file
+        	<AutoVariable width="fill" target="trigger.target.ignore-cloaked-spies" label="NOT Cloaked Spies"/>
+        	<AutoVariable width="fill" target="trigger.target.ignore-vaccinator" label="NOT Vaccinator"/>
+        	<AutoVariable width="fill" target="trigger.target.buildings-other" label="Other Buildings"/>
+        	<AutoVariable width="fill" target="trigger.target.buildings-sentry" label="Sentry Guns"/>
+        	<AutoVariable width="fill" target="trigger.target.stickybombs" label="Stickybombs"/>
+        	<AutoVariable width="fill" target="trigger.target.teammates" label="Teammates"/>
+        	<AutoVariable width="fill" target="trigger.target.max-range" label="Max Range" min="0" max="4096"/>
+    	</List>
+    </Box>
+</Tab>