diff --git a/src/de/steamwar/bungeecore/listeners/TablistManager.java b/src/de/steamwar/bungeecore/listeners/TablistManager.java
index 798f1133..16b49a23 100644
--- a/src/de/steamwar/bungeecore/listeners/TablistManager.java
+++ b/src/de/steamwar/bungeecore/listeners/TablistManager.java
@@ -298,10 +298,14 @@ public class TablistManager extends BasicListener {
         public void print(Tablist viewer, boolean slim) {
             boolean sameServer = viewer.player.getServer().getInfo() == info;
 
+            //TODO: Correct size prediction
+            //TODO: Devserver
             SteamwarUser user = SteamwarUser.get(viewer.player.getUniqueId());
             for(TablistPlayer player : players){
-                if(sameServer || (user.getTeam() != 0 && user.getTeam() == SteamwarUser.get(player.player.getUniqueId()).getTeam()))
+                if(sameServer)
                     viewer.setSlot(BungeeTabListPlusAPI.getIconFromPlayer(player.player), player.defaultName.startsWith("§7") ? "§f" + player.player.getName() : player.defaultName, 1);
+                else if(user.getTeam() != 0 && user.getTeam() == SteamwarUser.get(player.player.getUniqueId()).getTeam())
+                    viewer.setSlot(BungeeTabListPlusAPI.getIconFromPlayer(player.player), player.defaultName.startsWith("§7") ? "§f" + player.player.getName() : player.defaultName, 500);
                 else if(!slim || displaySlim(viewer.player, player.player))
                     viewer.setSlot(BungeeTabListPlusAPI.getIconFromPlayer(player.player), player.defaultName, 500);
             }