diff --git a/src/main/java/org/saturnclient/saturnclient/menus/CloaksMenu.java b/src/main/java/org/saturnclient/saturnclient/menus/CloaksMenu.java
index f480751..e4e50f8 100644
--- a/src/main/java/org/saturnclient/saturnclient/menus/CloaksMenu.java
+++ b/src/main/java/org/saturnclient/saturnclient/menus/CloaksMenu.java
@@ -1,17 +1,18 @@
 package org.saturnclient.saturnclient.menus;
 
+import net.minecraft.text.Text;
 import org.saturnclient.saturnclient.auth.SaturnSocket;
 import org.saturnclient.saturnclient.cloaks.Cloaks;
 import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.Textures;
 import org.saturnclient.ui.animations.Slide;
 import org.saturnclient.ui.widgets.SaturnClickableSprite;
-import org.saturnclient.ui.widgets.SaturnSprite;
 import org.saturnclient.ui.widgets.SaturnImage;
 import org.saturnclient.ui.widgets.SaturnScroll;
-import net.minecraft.text.Text;
+import org.saturnclient.ui.widgets.SaturnSprite;
 
 public class CloaksMenu extends SaturnUi {
+
     public CloaksMenu() {
         super(Text.of("Cloaks Menu"));
     }
@@ -23,22 +24,26 @@ public class CloaksMenu extends SaturnUi {
         int rectX = (width - rectWidth) / 2;
         int rectY = (height - rectHeight + 15) / 2;
 
-        draw(new SaturnSprite(Textures.SETTINGS_BG)
+        draw(
+            new SaturnSprite(Textures.SETTINGS_BG)
                 .setX(rectX)
                 .setY(rectY)
                 .setWidth(rectWidth)
                 .setHeight(rectHeight)
-                .setAnimations(new Slide(1, 10)));
+                .setAnimations(new Slide(1, 10))
+        );
 
         int tabsX = (width - 43) / 2;
         int tabsY = rectY - 17;
 
-        draw(new SaturnSprite(Textures.TABS)
+        draw(
+            new SaturnSprite(Textures.TABS)
                 .setX(tabsX)
                 .setY(tabsY)
                 .setWidth(43)
                 .setHeight(15)
-                .setAnimations(new Slide(1, 10)));
+                .setAnimations(new Slide(1, 10))
+        );
 
         int cloakWidth = 32;
         int cloakHeight = 70;
@@ -50,20 +55,24 @@ public class CloaksMenu extends SaturnUi {
         SaturnScroll modsScroll = new SaturnScroll();
 
         for (String cloak : Cloaks.availableCloaks) {
-            modsScroll.draw(new SaturnClickableSprite(Textures.BUTTON_BORDER, () -> {
-                Cloaks.setCloak(SaturnSocket.uuid, cloak);
-            })
+            modsScroll.draw(
+                new SaturnClickableSprite(Textures.BUTTON_BORDER, () -> {
+                    Cloaks.setCloak(SaturnSocket.uuid, cloak);
+                })
                     .setColor(10526880)
                     .setX(modX)
                     .setY(modY)
                     .setWidth(cloakWidth + 6)
-                    .setHeight(cloakHeight + 6));
+                    .setHeight(cloakHeight + 6)
+            );
 
-            modsScroll.draw(new SaturnImage(Textures.getCloakPreview(cloak))
+            modsScroll.draw(
+                new SaturnImage(Textures.getCloakPreview(cloak))
                     .setX(modX + 3)
                     .setY(modY + 3)
                     .setWidth(cloakWidth)
-                    .setHeight(cloakHeight));
+                    .setHeight(cloakHeight)
+            );
 
             col++;
 
@@ -76,7 +85,14 @@ public class CloaksMenu extends SaturnUi {
             }
         }
 
-        draw(modsScroll.setX(rectX + 17).setY(rectY + 10).setWidth(rectWidth - 17).setHeight(rectHeight - 10));
+        draw(
+            modsScroll
+                .setX(rectX + 17)
+                .setY(rectY + 10)
+                .setWidth(rectWidth - 17)
+                .setHeight(rectHeight - 10)
+                .setAnimations(new Slide(1, 10))
+        );
 
         super.init();
     }
diff --git a/src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java b/src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java
index 4135746..714f5e0 100644
--- a/src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java
+++ b/src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java
@@ -1,15 +1,16 @@
 package org.saturnclient.saturnclient.mixin;
 
-import org.saturnclient.saturnclient.auth.SaturnSocket;
+import net.minecraft.client.network.PlayerListEntry;
+import net.minecraft.text.Text;
 import org.jetbrains.annotations.Nullable;
+import org.saturnclient.saturnclient.auth.SaturnSocket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
-import net.minecraft.client.network.PlayerListEntry;
-import net.minecraft.text.Text;
 
 @Mixin(PlayerListEntry.class)
 public abstract class TabListMixin {
+
     @Shadow
     private Text displayName;
 
@@ -21,7 +22,11 @@ public abstract class TabListMixin {
     @Overwrite
     @Nullable
     public Text getDisplayName() {
-        String name = displayName.getString();
-        return Text.literal(SaturnSocket.playerNames.containsKey(name) ? "" + name : name);
+        String name = (displayName != null)
+            ? displayName.getString()
+            : ((PlayerListEntry) (Object) this).getProfile().getName();
+        return Text.literal(
+            SaturnSocket.playerNames.containsKey(name) ? "" + name : name
+        );
     }
 }
diff --git a/src/main/java/org/saturnclient/ui/components/SaturnToggle.java b/src/main/java/org/saturnclient/ui/components/SaturnToggle.java
index c2c77a6..2633600 100644
--- a/src/main/java/org/saturnclient/ui/components/SaturnToggle.java
+++ b/src/main/java/org/saturnclient/ui/components/SaturnToggle.java
@@ -28,7 +28,7 @@ public class SaturnToggle extends SaturnWidget {
         int color = prop.value
             ? SaturnClient.COLOR
             : SaturnClient.getWhite(alpha);
-        int w = 16;
+        int w = 13;
         int h = 6;
         int s = 8;
 
@@ -49,7 +49,7 @@ public class SaturnToggle extends SaturnWidget {
         context.drawTexture(
             RenderLayer::getGuiTextured,
             Textures.TOGGLE_INDICATOR,
-            prop.value ? x + 8 : x,
+            prop.value ? x + 5 : x,
             y,
             0,
             0,
diff --git a/src/main/resources/assets/minecraft/textures/font/custom/saturn.png b/src/main/resources/assets/minecraft/textures/font/custom/saturn.png
index 6e42bc2..f464196 100644
Binary files a/src/main/resources/assets/minecraft/textures/font/custom/saturn.png and b/src/main/resources/assets/minecraft/textures/font/custom/saturn.png differ
diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/mod_bg.png b/src/main/resources/assets/saturnclient/textures/gui/components/mod_bg.png
index 9eb0eee..464a3cf 100644
Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/mod_bg.png and b/src/main/resources/assets/saturnclient/textures/gui/components/mod_bg.png differ
diff --git a/src/main/resources/assets/saturnclient/textures/gui/components/toggle_bg.png b/src/main/resources/assets/saturnclient/textures/gui/components/toggle_bg.png
index 34150fb..733b8bc 100644
Binary files a/src/main/resources/assets/saturnclient/textures/gui/components/toggle_bg.png and b/src/main/resources/assets/saturnclient/textures/gui/components/toggle_bg.png differ