diff --git a/Makefile b/Makefile
index 804417e..ade8683 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: clean n3 killian vyo command grey_camo holoecho_colors
+all: clean n3 hsn3 killian vyo command grey_camo holoecho_colors
 
 .PHONY:
 
@@ -13,6 +13,9 @@ n3: .PHONY
 	pdfimages Sheets_Letter.pdf n3/marker
 	./doconversion.pl n3 jpg
 
+hsn3: .PHONY
+	./doconversion.pl hsn3 jpg
+
 killian: .PHONY
 	./doconversion.pl killian jpg
 
diff --git a/annotation.csv b/annotation.csv
index 38db7ab..4dfc528 100644
--- a/annotation.csv
+++ b/annotation.csv
@@ -3,53 +3,66 @@
 019,Regular #2,,Orders and Related,10/15/18/20/25,silver-green-jewel-2
 019,Regular #3,,Orders and Related,10/15/18/20/25,silver-green-jewel-3
 019,Regular #4,,Orders and Related,10/15/18/20/25,silver-green-jewel-4
+056,Lieutenant,,Orders and Related,10/15/18/20/25,
 029,Irregular,,Orders and Related,10/15/18/20/25,
 033,Impetuous,,Orders and Related,10/15/18/20/25,
 Ex Impetuious,Extreme Impetuous,,Orders and Related,10/15/18/20/25,
-056,Lieutenant,,Orders and Related,10/15/18/20/25,
 142,Command Token,,Orders and Related,10/15/18/20/25,
 round_command_cropped,Command Token (round),,Orders and Related,10/15/18/20/25,
-057,Spearhead,,Orders and Related,10/15/18/20/25,
 041,Retreat,,Orders and Related,10/15/18/20/25,
-094,Wound,095,Status Markers,10/15/18/20/25,
-079,V2: Dogged,,Status Markers,10/15/18/20/25,
-084,V3: NWI,,Status Markers,10/15/18/20/25,
-058,Unconscious,,Status Markers,10/15/18/20/25,
-069,Spawn-Embryo,,Status Markers,10/15/18/20/25,
-CP Symbiont Inactive,Symbiont Inactive,,Status Markers,10/15/18/20/25,
-086,Transmuted,,Status Markers,10/15/18/20/25,
-CP Casevac,CASEVAC,,Status Markers,10/15/18/20/25,
+057,Spearhead,,Coordination and Groups,10/15/18/20/25,
+team_leader,Team Leader,,Coordination and Groups,10/15/18/20/25,
+duo,Duo Leader,,Coordination and Groups,10/15/18/20/25,
+triad,Triad Leader,,Coordination and Groups,10/15/18/20/25,
+haris,Haris Leader,,Coordination and Groups,10/15/18/20/25,
+enomotarchos,Enomotarchos,,Coordination and Groups,10/15/18/20/25,
+proxy_active,Proxy Active,,Coordination and Groups,10/15/18/20/25,
+094,Wound,095,Wounds,10/15/18/20/25,
+079,V2: Dogged,,Wounds,10/15/18/20/25,
+084,V3: NWI,,Wounds,10/15/18/20/25,
+058,Unconscious,,Wounds,10/15/18/20/25,
+069,Spawn-Embryo,,Wounds,10/15/18/20/25,
+symbiont_inactive,Symbiont Inactive,,Wounds,10/15/18/20/25,
+086,Transmuted,,Wounds,10/15/18/20/25,
+battle_ravaged,Battle Ravaged,,Wounds,10/15/18/20/25,
+074,Damaged,,Wounds,10/15/18/20/25,
+076,Destroyed,,Wounds,10/15/18/20/25,
+power_up_1,Power Up (1),,Wounds,10/15/18/20/25,
+power_up_2,Power Up (2),,Wounds,10/15/18/20/25,
 000,Prone,,Status Markers,10/15/18/20/25,
-Sapper,Sapper,,Status Markers,10/15/18/20/25/40,
+foxhole,Foxhole,,Status Markers,10/15/18/20/25/40,
 005,IMM-1,,Status Markers,10/15/18/20/25,
 053,IMM-2,,Status Markers,10/15/18/20/25,
 063,DIS,,Status Markers,10/15/18/20/25,
 008,POS,,Status Markers,10/15/18/20/25,
 038,Sepsitorized,,Status Markers,10/15/18/20/25,
 013,Burnt,,Status Markers,10/15/18/20/25,
-046,Blinded,,Status Markers,10/15/18/20/25,
+stunned,Stunned,,Status Markers,10/15/18/20/25,
 048,Targeted,,Status Markers,10/15/18/20/25,
 051,Isolated,,Status Markers,10/15/18/20/25,
+disconnected,Disconnected,,Status Markers,10/15/18/20/25,
+standby,Stand By,,Status Markers,10/15/18/20/25,
+casevac,CASEVAC,,Status Markers,10/15/18/20/25,
 088,Suppression Fire,,Status Markers,10/15/18/20/25,
 009,Unloaded,,Status Markers,10/15/18/20/25,
-074,Damaged,,Status Markers,10/15/18/20/25,
-076,Destroyed,,Status Markers,10/15/18/20/25,
 125,Tinbot A,,Status Markers,10/15/18/20/25,
 123,Tinbot B,,Status Markers,10/15/18/20/25,
-090,Supportware,,Status Markers,10/15/18/20/25,
-115,SUP: Fairy Dust,,Status Markers,10/15/18/20/25,
-127,Marksmanship L2,,Status Markers,10/15/18/20/25,
-129,E. Reaction B2,,Status Markers,10/15/18/20/25,
-Haris L1,Haris L1,,Status Markers,10/15/18/20/25,
-Proxy,Proxy Active,,Status Markers,10/15/18/20/25,
-link team leader,Link Leader,,Status Markers,10/15/18/20/25,
+albedo,Albedo,,Status Markers,10/15/18/20/25,
+090,Supportware,,Supportware,10/15/18/20/25,
+115,SUP: Fairy Dust,,Supportware,10/15/18/20/25,
+127,Marksmanship L2,,Supportware,10/15/18/20/25,
+129,E. Reaction B2,,Supportware,10/15/18/20/25,
+kaleidoscope,EVO: Kaleidoscope,,Supportware,10/15/18/20/25,
+overclock,EVO: Overclock,,Supportware,10/15/18/20/25,
+reboot,EVO: Reboot,,Supportware,10/15/18/20/25,
+teampro,EVO: Teampro,,Supportware,10/15/18/20/25,
 066,Mines,,Deployables,25,
 078,Monofilament Mines,,Deployables,25,
 108,Viral Mines,,Deployables,25,
 065,E/Mauler,,Deployables,25,
 104,Repeater,,Deployables,25,
 120,Sniffer,,Deployables,25,
-CP Nullifier,Nullifier,,Deployables,25,
+nullifier,Nullifier,,Deployables,25,
 184,Camo Forest #1 (Hi Res),,Hidden Models,25/40/55,
 184,Camo Forest #2 (Hi Res),,Hidden Models,25/40/55,green-jewel-2
 184,Camo Forest #3 (Hi Res),,Hidden Models,25/40/55,green-jewel-3
@@ -116,14 +129,13 @@ camo-grey-1,Camo Grey #0,,Hidden Models,25/40/55,green-jewel-0-custom
 017,IMP-2 #3,,Hidden Models,25/40/55,silver-green-jewel-3
 017,IMP-2 #4,,Hidden Models,25/40/55,silver-green-jewel-4
 Seed Embryo,Seed Embryo,,Hidden Models,25,
-Holoecho A 1,Holoecho Green #1,,Hidden Models,25/40/55,
-Holoecho A 2,Holoecho Green #2,,Hidden Models,25/40/55,
-Holoecho B 1,Holoecho Yellow #1,,Hidden Models,25/40/55,
-Holoecho B 2,Holoecho Yellow #2,,Hidden Models,25/40/55,
+holoecho_1,Holoecho #1,,Hidden Models,25/40/55,
+holoecho_2,Holoecho #2,,Hidden Models,25/40/55,
 Holoecho_blue,Holoecho Blue #1,,Hidden Models,25/40/55,green-jewel-1
 Holoecho_blue,Holoecho Blue #2,,Hidden Models,25/40/55,green-jewel-2
 Holoecho_pink,Holoecho Pink #1,,Hidden Models,25/40/55,green-jewel-1
 Holoecho_pink,Holoecho Pink #2,,Hidden Models,25/40/55,green-jewel-2
+132,Objective,,Scenario Markers,40,
 CP Alien Console A,Alien Console A,,Scenario Markers,40,
 CP Alien Console B,Alien Console B,,Scenario Markers,40,
 CP Alien Console C,Alien Console C,,Scenario Markers,40,
@@ -140,7 +152,7 @@ CP Trans Antenna,Transmission Antenna,,Scenario Markers,40,
 CP Tracking Beacon,Tracking Beacon,,Scenario Markers,25,
 CP Decontaminated,Decontaminated,,Scenario Markers,10/15/18/20/25,
 CP Infected,Infected,,Scenario Markers,10/15/18/20/25,
-132,Objective,,Scenario Markers,40,
+hostile,Hostile,,Scenario Markers,10/15/18/20/25,
 147,Narrow Gate,,Misc Markers,30,
 151,Wide Gate,,Misc Markers,50,
 154,Cargo Gate,,Misc Markers,70,