diff --git a/src/resources/datatables/LightsaberColors.java b/src/resources/datatables/LightsaberColors.java
index cdf2c0cc..cb2028c5 100644
--- a/src/resources/datatables/LightsaberColors.java
+++ b/src/resources/datatables/LightsaberColors.java
@@ -31,42 +31,42 @@ public final class LightsaberColors {
 	static
 	{
 		// Basic color crystals with the basic lightsaber shader
-		map.put("Red", 0x00);
-		map.put("Dark Red", 0x01);
-		map.put("Light Green", 0x02);
-		map.put("Dark Green", 0x03);
-		map.put("Blue", 0x04);
-		map.put("Dark Blue", 0x05);
-		map.put("Yellow", 0x06);
-		map.put("Dark Yellow", 0x07);
-		map.put("Light Purple", 0x08);
-		map.put("Purple", 0x09);
-		map.put("Orange", 0x0A);
-		map.put("Brown", 0x0B);
-		map.put("Maul's Vengeance", 0x0C);
-		map.put("Kun's Blood", 0x0D);
-		map.put("Bondara's Folly", 0x0E);
-		map.put("Ulic's Redemption", 0x0F);
-		map.put("Bane's Heart", 0x10);
-		map.put("Gallia's Intuition", 0x11);		
-		map.put("Prowess of Plo Koon", 0x12);
-		map.put("B'Nar's Sacrifice", 0x13);
-		map.put("Windu's Guile", 0x14);
-		map.put("Mundi's Response", 0x15);
-		map.put("Strength of Luminaria", 0x16);		
-		map.put("Baaa's Wisdom", 0x17);
-		map.put("Quintessence of Force", 0x18);
-		map.put("Dawn of Dagobah", 0x19);
-		map.put("Horn's Future", 0x1A);
-		map.put("Qui-Gon's Devotion", 0x1B);
-		map.put("Kenobi's Legacy", 0x1C);
-		map.put("Sunrider's Destiny", 0x1D);
-		map.put("Kit's Ferocity", 0x1E);
+		map.put("Red", 0);
+		map.put("Dark Red", 1);
+		map.put("Light Green", 2);
+		map.put("Dark Green", 3);
+		map.put("Blue", 4);
+		map.put("Dark Blue", 5);
+		map.put("Yellow", 6);
+		map.put("Dark Yellow", 7);
+		map.put("Light Purple", 8);
+		map.put("Dark Purple", 9);
+		map.put("Orange", 10);
+		map.put("Brown", 11);
+		map.put("Allya's Exile", 12);
+		map.put("Kun's Blood", 13);
+		map.put("Bondara's Folly", 14);
+		map.put("Ulic's Redemption", 15);
+		map.put("Bane's Heart", 16);
+		map.put("Gallia's Intuition", 17);		
+		map.put("Prowess of Plo Koon", 18);
+		map.put("B'Nar's Sacrifice", 19);
+		map.put("Windu's Guile", 20);
+		map.put("Mundi's Response", 21);
+		map.put("Strength of Luminaria", 22);		
+		map.put("Baaa's Wisdom", 23);
+		map.put("Quintessence of the Force", 24);
+		map.put("Dawn of Dagobah", 25);
+		map.put("Horn's Future", 26);
+		map.put("Allya's Redemption", 27);
+		map.put("Kenobi's Legacy", 28);
+		map.put("Sunrider's Destiny", 29);
+		map.put("Kit's Ferocity", 30);
 		
 		// Special crystals that have seperate shaders - the 256 is for a hacky way to set blade type and color without more code
 		map.put("Lava", 256 + 1);
 		map.put("Permafrost", 256 + 2);
-		map.put("Blackwing", 256 + 3);
+		map.put("Blackwing Bezoar", 256 + 3);
 	}
 	
 	public static int getByName(String colorName)
diff --git a/src/services/EquipmentService.java b/src/services/EquipmentService.java
index 7cc326e0..4b6fe8f1 100644
--- a/src/services/EquipmentService.java
+++ b/src/services/EquipmentService.java
@@ -331,7 +331,7 @@ public class EquipmentService implements INetworkDispatch {
 		// Check if player tuned the crystal
 		if(tunerId != actor.getObjectId())
 		{
-			actor.sendSystemMessage("You did not tune this crystal.", (byte) 0);
+			actor.sendSystemMessage("@jedi_spam/saber_crystal_not_owner", (byte) 0);
 			return;
 		}
 		else item.getContainer().transferTo(actor, targetContainer, item);
diff --git a/src/services/LootService.java b/src/services/LootService.java
index 06c21012..f5a62344 100644
--- a/src/services/LootService.java
+++ b/src/services/LootService.java
@@ -542,8 +542,9 @@ public class LootService implements INetworkDispatch {
 			int crystalColor = new Random().nextInt(11);
 			
 			droppedItem.setCustomizationVariable("/private/index_color_1", (byte) crystalColor);
-			//droppedItem.getAttributes().put("@obj_attr_n:color", resources.datatables.LightsaberColors.get(crystalColor));
-			droppedItem.getAttributes().put("@obj_attr_n:color", "@jedi_spam:saber_color_" + crystalColor);
+			droppedItem.getAttributes().put("@obj_attr_n:color", resources.datatables.LightsaberColors.get(crystalColor));
+			//droppedItem.getAttributes().put("@obj_attr_n:color", "@jedi_spam:saber_color_" + crystalColor); // Commented out for now
+			
 		}
 		
 		// Example power crystal