diff --git a/src/main/java/org/saturnclient/saturnclient/auth/PlayerTracker.java b/src/main/java/org/saturnclient/saturnclient/auth/PlayerTracker.java
index ae23374..52baafc 100644
--- a/src/main/java/org/saturnclient/saturnclient/auth/PlayerTracker.java
+++ b/src/main/java/org/saturnclient/saturnclient/auth/PlayerTracker.java
@@ -45,6 +45,7 @@ public class PlayerTracker {
     private static void onPlayerJoin(MinecraftClient client, PlayerListEntry player) {
         GameProfile profile = player.getProfile();
         String uuid = profile.getId().toString();
-        SaturnSocket.player(profile.getName(), uuid);
+        if (uuid != SaturnSocket.uuid)
+            SaturnSocket.player(profile.getName(), uuid);
     }
 }
diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/CloakFeatureRenderer.java b/src/main/java/org/saturnclient/saturnclient/cosmetics/CloakFeatureRenderer.java
index 46e10ff..e59915c 100644
--- a/src/main/java/org/saturnclient/saturnclient/cosmetics/CloakFeatureRenderer.java
+++ b/src/main/java/org/saturnclient/saturnclient/cosmetics/CloakFeatureRenderer.java
@@ -1,8 +1,7 @@
 package org.saturnclient.saturnclient.cosmetics;
 
-import org.saturnclient.saturnclient.SaturnClient;
-import org.saturnclient.saturnclient.auth.SaturnPlayer;
 import org.saturnclient.saturnclient.auth.SaturnSocket;
+import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
 
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.RenderLayer;
@@ -63,15 +62,9 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
                     return;
                 }
 
-                SaturnPlayer player = SaturnSocket.players.get(uuid);
+                Identifier customCape = Cloaks.getCurrentCloakTexture(uuid);
 
-                if (player.cloak == "") {
-                    return;
-                }
-
-                Identifier customCape = Identifier.of(SaturnClient.MOD_ID, "textures/cloaks/" + player.cloak + ".png");
-
-                if (!this.hasCustomModelForLayer(playerEntityRenderState.equippedChestStack, LayerType.WINGS)) {
+                if (customCape != null && !this.hasCustomModelForLayer(playerEntityRenderState.equippedChestStack, LayerType.WINGS)) {
                     matrixStack.push();
                     if (this.hasCustomModelForLayer(playerEntityRenderState.equippedChestStack, LayerType.HUMANOID)) {
                         matrixStack.translate(0.0F, -0.053125F, 0.06875F);
diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/glitch.gif b/src/main/resources/assets/saturnclient/textures/cloaks/glitch.gif
index 8a4299b..3a9645f 100644
Binary files a/src/main/resources/assets/saturnclient/textures/cloaks/glitch.gif and b/src/main/resources/assets/saturnclient/textures/cloaks/glitch.gif differ
diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/glitch.png b/src/main/resources/assets/saturnclient/textures/cloaks/glitch.png
index e0d7f86..5124eb2 100644
Binary files a/src/main/resources/assets/saturnclient/textures/cloaks/glitch.png and b/src/main/resources/assets/saturnclient/textures/cloaks/glitch.png differ
diff --git a/src/main/resources/assets/saturnclient/textures/cloaks/glitch_.png b/src/main/resources/assets/saturnclient/textures/cloaks/glitch_.png
deleted file mode 100644
index 6370fba..0000000
Binary files a/src/main/resources/assets/saturnclient/textures/cloaks/glitch_.png and /dev/null differ
diff --git a/src/main/resources/assets/saturnclient/textures/gui/cloak/glitch.png b/src/main/resources/assets/saturnclient/textures/gui/cloak/glitch.png
index c8bf2e9..b0ea453 100644
Binary files a/src/main/resources/assets/saturnclient/textures/gui/cloak/glitch.png and b/src/main/resources/assets/saturnclient/textures/gui/cloak/glitch.png differ
diff --git a/test.svg b/test.svg
deleted file mode 100644
index 3455337..0000000
--- a/test.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="20" width="25" viewBox="0 0 640 512"><!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.--><path fill="#ffffff" d="M320 64c14.4 0 22.3-7 30.8-14.4C360.4 41.1 370.7 32 392 32c49.3 0 84.4 152.2 97.9 221.9C447.8 272.1 390.9 288 320 288s-127.8-15.9-169.9-34.1C163.6 184.2 198.7 32 248 32c21.3 0 31.6 9.1 41.2 17.6C297.7 57 305.6 64 320 64zM111.1 270.7c47.2 24.5 117.5 49.3 209 49.3s161.8-24.8 208.9-49.3c24.8-12.9 49.8-28.3 70.1-47.7c7.9-7.9 20.2-9.2 29.6-3.3c9.5 5.9 13.5 17.9 9.9 28.5c-13.5 37.7-38.4 72.3-66.1 100.6C523.7 398.9 443.6 448 320 448s-203.6-49.1-252.5-99.2C39.8 320.4 14.9 285.8 1.4 248.1c-3.6-10.6 .4-22.6 9.9-28.5c9.5-5.9 21.7-4.5 29.6 3.3c20.4 19.4 45.3 34.8 70.1 47.7z"/></svg>
\ No newline at end of file