diff --git a/src/main/java/net/ccbluex/liquidbounce/FDPClient.kt b/src/main/java/net/ccbluex/liquidbounce/FDPClient.kt
index 6ea4e4b556..e83af05778 100644
--- a/src/main/java/net/ccbluex/liquidbounce/FDPClient.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/FDPClient.kt
@@ -14,10 +14,10 @@ import net.ccbluex.liquidbounce.features.module.ModuleManager
 import net.ccbluex.liquidbounce.config.FileManager
 import net.ccbluex.liquidbounce.config.core.ConfigManager
 import net.ccbluex.liquidbounce.handler.combat.CombatManager
-import net.ccbluex.liquidbounce.handler.discord.DiscordRPC
+import net.ccbluex.liquidbounce.features.special.discord.DiscordRPC
 import net.ccbluex.liquidbounce.handler.network.BungeeCordSpoof
 import net.ccbluex.liquidbounce.handler.network.ClientFixes
-import net.ccbluex.liquidbounce.handler.network.ClientSpoofHandler
+import net.ccbluex.liquidbounce.features.special.spoof.ClientSpoofHandler
 import net.ccbluex.liquidbounce.ui.client.gui.EnumLaunchFilter
 import net.ccbluex.liquidbounce.ui.client.gui.LaunchFilterInfo
 import net.ccbluex.liquidbounce.ui.client.gui.LaunchOption
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/DiscordRPCModule.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/DiscordRPCModule.kt
index 857b48773a..642b2ae97c 100644
--- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/DiscordRPCModule.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/DiscordRPCModule.kt
@@ -8,7 +8,7 @@ package net.ccbluex.liquidbounce.features.module.modules.client
 import net.ccbluex.liquidbounce.features.module.Module
 import net.ccbluex.liquidbounce.features.module.ModuleCategory
 import net.ccbluex.liquidbounce.features.module.ModuleInfo
-import net.ccbluex.liquidbounce.handler.discord.DiscordRPC
+import net.ccbluex.liquidbounce.features.special.discord.DiscordRPC
 import net.ccbluex.liquidbounce.value.*
 
 @ModuleInfo(name = "DiscordRPC", category = ModuleCategory.CLIENT)
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/Target.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/Target.kt
index 03e0ed8b62..04761bd19e 100644
--- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/Target.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/client/Target.kt
@@ -13,9 +13,9 @@ import net.ccbluex.liquidbounce.value.BoolValue
 @ModuleInfo(name = "Target", category = ModuleCategory.CLIENT, canEnable = false)
 object Target : Module() {
     val playerValue = BoolValue("Player", true)
-    val animalValue = BoolValue("Animal", false)
+    val animalValue = BoolValue("Animal", true)
     val mobValue = BoolValue("Mob", true)
-    val invisibleValue = BoolValue("Invisible", false)
-    val deadValue = BoolValue("Dead", false)
+    val invisibleValue = BoolValue("Invisible", true)
+    val deadValue = BoolValue("Dead", true)
     override fun handleEvents() = true
 }
\ No newline at end of file
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt
index bbddfc6825..920155925b 100644
--- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/KillAura.kt
@@ -278,7 +278,6 @@ object KillAura : Module() {
 
     private val displayMode = ListValue("DisplayMode", arrayOf("Simple", "LessSimple", "Complicated"), "Simple")
 
-
     /**
      * MODULE
      */
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/velocitys/VelocityMode.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/velocitys/VelocityMode.kt
index 3e2c4da9b0..aacdf37354 100644
--- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/velocitys/VelocityMode.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/velocitys/VelocityMode.kt
@@ -1,3 +1,8 @@
+/*
+ * FDPClient Hacked Client
+ * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce.
+ * https://github.com/SkidderMC/FDPClient/
+ */
 package net.ccbluex.liquidbounce.features.module.modules.combat.velocitys
 
 import net.ccbluex.liquidbounce.FDPClient
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/velocitys/grim/Grim117.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/velocitys/grim/Grim117.kt
index 3552e0227f..679877401d 100644
--- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/velocitys/grim/Grim117.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/combat/velocitys/grim/Grim117.kt
@@ -13,7 +13,6 @@ import net.minecraft.util.EnumFacing
 
 class Grim117 : VelocityMode("Grim1.17") {
 
-    private var velocityInput = false
     override fun onPacket(event: PacketEvent) {
         mc.netHandler.addToSendQueue(
             C03PacketPlayer.C06PacketPlayerPosLook(
@@ -30,7 +29,6 @@ class Grim117 : VelocityMode("Grim1.17") {
                 C07PacketPlayerDigging.Action.STOP_DESTROY_BLOCK,mc.thePlayer.position,
                 EnumFacing.DOWN)
         )
-        velocityInput = false
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/AutoRole.java b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/AutoRole.java
new file mode 100644
index 0000000000..aa749b3350
--- /dev/null
+++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/AutoRole.java
@@ -0,0 +1,89 @@
+/*
+ * ZAVZ Hacked Client
+ */
+package net.ccbluex.liquidbounce.features.module.modules.player;
+
+import net.ccbluex.liquidbounce.FDPClient;
+import net.ccbluex.liquidbounce.config.impl.FriendsConfig;
+import net.ccbluex.liquidbounce.event.EventTarget;
+import net.ccbluex.liquidbounce.event.UpdateEvent;
+import net.ccbluex.liquidbounce.features.module.Module;
+import net.ccbluex.liquidbounce.features.module.ModuleCategory;
+import net.ccbluex.liquidbounce.features.module.ModuleInfo;
+import net.ccbluex.liquidbounce.utils.render.ColorUtils;
+import net.ccbluex.liquidbounce.value.BoolValue;
+import net.minecraft.scoreboard.ScorePlayerTeam;
+
+import java.util.Arrays;
+
+@ModuleInfo(name = "AutoRole", category = ModuleCategory.PLAYER)
+public class AutoRole extends Module {
+
+    private final BoolValue formattingValue = new BoolValue("Formatting", true);
+
+    private static final String[] STAFF_PREFIXES = {
+            "[Moderador] ",
+            "[MODERADOR] ",
+            "[Mod] ",
+            "[MOD] ",
+            "[Administrador] ",
+            "[ADMINISTRADOR] ",
+            "[Admin] ",
+            "[ADMIN] ",
+            "[Coordenador] ",
+            "[COORDENADOR] ",
+            "[Coord] ",
+            "[COORD] ",
+            "[Gerente] ",
+            "[GERENTE] ",
+            "[CEO] ",
+            "[Dono] ",
+            "[DONO] ",
+            "[DIRETOR] ",
+            "[DEV] ",
+            "[Dev] ",
+            "Diretor ",
+            "DIRETOR ",
+            "Dev ",
+            "DEV ",
+            "Mod ",
+            "MOD ",
+            "[Master] ",
+            "[MASTER] ",
+            "[CEO] ",
+            "[TRIAL] "
+    };
+
+    private boolean isStaff(final String prefix) {
+        return Arrays.asList(STAFF_PREFIXES).contains(ColorUtils.stripColor(prefix));
+    }
+
+    @EventTarget
+    public void handle(final UpdateEvent event) {
+        final FriendsConfig friendManager = FDPClient.fileManager.getFriendsConfig();
+
+        String[] formatCodes = {"§k", "§l", "§m", "§n", "§o"};
+        int currentFormatIndex = 0;
+
+        for (final ScorePlayerTeam team : mc.theWorld.getScoreboard().getTeams()) {
+            if (this.isStaff(team.getColorPrefix())) {
+                for (final String member : team.getMembershipCollection()) {
+                    if (!friendManager.isFriend(member)) {
+                        friendManager.addFriend(member);
+
+                        String colorPrefix = team.getColorPrefix();
+                        if (formattingValue.get() && currentFormatIndex < formatCodes.length) {
+                            colorPrefix = formatCodes[currentFormatIndex] + colorPrefix;
+                            currentFormatIndex++;
+                            if (currentFormatIndex >= formatCodes.length) {
+                                currentFormatIndex = 0;
+                            }
+                        }
+
+                        chat("§7[§d!§7]§7 ADICIONADO: " + colorPrefix + member);
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/FastUse.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/FastUse.kt
index d310fa7523..9b149e89ba 100644
--- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/FastUse.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/player/FastUse.kt
@@ -23,7 +23,7 @@ import net.minecraft.network.play.client.C03PacketPlayer
 @ModuleInfo(name = "FastUse", category = ModuleCategory.PLAYER)
 object FastUse : Module() {
 
-    private val modeValue = ListValue("Mode", arrayOf("NCP","Instant", "Timer", "CustomDelay", "DelayedInstant", "MinemoraTest", "AAC", "NewAAC","Medusa","Matrix","Fast"), "DelayedInstant")
+    private val modeValue = ListValue("Mode", arrayOf("NCP", "NCP2", "Instant", "Timer", "CustomDelay", "DelayedInstant", "MinemoraTest", "AAC", "NewAAC","Medusa","Matrix","Fast", "Grim"), "DelayedInstant")
     private val timerValue = FloatValue("Timer", 1.22F, 0.1F, 2.0F).displayable { modeValue.equals("Timer") }
     private val durationValue = IntegerValue("InstantDelay", 14, 0, 35).displayable { modeValue.equals("DelayedInstant") }
     private val delayValue = IntegerValue("CustomDelay", 0, 0, 300).displayable { modeValue.equals("CustomDelay") }
@@ -116,7 +116,13 @@ object FastUse : Module() {
 
                     stopUsing()
                 }
+                "ncp2" -> if (mc.thePlayer.itemInUseDuration > 14) {
+                    repeat(20) {
+                        mc.netHandler.addToSendQueue(C03PacketPlayer(mc.thePlayer.onGround))
+                    }
 
+                    mc.playerController.onStoppedUsingItem(mc.thePlayer)
+                }
                 "instant" -> {
                     send(35)
 
@@ -129,6 +135,13 @@ object FastUse : Module() {
                         send(23)
                     }
                 }
+                "grim" -> {
+                    mc.timer.timerSpeed = 0.3F
+                    usedTimer = true
+                    repeat(34) {
+                        mc.netHandler.addToSendQueue(C03PacketPlayer(mc.thePlayer.onGround))
+                    }
+                }
                 "newaac" -> {
                     mc.timer.timerSpeed = 0.49F
                     usedTimer = true
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/visual/Chams.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/visual/Chams.kt
index 9fc50bb703..c91717797c 100644
--- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/visual/Chams.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/visual/Chams.kt
@@ -5,13 +5,24 @@
  */
 package net.ccbluex.liquidbounce.features.module.modules.visual
 
+import net.ccbluex.liquidbounce.event.EventTarget
+import net.ccbluex.liquidbounce.event.Render2DEvent
+import net.ccbluex.liquidbounce.event.Render3DEvent
 import net.ccbluex.liquidbounce.features.module.Module
 import net.ccbluex.liquidbounce.features.module.ModuleCategory
 import net.ccbluex.liquidbounce.features.module.ModuleInfo
+import net.ccbluex.liquidbounce.features.module.modules.player.ChestAura
+import net.ccbluex.liquidbounce.utils.render.RenderUtils
+import net.ccbluex.liquidbounce.utils.render.shader.shaders.GlowShader
+import net.ccbluex.liquidbounce.utils.render.shader.shaders.OutlineShader
 import net.ccbluex.liquidbounce.value.BoolValue
 import net.ccbluex.liquidbounce.value.FloatValue
 import net.ccbluex.liquidbounce.value.IntegerValue
 import net.ccbluex.liquidbounce.value.ListValue
+import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher
+import net.minecraft.tileentity.*
+import org.lwjgl.opengl.GL11
+import java.awt.Color
 
 @ModuleInfo(name = "Chams", category = ModuleCategory.VISUAL)
 object Chams : Module() {
@@ -31,4 +42,97 @@ object Chams : Module() {
     val alphaValue = IntegerValue("Alpha", 255, 0, 255).displayable { legacyMode.get() }
     val saturationValue = FloatValue("Saturation", 1F, 0F, 1F).displayable { legacyMode.get() && colorModeValue.equals("Slowly") }
     val brightnessValue = FloatValue("Brightness", 1F, 0F, 1F).displayable { legacyMode.get() && colorModeValue.equals("Slowly") }
+
+    private val storageESP = BoolValue("StorageESP", false)
+    private val modeValue = ListValue("Storage-Mode", arrayOf("Box", "OtherBox", "Outline", "ShaderOutline", "ShaderGlow", "2D", "WireFrame"), "Outline").displayable  { storageESP.get() }
+    private val outlineWidthValue = FloatValue("Outline-Width", 3f, 0.5f, 5f).displayable { modeValue.equals("Outline") }
+    private val chestValue = BoolValue("Chest", false).displayable  { storageESP.get() }
+    private val enderChestValue = BoolValue("EnderChest", false).displayable  { storageESP.get() }
+    private val furnaceValue = BoolValue("Furnace", false).displayable  { storageESP.get() }
+    private val dispenserValue = BoolValue("Dispenser", false).displayable  { storageESP.get() }
+    private val hopperValue = BoolValue("Hopper", false).displayable  { storageESP.get() }
+
+    private fun getColor(tileEntity: TileEntity): Color? {
+        if (chestValue.get() && tileEntity is TileEntityChest && !ChestAura.clickedBlocks.contains(tileEntity.getPos())) return Color(0, 66, 255)
+        if (enderChestValue.get() && tileEntity is TileEntityEnderChest && !ChestAura.clickedBlocks.contains(tileEntity.getPos())) return Color.MAGENTA
+        if (furnaceValue.get() && tileEntity is TileEntityFurnace) return Color.BLACK
+        if (dispenserValue.get() && tileEntity is TileEntityDispenser) return Color.BLACK
+        if (hopperValue.get() && tileEntity is TileEntityHopper) return Color.GRAY
+
+        return null
+    }
+
+    @EventTarget
+    fun onRender3D(event: Render3DEvent) {
+        try {
+            val mode = modeValue.get()
+            val gamma = mc.gameSettings.gammaSetting
+            mc.gameSettings.gammaSetting = 100000.0f
+
+            for (tileEntity in mc.theWorld.loadedTileEntityList) {
+                val color = getColor(tileEntity) ?: continue
+                when (mode.lowercase()) {
+                    "otherbox", "box" -> RenderUtils.drawBlockBox(tileEntity.pos, color, !mode.equals("otherbox", ignoreCase = true), true, outlineWidthValue.get())
+
+                    "2d" -> RenderUtils.draw2D(tileEntity.pos, color.rgb, Color.BLACK.rgb)
+
+                    "outline" -> RenderUtils.drawBlockBox(tileEntity.pos, color, true, false, outlineWidthValue.get())
+
+                    "wireframe" -> {
+                        GL11.glPushMatrix()
+                        GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
+                        GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE)
+                        GL11.glDisable(GL11.GL_TEXTURE_2D)
+                        GL11.glDisable(GL11.GL_LIGHTING)
+                        GL11.glDisable(GL11.GL_DEPTH_TEST)
+                        GL11.glEnable(GL11.GL_LINE_SMOOTH)
+                        GL11.glEnable(GL11.GL_BLEND)
+                        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA)
+                        RenderUtils.glColor(color)
+                        GL11.glLineWidth(1.5f)
+                        TileEntityRendererDispatcher.instance.renderTileEntity(tileEntity, event.partialTicks, -1)
+                        GL11.glPopAttrib()
+                        GL11.glPopMatrix()
+                    }
+                }
+            }
+
+            GL11.glColor4f(1F, 1F, 1F, 1F)
+            mc.gameSettings.gammaSetting = gamma
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    @EventTarget
+    fun onRender2D(event: Render2DEvent) {
+        val mode = modeValue.get()
+        val renderManager = mc.renderManager
+        val partialTicks = event.partialTicks
+        val shader = when (mode) {
+            "shaderoutline" -> OutlineShader.OUTLINE_SHADER
+            "shaderglow" -> GlowShader.GLOW_SHADER
+            else -> return
+        }
+
+        val entityMap: MutableMap<Color, ArrayList<TileEntity>> = HashMap()
+
+        // search
+        for (tileEntity in mc.theWorld.loadedTileEntityList) {
+            val color = getColor(tileEntity) ?: continue
+            if (!entityMap.containsKey(color)) {
+                entityMap[color] = ArrayList()
+            }
+            entityMap[color]!!.add(tileEntity)
+        }
+
+        // draw
+        for ((key, value) in entityMap) {
+            shader.startDraw(partialTicks)
+            for (tileEntity in value) {
+                TileEntityRendererDispatcher.instance.renderTileEntityAt(tileEntity, tileEntity.pos.x - renderManager.renderPosX, tileEntity.pos.y - renderManager.renderPosY, tileEntity.pos.z - renderManager.renderPosZ, partialTicks)
+            }
+            shader.stopDraw(key, if (mode.equals("shaderglow", ignoreCase = true)) 2.5f else 1.5f, 1f)
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/visual/FreeLook.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/visual/FreeLook.kt
index 8a5745c38a..08eb708ed9 100644
--- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/visual/FreeLook.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/visual/FreeLook.kt
@@ -14,7 +14,7 @@ import net.ccbluex.liquidbounce.value.BoolValue
 import org.lwjgl.input.Keyboard
 import org.lwjgl.opengl.Display
 
-@ModuleInfo(name = "FreeLook",  description = "", category = ModuleCategory.VISUAL, keyBind = Keyboard.KEY_LSHIFT, triggerType = EnumTriggerType.PRESS)
+@ModuleInfo(name = "FreeLook",  description = "", category = ModuleCategory.VISUAL, keyBind = Keyboard.KEY_Z, triggerType = EnumTriggerType.PRESS)
 class FreeLook : Module() {
     private val thirdPerson = BoolValue("ThirdPerson", true)
     val reverse = BoolValue("Reverse", false)
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/visual/StorageESP.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/visual/StorageESP.kt
deleted file mode 100644
index a47b35e855..0000000000
--- a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/visual/StorageESP.kt
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * FDPClient Hacked Client
- * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce.
- * https://github.com/SkidderMC/FDPClient/
- */
-package net.ccbluex.liquidbounce.features.module.modules.visual
-
-import net.ccbluex.liquidbounce.event.EventTarget
-import net.ccbluex.liquidbounce.event.Render2DEvent
-import net.ccbluex.liquidbounce.event.Render3DEvent
-import net.ccbluex.liquidbounce.features.module.Module
-import net.ccbluex.liquidbounce.features.module.ModuleCategory
-import net.ccbluex.liquidbounce.features.module.ModuleInfo
-import net.ccbluex.liquidbounce.features.module.modules.player.ChestAura.clickedBlocks
-import net.ccbluex.liquidbounce.utils.render.RenderUtils
-import net.ccbluex.liquidbounce.utils.render.shader.shaders.GlowShader
-import net.ccbluex.liquidbounce.utils.render.shader.shaders.OutlineShader
-import net.ccbluex.liquidbounce.value.BoolValue
-import net.ccbluex.liquidbounce.value.FloatValue
-import net.ccbluex.liquidbounce.value.ListValue
-import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher
-import net.minecraft.tileentity.*
-import org.lwjgl.opengl.GL11
-import java.awt.Color
-
-@ModuleInfo(name = "StorageESP", category = ModuleCategory.VISUAL)
-object StorageESP : Module() {
-
-    private val modeValue = ListValue("Mode", arrayOf("Box", "OtherBox", "Outline", "ShaderOutline", "ShaderGlow", "2D", "WireFrame"), "Outline")
-    private val outlineWidthValue = FloatValue("Outline-Width", 3f, 0.5f, 5f).displayable { modeValue.equals("Outline") }
-    private val chestValue = BoolValue("Chest", true)
-    private val enderChestValue = BoolValue("EnderChest", true)
-    private val furnaceValue = BoolValue("Furnace", true)
-    private val dispenserValue = BoolValue("Dispenser", true)
-    private val hopperValue = BoolValue("Hopper", true)
-
-    private fun getColor(tileEntity: TileEntity): Color? {
-        if (chestValue.get() && tileEntity is TileEntityChest && !clickedBlocks.contains(tileEntity.getPos())) return Color(0, 66, 255)
-        if (enderChestValue.get() && tileEntity is TileEntityEnderChest && !clickedBlocks.contains(tileEntity.getPos())) return Color.MAGENTA
-        if (furnaceValue.get() && tileEntity is TileEntityFurnace) return Color.BLACK
-        if (dispenserValue.get() && tileEntity is TileEntityDispenser) return Color.BLACK
-        if (hopperValue.get() && tileEntity is TileEntityHopper) return Color.GRAY
-
-        return null
-    }
-
-    @EventTarget
-    fun onRender3D(event: Render3DEvent) {
-        try {
-            val mode = modeValue.get()
-            val gamma = mc.gameSettings.gammaSetting
-            mc.gameSettings.gammaSetting = 100000.0f
-
-            for (tileEntity in mc.theWorld.loadedTileEntityList) {
-                val color = getColor(tileEntity) ?: continue
-                when (mode.lowercase()) {
-                    "otherbox", "box" -> RenderUtils.drawBlockBox(tileEntity.pos, color, !mode.equals("otherbox", ignoreCase = true), true, outlineWidthValue.get())
-
-                    "2d" -> RenderUtils.draw2D(tileEntity.pos, color.rgb, Color.BLACK.rgb)
-
-                    "outline" -> RenderUtils.drawBlockBox(tileEntity.pos, color, true, false, outlineWidthValue.get())
-
-                    "wireframe" -> {
-                        GL11.glPushMatrix()
-                        GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS)
-                        GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE)
-                        GL11.glDisable(GL11.GL_TEXTURE_2D)
-                        GL11.glDisable(GL11.GL_LIGHTING)
-                        GL11.glDisable(GL11.GL_DEPTH_TEST)
-                        GL11.glEnable(GL11.GL_LINE_SMOOTH)
-                        GL11.glEnable(GL11.GL_BLEND)
-                        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA)
-                        RenderUtils.glColor(color)
-                        GL11.glLineWidth(1.5f)
-                        TileEntityRendererDispatcher.instance.renderTileEntity(tileEntity, event.partialTicks, -1)
-                        GL11.glPopAttrib()
-                        GL11.glPopMatrix()
-                    }
-                }
-            }
-
-            GL11.glColor4f(1F, 1F, 1F, 1F)
-            mc.gameSettings.gammaSetting = gamma
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    @EventTarget
-    fun onRender2D(event: Render2DEvent) {
-        val mode = modeValue.get()
-        val renderManager = mc.renderManager
-        val partialTicks = event.partialTicks
-        val shader = when (mode) {
-            "shaderoutline" -> OutlineShader.OUTLINE_SHADER
-            "shaderglow" -> GlowShader.GLOW_SHADER
-            else -> return
-        }
-
-        val entityMap: MutableMap<Color, ArrayList<TileEntity>> = HashMap()
-
-        // search
-        for (tileEntity in mc.theWorld.loadedTileEntityList) {
-            val color = getColor(tileEntity) ?: continue
-            if (!entityMap.containsKey(color)) {
-                entityMap[color] = ArrayList()
-            }
-            entityMap[color]!!.add(tileEntity)
-        }
-
-        // draw
-        for ((key, value) in entityMap) {
-            shader.startDraw(partialTicks)
-            for (tileEntity in value) {
-                TileEntityRendererDispatcher.instance.renderTileEntityAt(tileEntity, tileEntity.pos.x - renderManager.renderPosX, tileEntity.pos.y - renderManager.renderPosY, tileEntity.pos.z - renderManager.renderPosZ, partialTicks)
-            }
-            shader.stopDraw(key, if (mode.equals("shaderglow", ignoreCase = true)) 2.5f else 1.5f, 1f)
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/net/ccbluex/liquidbounce/handler/discord/DiscordRPC.kt b/src/main/java/net/ccbluex/liquidbounce/features/special/discord/DiscordRPC.kt
similarity index 98%
rename from src/main/java/net/ccbluex/liquidbounce/handler/discord/DiscordRPC.kt
rename to src/main/java/net/ccbluex/liquidbounce/features/special/discord/DiscordRPC.kt
index cad071f289..e26a46b20c 100644
--- a/src/main/java/net/ccbluex/liquidbounce/handler/discord/DiscordRPC.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/features/special/discord/DiscordRPC.kt
@@ -3,7 +3,7 @@
  * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce.
  * https://github.com/SkidderMC/FDPClient/
  */
-package net.ccbluex.liquidbounce.handler.discord
+package net.ccbluex.liquidbounce.features.special.discord
 
 import com.jagrosh.discordipc.IPCClient
 import com.jagrosh.discordipc.IPCListener
diff --git a/src/main/java/net/ccbluex/liquidbounce/handler/network/ClientSpoofHandler.java b/src/main/java/net/ccbluex/liquidbounce/features/special/spoof/ClientSpoofHandler.java
similarity index 98%
rename from src/main/java/net/ccbluex/liquidbounce/handler/network/ClientSpoofHandler.java
rename to src/main/java/net/ccbluex/liquidbounce/features/special/spoof/ClientSpoofHandler.java
index 410e9ceda4..b8d24d4643 100644
--- a/src/main/java/net/ccbluex/liquidbounce/handler/network/ClientSpoofHandler.java
+++ b/src/main/java/net/ccbluex/liquidbounce/features/special/spoof/ClientSpoofHandler.java
@@ -3,7 +3,7 @@
  * A free open source mixin-based injection hacked client for Minecraft using Minecraft Forge by LiquidBounce.
  * https://github.com/SkidderMC/FDPClient/
  */
-package net.ccbluex.liquidbounce.handler.network;
+package net.ccbluex.liquidbounce.features.special.spoof;
 
 import net.ccbluex.liquidbounce.FDPClient;
 import net.ccbluex.liquidbounce.event.EventTarget;
diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/ColorManager.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/ColorManager.kt
index 62426b303a..3a4aceabaa 100644
--- a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/ColorManager.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/ColorManager.kt
@@ -1,4 +1,4 @@
-package net.ccbluex.liquidbounce.ui.client.gui.newVer
+package net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer
 
 import java.awt.Color
 
diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/IconManager.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/IconManager.kt
index 5ab3fbc4b5..b41411de74 100644
--- a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/IconManager.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/IconManager.kt
@@ -1,4 +1,4 @@
-package net.ccbluex.liquidbounce.ui.client.gui.newVer
+package net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer
 
 import net.minecraft.util.ResourceLocation
 
diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/NewUi.java b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/NewUi.java
index 87cffba4a5..e5cadb02a0 100644
--- a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/NewUi.java
+++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/NewUi.java
@@ -2,7 +2,7 @@
 
 import net.ccbluex.liquidbounce.features.module.ModuleCategory;
 import net.ccbluex.liquidbounce.ui.clickgui.ClickGUIModule;
-import net.ccbluex.liquidbounce.ui.client.gui.newVer.IconManager;
+import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.IconManager;
 import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.CategoryElement;
 import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.SearchElement;
 import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.ModuleElement;
diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/CategoryElement.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/CategoryElement.kt
index ec0d06258b..93307ec669 100644
--- a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/CategoryElement.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/CategoryElement.kt
@@ -2,7 +2,7 @@ package net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element
 
 import net.ccbluex.liquidbounce.FDPClient
 import net.ccbluex.liquidbounce.features.module.ModuleCategory
-import net.ccbluex.liquidbounce.ui.client.gui.newVer.ColorManager
+import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.ColorManager
 import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.ModuleElement
 import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.extensions.animSmooth
 import net.ccbluex.liquidbounce.ui.font.Fonts
diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/SearchElement.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/SearchElement.kt
index 66deeeb616..ba415c953d 100644
--- a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/SearchElement.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/SearchElement.kt
@@ -1,7 +1,7 @@
 package net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element
 
-import net.ccbluex.liquidbounce.ui.client.gui.newVer.ColorManager
-import net.ccbluex.liquidbounce.ui.client.gui.newVer.IconManager
+import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.ColorManager
+import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.IconManager
 import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.extensions.animSmooth
 import net.ccbluex.liquidbounce.ui.font.Fonts
 import net.ccbluex.liquidbounce.utils.MouseUtils
diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/components/Slider.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/components/Slider.kt
index 06930d3ed3..fda0872d03 100644
--- a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/components/Slider.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/components/Slider.kt
@@ -1,6 +1,6 @@
 package net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.components
 
-import net.ccbluex.liquidbounce.ui.client.gui.newVer.ColorManager
+import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.ColorManager
 import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.extensions.animSmooth
 import net.ccbluex.liquidbounce.utils.render.RenderUtils
 
diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/ModuleElement.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/ModuleElement.kt
index fc63a62d10..7fb01e4a3e 100644
--- a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/ModuleElement.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/ModuleElement.kt
@@ -1,9 +1,9 @@
 package net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module
 
 import net.ccbluex.liquidbounce.features.module.Module
-import net.ccbluex.liquidbounce.ui.client.gui.newVer.ColorManager
+import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.ColorManager
 import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.components.ToggleSwitch
-import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.ValueElement
+import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.module.value.ValueElement
 import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.impl.BooleanElement
 import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.impl.ListElement
 import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.impl.IntElement
diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/ValueElement.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/ValueElement.kt
index d6b4de31d0..eb4319c5ad 100644
--- a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/ValueElement.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/ValueElement.kt
@@ -1,4 +1,4 @@
-package net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value
+package net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.module.value
 
 import net.ccbluex.liquidbounce.utils.MinecraftInstance
 import net.ccbluex.liquidbounce.value.Value
diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/BooleanElement.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/BooleanElement.kt
index b589eb7949..5419395790 100644
--- a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/BooleanElement.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/BooleanElement.kt
@@ -1,7 +1,7 @@
 package net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.impl
 
 import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.components.Checkbox
-import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.ValueElement
+import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.module.value.ValueElement
 import net.ccbluex.liquidbounce.ui.font.Fonts
 import net.ccbluex.liquidbounce.utils.MouseUtils
 import net.ccbluex.liquidbounce.value.BoolValue
diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/FloatElement.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/FloatElement.kt
index 723ada3912..c34d1e6a3e 100644
--- a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/FloatElement.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/FloatElement.kt
@@ -1,8 +1,8 @@
 package net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.impl
 
-import net.ccbluex.liquidbounce.ui.client.gui.newVer.ColorManager
+import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.ColorManager
 import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.components.Slider
-import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.ValueElement
+import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.module.value.ValueElement
 import net.ccbluex.liquidbounce.ui.font.Fonts
 import net.ccbluex.liquidbounce.utils.MouseUtils
 import net.ccbluex.liquidbounce.utils.render.RenderUtils
diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/IntElement.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/IntElement.kt
index 065c2e948f..0020594f57 100644
--- a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/IntElement.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/IntElement.kt
@@ -1,8 +1,8 @@
 package net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.impl
 
-import net.ccbluex.liquidbounce.ui.client.gui.newVer.ColorManager
+import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.ColorManager
 import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.components.Slider
-import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.ValueElement
+import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.module.value.ValueElement
 import net.ccbluex.liquidbounce.ui.font.Fonts
 import net.ccbluex.liquidbounce.utils.MouseUtils
 import net.ccbluex.liquidbounce.utils.render.RenderUtils
diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/ListElement.kt b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/ListElement.kt
index 78b4354a51..b344999daf 100644
--- a/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/ListElement.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/ui/clickgui/style/styles/newVer/element/module/value/impl/ListElement.kt
@@ -1,7 +1,7 @@
 package net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.impl
 
-import net.ccbluex.liquidbounce.ui.client.gui.newVer.ColorManager
-import net.ccbluex.liquidbounce.ui.client.gui.newVer.element.module.value.ValueElement
+import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.ColorManager
+import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.element.module.value.ValueElement
 import net.ccbluex.liquidbounce.ui.clickgui.style.styles.newVer.extensions.animSmooth
 import net.ccbluex.liquidbounce.ui.font.Fonts
 import net.ccbluex.liquidbounce.utils.MouseUtils
diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Arraylist.kt b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Arraylist.kt
index 68d1b0a057..e31e3cdfee 100644
--- a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Arraylist.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Arraylist.kt
@@ -42,7 +42,7 @@ class Arraylist(
 
     //Color settings
     private val colorDisplay = BoolValue("Color Options:", true)
-    private val colorModeValue = ListValue("Text-Color", arrayOf("Custom", "Random", "Rainbow", "Fade", "Slowly", "SkyRainbow", "Static"), "Fade").displayable { colorDisplay.get() }
+    private val colorModeValue = ListValue("Text-Color", arrayOf("Static", "Fade", "Random", "Rainbow", "Slowly", "SkyRainbow", "Static"), "Fade").displayable { colorDisplay.get() }
     val colorRedValue = IntegerValue("Text-R", 0, 0, 255).displayable { colorDisplay.get() }
     val colorGreenValue = IntegerValue("Text-G", 111, 0, 255).displayable { colorDisplay.get() }
     val colorBlueValue = IntegerValue("Text-B", 255, 0, 255).displayable { colorDisplay.get() }
@@ -53,7 +53,7 @@ class Arraylist(
     // Tag settings
     private val tagDisplay = BoolValue("Tag Options:", true)
     private val tagsValue = ListValue("TagsStyle", arrayOf("-", "|", "()", "[]", "<>", "Space", "None"), "Space").displayable { tagDisplay.get() }
-    private val tagColorModeValue = ListValue("Tag-Color", arrayOf("Custom", "Random", "Rainbow", "Fade", "Slowly", "SkyRainbow", "Static"), "Custom").displayable { tagDisplay.get() }
+    private val tagColorModeValue = ListValue("Tag-Color", arrayOf("Static", "Random", "Rainbow", "Fade", "Slowly", "SkyRainbow", "Static"), "Static").displayable { tagDisplay.get() }
     private val tagColorRedValue = IntegerValue("Tag-R", 195, 0, 255).displayable { tagDisplay.get() }
     private val tagColorGreenValue = IntegerValue("Tag-G", 195, 0, 255).displayable { tagDisplay.get() }
     private val tagColorBlueValue = IntegerValue("Tag-B", 195, 0, 255).displayable { tagDisplay.get() }
@@ -76,7 +76,7 @@ class Arraylist(
     // Rectangle color settings
     private val rectDisplay = BoolValue("Rect Options:", true)
     private val rectValue = ListValue("Rect", arrayOf("None", "Left", "Right", "Outline", "Special", "Top"), "None").displayable { rectDisplay.get() }
-    private val rectColorModeValue = ListValue("Rect-Color", arrayOf("Custom", "Random", "Rainbow", "Fade", "Slowly", "SkyRainbow", "Static"), "Fade").displayable { rectDisplay.get() }
+    private val rectColorModeValue = ListValue("Rect-Color", arrayOf("Static", "Random", "Rainbow", "Fade", "Slowly", "SkyRainbow", "Static"), "Fade").displayable { rectDisplay.get() }
     private val rectColorRedValue = IntegerValue("Rect-R", 255, 0, 255).displayable { rectDisplay.get() }
     private val rectColorGreenValue = IntegerValue("Rect-G", 255, 0, 255).displayable { rectDisplay.get() }
     private val rectColorBlueValue = IntegerValue("Rect-B", 255, 0, 255).displayable { rectDisplay.get() }
@@ -84,7 +84,7 @@ class Arraylist(
 
     // Background color settings
     private val backgroundDisplay = BoolValue("BackGround Options:", true)
-    private val backgroundColorModeValue = ListValue("Background-Color", arrayOf("Custom", "Random", "Rainbow", "Fade", "Slowly", "SkyRainbow", "Static"), "Custom").displayable { backgroundDisplay.get() }
+    private val backgroundColorModeValue = ListValue("Background-Color", arrayOf("Static", "Random", "Rainbow", "Fade", "Slowly", "SkyRainbow", "Static"), "Static").displayable { backgroundDisplay.get() }
     private val backgroundColorRedValue = IntegerValue("Background-R", 0, 0, 255).displayable { backgroundDisplay.get() }
     private val backgroundColorGreenValue = IntegerValue("Background-G", 0, 0, 255).displayable { backgroundDisplay.get() }
     private val backgroundColorBlueValue = IntegerValue("Background-B", 0, 0, 255).displayable { backgroundDisplay.get() }
@@ -96,7 +96,7 @@ class Arraylist(
     private val shadowShaderValue = BoolValue("Shadow-Shader", false).displayable { shadowDisplay.get() }
     private val shadowNoCutValue = BoolValue("Shadow-NoCut", false).displayable { shadowDisplay.get() }
     private val shadowStrength = IntegerValue("Shadow-Strength", 1, 1, 30).displayable { shadowDisplay.get() }
-    private val shadowColorMode = ListValue("Shadow-Color", arrayOf("Background", "Text", "Custom"), "Background").displayable { shadowDisplay.get() }
+    private val shadowColorMode = ListValue("Shadow-Color", arrayOf("Background", "Text", "Static"), "Background").displayable { shadowDisplay.get() }
     private val shadowColorRedValue = IntegerValue("Shadow-Red", 0, 0, 255).displayable { shadowDisplay.get() }
     private val shadowColorGreenValue = IntegerValue("Shadow-Green", 111, 0, 255).displayable { shadowDisplay.get() }
     private val shadowColorBlueValue = IntegerValue("Shadow-Blue", 255, 0, 255).displayable { shadowDisplay.get() }
diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/KeyStrokes.kt b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/KeyStrokes.kt
index 81a6378e1c..30c18e338f 100644
--- a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/KeyStrokes.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/KeyStrokes.kt
@@ -15,6 +15,7 @@ import net.ccbluex.liquidbounce.utils.render.ColorUtils
 import net.ccbluex.liquidbounce.utils.render.RenderUtils
 import net.ccbluex.liquidbounce.utils.render.shadowRenderUtils
 import net.ccbluex.liquidbounce.utils.CPSCounter
+import net.ccbluex.liquidbounce.utils.render.RenderUtils.*
 import net.ccbluex.liquidbounce.value.*
 import net.minecraft.util.ResourceLocation
 import net.minecraft.client.gui.FontRenderer
@@ -68,7 +69,7 @@ class KeyStrokes : Element(5.0, 25.0, 1.5F, Side.default()) {
 
         if(keyStyleValue.get().equals("Jello")) {
             for (keyStroke in keys) { keyStroke.renderJelloBlur(this.renderX.toFloat(), this.renderY.toFloat(), scale) }
-            RenderUtils.drawImage2(ResourceLocation("fdpclient/misc/keystrokes.png"), -3.5f, -3.5f, 54, 54)
+            drawImage2(ResourceLocation("fdpclient/misc/keystrokes.png"), -3.5f, -3.5f, 54, 54)
             for (keyStroke in keys) { keyStroke.renderJelloIndicator(animSpeedValue.get(), backGroundColor, textColor, highLightPercent.get(), this.renderX.toFloat(), this.renderY.toFloat(), scale) }
         }
 
@@ -77,8 +78,8 @@ class KeyStrokes : Element(5.0, 25.0, 1.5F, Side.default()) {
                 keyStroke.renderJuul(animSpeedValue.get(), backGroundColor, textColor, highLightPercent.get(), outline.get(), outlineBoldValue.get(), fontValue.get(), blurValue.get(), this.renderX.toFloat(), this.renderY.toFloat(), scale)
             }
            val fontRenderer = fontValue.get()
-           RenderUtils.drawRoundedCornerRect(0f, 32f, 23f, 47f, 4f, if (mc.gameSettings.keyBindAttack.isKeyDown) { Color(65, 65, 75, 255).rgb } else { Color(95, 95, 105, 255).rgb } )
-           RenderUtils.drawRoundedCornerRect(24f, 32f, 47f, 47f, 4f, if (mc.gameSettings.keyBindUseItem.isKeyDown) { Color(65, 65, 75, 255).rgb } else { Color(95, 95, 105, 255).rgb } )
+           drawRoundedCornerRect(0f, 32f, 23f, 47f, 4f, if (mc.gameSettings.keyBindAttack.isKeyDown) { Color(65, 65, 75, 255).rgb } else { Color(95, 95, 105, 255).rgb } )
+           drawRoundedCornerRect(24f, 32f, 47f, 47f, 4f, if (mc.gameSettings.keyBindUseItem.isKeyDown) { Color(65, 65, 75, 255).rgb } else { Color(95, 95, 105, 255).rgb } )
             val juulLeft = if (CPSCounter.getCPS(CPSCounter.MouseButton.LEFT).toFloat() != 0f) { CPSCounter.getCPS(CPSCounter.MouseButton.LEFT).toString() + " cps" } else { "Left" }
            val juulRight = if (CPSCounter.getCPS(CPSCounter.MouseButton.RIGHT).toFloat() != 0f) { CPSCounter.getCPS(CPSCounter.MouseButton.RIGHT).toString() + "CPS" } else { "Right" }
            Fonts.font28.drawString(juulLeft, 15.5f - (fontRenderer.getStringWidth(juulLeft) / 2f) + 1f, 39.5f - (fontRenderer.FONT_HEIGHT / 2f) + 2f, textColor.rgb)
@@ -114,7 +115,7 @@ class KeyStroke(val key: KeyBinding, val posX: Int, val posY: Int, val width: In
         val nowTime = System.currentTimeMillis()
 
         val rectColor = if (lastClick && animations.isEmpty()) { ColorUtils.reAlpha(highLightColor, clickAlpha.toInt()) } else { bgColor }
-        RenderUtils.drawRect(0F, 0F, width.toFloat(), height.toFloat(), rectColor)
+        drawRect(0F, 0F, width.toFloat(), height.toFloat(), rectColor)
 
         val removeAble = ArrayList<Long>()
         for (time in animations) {
@@ -123,7 +124,7 @@ class KeyStroke(val key: KeyBinding, val posX: Int, val posY: Int, val width: In
                 removeAble.add(time)
                 continue
             }
-            RenderUtils.drawLimitedCircle(0F, 0F, width.toFloat(), height.toFloat(), centerX, centerY, (width * 0.7F) * pct, Color(255 - ((255 - highLightColor.red) * pct).toInt(), 255 - ((255 - highLightColor.green) * pct).toInt(), 255 - ((255 - highLightColor.blue) * pct).toInt(), 255 - ((255 - clickAlpha) * pct).toInt()))
+            drawLimitedCircle(0F, 0F, width.toFloat(), height.toFloat(), centerX, centerY, (width * 0.7F) * pct, Color(255 - ((255 - highLightColor.red) * pct).toInt(), 255 - ((255 - highLightColor.green) * pct).toInt(), 255 - ((255 - highLightColor.blue) * pct).toInt(), 255 - ((255 - clickAlpha) * pct).toInt()))
         }
         for (time in removeAble) {
             animations.remove(time)
@@ -134,16 +135,16 @@ class KeyStroke(val key: KeyBinding, val posX: Int, val posY: Int, val width: In
         }
         
         if (key.isKeyDown && animations.isEmpty())
-            RenderUtils.drawRect(0F, 0F, width.toFloat(), height.toFloat(), ColorUtils.reAlpha(highLightColor, clickAlpha.toInt()))
+            drawRect(0F, 0F, width.toFloat(), height.toFloat(), ColorUtils.reAlpha(highLightColor, clickAlpha.toInt()))
         
         lastClick = key.isKeyDown
 
         font.drawString(keyName, centerX - (font.getStringWidth(keyName) / 2) + 1, centerY - (font.FONT_HEIGHT / 2) + 1, textColor.rgb)
         if (outline) {
-            RenderUtils.drawRect(0F, 0F, outlineBold.toFloat(), height.toFloat(), textColor.rgb)
-            RenderUtils.drawRect((width - outlineBold).toFloat(), 0F, width.toFloat(), height.toFloat(), textColor.rgb)
-            RenderUtils.drawRect((outlineBold).toFloat(), 0F, (width - outlineBold).toFloat(), outlineBold.toFloat(), textColor.rgb)
-            RenderUtils.drawRect((outlineBold).toFloat(), (height - outlineBold).toFloat(), (width - outlineBold).toFloat(), height.toFloat(), textColor.rgb)
+            drawRect(0F, 0F, outlineBold.toFloat(), height.toFloat(), textColor.rgb)
+            drawRect((width - outlineBold).toFloat(), 0F, width.toFloat(), height.toFloat(), textColor.rgb)
+            drawRect((outlineBold).toFloat(), 0F, (width - outlineBold).toFloat(), outlineBold.toFloat(), textColor.rgb)
+            drawRect((outlineBold).toFloat(), (height - outlineBold).toFloat(), (width - outlineBold).toFloat(), height.toFloat(), textColor.rgb)
         }
 
         GL11.glPopMatrix()
@@ -159,7 +160,7 @@ class KeyStroke(val key: KeyBinding, val posX: Int, val posY: Int, val width: In
             } else {
                 Color(95, 95, 95, 255)
             }
-            RenderUtils.drawRoundedCornerRect(0F, 0F, width.toFloat(), height.toFloat(), 3f, rectColor.rgb)
+            drawRoundedCornerRect(0F, 0F, width.toFloat(), height.toFloat(), 3f, rectColor.rgb)
             lastClick = key.isKeyDown
 
             Fonts.font28.drawString(keyName, width / 2 - (font.getStringWidth(keyName) / 2) + 1, height / 2 - (font.FONT_HEIGHT / 2) + 2, textColor.rgb)
@@ -183,7 +184,7 @@ class KeyStroke(val key: KeyBinding, val posX: Int, val posY: Int, val width: In
         val centerY = height / 2
         val nowTime = System.currentTimeMillis()
         val rectColor = if (lastClick && animations.isEmpty()) { ColorUtils.reAlpha(highLightColor, clickAlpha.toInt()) } else { Color(0f,0f,0f,0f) }
-        RenderUtils.drawRect(0F, 0F, width.toFloat(), height.toFloat(), rectColor)
+        drawRect(0F, 0F, width.toFloat(), height.toFloat(), rectColor)
 
         val removeAble = ArrayList<Long>()
         for (time in animations) {
@@ -192,7 +193,7 @@ class KeyStroke(val key: KeyBinding, val posX: Int, val posY: Int, val width: In
                 removeAble.add(time)
                 continue
             }
-            RenderUtils.drawLimitedCircle(0F, 0F, width.toFloat(), height.toFloat(), centerX, centerY, (width * 0.7F) * pct, Color(255 - ((255 - highLightColor.red) * pct).toInt(), 255 - ((255 - highLightColor.green) * pct).toInt(), 255 - ((255 - highLightColor.blue) * pct).toInt(), 255 - ((255 - clickAlpha) * pct).toInt()))
+            drawLimitedCircle(0F, 0F, width.toFloat(), height.toFloat(), centerX, centerY, (width * 0.7F) * pct, Color(255 - ((255 - highLightColor.red) * pct).toInt(), 255 - ((255 - highLightColor.green) * pct).toInt(), 255 - ((255 - highLightColor.blue) * pct).toInt(), 255 - ((255 - clickAlpha) * pct).toInt()))
         }
         for (time in removeAble) {
             animations.remove(time)
diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Notifications.kt b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Notifications.kt
index 045c40da60..faf4c9f328 100644
--- a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Notifications.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Notifications.kt
@@ -15,8 +15,6 @@ import net.ccbluex.liquidbounce.utils.render.*
 import net.ccbluex.liquidbounce.ui.font.Fonts
 import net.ccbluex.liquidbounce.value.*
 import net.ccbluex.liquidbounce.utils.render.shadowRenderUtils
-import net.minecraft.util.ResourceLocation
-import net.minecraft.client.renderer.GlStateManager
 import org.lwjgl.opengl.GL11
 import java.awt.Color
 import kotlin.math.max
@@ -36,7 +34,7 @@ class Notifications(x: Double = 0.0, y: Double = 0.0, scale: Float = 1F,side: Si
     private val whiteText = BoolValue("WhiteTextColor", true)
     private val modeColored = BoolValue("CustomModeColored", true)
     companion object {
-        val styleValue = ListValue("Mode", arrayOf("Classic", "FDP", "Modern", "Tenacity", "Intellij", "Skid"), "Modern")
+        val styleValue = ListValue("Mode", arrayOf("Classic", "FDP", "Modern", "Skid"), "Modern")
     }
 
     /**
@@ -124,7 +122,7 @@ class Notification(
         val realY = -(index + 1) * height
         val nowTime = System.currentTimeMillis()
         var transY = nowY.toDouble()
-        var lbtl = font.getStringWidth(title + ": " + content)
+        var lbtl = font.getStringWidth("$title: $content")
         var x = 0f
         
         var textColor = Color(255, 255, 255).rgb
@@ -186,10 +184,10 @@ class Notification(
         GL11.glTranslated(transX, transY, 0.0)
         // draw notify
         val style = parent.styleValue.get()
-        val nTypeWarning = if(type.renderColor == Color(0xF5FD00)){ true } else { false }
-        val nTypeInfo = if(type.renderColor == Color(0x6490A7)) { true } else { false }
-        val nTypeSuccess = if(type.renderColor == Color(0x60E092)) { true } else { false }
-        val nTypeError = if(type.renderColor == Color(0xFF2F2F)) { true } else { false }
+        val nTypeWarning = type.renderColor == Color(0xF5FD00)
+        val nTypeInfo = type.renderColor == Color(0x6490A7)
+        val nTypeSuccess = type.renderColor == Color(0x60E092)
+        val nTypeError = type.renderColor == Color(0xFF2F2F)
 
 
         if (style.equals("Modern")) {
@@ -264,7 +262,7 @@ class Notification(
             }
             
             val colors = Color(0, 0, 0, alpha / 4)
-            
+
             if (motionBlur) {
                 when (fadeState) {
                     FadeState.IN -> {
@@ -326,37 +324,6 @@ class Notification(
             return false
             }
 
-        if(style.equals("Tenacity")){ 
-        val fontRenderer = Fonts.font35
-        val thisWidth=100.coerceAtLeast(fontRenderer.getStringWidth(this.title).coerceAtLeast(fontRenderer.getStringWidth(this.content)) + 40)
-        val error = ResourceLocation("fdpclient/ui/notifications/icons/tenacity/cross.png")
-        val successful = ResourceLocation("fdpclient/ui/notifications/icons/tenacity/tick.png")
-        val warn = ResourceLocation("fdpclient/ui/notifications/icons/tenacity/warning.png")
-        val info = ResourceLocation("fdpclient/ui/notifications/icons/tenacity/info.png")
-        if(type.renderColor == Color(0xFF2F2F)){
-            RenderUtils.drawRoundedCornerRect(-18F,1F,thisWidth.toFloat(),height.toFloat() - 2F,5f,Color(180,0,0,190).rgb)
-            RenderUtils.drawImage(error,-13,5,18,18)
-            Fonts.font35.drawString(title,9F,16F,Color(255,255,255,255).rgb)
-            Fonts.font40.drawString(content,9F,6F,Color(255,255,255,255).rgb)
-        }else if(type.renderColor == Color(0x60E092)){
-            RenderUtils.drawRoundedCornerRect(-16F,1F,thisWidth.toFloat(),height.toFloat() - 2F,5f,Color(0,180,0,190).rgb)
-            RenderUtils.drawImage(successful,-13,5,18,18)
-            Fonts.font35.drawString(title,9F,16F,Color(255,255,255,255).rgb)
-            Fonts.font40.drawString(content,9F,6F,Color(255,255,255,255).rgb)
-        } else if(type.renderColor == Color(0xF5FD00)){
-            RenderUtils.drawRoundedCornerRect(-16F,1F,thisWidth.toFloat(),height.toFloat() - 2F,5f,Color(0,0,0,190).rgb)
-            RenderUtils.drawImage(warn,-13,5,18,18)
-            Fonts.font35.drawString(title,9F,16F,Color(255,255,255,255).rgb)
-            Fonts.font40.drawString(content,9F,6F,Color(255,255,255,255).rgb)
-        } else {
-            RenderUtils.drawRoundedCornerRect(-16F,1F,thisWidth.toFloat(),height.toFloat() - 2F,5f,Color(0,0,0,190).rgb)
-            RenderUtils.drawImage(info,-13,5,18,18)
-            Fonts.font35.drawString(title,9F,16F,Color(255,255,255,255).rgb)
-            Fonts.font40.drawString(content,9F,6F,Color(255,255,255,255).rgb)
-        }
-        return false
-        }
-
         if(style.equals("Classic")) {
             if (blurRadius != 0f)
                 BlurUtils.draw((x + transX).toFloat() * scale, (y + transY).toFloat() * scale, width * scale, classicHeight * scale, blurRadius) 
@@ -369,62 +336,6 @@ class Notification(
             return false
        }
 
-        if(style.equals("Intellij")) {
-                val notifyDir = "fdpclient/notifications/icons/noti/intellij/"
-                val imgSuccess = ResourceLocation("${notifyDir}checkmark.png")
-                val imgError = ResourceLocation("${notifyDir}error.png")
-                val imgWarning = ResourceLocation("${notifyDir}warning.png")
-                val imgInfo = ResourceLocation("${notifyDir}info.png")
-
-                val dist = (x + 1 + 26F) - (x - 8 - textLength)
-                val kek = -x - 1 - 20F
-
-                GlStateManager.resetColor()
-
-                Stencil.write(true)
-                if(nTypeError){
-                    RenderUtils.drawRoundedRect(-x + 9 + textLength, 1f, kek - 1, -28F - 1, 0F, Color(115,69,75).rgb)
-                    RenderUtils.drawRoundedRect(-x + 8 + textLength, 0f, kek, -28F, 0F, Color(89,61,65).rgb)
-                    FontLoaders.M16.DisplayFont2(
-                        FontLoaders.M16,title, -x + 6, -25F, Color(249,130,108).rgb, true)
-                }
-                if(nTypeInfo) {
-                    RenderUtils.drawRoundedRect(-x + 9 + textLength,  1f, kek - 1, -28F - 1, 0F, Color(70,94,115).rgb)
-                    RenderUtils.drawRoundedRect(-x + 8 + textLength, 0f, kek, -28F, 0F, Color(61,72,87).rgb)
-                    FontLoaders.M16.DisplayFont2(
-                        FontLoaders.M16,title, -x + 6, -25F, Color(119,145,147).rgb, true)
-                }
-                if(nTypeSuccess){
-                    RenderUtils.drawRoundedRect(-x + 9 + textLength, 1f, kek - 1, -28F - 1, 0F, Color(67,104,67).rgb)
-                    RenderUtils.drawRoundedRect(-x + 8 + textLength, 0f, kek, -28F, 0F, Color(55,78,55).rgb)
-                    FontLoaders.M16.DisplayFont2(
-                        FontLoaders.M16,title, -x + 6, -25F, Color(10,142,2).rgb, true)
-                }
-                if(nTypeWarning){
-                    RenderUtils.drawRoundedRect(-x + 9 + textLength, 1f, kek - 1, -28F - 1, 0F, Color(103,103,63).rgb)
-                    RenderUtils.drawRoundedRect(-x + 8 + textLength, 0f, kek, -28F, 0F, Color(80,80,57).rgb)
-                    FontLoaders.M16.DisplayFont2(
-                        FontLoaders.M16,title, -x + 6, -25F, Color(175,163,0).rgb, true)
-                }
-
-                Stencil.erase(true)
-
-                GlStateManager.resetColor()
-
-                Stencil.dispose()
-
-                GL11.glPushMatrix()
-                GlStateManager.disableAlpha()
-                GlStateManager.resetColor()
-                GL11.glColor4f(1F, 1F, 1F, 1F)
-                RenderUtils.drawImage2(if(nTypeSuccess){imgSuccess} else if(nTypeError){imgError} else if(nTypeWarning){imgWarning} else {imgInfo}, kek + 5, -25F - y, 7, 7)
-                GlStateManager.enableAlpha()
-                GL11.glPopMatrix()
-
-
-                FontLoaders.M16.DisplayFont2(FontLoaders.M16,content, -x + 6, -13F, -1, true)
-                return false
-        } 
     return false
     }
       
diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Targets.kt b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Targets.kt
index 134bec9d3a..a510a2153c 100644
--- a/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Targets.kt
+++ b/src/main/java/net/ccbluex/liquidbounce/ui/client/hud/element/elements/Targets.kt
@@ -44,7 +44,7 @@ open class Targets : Element(-46.0, -40.0, 1F, Side(Side.Horizontal.MIDDLE, Side
 
     // Style settings
     private val styleDisplay = BoolValue("Style Options:", true)
-    val modeValue = ListValue("Mode", arrayOf("FDP", "Bar", "Chill", "ChillLite", "Vape", "Stitch", "Rice", "Slowly", "Remix", "Astolfo", "Astolfo2", "Liquid", "Flux", "Rise", "Exhibition", "ExhibitionOld", "Zamorozka", "Arris", "Tenacity", "Tenacity5", "WaterMelon", "SparklingWater"), "Slowly").displayable { styleDisplay.get() }
+    val modeValue = ListValue("Mode", arrayOf("FDP", "Bar", "Chill", "ChillLite", "Vape", "Stitch", "Rice", "Slowly", "Remix", "Astolfo", "Astolfo2", "Liquid", "Flux", "Rise", "Exhibition", "ExhibitionOld", "Zamorozka", "Arris", "Tenacity", "Tenacity5", "WaterMelon", "SparklingWater"), "Flux").displayable { styleDisplay.get() }
     private val modeRise = ListValue("RiseMode", arrayOf("Original", "New1", "New2", "Rise6"), "Rise6").displayable { modeValue.equals("Rise") }.displayable { styleDisplay.get() }
     private val chillFontSpeed = FloatValue("Chill-FontSpeed", 0.5F, 0.01F, 1F).displayable { modeValue.get().equals("chill", true) }.displayable { styleDisplay.get() }
 
diff --git a/src/main/java/net/ccbluex/liquidbounce/utils/render/RenderUtils.java b/src/main/java/net/ccbluex/liquidbounce/utils/render/RenderUtils.java
index a9001b7d2d..b48f933e8a 100644
--- a/src/main/java/net/ccbluex/liquidbounce/utils/render/RenderUtils.java
+++ b/src/main/java/net/ccbluex/liquidbounce/utils/render/RenderUtils.java
@@ -2294,6 +2294,21 @@ public static void drawOutlinedBoundingBox(AxisAlignedBB aa) {
         tessellator.draw();
     }
 
+    public static Color getGradientOffset(Color color1, Color color2, double offset) {
+        double inverse_percent;
+        int redPart;
+        if(offset > 1.0D) {
+            inverse_percent = offset % 1.0D;
+            redPart = (int)offset;
+            offset = redPart % 2 == 0?inverse_percent:1.0D - inverse_percent;
+        }
+        inverse_percent = 1.0D - offset;
+        redPart = (int)((double)color1.getRed() * inverse_percent + (double)color2.getRed() * offset);
+        int greenPart = (int)((double)color1.getGreen() * inverse_percent + (double)color2.getGreen() * offset);
+        int bluePart = (int)((double)color1.getBlue() * inverse_percent + (double)color2.getBlue() * offset);
+        return new Color(redPart, greenPart, bluePart);
+    }
+
     public static void drawBoundingBox(AxisAlignedBB aa) {
         Tessellator tessellator = Tessellator.getInstance();
         WorldRenderer worldRenderer = tessellator.getWorldRenderer();
diff --git a/src/main/resources/assets/minecraft/fdpclient/ui/clickgui/slight/background.png b/src/main/resources/assets/minecraft/fdpclient/ui/clickgui/slight/background.png
deleted file mode 100644
index d67b933d96..0000000000
Binary files a/src/main/resources/assets/minecraft/fdpclient/ui/clickgui/slight/background.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/intellij/checkmark.png b/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/intellij/checkmark.png
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/intellij/error.png b/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/intellij/error.png
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/intellij/info.png b/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/intellij/info.png
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/intellij/warning.png b/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/intellij/warning.png
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/tenacity/cross.png b/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/tenacity/cross.png
deleted file mode 100644
index 7c22dbc044..0000000000
Binary files a/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/tenacity/cross.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/tenacity/info.png b/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/tenacity/info.png
deleted file mode 100644
index 5d349015e3..0000000000
Binary files a/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/tenacity/info.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/tenacity/tick.png b/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/tenacity/tick.png
deleted file mode 100644
index 7e1a4b8ffb..0000000000
Binary files a/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/tenacity/tick.png and /dev/null differ
diff --git a/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/tenacity/warning.png b/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/tenacity/warning.png
deleted file mode 100644
index 16060b2682..0000000000
Binary files a/src/main/resources/assets/minecraft/fdpclient/ui/notifications/icons/tenacity/warning.png and /dev/null differ