diff --git a/annotation.csv b/annotation.csv
index 2a5b78a..1616839 100644
--- a/annotation.csv
+++ b/annotation.csv
@@ -143,17 +143,17 @@ Holoecho_pink,Holoecho Pink #1,,Holoechoes,25/40/55,,green-jewel-1
 Holoecho_pink,Holoecho Pink #2,,Holoechoes,25/40/55,,green-jewel-2
 Holoecho_yellow,Holoecho Yellow #1,,Holoechoes,25/40/55,,green-jewel-1
 Holoecho_yellow,Holoecho Yellow #2,,Holoechoes,25/40/55,,green-jewel-2
-132,Objective,,Scenario Markers,25/40,40,
-CP Console A,Console A,,Scenario Markers,25/40,40,
-CP Console B,Console B,,Scenario Markers,25/40,40,
-CP Console C,Console C,,Scenario Markers,25/40,40,
-CP Alien Console A,Alien Console A,,Scenario Markers,25/40,40,
-CP Alien Console B,Alien Console B,,Scenario Markers,25/40,40,
-CP Alien Console C,Alien Console C,,Scenario Markers,25/40,40,
-CP Alien Tech,Alien Tech,,Scenario Markers,25/40,40,
-CP Trans Antenna,Transmission Antenna,,Scenario Markers,25/40,40,
-CP Tech Coffin,Tech Coffin,,Scenario Markers,25/40,40,
-CP Crash Coffin,Crash Coffin,,Scenario Markers,25/40,40,
+132,Objective,,Scenario Objectives,25/40,40,
+CP Console A,Console A,,Scenario Objectives,25/40,40,
+CP Console B,Console B,,Scenario Objectives,25/40,40,
+CP Console C,Console C,,Scenario Objectives,25/40,40,
+CP Alien Console A,Alien Console A,,Scenario Objectives,25/40,40,
+CP Alien Console B,Alien Console B,,Scenario Objectives,25/40,40,
+CP Alien Console C,Alien Console C,,Scenario Objectives,25/40,40,
+CP Alien Tech,Alien Tech,,Scenario Objectives,25/40,40,
+CP Trans Antenna,Transmission Antenna,,Scenario Objectives,25/40,40,
+CP Tech Coffin,Tech Coffin,,Scenario Objectives,25/40,40,
+CP Crash Coffin,Crash Coffin,,Scenario Objectives,25/40,40,
 supply,Supply Box,,Scenario Markers,10/15/18/20/25,,
 beacon,Beacon,,Scenario Markers,10/15/18/20/25,,
 CP Elevator,Elevator,,Scenario Markers,25/40,40,
@@ -174,39 +174,40 @@ hostile,Hostile,,Scenario Markers,10/15/18/20/25,,
 164,Eclipse Grenade,,Impact Markers,10/15/18/20/25/40,,
 162,Nimbus Grenade,,Impact Markers,10/15/18/20/25/40,,
 166,Nimbus Plus Grenade,,Impact Markers,10/15/18/20/25/40,,
-logo_701,Aleph,,Faction Logos,10/15/18/20/25,,
-logo_702,Steel Phalanx,,Faction Logos,10/15/18/20/25,,
-logo_703,OperationS,,Faction Logos,10/15/18/20/25,,
-logo_301,Ariadna,,Faction Logos,10/15/18/20/25,,
-logo_302,Caledonian,,Faction Logos,10/15/18/20/25,,
-logo_303,Merovingians,,Faction Logos,10/15/18/20/25,,
-logo_304,USAriadna,,Faction Logos,10/15/18/20/25,,
-logo_305,Tartary,,Faction Logos,10/15/18/20/25,,
-logo_601,Combined Army,,Faction Logos,10/15/18/20/25,,
-logo_602,Morat,,Faction Logos,10/15/18/20/25,,
-logo_603,Shasvastii,,Faction Logos,10/15/18/20/25,,
-logo_604,Onyx,,Faction Logos,10/15/18/20/25,,
-logo_401,Haqqislam,,Faction Logos,10/15/18/20/25,,
-logo_402,Hassassins,,Faction Logos,10/15/18/20/25,,
-logo_403,Qapu Khalqi,,Faction Logos,10/15/18/20/25,,
-logo_901,Non-Aligned Armies,,Faction Logos,10/15/18/20/25,,
-logo_902,Druze Bayram,,Faction Logos,10/15/18/20/25,,
-logo_903,Japanese Secessionist Army,,Faction Logos,10/15/18/20/25,,
-logo_904,Ikari Company,,Faction Logos,10/15/18/20/25,,
-logo_905,Starco,,Faction Logos,10/15/18/20/25,,
-logo_906,Spiral Corps,,Faction Logos,10/15/18/20/25,,
-logo_907,Foreign Company,,Faction Logos,10/15/18/20/25,,
-logo_908,Dashat Company,,Faction Logos,10/15/18/20/25,,
-logo_501,Nomads,,Faction Logos,10/15/18/20/25,,
-logo_503,Bakunin,,Faction Logos,10/15/18/20/25,,
-logo_502,Corregidor,,Faction Logos,10/15/18/20/25,,
-logo_504,Tunguska,,Faction Logos,10/15/18/20/25,,
-logo_101,PanOceania,,Faction Logos,10/15/18/20/25,,
-logo_104,Neoterra,,Faction Logos,10/15/18/20/25,,
-logo_103,Military Orders,,Faction Logos,10/15/18/20/25,,
-logo_102,Acontecimento,,Faction Logos,10/15/18/20/25,,
-logo_105,Varuna,,Faction Logos,10/15/18/20/25,,
-logo_801,Tohaa,,Faction Logos,10/15/18/20/25,,
-logo_201,Yu Jing,,Faction Logos,10/15/18/20/25,,
-logo_202,Imperial Service,,Faction Logos,10/15/18/20/25,,
-logo_204,Invincible Army,,Faction Logos,10/15/18/20/25,,
+logo_701,Aleph,,Aleph Logos,10/15/18/20/25,,
+logo_702,Steel Phalanx,,Aleph Logos,10/15/18/20/25,,
+logo_703,OperationS,,Aleph Logos,10/15/18/20/25,,
+logo_301,Ariadna,,Ariadna Logos,10/15/18/20/25,,
+logo_302,Caledonian,,Ariadna Logos,10/15/18/20/25,,
+logo_303,Merovingians,,Ariadna Logos,10/15/18/20/25,,
+logo_304,USAriadna,,Ariadna Logos,10/15/18/20/25,,
+logo_305,Tartary,,Ariadna Logos,10/15/18/20/25,,
+logo_601,Combined Army,,Combined Logos,10/15/18/20/25,,
+logo_602,Morat,,Combined Logos,10/15/18/20/25,,
+logo_603,Shasvastii,,Combined Logos,10/15/18/20/25,,
+logo_604,Onyx,,Combined Logos,10/15/18/20/25,,
+logo_401,Haqqislam,,Haqqislam Logos,10/15/18/20/25,,
+logo_402,Hassassins,,Haqqislam Logos,10/15/18/20/25,,
+logo_403,Qapu Khalqi,,Haqqislam Logos,10/15/18/20/25,,
+logo_404,Ramah Taskforce,,Haqqislam Logos,10/15/18/20/25,,
+logo_901,Non-Aligned Armies,,NAA Logos,10/15/18/20/25,,
+logo_902,Druze Bayram,,NAA Logos,10/15/18/20/25,,
+logo_903,Japanese Secessionist Army,,NAA Logos,10/15/18/20/25,,
+logo_904,Ikari Company,,NAA Logos,10/15/18/20/25,,
+logo_905,Starco,,NAA Logos,10/15/18/20/25,,
+logo_906,Spiral Corps,,NAA Logos,10/15/18/20/25,,
+logo_907,Foreign Company,,NAA Logos,10/15/18/20/25,,
+logo_908,Dashat Company,,NAA Logos,10/15/18/20/25,,
+logo_501,Nomads,,Nomad Logos,10/15/18/20/25,,
+logo_503,Bakunin,,Nomad Logos,10/15/18/20/25,,
+logo_502,Corregidor,,Nomad Logos,10/15/18/20/25,,
+logo_504,Tunguska,,Nomad Logos,10/15/18/20/25,,
+logo_101,PanOceania,,PanO Logos,10/15/18/20/25,,
+logo_104,Neoterra,,PanO Logos,10/15/18/20/25,,
+logo_103,Military Orders,,PanO Logos,10/15/18/20/25,,
+logo_102,Acontecimento,,PanO Logos,10/15/18/20/25,,
+logo_105,Varuna,,PanO Logos,10/15/18/20/25,,
+logo_801,Tohaa,,Tohaa Logos,10/15/18/20/25,,
+logo_201,Yu Jing,,Yu Jing Logos,10/15/18/20/25,,
+logo_202,Imperial Service,,Yu Jing Logos,10/15/18/20/25,,
+logo_204,Invincible Army,,Yu Jing Logos,10/15/18/20/25,,