diff --git a/images/attachments/hopups/13.png b/images/attachments/hopups/13.png
index 2aaeea7..e00bff3 100644
Binary files a/images/attachments/hopups/13.png and b/images/attachments/hopups/13.png differ
diff --git a/images/legends/icon/20.png b/images/legends/icon/20.png
new file mode 100644
index 0000000..afbfda8
Binary files /dev/null and b/images/legends/icon/20.png differ
diff --git a/images/legends/passive/20.png b/images/legends/passive/20.png
new file mode 100644
index 0000000..b8afb7e
Binary files /dev/null and b/images/legends/passive/20.png differ
diff --git a/images/legends/tactical/20.png b/images/legends/tactical/20.png
new file mode 100644
index 0000000..f1aa88a
Binary files /dev/null and b/images/legends/tactical/20.png differ
diff --git a/images/legends/ultimate/20.png b/images/legends/ultimate/20.png
new file mode 100644
index 0000000..dbb0e4c
Binary files /dev/null and b/images/legends/ultimate/20.png differ
diff --git a/script.js b/script.js
index b78404d..c254888 100644
--- a/script.js
+++ b/script.js
@@ -18,7 +18,8 @@ var legend_names = [
 	"VALKYRIE",
 	"SEER",
 	"ASH",
-	"MAD MAGGIE"
+	"MAD MAGGIE",
+	"NEWCASTLE"
 	];
 
 var legend_descriptions = [
@@ -41,7 +42,8 @@ var legend_descriptions = [
 	"WINGED AVENGER",
 	"AMBUSH ARTIST",
 	"INCISIVE INSIGATOR",
-	"REBEL WARLORD"
+	"REBEL WARLORD",
+	"HEROIC DEFENDER"
 	];
 
 var legend_passives = [
@@ -64,7 +66,8 @@ var legend_passives = [
 	"VTOL JETS",
 	"FOCUS OF ATTENTION",
 	"MARKED FOR DEATH",
-	"WARLORD'S IRE"
+	"WARLORD'S IRE",
+	"RETRIEVE THE WOUNDED"
 	];
 
 var legend_tacticals = [
@@ -87,7 +90,8 @@ var legend_tacticals = [
 	"MISSILE SWARM",
 	"HEART SEEKER",
 	"ARC SNARE",
-	"RIOT DRILL"
+	"RIOT DRILL",
+	"MOBILE SHIELD"
 	];
 
 var legend_ultimates = [
@@ -110,11 +114,12 @@ var legend_ultimates = [
 	"SKYWARD DIVE",
 	"EXHIBIT",
 	"PHASE BREACH",
-	"WRECKING BALL"
+	"WRECKING BALL",
+	"CASTLE WALL"
 	];
 
-var legend_classes = [0, 1, 2, 0, 3, 3, 1, 3, 3, 1, 0, 3, 2, 1, 3, 3, 0, 0, 3, 3];
-var legend_mods = [-1, 0, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1];
+var legend_classes = [0, 1, 2, 0, 3, 3, 1, 3, 3, 1, 0, 3, 2, 1, 3, 3, 0, 0, 3, 3, 1];
+var legend_mods = [-1, 0, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0];
 var legend_classes_txt = ["RECON", "DEFENSE", "SUPPORT", "OFFENSE"];
 var legend_mods_txt = ["FORTIFIED", "LOW PROFILE"];
 
@@ -150,34 +155,34 @@ var weapon2 = -1;
 // Longest - KRABER
 // Tallest - RE-45
 
+weapons.push({name:"WINGMAN", barrel:false, bolt:false, mag:[1], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[12], multi_hopup:false, ammo:1, filename:"wingman.png"});
+//weapons.push({name:"VOLT SMG", barrel:true, bolt:false, mag:[3], optic:[0, 1, 2, 3, 4], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:3, filename:"volt.png"});
+weapons.push({name:"C.A.R. SMG", barrel: true, bolt:false, mag:[1,0], optic:[0, 1, 2, 3, 4], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:1, filename:"car.png"});
+weapons.push({name:"R-99 SMG", barrel:true, bolt:false, mag:[0], optic:[0, 1, 2, 3, 4], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:0, filename:"r99.png"});
+weapons.push({name:"ALTERNATOR SMG", barrel:true, bolt:false, mag:[0], optic:[0, 1, 2, 3, 4], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:0, filename:"alternator.png"});
 weapons.push({name:"VK-47 FLATLINE", barrel:false, bolt:false, mag:[1], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:1, filename:"flatline.png"});
 weapons.push({name:"R-301 CARBINE", barrel:true, bolt:false, mag:[0], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:0, filename:"r301.png"});
-weapons.push({name:"C.A.R. SMG", barrel: true, bolt:false, mag:[1,0], optic:[0, 1, 2, 3, 4], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:1, filename:"car.png"});
-weapons.push({name:"ALTERNATOR SMG", barrel:true, bolt:false, mag:[0], optic:[0, 1, 2, 3, 4], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:0, filename:"alternator.png"});
-weapons.push({name:"L-STAR EMG", barrel:true, bolt:false, mag:[3], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:3, filename:"lstar.png"});
+weapons.push({name:"M600 SPITFIRE", barrel:false, bolt:false, mag:[1], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:1, filename:"spitfire.png"});
+weapons.push({name:"DEVOTION LMG", barrel:true, bolt:false, mag:[3], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[3], multi_hopup:false, ammo:3, filename:"devotion.png"});
 weapons.push({name:"RAMPAGE", barrel:true, bolt:false, mag:[1], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:1, filename:"rampage.png"});
 weapons.push({name:"HAVOC RIFLE", barrel:false, bolt:false, mag:[3], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[3], multi_hopup:false, ammo:3, filename:"havoc.png"});
-weapons.push({name:"30-30 REPEATER", barrel:false, bolt:false, mag:[1], optic:[1, 2, 3, 4, 5, 6], stock_standard:false, stock_sniper:true, hopup:[10, 13], multi_hopup:false, ammo:1, filename:"3030.png"});
-weapons.push({name:"TRIPLE TAKE", barrel:false, bolt:false, mag:[3], optic:[1, 2, 3, 4, 5, 6], stock_standard:false, stock_sniper:true, hopup:[14], multi_hopup:false, ammo:3, filename:"tripletake.png"});
-weapons.push({name:"DEVOTION LMG", barrel:true, bolt:false, mag:[3], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[3], multi_hopup:false, ammo:3, filename:"devotion.png"});
-weapons.push({name:"WINGMAN", barrel:false, bolt:false, mag:[1], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[12], multi_hopup:false, ammo:1, filename:"wingman.png"});
-weapons.push({name:"BOCEK COMPOUND BOW", barrel:false, bolt:false, mag:[], optic:[1, 2, 3, 4, 5], stock_standard:false, stock_sniper:false, hopup:[10, 11], multi_hopup:true, ammo:5, filename:"bocek.png"});
+weapons.push({name:"L-STAR EMG", barrel:true, bolt:false, mag:[3], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:3, filename:"lstar.png"});
+//weapons.push({name:"G7 SCOUT", barrel:true, bolt:false, mag:[0], optic:[1, 2, 3, 4, 5, 6], stock_standard:false, stock_sniper:true, hopup:[], multi_hopup:false, ammo:0, filename:"g7.png"});
 weapons.push({name:"HEMLOK BURST AR", barrel:true, bolt:false, mag:[1], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[12], multi_hopup:false, ammo:1, filename:"hemlok.png"});
+weapons.push({name:"30-30 REPEATER", barrel:false, bolt:false, mag:[1], optic:[1, 2, 3, 4, 5, 6], stock_standard:false, stock_sniper:true, hopup:[10], multi_hopup:false, ammo:1, filename:"3030.png"});
+weapons.push({name:"TRIPLE TAKE", barrel:false, bolt:false, mag:[3], optic:[1, 2, 3, 4, 5, 6], stock_standard:false, stock_sniper:true, hopup:[14], multi_hopup:false, ammo:3, filename:"tripletake.png"});
+weapons.push({name:"BOCEK COMPOUND BOW", barrel:false, bolt:false, mag:[], optic:[1, 2, 3, 4, 5], stock_standard:false, stock_sniper:false, hopup:[10, 11], multi_hopup:true, ammo:5, filename:"bocek.png"});
 weapons.push({name:"PROWLER BURST PDW", barrel:false, bolt:false, mag:[1], optic:[0, 1, 2, 3, 4], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:1, filename:"prowler.png"});
 weapons.push({name:"RE-45 AUTO", barrel:true, bolt:false, mag:[0], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[7], multi_hopup:false, ammo:0, filename:"re45.png"});
-weapons.push({name:"R-99 SMG", barrel:true, bolt:false, mag:[0], optic:[0, 1, 2, 3, 4], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:0, filename:"r99.png"});
-weapons.push({name:"EVA-8 AUTO", barrel:false, bolt:true, mag:[], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[], multi_hopup:false, ammo:4, filename:"eva8.png"});
-weapons.push({name:"MASTIFF SHOTGUN", barrel:false, bolt:true, mag:[], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[13], multi_hopup:false, ammo:4, filename:"mastiff.png"});
-weapons.push({name:"PEACEKEEPER", barrel:false, bolt:true, mag:[], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[14], multi_hopup:false, ammo:4, filename:"peacekeeper.png"});
-weapons.push({name:"MOZAMBIQUE SHOTGUN", barrel:false, bolt:true, mag:[], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[7], multi_hopup:false, ammo:4, filename:"mozambique.png"});
-weapons.push({name:"P2020", barrel:false, bolt:false, mag:[0], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[7], multi_hopup:false, ammo:0, filename:"p2020.png"});
+//weapons.push({name:"KRABER .50-CAL SNIPER", barrel:false, bolt:true, mag:[], optic:[1, 2, 3, 4, 5, 6, 7, 8 ,9], stock_standard:false, stock_sniper:true, hopup:[], multi_hopup:false, ammo:2, filename:"kraber.png"});
 weapons.push({name:"LONGBOW DMR", barrel:true, bolt:false, mag:[2], optic:[1, 2, 3, 4, 5, 6, 7, 8 ,9], stock_standard:false, stock_sniper:true, hopup:[], multi_hopup:false, ammo:2, filename:"longbow.png"});
 weapons.push({name:"SENTINEL", barrel:false, bolt:false, mag:[2], optic:[1, 2, 3, 4, 5, 6, 7, 8 ,9], stock_standard:false, stock_sniper:true, hopup:[11], multi_hopup:false, ammo:2, filename:"sentinel.png"});
 weapons.push({name:"CHARGE RIFLE", barrel:false, bolt:false, mag:[], optic:[1, 2, 3, 4, 5, 6, 7, 8 ,9], stock_standard:false, stock_sniper:true, hopup:[], multi_hopup:false, ammo:2, filename:"chargerifle.png"});
-//weapons.push({name:"G7 SCOUT", barrel:true, bolt:false, mag:[0], optic:[1, 2, 3, 4, 5, 6], stock_standard:false, stock_sniper:true, hopup:[], multi_hopup:false, ammo:0, filename:"g7.png"});
-//weapons.push({name:"VOLT SMG", barrel:true, bolt:false, mag:[3], optic:[0, 1, 2, 3, 4], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:3, filename:"volt.png"});
-//weapons.push({name:"M600 SPITFIRE", barrel:true, bolt:false, mag:[1], optic:[1, 2, 3, 4, 5, 6], stock_standard:true, stock_sniper:false, hopup:[], multi_hopup:false, ammo:1, filename:"spitfire.png"});
-//weapons.push({name:"KRABER .50-CAL SNIPER", barrel:false, bolt:true, mag:[], optic:[1, 2, 3, 4, 5, 6, 7, 8 ,9], stock_standard:false, stock_sniper:true, hopup:[], multi_hopup:false, ammo:2, filename:"kraber.png"});
+//weapons.push({name:"MASTIFF SHOTGUN", barrel:false, bolt:true, mag:[], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[], multi_hopup:false, ammo:4, filename:"mastiff.png"});
+weapons.push({name:"PEACEKEEPER", barrel:false, bolt:true, mag:[], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[14], multi_hopup:false, ammo:4, filename:"peacekeeper.png"});
+weapons.push({name:"EVA-8 AUTO", barrel:false, bolt:true, mag:[], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[], multi_hopup:false, ammo:4, filename:"eva8.png"});
+weapons.push({name:"MOZAMBIQUE SHOTGUN", barrel:false, bolt:true, mag:[], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[7], multi_hopup:false, ammo:4, filename:"mozambique.png"});
+weapons.push({name:"P2020", barrel:false, bolt:false, mag:[0], optic:[0, 1, 2, 3, 4], stock_standard:false, stock_sniper:false, hopup:[7], multi_hopup:false, ammo:0, filename:"p2020.png"});
 
 function zeroPad(nr,base)
 {