From 681785cec65e8d5dc1242f0233b37445f8f13638 Mon Sep 17 00:00:00 2001
From: GAMER <69512711+G-4-M-3-R@users.noreply.github.com>
Date: Mon, 28 Dec 2020 12:36:49 +0100
Subject: [PATCH] Clean up menu

---
 data/menu/nullified-ui.xml                    |  13 +--
 data/menu/nullifiedcat/chat.xml               |  16 +--
 data/menu/nullifiedcat/hackinfo.xml           |  25 ++++-
 data/menu/nullifiedcat/misc.xml               |   1 -
 data/menu/nullifiedcat/misc/autoparty.xml     |  20 ++--
 data/menu/nullifiedcat/misc/buildings.xml     |  26 -----
 data/menu/nullifiedcat/misc/catbot.xml        |  24 +++++
 data/menu/nullifiedcat/misc/collective.xml    |  46 --------
 data/menu/nullifiedcat/movement.xml           |   9 +-
 data/menu/nullifiedcat/trigger/autopyro.xml   |  38 -------
 data/menu/nullifiedcat/trigger/autospy.xml    |  21 ----
 data/menu/nullifiedcat/trigger/autosticky.xml |  11 --
 data/menu/nullifiedcat/triggerbot.xml         |  46 --------
 data/menu/nullifiedcat/visuals.xml            |   2 -
 .../nullifiedcat/visuals/bullettracers.xml    |  19 ----
 data/menu/nullifiedcat/visuals/esp.xml        |  14 ++-
 data/menu/nullifiedcat/visuals/playerinfo.xml |  15 ---
 data/menu/nullifiedcat/visuals/radar.xml      |   2 +-
 data/menu/nullifiedcat/visuals/tracers.xml    |  27 ++++-
 data/menu/nullifiedcat/visuals/world.xml      |  40 ++++++-
 data/menu/nullifiedcat/warp.xml               |   0
 data/menu/nullifiedcat/weapons.xml            |   8 ++
 .../nullifiedcat/{ => weapons}/aimbot.xml     |   0
 .../{trigger => weapons}/autoheal.xml         |   0
 .../nullifiedcat/{ => weapons}/nospread.xml   |   0
 data/menu/nullifiedcat/weapons/triggerbot.xml | 102 ++++++++++++++++++
 26 files changed, 256 insertions(+), 269 deletions(-)
 delete mode 100755 data/menu/nullifiedcat/misc/buildings.xml
 delete mode 100755 data/menu/nullifiedcat/trigger/autopyro.xml
 delete mode 100755 data/menu/nullifiedcat/trigger/autospy.xml
 delete mode 100755 data/menu/nullifiedcat/trigger/autosticky.xml
 delete mode 100755 data/menu/nullifiedcat/triggerbot.xml
 delete mode 100755 data/menu/nullifiedcat/visuals/bullettracers.xml
 delete mode 100755 data/menu/nullifiedcat/visuals/playerinfo.xml
 mode change 100644 => 100755 data/menu/nullifiedcat/warp.xml
 create mode 100755 data/menu/nullifiedcat/weapons.xml
 rename data/menu/nullifiedcat/{ => weapons}/aimbot.xml (100%)
 rename data/menu/nullifiedcat/{trigger => weapons}/autoheal.xml (100%)
 rename data/menu/nullifiedcat/{ => weapons}/nospread.xml (100%)
 mode change 100644 => 100755
 create mode 100755 data/menu/nullifiedcat/weapons/triggerbot.xml

diff --git a/data/menu/nullified-ui.xml b/data/menu/nullified-ui.xml
index 80b11c00..f7f85da0 100755
--- a/data/menu/nullified-ui.xml
+++ b/data/menu/nullified-ui.xml
@@ -1,18 +1,15 @@
 <ElementGroup>
     <Window x="100" y="300" name="Main Window" width="content" height="content">
-        <TabContainer width="600" height="400">
-            <Include path="nullifiedcat/aimbot.xml"/>
-            <Include path="nullifiedcat/nospread.xml"/>
-            <Include path="nullifiedcat/triggerbot.xml"/>
-            <Include path="nullifiedcat/antiaim.xml"/>
-            <Include path="nullifiedcat/chat.xml"/>
+        <TabContainer width="600" height="450">
+            <Include path="nullifiedcat/weapons.xml"/>
             <Include path="nullifiedcat/crits.xml"/>
             <Include path="nullifiedcat/visuals.xml"/>
-            <Include path="nullifiedcat/movement.xml"/>
+            <Include path="nullifiedcat/antiaim.xml"/>
             <Include path="nullifiedcat/warp.xml"/>
+            <Include path="nullifiedcat/movement.xml"/>
             <Include path="nullifiedcat/misc.xml"/>
+            <Include path="nullifiedcat/chat.xml"/>
             <Include path="nullifiedcat/hackinfo.xml"/>
-            <Include path="nullifiedcat/debug.xml"/>
         </TabContainer>
     </Window>
 </ElementGroup>
diff --git a/data/menu/nullifiedcat/chat.xml b/data/menu/nullifiedcat/chat.xml
index 7a0ee271..268d9e2f 100755
--- a/data/menu/nullifiedcat/chat.xml
+++ b/data/menu/nullifiedcat/chat.xml
@@ -75,7 +75,7 @@
         </List>
     </Box>
     <Box name="Uber chat" width="content" height="content" padding="12 6 6 6" x="352">
-        <List width="150">
+        <List width="177">
             <LabeledObject width="fill" label="Source" tooltip="Automatically sends uber % to chat.">
                 <Select target="uberspam.source">
                     <Option name="Disable" value="0"/>
@@ -94,7 +94,7 @@
         </List>
     </Box>
     <Box name="Misc" width="content" height="content" padding="12 6 6 6" x="352" y="130">
-        <List width="150">
+        <List width="177">
             <AutoVariable width="fill" target="chat.clean" label="Remove newlines" tooltip="Hides newline spam."/>
             <AutoVariable width="fill" target="chat.anti-spam" label="Anti-spam" tooltip="Hides chat spam."/>
             <AutoVariable width="fill" target="chat.crypto" label="Crypto chat"/>
@@ -113,7 +113,7 @@
         </List>
     </Box>
     <Box name="Votelogger" width="content" height="content" padding="12 6 6 6" x="170" y="140">
-        <List width="155">
+        <List width="165">
             <AutoVariable width="fill" target="votelogger.autovote.yes" label="Autovote yes"/>
             <AutoVariable width="fill" target="votelogger.autovote.no" label="Autovote no"/>
             <AutoVariable width="fill" target="votelogger.autovote.no.rage" label="Kick RAGE status"/>
@@ -124,14 +124,4 @@
             <AutoVariable width="fill" target="votelogger.restart-on-kick" label="Crash when kicked"/>
         </List>
     </Box>
-    <Box name="Command & Control" width="content" height="content" padding="12 6 6 6" y="235">
-        <List width="150">
-            <AutoVariable width="fill" target="irc.cc.channel" label="Channel"/>
-            <AutoVariable width="fill" target="irc.cc.password" label="Password"/>
-            <AutoVariable width="fill" target="irc.cc.party" label="Autoparty"/>
-            <AutoVariable width="fill" target="irc.cc.respondparty" label="Respond autoparty"/>
-            <AutoVariable width="fill" target="irc.cc.party-cooldown" label="Party cooldown"/>
-            <AutoVariable width="fill" target="irc.cc.party-size" label="Party maxsize"/>
-        </List>
-    </Box>
 </Tab>
diff --git a/data/menu/nullifiedcat/hackinfo.xml b/data/menu/nullifiedcat/hackinfo.xml
index e1b5248f..a752665d 100755
--- a/data/menu/nullifiedcat/hackinfo.xml
+++ b/data/menu/nullifiedcat/hackinfo.xml
@@ -1,8 +1,27 @@
-<Tab name="Cathook" padding="4 4 4 4">
-    <Box height="content" width="content" padding="12 6 6 6" name="Cathook">
+<Tab name="Info" padding="4 4 4 4">
+    <Box padding="12 6 6 6" width="content" height="content" name="Debug">
+        <List width="200">
+            <AutoVariable width="fill" target="misc.debug-info" label="Debug"/>
+            <AutoVariable width="fill" target="hack.log-console" label="Log debug info"/>
+            <AutoVariable width="fill" target="debug.engine-pred-others" label="Engine pred others"/>
+            <AutoVariable width="fill" target="debug.fast-vischeck" label="Fast vischeck"/>
+            <AutoVariable width="fill" target="debug.join-wait-time" label="Joinspam wait time"/>
+            <AutoVariable width="fill" target="debug.log-dispatch-user-msg" label="Log dispatched user messages"/>
+            <AutoVariable width="fill" target="debug.log-sent-chat" label="Log sent chat"/>
+            <AutoVariable width="fill" target="debug.pp-extrapolate" label="PP extrapolate"/>
+            <AutoVariable width="fill" target="debug.pp-rocket-time-ping" label="PP rocket time ping"/>
+            <AutoVariable width="fill" target="debug.projectiles" label="Debug projectiles"/>
+            <AutoVariable width="fill" target="debug.tcm" label="Debug TCM"/>
+            <AutoVariable width="fill" target="debug.ve.averaging" label="VE averaging"/>
+            <AutoVariable width="fill" target="debug.ve.smooth" label="VE smooth"/>
+            <AutoVariable width="fill" target="debug.ve.window" label="VE window"/>
+            <AutoVariable width="fill" target="aimbot.debug" label="Debug aimbot"/>
+            <AutoVariable width="fill" target="aimbot.debug.engine-pp" label="Debug engine PP"/>
+        </List>
+    </Box>
+    <Box height="content" width="content" padding="12 6 6 6" name="Cathook" x="215">
         <List width="150">
             <AutoVariable width="fill" target="hack.enable" label="Enable cathook"/>
-            <AutoVariable width="fill" target="hack.log-console" label="Log debug info"/>
             <AutoVariable width="fill" target="hack-info.enable" label="Enable Cathook label" tooltip="Controls text at top left of screen."/>
             <AutoVariable width="fill" target="hack-info.minimal" label="Minimal Cathook label"/>
         </List>
diff --git a/data/menu/nullifiedcat/misc.xml b/data/menu/nullifiedcat/misc.xml
index 8ade13db..6ad6c7f7 100755
--- a/data/menu/nullifiedcat/misc.xml
+++ b/data/menu/nullifiedcat/misc.xml
@@ -2,7 +2,6 @@
     <TabContainer width="fill" height="fill">
         <Include path="nullifiedcat/misc/anticheat.xml"/>
         <Include path="nullifiedcat/misc/autoitem.xml"/>
-        <Include path="nullifiedcat/misc/buildings.xml"/>
         <Include path="nullifiedcat/misc/spyalert.xml"/>
         <Include path="nullifiedcat/misc/collective.xml"/>
         <Include path="nullifiedcat/misc/catbot.xml"/>
diff --git a/data/menu/nullifiedcat/misc/autoparty.xml b/data/menu/nullifiedcat/misc/autoparty.xml
index d2b83a43..2a4198e0 100755
--- a/data/menu/nullifiedcat/misc/autoparty.xml
+++ b/data/menu/nullifiedcat/misc/autoparty.xml
@@ -1,17 +1,17 @@
 <Tab name="Auto Party" padding="4 4 4 4">
     <Box name="Auto Party" width="content" height="content" padding="12 6 6 6">
-        <List width="400">
+        <List width="250">
             <AutoVariable width="fill" target="autoparty.enable" label="Enable auto party"/>
-            <AutoVariable width="fill" target="autoparty.run-frequency" label="Run every N seconds"/>
+            <AutoVariable width="fill" target="autoparty.run-frequency" label="Run frequency" tooltip="Run every N seconds"/>
             <AutoVariable width="fill" target="autoparty.max-party-size" label="Max party members allowed"/>
-            <AutoVariable width="fill" target="autoparty.kick-rage" label="Automatically kick raged players from the party"/>
-            <AutoVariable width="fill" target="autoparty.auto-leave" label="Leave the party when a member goes offline"/>
-            <AutoVariable width="fill" target="autoparty.auto-lock" label="Lock the party when max party size is reached"/>
-            <AutoVariable width="fill" target="autoparty.auto-unlock" label="Unlock the party when max party size has not been reached"/>
-            <AutoVariable width="fill" target="autoparty.party-hosts" label="Comma-separated list of Steam32 IDs to use as party hosts"/>
-            <AutoVariable width="fill" target="autoparty.log" label="Log party leaves and member kicks"/>
-            <AutoVariable width="fill" target="autoparty.message-kicks" label="Log kick notifications to party chat"/>
-            <AutoVariable width="fill" target="autoparty.debug" label="Log party locks and unlocks"/>
+            <AutoVariable width="fill" target="autoparty.kick-rage" label="Autokick rage" tooltip="Automatically kick raged players from the party"/>
+            <AutoVariable width="fill" target="autoparty.auto-leave" label="Leave if offline" tooltip="Leave the party when a member goes offline"/>
+            <AutoVariable width="fill" target="autoparty.auto-lock" label="Autolock party" tooltip="Lock the party when max party size is reached"/>
+            <AutoVariable width="fill" target="autoparty.auto-unlock" label="Auto unlock party" tooltip="Unlock the party when max party size has not been reached"/>
+            <AutoVariable width="fill" target="autoparty.party-hosts" label="Party hosts" tooltip="Comma-separated list of Steam32 IDs to use as party hosts"/>
+            <AutoVariable width="fill" target="autoparty.log" label="Log party leaves and kicks"/>
+            <AutoVariable width="fill" target="autoparty.message-kicks" label="Log to chat" tooltip="Log kick notifications to party chat"/>
+            <AutoVariable width="fill" target="autoparty.debug" label="Log locks/unlocks"/>
         </List>
     </Box>
 </Tab>
diff --git a/data/menu/nullifiedcat/misc/buildings.xml b/data/menu/nullifiedcat/misc/buildings.xml
deleted file mode 100755
index 1d41beb9..00000000
--- a/data/menu/nullifiedcat/misc/buildings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Tab name="Engineer-Bot" padding="4 4 4 4">
-    <Box padding="12 6 6 6" width="content" height="content" name="Engineer-Bot">
-        <List width="200">
-            <AutoVariable width="fill" target="autorepair.enabled" label="Enable auto repair"/> 
-            <AutoVariable width="fill" target="autorepair.silent" label="Silent"/> 
-            <AutoVariable width="fill" target="autorepair.sentry" label="Repair sentry"/> 
-            <AutoVariable width="fill" target="autorepair.dispenser" label="Repair dispenser"/> 
-            <AutoVariable width="fill" target="autorepair.teleport" label="Repair teleporter"/> 
-            <LabeledObject width="fill" label="Priority"> 
-                <Select target="autorepair.priority"> 
-                    <Option name="None" value="0"/> 
-                    <Option name="Sentry" value="1"/> 
-                    <Option name="Dispenser" value="2"/> 
-                    <Option name="Teleport" value="3"/> 
-                </Select> 
-            </LabeledObject> 
-            <AutoVariable width="fill" target="autoupgrade.enabled" label="Enable auto upgrade"/> 
-            <AutoVariable width="fill" target="autoupgrade.sentry" label="Upgrade sentry"/> 
-            <AutoVariable width="fill" target="autoupgrade.sentry.level" label="Upgrade sentry level" min="1" max="3"/> 
-            <AutoVariable width="fill" target="autoupgrade.dispenser" label="Upgrade dispenser"/> 
-            <AutoVariable width="fill" target="autoupgrade.dispenser.level" label="Upgrade dispenser level" min="1" max="3"/> 
-            <AutoVariable width="fill" target="autoupgrade.teleport" label="Upgrade teleporter"/> 
-            <AutoVariable width="fill" target="autoupgrade.teleport.level" label="Upgrade teleporter level" min="1" max="3"/> 
-        </List>
-    </Box>
-</Tab> 
diff --git a/data/menu/nullifiedcat/misc/catbot.xml b/data/menu/nullifiedcat/misc/catbot.xml
index 8c252a2b..4ed6148d 100755
--- a/data/menu/nullifiedcat/misc/catbot.xml
+++ b/data/menu/nullifiedcat/misc/catbot.xml
@@ -36,6 +36,30 @@
             <AutoVariable width="fill" target="autojoin.team" label="Autojoin team" tooltip="Automatically join a team."/>
         </List>
     </Box>
+    <Box padding="12 6 6 6" width="content" height="content" name="Engineer-Bot" y="165">
+        <List width="200">
+            <AutoVariable width="fill" target="autorepair.enabled" label="Enable auto repair"/> 
+            <AutoVariable width="fill" target="autorepair.silent" label="Silent"/> 
+            <AutoVariable width="fill" target="autorepair.sentry" label="Repair sentry"/> 
+            <AutoVariable width="fill" target="autorepair.dispenser" label="Repair dispenser"/> 
+            <AutoVariable width="fill" target="autorepair.teleport" label="Repair teleporter"/> 
+            <LabeledObject width="fill" label="Priority"> 
+                <Select target="autorepair.priority"> 
+                    <Option name="None" value="0"/> 
+                    <Option name="Sentry" value="1"/> 
+                    <Option name="Dispenser" value="2"/> 
+                    <Option name="Teleport" value="3"/> 
+                </Select> 
+            </LabeledObject> 
+            <AutoVariable width="fill" target="autoupgrade.enabled" label="Enable auto upgrade"/> 
+            <AutoVariable width="fill" target="autoupgrade.sentry" label="Upgrade sentry"/> 
+            <AutoVariable width="fill" target="autoupgrade.sentry.level" label="Upgrade sentry level" min="1" max="3"/> 
+            <AutoVariable width="fill" target="autoupgrade.dispenser" label="Upgrade dispenser"/> 
+            <AutoVariable width="fill" target="autoupgrade.dispenser.level" label="Upgrade dispenser level" min="1" max="3"/> 
+            <AutoVariable width="fill" target="autoupgrade.teleport" label="Upgrade teleporter"/> 
+            <AutoVariable width="fill" target="autoupgrade.teleport.level" label="Upgrade teleporter level" min="1" max="3"/> 
+        </List>
+    </Box>
     <Box name="Utilities" width="content" height="content" padding="12 6 6 6" x="215">
         <List width="200">
             <AutoVariable width="fill" target="cat-bot.enable" label="Enable utilities"/>
diff --git a/data/menu/nullifiedcat/misc/collective.xml b/data/menu/nullifiedcat/misc/collective.xml
index 68c0ecfc..5de8f3c7 100755
--- a/data/menu/nullifiedcat/misc/collective.xml
+++ b/data/menu/nullifiedcat/misc/collective.xml
@@ -4,58 +4,17 @@
             <AutoVariable width="fill" target="misc.anti-afk" label="Enable antiafk"/>
             <AutoVariable width="fill" target="misc.auto-abandon" label="Enable auto abandon"/>
             <AutoVariable width="fill" target="misc.auto-balance-spam" label="Enable auto balance spam"/>
-            <AutoVariable width="fill" target="misc.debug-info" label="Debug"/>
             <AutoVariable width="fill" target="misc.die-if-vac" label="Crash on VAC"/>
             <AutoVariable width="fill" target="misc.disconnect-reason" label="Disconnect reason"/>
             <AutoVariable width="fill" target="misc.engine-prediction" label="Engine prediction"/>
             <AutoVariable width="fill" target="misc.flashlight-spam" label="Flashlight spam" tooltip="Used in Half Life Death Match."/>
             <AutoVariable width="fill" target="misc.force-halloween" label="Force halloween"/>
             <AutoVariable width="fill" target="misc.god-mode" label="xd"/>
-            <AutoVariable width="fill" target="misc.minigun-jump-tf2c" label="TF2C minigun jump"/>
             <AutoVariable width="fill" target="misc.no-homo" label="#nohomo"/>
             <AutoVariable width="fill" target="misc.no-lerp" label="Nolerp"/>
-            <AutoVariable width="fill" target="misc.no-push" label="Nopush"/>
-            <AutoVariable width="fill" target="misc.roll-speedhack" label="Moonwalk"/>
             <AutoVariable width="fill" target="misc.full-auto" label="Fully automated firing"/>
             <AutoVariable width="fill" target="misc.show-spectators" label="Show spectators"/>
-            <LabeledObject width="fill" label="Skybox override">
-                <Select target="misc.skybox-override">
-                    <Option name="none" value="0"/>
-                    <Option name="sky_tf2_04" value="1"/>
-                    <Option name="sky_upward" value="2"/>
-                    <Option name="sky_dustbowl_01" value="3"/>
-                    <Option name="sky_goldrush_01" value="4"/>
-                    <Option name="sky_granary_01" value="5"/>
-                    <Option name="sky_well_01" value="6"/>
-                    <Option name="sky_gravel_01" value="7"/>
-                    <Option name="sky_badlands_01" value="8"/>
-                    <Option name="sky_hydro_01" value="9"/>
-                    <Option name="sky_night_01" value="10"/>
-                    <Option name="sky_nightfall_01" value="11"/>
-                    <Option name="sky_trainyard_01" value="12"/>
-                    <Option name="sky_stormfront_01" value="13"/>
-                    <Option name="sky_morningsnow_01" value="14"/>
-                    <Option name="sky_alpinestorm_01" value="15"/>
-                    <Option name="sky_harvest_01" value="16"/>
-                    <Option name="sky_harvest_night_01" value="17"/>
-                    <Option name="sky_halloween" value="18"/>
-                    <Option name="sky_halloween_night_01" value="19"/>
-                    <Option name="sky_halloween_night2014_01" value="20"/>
-                    <Option name="sky_island_01" value="21"/>
-                    <Option name="sky_jungle_01" value="22"/>
-                    <Option name="sky_invasion2fort_01" value="23"/>
-                    <Option name="sky_well_02" value="24"/>
-                    <Option name="sky_outpost_01" value="25"/>
-                    <Option name="sky_coastal_01" value="26"/>
-                    <Option name="sky_rainbow_01" value="27"/>
-                    <Option name="sky_badlands_pyroland_01" value="28"/>
-                    <Option name="sky_pyroland_01" value="29"/>
-                    <Option name="sky_pyroland_02" value="30"/>
-                    <Option name="sky_pyroland_03" value="31"/>
-                </Select>
-            </LabeledObject>
             <AutoVariable width="fill" target="misc.tauntslide" label="Tauntslide"/>
-            <AutoVariable width="fill" target="misc.tauntslide-tf2c" label="TF2C tauntslide"/>
             <AutoVariable width="fill" target="announcer" label="Enable announcer"/>
         </List>
     </Box>
@@ -76,13 +35,8 @@
     <Box height="content" width="content" padding="12 6 6 6" name="Extra" x="215" y="65">
         <List width="200">
             <AutoVariable width="fill" target="noisemaker-spam.enable" label="Noisemaker spam"/>
-            <AutoVariable width="fill" target="online.enable" label="Enable Cathook online"/>
             <AutoVariable width="fill" target="player-tools.betrayal-limit" label="Betrayal limit"/>
-            <AutoVariable width="fill" target="player-tools.ignore.online.notarget" label="Don't target users"/>
             <AutoVariable width="fill" target="player-tools.ignore.hoovy" label="Ignore hoovies"/>
-            <AutoVariable width="fill" target="player-tools.ignore.online.anonymous" label="Ignore anonymous"/>
-            <AutoVariable width="fill" target="player-tools.ignore.online.friendly-software" label="Ignore friendly software"/>
-            <AutoVariable width="fill" target="player-tools.ignore.online.only-verified-accounts" label="Only ignore verified accounts"/>
             <AutoVariable width="fill" target="player-tools.ignore.taunting" label="Ignore taunting players"/>
             <AutoVariable width="fill" target="player-tools.auto-party" label="Automatically add party state"/>
             <AutoVariable width="fill" target="killstreak.enable" label="Enable killstreak"/>
diff --git a/data/menu/nullifiedcat/movement.xml b/data/menu/nullifiedcat/movement.xml
index b179a0b9..aa6b8fb0 100755
--- a/data/menu/nullifiedcat/movement.xml
+++ b/data/menu/nullifiedcat/movement.xml
@@ -24,7 +24,7 @@
             <AutoVariable width="fill" target="follow-bot.corners" label="Corner activate"/>
             <AutoVariable width="fill" target="follow-bot.steamid" label="SteamID to follow" tooltip="Steamid of player to follow. Highest priority."/>
             <AutoVariable width="fill" target="follow-bot.prioritize-leader" label="Prioritize the party leader" Tooltip="Second highest priority."/>
-            <AutoVariable width="fill" target="follow-bot.prioritize-friends" label="Prioritize friends" tooltip="Thrid highest priority."/>
+            <AutoVariable width="fill" target="follow-bot.prioritize-friends" label="Prioritize friends" tooltip="Third highest priority."/>
             <AutoVariable width="fill" target="follow-bot.draw-crumbs" label="Draw crumbs" tooltip="Draw follow path"/>
         </List>
     </Box>
@@ -56,4 +56,11 @@
             <AutoVariable width="fill" target="antibackstab.nope" label="Nope!" tooltip="Have the charachter say 'no'."/>
         </List>
     </Box>
+    <Box padding="12 6 6 6" width="content" height="content" name="Misc" x="370">
+        <List width="150">
+            <AutoVariable width="fill" target="misc.no-push" label="Nopush"/>
+            <AutoVariable width="fill" target="misc.roll-speedhack" label="Moonwalk"/>
+            <AutoVariable width="fill" target="misc.roll-speedhack.forward" label="Moonwalk Fowards"/>
+        </List>
+    </Box>
 </Tab>
diff --git a/data/menu/nullifiedcat/trigger/autopyro.xml b/data/menu/nullifiedcat/trigger/autopyro.xml
deleted file mode 100755
index e1bd91ce..00000000
--- a/data/menu/nullifiedcat/trigger/autopyro.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<Tab name="Auto Pyro" padding="4 4 4 4">
-    <Box padding="12 6 6 6" width="content" height="content" name="Auto reflect">
-        <List width="202">
-            <AutoVariable width="fill" target="autoreflect.enable" label="Enable auto reflect"/>
-            <AutoVariable width="fill" target="autoreflect.button" label="Reflect button"/>
-            <AutoVariable width="fill" target="autoreflect.idle-only" label="Only reflect when able" tooltip="Don't try to reflect when using primary fire."/>
-            <AutoVariable width="fill" target="autoreflect.teammate" label="Teammate projectiles" tooltip="Attempt to reflect teammate projectiles."/>
-            <AutoVariable width="fill" target="autoreflect.dodgeball" label="Dodgeball mode" tooltip="Disable vischeck"/>
-            <AutoVariable width="fill" target="autoreflect.legit" label="Legit mode" tooltip="Don't move the mouse to reflect. Spectator safe."/>
-        </List>
-        <Box padding="12 6 6 6" name="Targets" width="content" height="content" y="100">
-            <Box padding="12 6 6 6" name="Big" width="content" height="content">
-                <List width="95">
-                    <AutoVariable width="fill" target="autoreflect.rockets" label="Rockets"/>
-                    <AutoVariable width="fill" target="autoreflect.pipes" label="Pipes"/>
-                    <AutoVariable width="fill" target="autoreflect.stickies" label="Stickies"/>
-                    <AutoVariable width="fill" target="autoreflect.sentryrockets" label="Sentry rockets"/>
-                </List>
-            </Box>
-            <Box padding="12 6 6 6" name="Small" width="content" height="content" x="105">
-                <List width="85">
-                    <AutoVariable width="fill" target="autoreflect.flares" label="Flares"/>
-                    <AutoVariable width="fill" target="autoreflect.arrows" label="Arrows"/>
-                    <AutoVariable width="fill" target="autoreflect.jars" label="Jars"/>
-                    <AutoVariable width="fill" target="autoreflect.healingbolts" label="Healing bolts"/>
-                    <AutoVariable width="fill" target="autoreflect.cleavers" label="Cleavers"/>
-                </List>
-            </Box>
-            <AutoVariable width="196" y="95" target="autoreflect.default" label="Default" tooltip="If a projectile is not known, should autoreflect still try to reflect it?"/>
-        </Box>
-    </Box>
-    <Box padding="12 6 6 6" width="content" height="content" name="Auto Detonator" x="235">
-        <List width="150">
-            <AutoVariable width="fill" target="auto-detonator.enable" label="Enable auto detonator" tooltip="Auto explode flares"/>
-            <AutoVariable width="fill" target="auto-detonator.ignore-cloaked" label="Ignore cloaked"/>
-        </List>
-    </Box>
-</Tab>
diff --git a/data/menu/nullifiedcat/trigger/autospy.xml b/data/menu/nullifiedcat/trigger/autospy.xml
deleted file mode 100755
index 65ea2897..00000000
--- a/data/menu/nullifiedcat/trigger/autospy.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<Tab name="Auto Spy" padding="4 4 4 4">
-    <Box padding="12 6 6 6" width="content" height="content" name="Auto backstab">
-        <List width="170">
-            <AutoVariable width="fill" target="autobackstab.enabled" label="Enable auto backstab"/>
-            <LabeledObject width="fill" label="Auto backstab mode">
-                <Select target="autobackstab.mode">
-                    <Option name="Legit" value="0"/>
-                    <Option name="Rage" value="1"/>
-                    <Option name="Backtrack" value="2"/>
-                    <Option name="Legit backtrack" value="3"/>
-                </Select>
-            </LabeledObject>
-        </List>
-    </Box>
-    <Box padding="12 6 6 6" width="content" height="content" name="Auto Dead Ringer" x="185">
-        <List width="150">
-            <AutoVariable width="fill" target="auto-deadringer.enable" label="Enable auto Dead Ringer"/>
-            <AutoVariable width="fill" target="auto-deadringer.health" label="Trigger at health"/>
-        </List>
-    </Box>
-</Tab>
diff --git a/data/menu/nullifiedcat/trigger/autosticky.xml b/data/menu/nullifiedcat/trigger/autosticky.xml
deleted file mode 100755
index 4e0f0fea..00000000
--- a/data/menu/nullifiedcat/trigger/autosticky.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Tab name="Auto Sticky" padding="4 4 4 4">
-    <Box padding="12 6 6 6" width="content" height="content" name="Auto sticky">
-        <List width="150">
-            <AutoVariable width="fill" target="autosticky.enable" label="Enable auto sticky" tooltip="Auto detonate stickies."/>
-            <AutoVariable width="fill" target="autosticky.buildings" label="Detonate on buildings"/>
-            <AutoVariable width="fill" target="autosticky.legit" label="Legit mode" tooltip="Require line of sight and ignores invisible spies."/>
-            <AutoVariable width="fill" target="autosticky.dontblowmeup" label="Don't blow me up" tooltip="Don't detonate if you would recieve damage."/>
-            <AutoVariable width="fill" target="autosticky.min-dist" label="Min distance" min="0" max="130" step="5"/>
-        </List>
-    </Box>
-</Tab>
diff --git a/data/menu/nullifiedcat/triggerbot.xml b/data/menu/nullifiedcat/triggerbot.xml
deleted file mode 100755
index 331181ae..00000000
--- a/data/menu/nullifiedcat/triggerbot.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<Tab name="Trigger">
-    <TabContainer width="fill" height="fill">
-        <Tab name="Trigger bot" padding="6 6 6 6">
-            <Box name="Trigger bot" padding="12 6 6 6" width="content" height="content">
-                <List width="150">
-                    <AutoVariable width="fill" target="trigger.enable" label="Enable trigger bot"/>
-                    <LabeledObject width="fill" label="Trigger key mode" tooltip="Optional: what should the key set below do?">
-                        <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>
-                    <AutoVariable width="fill" target="trigger.key.button" label="Aim key"/>
-                    <AutoVariable width="fill" target="trigger.wait-for-charge" label="Wait for charge" tooltip="Hold fire until a single shot is enough to kill the target."/>
-                    <AutoVariable width="fill" target="trigger.zoomed-only" label="Zoomed only" tooltip="When applicable, only fire when zoomed."/>
-                    <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"/>
-                </List>
-            </Box>
-            <Box padding="12 6 6 6" width="content" height="content" name="Target selection" x="170">
-                <List width="150">
-                    <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.target.max-range" label="Max range"/>
-                    <AutoVariable width="fill" target="trigger.target.teammates" label="Teammates" tooltip="Fire on teammates."/>
-                    <AutoVariable width="fill" target="trigger.target.stickybombs" label="Stickybombs" tooltip="Fire upon stickybombs."/>
-                    <AutoVariable width="fill" target="trigger.target.buildings-sentry" label="Sentry guns"/>
-                    <AutoVariable width="fill" target="trigger.target.buildings-other" label="Other buildings"/>
-                    <AutoVariable width="fill" target="trigger.target.ignore-cloaked-spies" label="Ignore Cloaked"/>
-                    <AutoVariable width="fill" target="trigger.target.ignore-vaccinator" label="Ignore Vaccinator"/>
-                </List>
-            </Box>
-        </Tab>
-        <Include path="nullifiedcat/trigger/autopyro.xml"/>
-        <Include path="nullifiedcat/trigger/autosticky.xml"/>
-        <Include path="nullifiedcat/trigger/autoheal.xml"/>
-        <Include path="nullifiedcat/trigger/autospy.xml"/>
-    </TabContainer>
-</Tab>
diff --git a/data/menu/nullifiedcat/visuals.xml b/data/menu/nullifiedcat/visuals.xml
index e85a0111..6ba68e3a 100755
--- a/data/menu/nullifiedcat/visuals.xml
+++ b/data/menu/nullifiedcat/visuals.xml
@@ -5,10 +5,8 @@
         <Include path="nullifiedcat/visuals/chams.xml"/>
         <Include path="nullifiedcat/visuals/tracers.xml"/>
         <Include path="nullifiedcat/visuals/radar.xml"/>
-        <Include path="nullifiedcat/visuals/playerinfo.xml"/>
         <Include path="nullifiedcat/visuals/ui.xml"/>
         <Include path="nullifiedcat/visuals/uicolors.xml"/>
-        <Include path="nullifiedcat/visuals/bullettracers.xml"/>
         <Include path="nullifiedcat/visuals/world.xml"/>
     </TabContainer>
 </Tab>
diff --git a/data/menu/nullifiedcat/visuals/bullettracers.xml b/data/menu/nullifiedcat/visuals/bullettracers.xml
deleted file mode 100755
index 24bded05..00000000
--- a/data/menu/nullifiedcat/visuals/bullettracers.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<Tab name="Bullet Tracers" padding="4 4 4 4">
-    <Box padding="12 6 6 6" width="content" height="content" name="Bullet tracers">
-        <List width="150">
-            <AutoVariable width="fill" target="visual.bullet-tracers.enable" label="Enable" tooltip="Make weapons have Machina tracers."/>
-            <AutoVariable width="fill" target="visual.bullet-tracers.sniper-only" label="Sniperrifles only" tooltip="Only snipers have bullet tracers."/>
-            <AutoVariable width="fill" target="visual.bullet-tracers.local-only" label="Don't draw other players"/>
-            <AutoVariable width="fill" target="visual.bullet-tracers.draw-local" label="Draw local beams" tooltip="Draw bullet tracers for self."/>
-            <AutoVariable width="fill" target="visual.bullet-tracers.sentry" label="Sentry tracers"/>
-            <LabeledObject width="fill" label="Team mode">
-                <Select target="visual.bullet-tracers.teammode" tooltip="Set team to have tracers.">
-                    <Option name="All" value="0"/>
-                    <Option name="Enemies" value="1"/>
-                    <Option name="Teammates" value="2"/>
-                </Select>
-            </LabeledObject>
-            <AutoVariable width="fill" target="visual.bullet-tracers.one-trace-only" label="Single beam only"/>
-        </List>
-    </Box>
-</Tab>
diff --git a/data/menu/nullifiedcat/visuals/esp.xml b/data/menu/nullifiedcat/visuals/esp.xml
index 6e5080b7..f733a3b3 100755
--- a/data/menu/nullifiedcat/visuals/esp.xml
+++ b/data/menu/nullifiedcat/visuals/esp.xml
@@ -107,6 +107,12 @@
             <AutoVariable width="fill" target="esp.hide-invis" label="Hide invisible"/>
         </List>
     </Box>
+    <Box padding="12 6 6 6" width="content" height="content" name="Player Info" x="170" y="300">
+        <List width="150">
+            <AutoVariable width="fill" target="misc.playerinfo.draw-kda" label="Draw K/D Over Head"/>
+            <AutoVariable width="fill" target="misc.playerinfo.draw-level" label="That's How Mafia Works"/>
+        </List>
+    </Box>
     <Box padding="12 6 6 6" width="content" height="content" name="Strings" x="340">
         <List width="150">
             <AutoVariable width="fill" target="esp.info.name" label="Name"/>
@@ -137,7 +143,13 @@
             <AutoVariable width="fill" target="esp.emoji.size" label="Size"/>
         </List>
     </Box>
-
+    <Box padding="12 6 6 6" width="content" height="content" name="Dominatemark" x="340" y="240">
+        <List width="150">
+            <AutoVariable width="fill" target="dominatemark.enable" label="Enable" tooltip="Enables a mark on people you are dominating, similar to one if you are being dominated by someone else."/>
+            <AutoVariable width="fill" target="dominatemark.min-size" label="Draw min size"/>
+            <AutoVariable width="fill" target="dominatemark.max-size" label="Draw max size"/>
+        </List>
+    </Box>
     <!-- <Box padding="12 6 6 6" width="content" height="content" y="260" name="Debug">
         <List width="150">
             <AutoVariable width="fill" target="esp.debug.entity" label="Entity ESP"/>
diff --git a/data/menu/nullifiedcat/visuals/playerinfo.xml b/data/menu/nullifiedcat/visuals/playerinfo.xml
deleted file mode 100755
index edcbad57..00000000
--- a/data/menu/nullifiedcat/visuals/playerinfo.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Tab name="Player Info" padding="4 4 4 4">
-    <Box padding="12 6 6 6" width="content" height="content" name="Player Info">
-        <List width="150">
-            <AutoVariable width="fill" target="misc.playerinfo.draw-kda" label="Draw K/D Over Head"/>
-            <AutoVariable width="fill" target="misc.playerinfo.draw-level" label="That's How Mafia Works"/>
-        </List>
-    </Box>
-    <Box padding="12 6 6 6" width="content" height="content" name="Dominatemark" x="170">
-        <List width="150">
-            <AutoVariable width="fill" target="dominatemark.enable" label="Enable" tooltip="Enables a mark on people you are dominating, similar to one if you are being dominated by someone else."/>
-            <AutoVariable width="fill" target="dominatemark.min-size" label="Draw min size"/>
-            <AutoVariable width="fill" target="dominatemark.max-size" label="Draw max size"/>
-        </List>
-    </Box>
-</Tab>
diff --git a/data/menu/nullifiedcat/visuals/radar.xml b/data/menu/nullifiedcat/visuals/radar.xml
index c1920205..3911039c 100755
--- a/data/menu/nullifiedcat/visuals/radar.xml
+++ b/data/menu/nullifiedcat/visuals/radar.xml
@@ -25,7 +25,7 @@
             <AutoVariable width="fill" target="radar.show.ammo" label="Ammo packs"/>
             <AutoVariable width="fill" target="radar.show.health" label="Health packs"/>
             <AutoVariable width="fill" target="radar.show.teammates" label="Teammates"/>
-            <AutoVariable width="fill" target="radar.show.team.buildings" label="Team buildings"/>
+        <AutoVariable width="fill" target="radar.show.team.buildings" label="Team buildings"/>
             <AutoVariable width="fill" target="radar.hide-invis" label="Hide invisible"/>
         </List>
     </Box>
diff --git a/data/menu/nullifiedcat/visuals/tracers.xml b/data/menu/nullifiedcat/visuals/tracers.xml
index 25029260..b4b2e41f 100755
--- a/data/menu/nullifiedcat/visuals/tracers.xml
+++ b/data/menu/nullifiedcat/visuals/tracers.xml
@@ -1,5 +1,22 @@
 <Tab name="Tracers" padding="4 4 4 4">
-    <Box padding="12 6 6 6" width="content" height="content" name="Tracers">
+    <Box padding="12 6 6 6" width="content" height="content" name="Bullet tracers">
+        <List width="150">
+            <AutoVariable width="fill" target="visual.bullet-tracers.enable" label="Enable" tooltip="Make weapons have Machina tracers."/>
+            <AutoVariable width="fill" target="visual.bullet-tracers.sniper-only" label="Sniperrifles only" tooltip="Only snipers have bullet tracers."/>
+            <AutoVariable width="fill" target="visual.bullet-tracers.local-only" label="Don't draw other players"/>
+            <AutoVariable width="fill" target="visual.bullet-tracers.draw-local" label="Draw local beams" tooltip="Draw bullet tracers for self."/>
+            <AutoVariable width="fill" target="visual.bullet-tracers.sentry" label="Sentry tracers"/>
+            <LabeledObject width="fill" label="Team mode">
+                <Select target="visual.bullet-tracers.teammode" tooltip="Set team to have tracers.">
+                    <Option name="All" value="0"/>
+                    <Option name="Enemies" value="1"/>
+                    <Option name="Teammates" value="2"/>
+                </Select>
+            </LabeledObject>
+            <AutoVariable width="fill" target="visual.bullet-tracers.one-trace-only" label="Single beam only"/>
+        </List>
+    </Box>
+    <Box padding="12 6 6 6" width="content" height="content" name="Tracers" x="165">
         <List width="150">
             <AutoVariable width="fill" target="tracers.enabled" label="Enabled"/>
             <AutoVariable width="fill" target="tracers.buildings" label="Enable building tracers"/>
@@ -9,10 +26,10 @@
             <AutoVariable width="fill" target="tracers.min-fov" label="Min FOV"/>
             <AutoVariable width="fill" target="tracers.max-dist" label="Max distance"/>
             <LabeledObject width="fill" label="Show friends">
-                <Select width="150" target="tracers.draw-friends">
-                    <Option name="Don't show friends" value="0"/>
-                    <Option name="Friends in enemy team" value="1"/>
-                    <Option name="Always show friends" value="2"/>
+                <Select width="content" target="tracers.draw-friends">
+                    <Option name="None" value="0"/>
+                    <Option name="Enemy" value="1"/>
+                    <Option name="All" value="2"/>
                 </Select>
             </LabeledObject>
         </List>
diff --git a/data/menu/nullifiedcat/visuals/world.xml b/data/menu/nullifiedcat/visuals/world.xml
index 96874a8f..c166501e 100755
--- a/data/menu/nullifiedcat/visuals/world.xml
+++ b/data/menu/nullifiedcat/visuals/world.xml
@@ -14,9 +14,9 @@
     <Box padding="12 6 6 6" width="content" height="content" name="Thirdperson" y="110">
         <List width="180">
             <AutoVariable width="fill" target="visual.thirdperson.enable" label="Enable Thirdperson"/>
-            <AutoVariable width="fill" target="visual.thirdperson-button" label="Thirdperson Button" tooltip="Set a Button to Toggle Thirdperson"/>
+        <AutoVariable width="fill" target="visual.thirdperson-button" label="Thirdperson Button" tooltip="Set a Button to Toggle Thirdperson"/>
             <AutoVariable width="fill" target="visual.thirdperson.real-angles" label="Show Angles in Thirdperson" tooltip="Show Real Antiaim Angles in Third Person"/>
-            <AutoVariable width="fill" target="visual.thirdperson.disable-zoomed" label="Disable When Zoomed" tooltip="Disables Thirdperson When Zoomed In"/>
+        <AutoVariable width="fill" target="visual.thirdperson.disable-zoomed" label="Disable When Zoomed" tooltip="Disables Thirdperson When Zoomed In"/>
         </List>
     </Box>
     <Box padding="12 6 6 6" width="content" height="content" name="Remove" x="195">
@@ -50,6 +50,42 @@
                     <Option name="Ice" value="6"/>
                 </Select>
             </LabeledObject>
+            <LabeledObject width="fill" label="Skybox Override">
+                <Select target="misc.skybox-override">
+                    <Option name="none" value="0"/>
+                    <Option name="sky_tf2_04" value="1"/>
+                    <Option name="sky_upward" value="2"/>
+                    <Option name="sky_dustbowl_01" value="3"/>
+                    <Option name="sky_goldrush_01" value="4"/>
+                    <Option name="sky_granary_01" value="5"/>
+                    <Option name="sky_well_01" value="6"/>
+                    <Option name="sky_gravel_01" value="7"/>
+                    <Option name="sky_badlands_01" value="8"/>
+                    <Option name="sky_hydro_01" value="9"/>
+                    <Option name="sky_night_01" value="10"/>
+                    <Option name="sky_nightfall_01" value="11"/>
+                    <Option name="sky_trainyard_01" value="12"/>
+                    <Option name="sky_stormfront_01" value="13"/>
+                    <Option name="sky_morningsnow_01" value="14"/>
+                    <Option name="sky_alpinestorm_01" value="15"/>
+                    <Option name="sky_harvest_01" value="16"/>
+                    <Option name="sky_harvest_night_01" value="17"/>
+                    <Option name="sky_halloween" value="18"/>
+                    <Option name="sky_halloween_night_01" value="19"/>
+                    <Option name="sky_halloween_night2014_01" value="20"/>
+                    <Option name="sky_island_01" value="21"/>
+                    <Option name="sky_jungle_01" value="22"/>
+                    <Option name="sky_invasion2fort_01" value="23"/>
+                    <Option name="sky_well_02" value="24"/>
+                    <Option name="sky_outpost_01" value="25"/>
+                    <Option name="sky_coastal_01" value="26"/>
+                    <Option name="sky_rainbow_01" value="27"/>
+                    <Option name="sky_badlands_pyroland_01" value="28"/>
+                    <Option name="sky_pyroland_01" value="29"/>
+                    <Option name="sky_pyroland_02" value="30"/>
+                    <Option name="sky_pyroland_03" value="31"/>
+                </Select>
+            </LabeledObject>
             <AutoVariable width="fill" target="visual.ragdoll-only-local" label="Only Override Local Player Kills"/>
             <LabeledObject width="fill" label="Pyro Vision">
                 <Select target="visual.force-pyrovision">
diff --git a/data/menu/nullifiedcat/warp.xml b/data/menu/nullifiedcat/warp.xml
old mode 100644
new mode 100755
diff --git a/data/menu/nullifiedcat/weapons.xml b/data/menu/nullifiedcat/weapons.xml
new file mode 100755
index 00000000..afa733f4
--- /dev/null
+++ b/data/menu/nullifiedcat/weapons.xml
@@ -0,0 +1,8 @@
+<Tab name="Weapons">
+    <TabContainer width="fill" height="fill">
+        <Include path="nullifiedcat/weapons/aimbot.xml"/>
+        <Include path="nullifiedcat/weapons/nospread.xml"/>
+        <Include path="nullifiedcat/weapons/triggerbot.xml"/>
+        <Include path="nullifiedcat/weapons/autoheal.xml"/>
+    </TabContainer>
+</Tab>
diff --git a/data/menu/nullifiedcat/aimbot.xml b/data/menu/nullifiedcat/weapons/aimbot.xml
similarity index 100%
rename from data/menu/nullifiedcat/aimbot.xml
rename to data/menu/nullifiedcat/weapons/aimbot.xml
diff --git a/data/menu/nullifiedcat/trigger/autoheal.xml b/data/menu/nullifiedcat/weapons/autoheal.xml
similarity index 100%
rename from data/menu/nullifiedcat/trigger/autoheal.xml
rename to data/menu/nullifiedcat/weapons/autoheal.xml
diff --git a/data/menu/nullifiedcat/nospread.xml b/data/menu/nullifiedcat/weapons/nospread.xml
old mode 100644
new mode 100755
similarity index 100%
rename from data/menu/nullifiedcat/nospread.xml
rename to data/menu/nullifiedcat/weapons/nospread.xml
diff --git a/data/menu/nullifiedcat/weapons/triggerbot.xml b/data/menu/nullifiedcat/weapons/triggerbot.xml
new file mode 100755
index 00000000..ca77b181
--- /dev/null
+++ b/data/menu/nullifiedcat/weapons/triggerbot.xml
@@ -0,0 +1,102 @@
+<Tab name="Triggerbot" padding="4 4 4 4">
+    <Box padding="12 6 6 6" width="content" height="content" name="Auto Reflect">
+        <List width="202">
+            <AutoVariable width="fill" target="autoreflect.enable" label="Enable auto reflect"/>
+            <AutoVariable width="fill" target="autoreflect.button" label="Reflect button"/>
+            <AutoVariable width="fill" target="autoreflect.idle-only" label="Only reflect when able" tooltip="Don't try to reflect when using primary fire."/>
+            <AutoVariable width="fill" target="autoreflect.teammate" label="Teammate projectiles" tooltip="Attempt to reflect teammate projectiles."/>
+            <AutoVariable width="fill" target="autoreflect.dodgeball" label="Dodgeball mode" tooltip="Disable vischeck"/>
+            <AutoVariable width="fill" target="autoreflect.legit" label="Legit mode" tooltip="Don't move the mouse to reflect. Spectator safe."/>
+        </List>
+        <Box padding="12 6 6 6" name="Targets" width="content" height="content" y="100">
+            <Box padding="12 6 6 6" name="Big" width="content" height="content">
+                <List width="95">
+                    <AutoVariable width="fill" target="autoreflect.rockets" label="Rockets"/>
+                    <AutoVariable width="fill" target="autoreflect.pipes" label="Pipes"/>
+                    <AutoVariable width="fill" target="autoreflect.stickies" label="Stickies"/>
+                    <AutoVariable width="fill" target="autoreflect.sentryrockets" label="Sentry rockets"/>
+                </List>
+            </Box>
+            <Box padding="12 6 6 6" name="Small" width="content" height="content" x="105">
+                <List width="85">
+                    <AutoVariable width="fill" target="autoreflect.flares" label="Flares"/>
+                    <AutoVariable width="fill" target="autoreflect.arrows" label="Arrows"/>
+                    <AutoVariable width="fill" target="autoreflect.jars" label="Jars"/>
+                    <AutoVariable width="fill" target="autoreflect.healingbolts" label="Healing bolts"/>
+                    <AutoVariable width="fill" target="autoreflect.cleavers" label="Cleavers"/>
+                </List>
+            </Box>
+            <AutoVariable width="196" y="95" target="autoreflect.default" label="Default" tooltip="If a projectile is not known, should autoreflect still try to reflect it?"/>
+        </Box>
+    </Box>
+    <Box padding="12 6 6 6" width="content" height="content" name="Auto backstab" y="245">
+        <List width="214">
+            <AutoVariable width="fill" target="autobackstab.enabled" label="Enable auto backstab"/>
+            <LabeledObject width="fill" label="Auto backstab mode">
+                <Select target="autobackstab.mode">
+                    <Option name="Legit" value="0"/>
+                    <Option name="Rage" value="1"/>
+                    <Option name="Backtrack" value="2"/>
+                    <Option name="Legit backtrack" value="3"/>
+                </Select>
+            </LabeledObject>
+        </List>
+    </Box>
+    <Box name="Trigger bot" padding="12 6 6 6" width="content" height="content" x="230">
+        <List width="150">
+            <AutoVariable width="fill" target="trigger.enable" label="Enable trigger bot"/>
+            <LabeledObject width="fill" label="Trigger key mode" tooltip="Optional: what should the key set below do?">
+                <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>
+            <AutoVariable width="fill" target="trigger.key.button" label="Aim key"/>
+            <AutoVariable width="fill" target="trigger.wait-for-charge" label="Wait for charge" tooltip="Hold fire until a single shot is enough to kill the target."/>
+            <AutoVariable width="fill" target="trigger.zoomed-only" label="Zoomed only" tooltip="When applicable, only fire when zoomed."/>
+            <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"/>
+        </List>
+        <Box padding="12 6 6 6" width="content" height="content" name="Target selection" y="125">
+            <List width="150">
+                <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.target.max-range" label="Max range"/>
+                <AutoVariable width="fill" target="trigger.target.teammates" label="Teammates" tooltip="Fire on teammates."/>
+                <AutoVariable width="fill" target="trigger.target.stickybombs" label="Stickybombs" tooltip="Fire upon stickybombs."/>
+                <AutoVariable width="fill" target="trigger.target.buildings-sentry" label="Sentry guns"/>
+                <AutoVariable width="fill" target="trigger.target.buildings-other" label="Other buildings"/>
+                <AutoVariable width="fill" target="trigger.target.ignore-cloaked-spies" label="Ignore Cloaked"/>
+                <AutoVariable width="fill" target="trigger.target.ignore-vaccinator" label="Ignore Vaccinator"/>
+            </List>
+        </Box>
+    </Box>
+    <Box padding="12 6 6 6" width="content" height="content" name="Auto Detonator" x="410">
+        <List width="150">
+            <AutoVariable width="fill" target="auto-detonator.enable" label="Enable auto detonator" tooltip="Auto explode flares"/>
+            <AutoVariable width="fill" target="auto-detonator.ignore-cloaked" label="Ignore cloaked"/>
+        </List>
+    </Box>
+    <Box padding="12 6 6 6" width="content" height="content" name="Auto sticky" x="410" y="50">
+        <List width="150">
+            <AutoVariable width="fill" target="autosticky.enable" label="Enable auto sticky" tooltip="Auto detonate stickies."/>
+            <AutoVariable width="fill" target="autosticky.buildings" label="Detonate on buildings"/>
+            <AutoVariable width="fill" target="autosticky.legit" label="Legit mode" tooltip="Require line of sight and ignores invisible spies."/>
+            <AutoVariable width="fill" target="autosticky.dontblowmeup" label="Don't blow me up" tooltip="Don't detonate if you would recieve damage."/>
+            <AutoVariable width="fill" target="autosticky.min-dist" label="Min distance" min="0" max="130" step="5"/>
+        </List>
+    </Box>
+    <Box padding="12 6 6 6" width="content" height="content" name="Auto Dead Ringer" x="410" y="150">
+        <List width="150">
+            <AutoVariable width="fill" target="auto-deadringer.enable" label="Enable auto Dead Ringer"/>
+            <AutoVariable width="fill" target="auto-deadringer.health" label="Trigger at health"/>
+        </List>
+    </Box>
+</Tab>