diff --git a/_entWatch4/configs/entwatch/ze_abandoned_project_v1_2.cfg b/_entWatch4/configs/entwatch/ze_abandoned_project_v1_2.cfg
index 55975970..3d0082a1 100644
--- a/_entWatch4/configs/entwatch/ze_abandoned_project_v1_2.cfg
+++ b/_entWatch4/configs/entwatch/ze_abandoned_project_v1_2.cfg
@@ -33,7 +33,7 @@
 	}
 	"2"
 	{
-		"name"          "Turret1"
+		"name"          "Turret"
 		"short"         "Turret"
 		"color"         "111111"
 		"filter"        "torreta_0"
@@ -48,7 +48,7 @@
 	}
 	"3"
 	{
-		"name"          "Turret2"
+		"name"          "Turret"
 		"short"         "Turret"
 		"color"         "111111"
 		"filter"        "torreta_1"
diff --git a/_entWatch4/configs/entwatch/ze_death_star_escape_v4_3.cfg b/_entWatch4/configs/entwatch/ze_death_star_escape_v4_3.cfg
index acc6d614..b26164e0 100644
--- a/_entWatch4/configs/entwatch/ze_death_star_escape_v4_3.cfg
+++ b/_entWatch4/configs/entwatch/ze_death_star_escape_v4_3.cfg
@@ -3,7 +3,7 @@
 	// Human - Items
 	"0"
 	{
-		"name"          "Blue LightSaber"
+		"name"          "Blue Lightsaber"
 		"short"         "Blue Saber"
 		"color"         "0000FF"
 		"filter"        "Player_Fire"
@@ -18,7 +18,7 @@
 	}
 	"1"
 	{
-		"name"          "Red LightSaber"
+		"name"          "Red Lightsaber"
 		"short"         "Red Saber"
 		"color"         "FF0000"
 		"filter"        "Player_Earth"
diff --git a/_entWatch4/configs/entwatch/ze_ffvii_cosmo_canyon_v5fix.cfg b/_entWatch4/configs/entwatch/ze_ffvii_cosmo_canyon_v5fix.cfg
index 2426cc33..adc7f515 100644
--- a/_entWatch4/configs/entwatch/ze_ffvii_cosmo_canyon_v5fix.cfg
+++ b/_entWatch4/configs/entwatch/ze_ffvii_cosmo_canyon_v5fix.cfg
@@ -157,8 +157,8 @@
 	// Zombie - Items
 	"10"
 	{
-		"name"          "Ice Materia"
-		"short"         "Ice"
+		"name"          "[ZM] Ice Materia"
+		"short"         "[ZM] Ice"
 		"color"         "00BFFF"
 		"filter"        "Ice_Z_Owner"
 		"weaponid"      "1589580"
@@ -172,8 +172,8 @@
 	}
 	"11"
 	{
-		"name"          "Fire Materia"
-		"short"         "Fire"
+		"name"          "[ZM] Fire Materia"
+		"short"         "[ZM] Fire"
 		"color"         "B22222"
 		"filter"        "Fire_Z_Owner"
 		"weaponid"      "1576012"
@@ -187,8 +187,8 @@
 	}
 	"12"
 	{
-		"name"          "Poison Materia"
-		"short"         "Poison"
+		"name"          "[ZM] Poison Materia"
+		"short"         "[ZM] Poison"
 		"color"         "7CFC00"
 		"filter"        "Poison_Z_Owner"
 		"weaponid"      "2102221"
@@ -202,8 +202,8 @@
 	}
 	"13"
 	{
-		"name"          "Confuse Materia"
-		"short"         "Confuse"
+		"name"          "[ZM] Confuse Materia"
+		"short"         "[ZM] Confuse"
 		"color"         "9B27D1"
 		"filter"        "Confuse_Owner"
 		"weaponid"      "3468411"
@@ -219,8 +219,8 @@
 	// Zombie - Misc
 	"14"
 	{
-		"name"          "Pampa"
-		"short"         "Pampa"
+		"name"          "[ZM] Pampa"
+		"short"         "[ZM] Pampa"
 		"color"         "9B27D1"
 		"filter"        "CactusZM_Z_Owner"
 		"weaponid"      "1446677"
diff --git a/_entWatch4/configs/entwatch/ze_ffxii_feywood_b3_1.cfg b/_entWatch4/configs/entwatch/ze_ffxii_feywood_b3_1.cfg
index 796c3afa..1b904e05 100644
--- a/_entWatch4/configs/entwatch/ze_ffxii_feywood_b3_1.cfg
+++ b/_entWatch4/configs/entwatch/ze_ffxii_feywood_b3_1.cfg
@@ -110,8 +110,8 @@
 	// Zombie - Items
 	"7"
 	{
-		"name"          "Warp Magick"
-		"short"         "Warp"
+		"name"          "[ZM] Warp Magick"
+		"short"         "[ZM] Warp"
 		"color"         "FF00FF"
 		"filter"        "Warp_Z_Owner"
 		"weaponid"      "1871651"
@@ -125,8 +125,8 @@
 	}
 	"8"
 	{
-		"name"          "Dark Magick"
-		"short"         "Dark"
+		"name"          "[ZM] Dark Magick"
+		"short"         "[ZM] Dark"
 		"color"         "8B689F"
 		"filter"        "Darkaga_Z_Owner"
 		"weaponid"      "1871410"
@@ -140,8 +140,8 @@
 	}
 	"9"
 	{
-		"name"          "Fire Magick"
-		"short"         "Fire"
+		"name"          "[ZM] Fire Magick"
+		"short"         "[ZM] Fire"
 		"color"         "FF0000"
 		"filter"        "Fire_Z_Owner"
 		"weaponid"      "1870326"
@@ -155,8 +155,8 @@
 	}
 	"10"
 	{
-		"name"          "Heal Magick"
-		"short"         "Heal"
+		"name"          "[ZM] Heal Magick"
+		"short"         "[ZM] Heal"
 		"color"         "FFFFFF"
 		"filter"        "Heal_Z_Owner"
 		"weaponid"      "1869948"
diff --git a/_entWatch4/configs/entwatch/ze_ffxii_paramina_rift_v1_4.cfg b/_entWatch4/configs/entwatch/ze_ffxii_paramina_rift_v1_4.cfg
index 8327fde3..da0a8445 100644
--- a/_entWatch4/configs/entwatch/ze_ffxii_paramina_rift_v1_4.cfg
+++ b/_entWatch4/configs/entwatch/ze_ffxii_paramina_rift_v1_4.cfg
@@ -174,8 +174,8 @@
 	// Zombie - Items
 	"11"
 	{
-		"name"          "Warp Magick"
-		"short"         "Warp"
+		"name"          "[ZM] Warp Magick"
+		"short"         "[ZM] Warp"
 		"color"         "B40404"
 		"filter"        ""
 		"weaponid"      "2511649"
@@ -189,8 +189,8 @@
 	}
 	"12"
 	{
-		"name"          "Lure Magick"
-		"short"         "Lure"
+		"name"          "[ZM] Lure Magick"
+		"short"         "[ZM] Lure"
 		"color"         "B40404"
 		"filter"        ""
 		"weaponid"      "2511748"
@@ -204,8 +204,8 @@
 	}
 	"13"
 	{
-		"name"          "Fire Magick"
-		"short"         "Fire"
+		"name"          "[ZM] Fire Magick"
+		"short"         "[ZM] Fire"
 		"color"         "B40404"
 		"filter"        ""
 		"weaponid"      "2512450"
@@ -219,8 +219,8 @@
 	}
 	"14"
 	{
-		"name"          "Frost Magick"
-		"short"         "Frost"
+		"name"          "[ZM] Frost Magick"
+		"short"         "[ZM] Frost"
 		"color"         "B40404"
 		"filter"        ""
 		"weaponid"      "2512303"
diff --git a/_entWatch4/configs/entwatch/ze_ffxii_westersand_v5_2.cfg b/_entWatch4/configs/entwatch/ze_ffxii_westersand_v5_2.cfg
index df461ef4..b53a1b7d 100644
--- a/_entWatch4/configs/entwatch/ze_ffxii_westersand_v5_2.cfg
+++ b/_entWatch4/configs/entwatch/ze_ffxii_westersand_v5_2.cfg
@@ -157,8 +157,8 @@
 	// Zombie - Items
 	"10"
 	{
-		"name"          "Warp"
-		"short"         "Warp"
+		"name"          "[ZM] Warp"
+		"short"         "[ZM] Warp"
 		"color"         "FF0000"
 		"filter"        "warpcaster"
 		"weaponid"      "476523"
@@ -172,8 +172,8 @@
 	}
 	"11"
 	{
-		"name"          "Lure"
-		"short"         "Lure"
+		"name"          "[ZM] Lure"
+		"short"         "[ZM] Lure"
 		"color"         "FF0000"
 		"filter"        "lurecaster"
 		"weaponid"      "476278"
@@ -187,8 +187,8 @@
 	}
 	"12"
 	{
-		"name"          "Blind"
-		"short"         "Blind"
+		"name"          "[ZM] Blind"
+		"short"         "[ZM] Blind"
 		"color"         "FF0000"
 		"filter"        "blindcaster"
 		"weaponid"      "476360"
@@ -202,8 +202,8 @@
 	}
 	"13"
 	{
-		"name"          "Chocobo"
-		"short"         "Chocobo"
+		"name"          "[ZM] Chocobo"
+		"short"         "[ZM] Chocobo"
 		"color"         "FF0000"
 		"filter"        ""
 		"weaponid"      "795408"
@@ -217,8 +217,8 @@
 	}
 	"14"
 	{
-		"name"          "Chocobo"
-		"short"         "Chocobo"
+		"name"          "[ZM] Chocobo"
+		"short"         "[ZM] Chocobo"
 		"color"         "FF0000"
 		"filter"        ""
 		"weaponid"      "795464"
diff --git a/_entWatch4/configs/entwatch/ze_ffxii_westersand_v7_2.cfg b/_entWatch4/configs/entwatch/ze_ffxii_westersand_v7_2.cfg
index 5ff6f285..b781379d 100644
--- a/_entWatch4/configs/entwatch/ze_ffxii_westersand_v7_2.cfg
+++ b/_entWatch4/configs/entwatch/ze_ffxii_westersand_v7_2.cfg
@@ -172,8 +172,8 @@
 	// Zombie - Items
 	"11"
 	{
-		"name"          "Warp"
-		"short"         "Warp"
+		"name"          "[ZM] Warp"
+		"short"         "[ZM] Warp"
 		"color"         "B40404"
 		"filter"        "Player_Knife_Warp"
 		"weaponid"      "473843"
@@ -187,8 +187,8 @@
 	}
 	"12"
 	{
-		"name"          "Invisibility"
-		"short"         "Invisibility"
+		"name"          "[ZM] Invisibility"
+		"short"         "[ZM] Invisibility"
 		"color"         "B40404"
 		"filter"        "Player_Knife_Invis"
 		"weaponid"      "474656"
@@ -202,8 +202,8 @@
 	}
 	"13"
 	{
-		"name"          "Lure"
-		"short"         "Lure"
+		"name"          "[ZM] Lure"
+		"short"         "[ZM] Lure"
 		"color"         "B40404"
 		"filter"        "Player_Knife_Lure"
 		"weaponid"      "474985"
@@ -217,8 +217,8 @@
 	}
 	"14"
 	{
-		"name"          "Heal"
-		"short"         "Heal"
+		"name"          "[ZM] Heal"
+		"short"         "[ZM] Heal"
 		"color"         "B40404"
 		"filter"        "Player_Knife_Blind"
 		"weaponid"      "475298"
@@ -232,8 +232,8 @@
 	}
 	"15"
 	{
-		"name"          "Chocobo"
-		"short"         "Chocobo"
+		"name"          "[ZM] Chocobo"
+		"short"         "[ZM] Chocobo"
 		"color"         "FF0000"
 		"filter"        ""
 		"weaponid"      "1608309"
diff --git a/_entWatch4/configs/entwatch/ze_ffxii_westersand_v8zeta1.cfg b/_entWatch4/configs/entwatch/ze_ffxii_westersand_v8zeta1.cfg
index 797f19f2..61b59ef7 100644
--- a/_entWatch4/configs/entwatch/ze_ffxii_westersand_v8zeta1.cfg
+++ b/_entWatch4/configs/entwatch/ze_ffxii_westersand_v8zeta1.cfg
@@ -127,8 +127,8 @@
 	// Zombie - Items
 	"9"
 	{
-		"name"          "Lure"
-		"short"         "Lure"
+		"name"          "[ZM] Lure"
+		"short"         "[ZM] Lure"
 		"color"         "FF0000"
 		"filter"        "Player_Knife_Lure"
 		"weaponid"      "2665489"
@@ -142,8 +142,8 @@
 	}
 	"10"
 	{
-		"name"          "Blind"
-		"short"         "Blind"
+		"name"          "[ZM] Blind"
+		"short"         "[ZM] Blind"
 		"color"         "FF0000"
 		"filter"        "Player_Knife_Blind"
 		"weaponid"      "2665770"
@@ -157,8 +157,8 @@
 	}
 	"11"
 	{
-		"name"          "Warp"
-		"short"         "Warp"
+		"name"          "[ZM] Warp"
+		"short"         "[ZM] Warp"
 		"color"         "FF0000"
 		"filter"        "Player_Knife_Warp"
 		"weaponid"      "2666579"
@@ -172,8 +172,8 @@
 	}
 	"12"
 	{
-		"name"          "Invisibility"
-		"short"         "Invisibility"
+		"name"          "[ZM] Invisibility"
+		"short"         "[ZM] Invisibility"
 		"color"         "FF0000"
 		"filter"        "Player_Knife_Invis"
 		"weaponid"      "2666721"
@@ -187,8 +187,8 @@
 	}
 	"13"
 	{
-		"name"          "Shield"
-		"short"         "Shield"
+		"name"          "[ZM] Shield"
+		"short"         "[ZM] Shield"
 		"color"         "FF0000"
 		"filter"        "Player_Knife_Shield"
 		"weaponid"      "2666977"
@@ -202,8 +202,8 @@
 	}
 	"14"
 	{
-		"name"          "Heal"
-		"short"         "Heal"
+		"name"          "[ZM] Heal"
+		"short"         "[ZM] Heal"
 		"color"         "FF0000"
 		"filter"        "Player_Knife_Heal"
 		"weaponid"      "2667303"
@@ -217,8 +217,8 @@
 	}
 	"15"
 	{
-		"name"          "Fire"
-		"short"         "Fire"
+		"name"          "[ZM] Fire"
+		"short"         "[ZM] Fire"
 		"color"         "FF0000"
 		"filter"        "Player_Knife_Fire"
 		"weaponid"      "2708384"
@@ -232,8 +232,8 @@
 	}
 	"16"
 	{
-		"name"          "Frost"
-		"short"         "Frost"
+		"name"          "[ZM] Frost"
+		"short"         "[ZM] Frost"
 		"color"         "FF0000"
 		"filter"        "Player_Knife_Frost"
 		"weaponid"      "2708451"
diff --git a/_entWatch4/configs/entwatch/ze_ffxiv_wanderers_palace_v5_2f.cfg b/_entWatch4/configs/entwatch/ze_ffxiv_wanderers_palace_v5_2f.cfg
index 6fc7edec..b7baf58e 100644
--- a/_entWatch4/configs/entwatch/ze_ffxiv_wanderers_palace_v5_2f.cfg
+++ b/_entWatch4/configs/entwatch/ze_ffxiv_wanderers_palace_v5_2f.cfg
@@ -144,8 +144,8 @@
 	// Zombie - Items
 	"9"
 	{
-		"name"          "Gravity"
-		"short"         "Gravity"
+		"name"          "[ZM] Gravity"
+		"short"         "[ZM] Gravity"
 		"color"         "8000FF"
 		"filter"        "Player_Zombie_Gravity"
 		"weaponid"      "6007303"
@@ -159,8 +159,8 @@
 	}
 	"10"
 	{
-		"name"          "Heal"
-		"short"         "Heal"
+		"name"          "[ZM] Heal"
+		"short"         "[ZM] Heal"
 		"color"         "FFFFFF"
 		"filter"        "Player_Zombie_Heal"
 		"weaponid"      "6008042"
@@ -174,8 +174,8 @@
 	}
 	"11"
 	{
-		"name"          "Ice"
-		"short"         "Ice"
+		"name"          "[ZM] Ice"
+		"short"         "[ZM] Ice"
 		"color"         "00FFFF"
 		"filter"        "Player_Zombie_Ice"
 		"weaponid"      "6008636"
@@ -189,8 +189,8 @@
 	}
 	"12"
 	{
-		"name"          "Malefic"
-		"short"         "Malefic"
+		"name"          "[ZM] Malefic"
+		"short"         "[ZM] Malefic"
 		"color"         "00FFFF"
 		"filter"        "Player_Zombie_Malefic"
 		"weaponid"      "6008053"
@@ -204,8 +204,8 @@
 	}
 	"13"
 	{
-		"name"          "Seymour Natus"
-		"short"         "Seymour"
+		"name"          "[ZM] Seymour Natus"
+		"short"         "[ZM] Seymour"
 		"color"         "8000FF"
 		"filter"        "Player_Zombie_Seymour"
 		"weaponid"      "6006573"
@@ -219,8 +219,8 @@
 	}
 	"14"
 	{
-		"name"          "Bahamut Wing"
-		"short"         "Bahamut"
+		"name"          "[ZM] Bahamut Wing"
+		"short"         "[ZM] Bahamut"
 		"color"         "00FFFF"
 		"filter"        "Player_Zombie_Bahamut"
 		"weaponid"      "6006090"
@@ -235,8 +235,8 @@
 
 	"15"
 	{
-		"name"          "Vyraal"
-		"short"         "Vyraal"
+		"name"          "[ZM] Vyraal"
+		"short"         "[ZM] Vyraal"
 		"color"         "C0C0C0"
 		"filter"        "Player_Zombie_Vyraal"
 		"weaponid"      "6006814"
@@ -250,8 +250,8 @@
 	}
 	"16"
 	{
-		"name"          "Alteci"
-		"short"         "Alteci"
+		"name"          "[ZM] Alteci"
+		"short"         "[ZM] Alteci"
 		"color"         "C0C0C0"
 		"filter"        "Player_Zombie_Alteci"
 		"weaponid"      "6007341"
@@ -265,8 +265,8 @@
 	}
 	"17"
 	{
-		"name"          "Garuda"
-		"short"         "Garuda"
+		"name"          "[ZM] Garuda"
+		"short"         "[ZM] Garuda"
 		"color"         "F06E00"
 		"filter"        "Player_Zombie_Garuda"
 		"weaponid"      "6007281"
diff --git a/_entWatch4/configs/entwatch/ze_grau_s2.cfg b/_entWatch4/configs/entwatch/ze_grau_s2.cfg
index 2884fd63..78b6d0d4 100644
--- a/_entWatch4/configs/entwatch/ze_grau_s2.cfg
+++ b/_entWatch4/configs/entwatch/ze_grau_s2.cfg
@@ -3,8 +3,8 @@
 	// Zombie - Items
 	"0"
 	{
-		"name"          "Item1"
-		"short"         "Item1"
+		"name"          "Item"
+		"short"         "Item"
 		"color"         "FF0000"
 		"filter"        "item1_gr"
 		"weaponid"      "298159"
@@ -18,8 +18,8 @@
 	}
 	"1"
 	{
-		"name"          "Item2"
-		"short"         "Item2"
+		"name"          "Item"
+		"short"         "Item"
 		"color"         "FF0000"
 		"filter"        "item2_gr"
 		"weaponid"      "298201"
@@ -33,8 +33,8 @@
 	}
 	"2"
 	{
-		"name"          "Item3"
-		"short"         "Item3"
+		"name"          "Item"
+		"short"         "Item"
 		"color"         "FF0000"
 		"filter"        "item3_gr"
 		"weaponid"      "377002"
diff --git a/_entWatch4/configs/entwatch/ze_gris_fyk.cfg b/_entWatch4/configs/entwatch/ze_gris_fyk.cfg
index 7ab18338..52bb8de6 100644
--- a/_entWatch4/configs/entwatch/ze_gris_fyk.cfg
+++ b/_entWatch4/configs/entwatch/ze_gris_fyk.cfg
@@ -20,8 +20,8 @@
 	// Zombie - Items
 	"1"
 	{
-		"name"          "Item1"
-		"short"         "Item1"
+		"name"          "Item"
+		"short"         "Item"
 		"color"         "FF0000"
 		"filter"        "item1"
 		"weaponid"      "1019078"
@@ -35,8 +35,8 @@
 	}
 	"2"
 	{
-		"name"          "Item2"
-		"short"         "Item2"
+		"name"          "Item"
+		"short"         "Item"
 		"color"         "FF0000"
 		"filter"        "item2"
 		"weaponid"      "1021495"
@@ -50,8 +50,8 @@
 	}
 	"3"
 	{
-		"name"          "Item3"
-		"short"         "Item3"
+		"name"          "Item"
+		"short"         "Item"
 		"color"         "FF0000"
 		"filter"        "item3"
 		"weaponid"      "1020939"
diff --git a/_entWatch4/configs/entwatch/ze_icecap_derp_unloze_v420.cfg b/_entWatch4/configs/entwatch/ze_icecap_derp_unloze_v420.cfg
index e065e657..61424163 100644
--- a/_entWatch4/configs/entwatch/ze_icecap_derp_unloze_v420.cfg
+++ b/_entWatch4/configs/entwatch/ze_icecap_derp_unloze_v420.cfg
@@ -3,8 +3,8 @@
 	// Human - Items
 	"0"
 	{
-		"name"          "Cock 1"
-		"short"         "Cock 1"
+		"name"          "Cock"
+		"short"         "Cock"
 		"color"         "FF2828"
 		"filter"        ""
 		"weaponid"      "145599"
@@ -18,8 +18,8 @@
 	}
 	"1"
 	{
-		"name"          "Cock 2"
-		"short"         "Cock 2"
+		"name"          "Cock"
+		"short"         "Cock"
 		"color"         "7DBEFF"
 		"filter"        ""
 		"weaponid"      "213802"
@@ -33,8 +33,8 @@
 	}
 	"2"
 	{
-		"name"          "Cock 3"
-		"short"         "Cock 3"
+		"name"          "Cock"
+		"short"         "Cock"
 		"color"         "F4F4F4"
 		"filter"        ""
 		"weaponid"      "266867"
diff --git a/_entWatch4/configs/entwatch/ze_l0v0l_v1_4.cfg b/_entWatch4/configs/entwatch/ze_l0v0l_v1_4.cfg
index 9d896416..f50ee62c 100644
--- a/_entWatch4/configs/entwatch/ze_l0v0l_v1_4.cfg
+++ b/_entWatch4/configs/entwatch/ze_l0v0l_v1_4.cfg
@@ -200,8 +200,8 @@
 	// Zombie - Items
 	"13"
 	{
-		"name"          "Gravity"
-		"short"         "Gravity"
+		"name"          "[ZM] Gravity"
+		"short"         "[ZM] Gravity"
 		"color"         "FF00FF"
 		"filter"        "player_zgravity"
 		"weaponid"      "432888"
@@ -215,8 +215,8 @@
 	}
 	"14"
 	{
-		"name"          "Heal"
-		"short"         "Heal"
+		"name"          "[ZM] Heal"
+		"short"         "[ZM] Heal"
 		"color"         "F08080"
 		"filter"        "player_zheal"
 		"weaponid"      "433324"
diff --git a/_entWatch4/configs/entwatch/ze_lotr_minas_tirith_v2_2fix.cfg b/_entWatch4/configs/entwatch/ze_lotr_minas_tirith_v2_2fix.cfg
index 7a17a7aa..563ecf36 100644
--- a/_entWatch4/configs/entwatch/ze_lotr_minas_tirith_v2_2fix.cfg
+++ b/_entWatch4/configs/entwatch/ze_lotr_minas_tirith_v2_2fix.cfg
@@ -47,21 +47,6 @@
 		"cooldown"      "0"
 	}
 	"3"
-	{
-		"name"          "Horse"
-		"short"         "Horse"
-		"color"         "0040FF"
-		"filter"        ""
-		"weaponid"      "2347177"
-		"buttonid"      "0"
-		"triggerid"     "4042877"
-		"display"       "5"
-		"slot"          "3"
-		"mode"          "0"
-		"maxuses"       "0"
-		"cooldown"      "0"
-	}
-	"4"
 	{
 		"name"          "Oil Vase"
 		"short"         "Oil"
@@ -76,7 +61,7 @@
 		"maxuses"       "0"
 		"cooldown"      "0"
 	}
-	"5"
+	"4"
 	{
 		"name"          "Ammo Barrel"
 		"short"         "Ammo"
@@ -91,7 +76,7 @@
 		"maxuses"       "0"
 		"cooldown"      "0"
 	}
-	"6"
+	"5"
 	{
 		"name"          "Armor"
 		"short"         "Armor"
@@ -106,7 +91,7 @@
 		"maxuses"       "0"
 		"cooldown"      "0"
 	}
-	"7"
+	"6"
 	{
 		"name"          "Flag"
 		"short"         "Flag"
@@ -123,7 +108,7 @@
 	}
 
 	// Human - Misc
-	"8"
+	"7"
 	{
 		"name"          "Torch"
 		"short"         "Torch"
@@ -138,7 +123,7 @@
 		"maxuses"       "0"
 		"cooldown"      "0"
 	}
-	"9"
+	"8"
 	{
 		"name"          "Torch"
 		"short"         "Torch"
@@ -155,7 +140,7 @@
 	}
 
 	// Human - Barricades
-	"10"
+	"9"
 	{
 		"name"          "Barricade - Explosive Barrel"
 		"short"         "Explosive Barrel"
@@ -170,7 +155,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"11"
+	"10"
 	{
 		"name"          "Barricade - Toilet"
 		"short"         "Toilet"
@@ -185,7 +170,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"12"
+	"11"
 	{
 		"name"          "Barricade - Bench"
 		"short"         "Bench"
@@ -200,7 +185,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"13"
+	"12"
 	{
 		"name"          "Barricade - Shelf"
 		"short"         "Shelf"
@@ -215,7 +200,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"14"
+	"13"
 	{
 		"name"          "Barricade - Fence"
 		"short"         "Fence"
@@ -230,7 +215,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"15"
+	"14"
 	{
 		"name"          "Barricade - Basket"
 		"short"         "Basket"
@@ -245,7 +230,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"16"
+	"15"
 	{
 		"name"          "Barricade - Plank"
 		"short"         "Plank"
@@ -260,7 +245,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"27"
+	"16"
 	{
 		"name"          "Barricade - Bell"
 		"short"         "Bell"
@@ -275,7 +260,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"28"
+	"17"
 	{
 		"name"          "Barricade - Haybale"
 		"short"         "Haybale"
@@ -290,7 +275,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"19"
+	"18"
 	{
 		"name"          "Barricade - Big Boulder"
 		"short"         "Big Boulder"
@@ -305,7 +290,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"20"
+	"19"
 	{
 		"name"          "Barricade - Boulder"
 		"short"         "Boulder"
@@ -320,7 +305,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"21"
+	"20"
 	{
 		"name"          "Barricade - Barrel"
 		"short"         "Barrel"
@@ -335,7 +320,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"22"
+	"21"
 	{
 		"name"          "Barricade - Table"
 		"short"         "Table"
@@ -350,7 +335,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"23"
+	"22"
 	{
 		"name"          "Barricade - Crate"
 		"short"         "Crate"
@@ -367,7 +352,7 @@
 	}
 
 	// Zombie - Items
-	"24"
+	"23"
 	{
 		"name"          "Totem"
 		"short"         "Totem"
@@ -382,7 +367,7 @@
 		"maxuses"       "0"
 		"cooldown"      "0"
 	}
-	"25"
+	"24"
 	{
 		"name"          "TNT"
 		"short"         "TNT"
@@ -397,7 +382,7 @@
 		"maxuses"       "0"
 		"cooldown"      "0"
 	}
-	"26"
+	"25"
 	{
 		"name"          "Troll"
 		"short"         "Troll"
@@ -412,7 +397,7 @@
 		"maxuses"       "0"
 		"cooldown"      "0"
 	}
-	"27"
+	"26"
 	{
 		"name"          "Balrog"
 		"short"         "Balrog"
@@ -427,7 +412,7 @@
 		"maxuses"       "0"
 		"cooldown"      "0"
 	}
-	"28"
+	"27"
 	{
 		"name"          "Nazgul"
 		"short"         "Nazgul"
@@ -444,27 +429,27 @@
 	}
 
 	// Zombie - Triggers
-	"29"
+	"28"
 	{
 		"name"          "Extreme Totem"
 		"triggerid"     "4658425"
 	}
-	"30"
+	"29"
 	{
 		"name"          "Extreme TNT"
 		"triggerid"     "4658428"
 	}
-	"31"
+	"30"
 	{
 		"name"          "Extreme Troll"
 		"triggerid"     "4658434"
 	}
-	"32"
+	"31"
 	{
 		"name"          "Stage 1 Nazgul"
 		"triggerid"     "4963264"
 	}
-	"33"
+	"32"
 	{
 		"name"          "Stage 4 Nazgul"
 		"triggerid"     "4963466"
diff --git a/_entWatch4/configs/entwatch/ze_lotr_minas_tirith_v3_3.cfg b/_entWatch4/configs/entwatch/ze_lotr_minas_tirith_v3_3.cfg
index f500b49a..d0875b9c 100644
--- a/_entWatch4/configs/entwatch/ze_lotr_minas_tirith_v3_3.cfg
+++ b/_entWatch4/configs/entwatch/ze_lotr_minas_tirith_v3_3.cfg
@@ -47,21 +47,6 @@
 		"cooldown"      "0"
 	}
 	"3"
-	{
-		"name"          "Horse"
-		"short"         "Horse"
-		"color"         "0040FF"
-		"filter"        ""
-		"weaponid"      "2347177"
-		"buttonid"      "0"
-		"triggerid"     "4042877"
-		"display"       "5"
-		"slot"          "3"
-		"mode"          "0"
-		"maxuses"       "0"
-		"cooldown"      "0"
-	}
-	"4"
 	{
 		"name"          "Oil Vase"
 		"short"         "Oil"
@@ -76,7 +61,7 @@
 		"maxuses"       "0"
 		"cooldown"      "0"
 	}
-	"5"
+	"4"
 	{
 		"name"          "Ammo Barrel"
 		"short"         "Ammo"
@@ -91,7 +76,7 @@
 		"maxuses"       "0"
 		"cooldown"      "0"
 	}
-	"6"
+	"5"
 	{
 		"name"          "Armor"
 		"short"         "Armor"
@@ -106,7 +91,7 @@
 		"maxuses"       "0"
 		"cooldown"      "0"
 	}
-	"7"
+	"6"
 	{
 		"name"          "Flag"
 		"short"         "Flag"
@@ -123,7 +108,7 @@
 	}
 
 	// Human - Misc
-	"8"
+	"7"
 	{
 		"name"          "Torch"
 		"short"         "Torch"
@@ -138,7 +123,7 @@
 		"maxuses"       "0"
 		"cooldown"      "0"
 	}
-	"9"
+	"8"
 	{
 		"name"          "Torch"
 		"short"         "Torch"
@@ -155,7 +140,7 @@
 	}
 
 	// Human - Barricades
-	"10"
+	"9"
 	{
 		"name"          "Barricade - Explosive Barrel"
 		"short"         "Explosive Barrel"
@@ -170,7 +155,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"11"
+	"10"
 	{
 		"name"          "Barricade - Toilet"
 		"short"         "Toilet"
@@ -185,7 +170,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"12"
+	"11"
 	{
 		"name"          "Barricade - Bench"
 		"short"         "Bench"
@@ -200,7 +185,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"13"
+	"12"
 	{
 		"name"          "Barricade - Shelf"
 		"short"         "Shelf"
@@ -215,7 +200,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"14"
+	"13"
 	{
 		"name"          "Barricade - Fence"
 		"short"         "Fence"
@@ -230,7 +215,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"15"
+	"14"
 	{
 		"name"          "Barricade - Basket"
 		"short"         "Basket"
@@ -245,7 +230,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"16"
+	"15"
 	{
 		"name"          "Barricade - Plank"
 		"short"         "Plank"
@@ -260,7 +245,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"17"
+	"16"
 	{
 		"name"          "Barricade - Bell"
 		"short"         "Bell"
@@ -275,7 +260,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"18"
+	"17"
 	{
 		"name"          "Barricade - Haybale"
 		"short"         "Haybale"
@@ -290,7 +275,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"19"
+	"18"
 	{
 		"name"          "Barricade - Big Boulder"
 		"short"         "Big Boulder"
@@ -305,7 +290,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"20"
+	"19"
 	{
 		"name"          "Barricade - Boulder"
 		"short"         "Boulder"
@@ -320,7 +305,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"21"
+	"20"
 	{
 		"name"          "Barricade - Barrel"
 		"short"         "Barrel"
@@ -335,7 +320,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"22"
+	"21"
 	{
 		"name"          "Barricade - Table"
 		"short"         "Table"
@@ -350,7 +335,7 @@
 		"maxuses"       "1"
 		"cooldown"      "0"
 	}
-	"23"
+	"22"
 	{
 		"name"          "Barricade - Crate"
 		"short"         "Crate"
@@ -367,7 +352,7 @@
 	}
 
 	// Zombie - Items
-	"24"
+	"23"
 	{
 		"name"          "Totem"
 		"short"         "Totem"
@@ -382,7 +367,7 @@
 		"maxuses"       "0"
 		"cooldown"      "0"
 	}
-	"25"
+	"24"
 	{
 		"name"          "TNT"
 		"short"         "TNT"
@@ -397,7 +382,7 @@
 		"maxuses"       "0"
 		"cooldown"      "0"
 	}
-	"26"
+	"25"
 	{
 		"name"          "Ladder"
 		"short"         "Ladder"
@@ -412,7 +397,7 @@
 		"maxuses"       "0"
 		"cooldown"      "0"
 	}
-	"27"
+	"26"
 	{
 		"name"          "Troll"
 		"short"         "Troll"
@@ -427,7 +412,7 @@
 		"maxuses"       "0"
 		"cooldown"      "0"
 	}
-	"28"
+	"27"
 	{
 		"name"          "Balrog"
 		"short"         "Balrog"
@@ -442,7 +427,7 @@
 		"maxuses"       "0"
 		"cooldown"      "0"
 	}
-	"29"
+	"28"
 	{
 		"name"          "Nazgul"
 		"short"         "Nazgul"
@@ -460,32 +445,32 @@
 
 	// Zombie - Triggers
 
-	"30"
+	"29"
 	{
 		"name"          "Extreme Totem"
 		"triggerid"     "4658425"
 	}
-	"31"
+	"30"
 	{
 		"name"          "Extreme TNT"
 		"triggerid"     "4658428"
 	}
-	"32"
+	"31"
 	{
 		"name"          "Extreme Ladder"
 		"triggerid"     "4658431"
 	}
-	"33"
+	"32"
 	{
 		"name"          "Extreme Troll"
 		"triggerid"     "4658434"
 	}
-	"34"
+	"33"
 	{
 		"name"          "Stage 1 Nazgul"
 		"triggerid"     "4963264"
 	}
-	"35"
+	"34"
 	{
 		"name"          "Stage 4 Nazgul"
 		"triggerid"     "4963466"
diff --git a/_entWatch4/configs/entwatch/ze_rizomata_s1_3.cfg b/_entWatch4/configs/entwatch/ze_rizomata_s1_3.cfg
index bcb43484..9a8e50f4 100644
--- a/_entWatch4/configs/entwatch/ze_rizomata_s1_3.cfg
+++ b/_entWatch4/configs/entwatch/ze_rizomata_s1_3.cfg
@@ -3,8 +3,8 @@
 	// Human - Items
 	"0"
 	{
-		"name"          "Heal1"
-		"short"         "Heal1"
+		"name"          "Heal"
+		"short"         "Heal"
 		"color"         "FFFFFF"
 		"filter"        ""
 		"weaponid"      "2169221"
@@ -18,8 +18,8 @@
 	}
 	"1"
 	{
-		"name"          "Heal2"
-		"short"         "Heal2"
+		"name"          "Heal"
+		"short"         "Heal"
 		"color"         "FFFFFF"
 		"filter"        ""
 		"weaponid"      "2170630"
@@ -33,8 +33,8 @@
 	}
 	"2"
 	{
-		"name"          "Water1"
-		"short"         "Water1"
+		"name"          "Water"
+		"short"         "Water"
 		"color"         "0000FF"
 		"filter"        ""
 		"weaponid"      "2171387"
@@ -48,8 +48,8 @@
 	}
 	"3"
 	{
-		"name"          "Water2"
-		"short"         "Water2"
+		"name"          "Water"
+		"short"         "Water"
 		"color"         "0000FF"
 		"filter"        ""
 		"weaponid"      "2171364"
@@ -63,8 +63,8 @@
 	}
 	"4"
 	{
-		"name"          "Wind1"
-		"short"         "Wind1"
+		"name"          "Wind"
+		"short"         "Wind"
 		"color"         "00FF00"
 		"filter"        ""
 		"weaponid"      "2173488"
@@ -78,8 +78,8 @@
 	}
 	"5"
 	{
-		"name"          "Wind2"
-		"short"         "Wind2"
+		"name"          "Wind"
+		"short"         "Wind"
 		"color"         "00FF00"
 		"filter"        ""
 		"weaponid"      "2173532"
@@ -93,8 +93,8 @@
 	}
 	"6"
 	{
-		"name"          "Earth1"
-		"short"         "Earth1"
+		"name"          "Earth"
+		"short"         "Earth"
 		"color"         "774C10"
 		"filter"        ""
 		"weaponid"      "2174229"
@@ -108,8 +108,8 @@
 	}
 	"7"
 	{
-		"name"          "Earth2"
-		"short"         "Earth2"
+		"name"          "Earth"
+		"short"         "Earth"
 		"color"         "774C10"
 		"filter"        ""
 		"weaponid"      "2174216"
diff --git a/_entWatch4/configs/entwatch/ze_s_a_m_v1_3_css.cfg b/_entWatch4/configs/entwatch/ze_s_a_m_v1_3_css.cfg
index 88b4b185..b8726d05 100644
--- a/_entWatch4/configs/entwatch/ze_s_a_m_v1_3_css.cfg
+++ b/_entWatch4/configs/entwatch/ze_s_a_m_v1_3_css.cfg
@@ -230,32 +230,32 @@
 	// Humans Models - Trigger
 	"15"
 	{
-		"name"          "Kirito1"
+		"name"          "Kirito 1"
 		"triggerid"     "2073442"
 	}
 	"16"
 	{
-		"name"          "Kirito2"
+		"name"          "Kirito 2"
 		"triggerid"     "1320951"
 	}
 	"17"
 	{
-		"name"          "Kirito3"
+		"name"          "Kirito 3"
 		"triggerid"     "2530081"
 	}
 	"18"
 	{
-		"name"          "Asuna1"
+		"name"          "Asuna 1"
 		"triggerid"     "2381365"
 	}
 	"19"
 	{
-		"name"          "Asuna2"
+		"name"          "Asuna 2"
 		"triggerid"     "2431205"
 	}
 	"20"
 	{
-		"name"          "Asuna3"
+		"name"          "Asuna 3"
 		"triggerid"     "2530011"
 	}
 
diff --git a/_entWatch4/configs/entwatch/ze_sandstorm_f1.cfg b/_entWatch4/configs/entwatch/ze_sandstorm_f1.cfg
index 1db265ab..5e8e12b2 100644
--- a/_entWatch4/configs/entwatch/ze_sandstorm_f1.cfg
+++ b/_entWatch4/configs/entwatch/ze_sandstorm_f1.cfg
@@ -95,8 +95,8 @@
 	// Zombie - Items
 	"6"
 	{
-		"name"          "Dark"
-		"short"         "Dark"
+		"name"          "[ZM] Dark"
+		"short"         "[ZM] Dark"
 		"color"         "A020F0"
 		"filter"        "zdark_zm_player"
 		"weaponid"      "10831741"
@@ -110,8 +110,8 @@
 	}
 	"7"
 	{
-		"name"          "Fire"
-		"short"         "Fire"
+		"name"          "[ZM] Fire"
+		"short"         "[ZM] Fire"
 		"color"         "FF4500"
 		"filter"        "zfirez_zm_player"
 		"weaponid"      "10912707"
@@ -125,8 +125,8 @@
 	}
 	"8"
 	{
-		"name"          "Antlion"
-		"short"         "Antlion"
+		"name"          "[ZM] Antlion"
+		"short"         "[ZM] Antlion"
 		"color"         "228B22"
 		"filter"        "antlion_player"
 		"weaponid"      "10753189"
diff --git a/_entWatch4/configs/entwatch/ze_tilex_ultimate_v2_14s.cfg b/_entWatch4/configs/entwatch/ze_tilex_ultimate_v2_14s.cfg
index 0170a8e0..a778604b 100644
--- a/_entWatch4/configs/entwatch/ze_tilex_ultimate_v2_14s.cfg
+++ b/_entWatch4/configs/entwatch/ze_tilex_ultimate_v2_14s.cfg
@@ -3,8 +3,8 @@
 	// Human - Items
 	"0"
 	{
-		"name"          "Heal1"
-		"short"         "Heal1"
+		"name"          "Heal"
+		"short"         "Heal"
 		"color"         "FFFFFF"
 		"filter"        "healer1"
 		"weaponid"      "374229"
@@ -18,8 +18,8 @@
 	}
 	"1"
 	{
-		"name"          "Heal2"
-		"short"         "Heal2"
+		"name"          "Heal"
+		"short"         "Heal"
 		"color"         "FFFFFF"
 		"filter"        "healer2"
 		"weaponid"      "928679"
@@ -33,8 +33,8 @@
 	}
 	"2"
 	{
-		"name"          "Heal3"
-		"short"         "Heal3"
+		"name"          "Heal"
+		"short"         "Heal"
 		"color"         "FFFFFF"
 		"filter"        "healer3"
 		"weaponid"      "375991"
diff --git a/_entWatch4/configs/entwatch/ze_tyranny_v5fix.cfg b/_entWatch4/configs/entwatch/ze_tyranny_v5fix.cfg
index 6d8ad7a6..117be895 100644
--- a/_entWatch4/configs/entwatch/ze_tyranny_v5fix.cfg
+++ b/_entWatch4/configs/entwatch/ze_tyranny_v5fix.cfg
@@ -140,8 +140,8 @@
 	// Zombie - Items
 	"9"
 	{
-		"name"          "Killer"
-		"short"         "ZKiller"
+		"name"          "[ZM] Killer"
+		"short"         "[ZM] Killer"
 		"color"         "BB4433"
 		"filter"        "player_zkiller"
 		"weaponid"      "566669"
@@ -155,8 +155,8 @@
 	}
 	"10"
 	{
-		"name"          "Heal"
-		"short"         "ZHeal"
+		"name"          "[ZM] Heal"
+		"short"         "[ZM] Heal"
 		"color"         "FF7777"
 		"filter"        "player_zheal"
 		"weaponid"      "566812"
@@ -170,8 +170,8 @@
 	}
 	"11"
 	{
-		"name"          "Fire"
-		"short"         "ZFire"
+		"name"          "[ZM] Fire"
+		"short"         "[ZM] Fire"
 		"color"         "FF4400"
 		"filter"        "player_zfire"
 		"weaponid"      "567096"
@@ -185,8 +185,8 @@
 	}
 	"12"
 	{
-		"name"          "Drug"
-		"short"         "ZDrug"
+		"name"          "[ZM] Drug"
+		"short"         "[ZM] Drug"
 		"color"         "0011BB"
 		"filter"        "player_zdrag"
 		"weaponid"      "567263"
@@ -200,8 +200,8 @@
 	}
 	"13"
 	{
-		"name"          "Invisible"
-		"short"         "ZInvisible"
+		"name"          "[ZM] Invisible"
+		"short"         "[ZM] Invisible"
 		"color"         "FFBB00"
 		"filter"        "player_zinv"
 		"weaponid"      "567408"
@@ -215,8 +215,8 @@
 	}
 	"14"
 	{
-		"name"          "Poison"
-		"short"         "ZPoison"
+		"name"          "[ZM] Poison"
+		"short"         "[ZM] Poison"
 		"color"         "00DD00"
 		"filter"        "player_zpoison"
 		"weaponid"      "567548"
@@ -230,8 +230,8 @@
 	}
 	"15"
 	{
-		"name"          "Gravity"
-		"short"         "ZGravity"
+		"name"          "[ZM] Gravity"
+		"short"         "[ZM] Gravity"
 		"color"         "FF0066"
 		"filter"        "player_zgravity"
 		"weaponid"      "567631"