diff --git a/ReallifeGamemode.Client/Gui/nametags.ts b/ReallifeGamemode.Client/Gui/nametags.ts
index 9cf0618d..df6fc96d 100644
--- a/ReallifeGamemode.Client/Gui/nametags.ts
+++ b/ReallifeGamemode.Client/Gui/nametags.ts
@@ -9,7 +9,7 @@ var playerColors = [];
 export default function customNametags() {
 
     mp.nametags.enabled = false;
-
+    /*
     mp.events.addDataHandler("nameTagColor", (entity, value) => {
         if (entity.type === "player") {
             var color = JSON.parse(value);
@@ -21,14 +21,12 @@ export default function customNametags() {
     mp.events.add('setNameTag', (value) => {
         var color = JSON.parse(value);
         mp.gui.chat.push(color);
-    });
+    });*/
 
     mp.events.add('render', (nametags) => {
         const graphics = mp.game.graphics;
         const screenRes = graphics.getScreenResolution(0, 0);
 
-
-
         nametags.forEach(nametag => {
             let [player, x, y, distance] = nametag;
 
@@ -45,8 +43,8 @@ export default function customNametags() {
                 mp.game.graphics.drawText(player.name + " (" + player.remoteId + ")", [x, y],
                     {
                         font: 4,
-                        color: [player.data.nametagColor[0], player.data.nametagColor[1], player.data.nametagColor[2], 200], //Grove //Ballas 171 0 207 //PD 0 95 190 //FIB 0 0 170 LSED 147 0 0 NR 0 166 133 Trucker 255 162 Support 0 255 255 Zivilist 255 255 255
-                        //color: [255, 255, 255, 255],
+                        //color: [player.data.nametagColor[0], player.data.nametagColor[1], player.data.nametagColor[2], 200], //Grove //Ballas 171 0 207 //PD 0 95 190 //FIB 0 0 170 LSED 147 0 0 NR 0 166 133 Trucker 255 162 Support 0 255 255 Zivilist 255 255 255
+                        color: [255, 255, 255, 255],
                         scale: [0.4, 0.4],
                         outline: true,
                         centre: false
diff --git a/ReallifeGamemode.Server/Events/Key.cs b/ReallifeGamemode.Server/Events/Key.cs
index 8e978c02..9ae0aaaa 100644
--- a/ReallifeGamemode.Server/Events/Key.cs
+++ b/ReallifeGamemode.Server/Events/Key.cs
@@ -279,23 +279,23 @@ namespace ReallifeGamemode.Server.Events
               //LSPD
               case 1:
                 //nameTagColor = new Color(28, 134, 238);
-                player.TriggerEvent("setNameTag", JsonConvert.SerializeObject(new int[] { 28, 134, 238 }))
-                player.SetSharedData("nameTagColor", JsonConvert.SerializeObject(new int[] { 28, 134, 238}));
+                //player.TriggerEvent("setNameTag", JsonConvert.SerializeObject(new int[] { 28, 134, 238 }));
+                //player.SetSharedData("nameTagColor", JsonConvert.SerializeObject(new int[] { 28, 134, 238}));
                 player.SetSharedData("blipColor", 38);
                 break;
 
               //Medic
               case 2:
                 //nameTagColor = new Color(255, 0, 0);
-                player.TriggerEvent("setNameTag", JsonConvert.SerializeObject(new int[] { 255, 0, 0 }));
-                player.SetSharedData("nameTagColor", new int[] { 255, 0, 0});
+                //player.TriggerEvent("setNameTag", JsonConvert.SerializeObject(new int[] { 255, 0, 0 }));
+                //player.SetSharedData("nameTagColor", new int[] { 255, 0, 0});
                 player.SetSharedData("blipColor", 79);
                 break;
 
               //FBI
               case 3:
                 //nameTagColor = new Color(173, 0, 118);
-                player.SetSharedData("nameTagColor", new int[] { 173, 0, 118});
+                //player.SetSharedData("nameTagColor", new int[] { 173, 0, 118});
                 player.SetSharedData("blipColor", 72);
                 player.SetAccessories(2, 2, 0);
                 break;
diff --git a/ReallifeGamemode.Server/Events/Login.cs b/ReallifeGamemode.Server/Events/Login.cs
index 54c7e342..4667db80 100644
--- a/ReallifeGamemode.Server/Events/Login.cs
+++ b/ReallifeGamemode.Server/Events/Login.cs
@@ -104,22 +104,22 @@ namespace ReallifeGamemode.Server.Events
             {
               case null:
                 player.SetSharedData("blipColor", 0);
-                player.SetSharedData("nameTagColor", new int[] { 255, 255, 255 });
+                //player.SetSharedData("nameTagColor", new int[] { 255, 255, 255 });
                 break;
 
               case 0:
                 player.SetSharedData("blipColor", 0);
-                player.SetSharedData("nameTagColor", new int[] { 255, 255, 255 });
+                //player.SetSharedData("nameTagColor", new int[] { 255, 255, 255 });
                 break;
 
               case 8:
                 player.SetSharedData("blipColor", 83);
-                player.SetSharedData("nameTagColor", new int[]{171, 0, 207});
+                //player.SetSharedData("nameTagColor", new int[]{171, 0, 207});
                 break;
 
               case 7:
                 player.SetSharedData("blipColor", 52);
-                player.SetSharedData("nameTagColor", new int[] { 0, 54, 0});
+                //player.SetSharedData("nameTagColor", new int[] { 0, 54, 0});
                 break;
 
               case 4:
@@ -127,7 +127,7 @@ namespace ReallifeGamemode.Server.Events
                 break;
               case 9:
                 player.SetSharedData("blipColor", 25);
-                player.SetSharedData("nameTagColor", new int[] { 0, 166, 133});
+                //player.SetSharedData("nameTagColor", new int[] { 0, 166, 133});
                 break;
             }