diff --git a/config.py b/config.py
index fa073ad9d..d10dda270 100644
--- a/config.py
+++ b/config.py
@@ -24,10 +24,10 @@ saveInRoot = False
 
 # Version data
 
-version = "2.3.1"
+version = "2.4.0"
 tag = "Stable"
-expansionName = "YC120.7"
-expansionVersion = "1.2"
+expansionName = "YC120.8"
+expansionVersion = "1.0"
 evemonMinVersion = "4081"
 
 minItemSearchLength = 3
diff --git a/eos/effects/boostershieldcapacitypenalty.py b/eos/effects/boostershieldcapacitypenalty.py
index ade1336d0..9258da2c5 100644
--- a/eos/effects/boostershieldcapacitypenalty.py
+++ b/eos/effects/boostershieldcapacitypenalty.py
@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 66)
+# Implants from group: Booster (12 of 65)
 type = "boosterSideEffect"
 
 # User-friendly name for the side effect
diff --git a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
index a808a2650..7ea8e593d 100644
--- a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
+++ b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py
@@ -3,9 +3,9 @@
 # Used by:
 # Ships from group: Black Ops (5 of 5)
 # Ships from group: Blockade Runner (4 of 4)
-# Ships from group: Covert Ops (7 of 7)
+# Ships from group: Covert Ops (8 of 8)
 # Ships from group: Expedition Frigate (2 of 2)
-# Ships from group: Force Recon Ship (8 of 8)
+# Ships from group: Force Recon Ship (9 of 9)
 # Ships from group: Stealth Bomber (5 of 5)
 # Ships named like: Stratios (2 of 2)
 # Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
diff --git a/eos/effects/covertopscloakcpupercentbonus1.py b/eos/effects/covertopscloakcpupercentbonus1.py
index 703b37189..e34450131 100644
--- a/eos/effects/covertopscloakcpupercentbonus1.py
+++ b/eos/effects/covertopscloakcpupercentbonus1.py
@@ -1,7 +1,7 @@
 # covertOpsCloakCpuPercentBonus1
 #
 # Used by:
-# Ships from group: Covert Ops (5 of 7)
+# Ships from group: Covert Ops (6 of 8)
 type = "passive"
 runTime = "early"
 
diff --git a/eos/effects/covertopswarpresistance.py b/eos/effects/covertopswarpresistance.py
new file mode 100644
index 000000000..1ab7538c1
--- /dev/null
+++ b/eos/effects/covertopswarpresistance.py
@@ -0,0 +1,9 @@
+# covertOpsWarpResistance
+#
+# Used by:
+# Ships from group: Covert Ops (5 of 8)
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.ship.increaseItemAttr("warpFactor", src.getModifiedItemAttr("eliteBonusCovertOps1"), skill="Covert Ops")
diff --git a/eos/effects/cynosuraldurationbonus.py b/eos/effects/cynosuraldurationbonus.py
index cb306dded..4f78ea09e 100644
--- a/eos/effects/cynosuraldurationbonus.py
+++ b/eos/effects/cynosuraldurationbonus.py
@@ -1,7 +1,7 @@
 # cynosuralDurationBonus
 #
 # Used by:
-# Ships from group: Force Recon Ship (7 of 8)
+# Ships from group: Force Recon Ship (8 of 9)
 type = "passive"
 
 
diff --git a/eos/effects/cynosuraltheoryconsumptionbonus.py b/eos/effects/cynosuraltheoryconsumptionbonus.py
index 217374cee..d67c969f8 100644
--- a/eos/effects/cynosuraltheoryconsumptionbonus.py
+++ b/eos/effects/cynosuraltheoryconsumptionbonus.py
@@ -1,7 +1,7 @@
 # cynosuralTheoryConsumptionBonus
 #
 # Used by:
-# Ships from group: Force Recon Ship (7 of 8)
+# Ships from group: Force Recon Ship (8 of 9)
 # Skill: Cynosural Field Theory
 type = "passive"
 
diff --git a/eos/effects/elitebonuscoveropsscanprobestrength2.py b/eos/effects/elitebonuscoveropsscanprobestrength2.py
index 8b922cee1..77feea510 100644
--- a/eos/effects/elitebonuscoveropsscanprobestrength2.py
+++ b/eos/effects/elitebonuscoveropsscanprobestrength2.py
@@ -1,7 +1,7 @@
 # eliteBonusCoverOpsScanProbeStrength2
 #
 # Used by:
-# Ships from group: Covert Ops (7 of 7)
+# Ships from group: Covert Ops (8 of 8)
 type = "passive"
 
 
diff --git a/eos/effects/elitebonusmaxdmgmultibonusadd.py b/eos/effects/elitebonusmaxdmgmultibonusadd.py
new file mode 100644
index 000000000..7e9a5cc29
--- /dev/null
+++ b/eos/effects/elitebonusmaxdmgmultibonusadd.py
@@ -0,0 +1,10 @@
+# eliteBonusMaxDmgMultiBonusAdd
+#
+# Used by:
+# Ship: Hydra
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Small Precursor Weapon"), "damageMultiplierBonusMax",
+                                     src.getModifiedItemAttr("eliteBonusCovertOps3"), skill="Covert Ops")
diff --git a/eos/effects/elitebonusreconmaxdmgmultimaxhpt.py b/eos/effects/elitebonusreconmaxdmgmultimaxhpt.py
new file mode 100644
index 000000000..1350d5a93
--- /dev/null
+++ b/eos/effects/elitebonusreconmaxdmgmultimaxhpt.py
@@ -0,0 +1,10 @@
+# eliteBonusReconMaxDmgMultiMaxHPT
+#
+# Used by:
+# Ship: Tiamat
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Medium Precursor Weapon"), "damageMultiplierBonusMax",
+                                     src.getModifiedItemAttr("eliteBonusReconShip3"), skill="Recon Ships")
diff --git a/eos/effects/elitebonusreconscanprobestrength2.py b/eos/effects/elitebonusreconscanprobestrength2.py
new file mode 100644
index 000000000..55db46631
--- /dev/null
+++ b/eos/effects/elitebonusreconscanprobestrength2.py
@@ -0,0 +1,10 @@
+# eliteBonusReconScanProbeStrength2
+#
+# Used by:
+# Ship: Tiamat
+type = "passive"
+
+
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"), "baseSensorStrength",
+                                    src.getModifiedItemAttr("eliteBonusReconShip2"), skill="Recon Ships")
diff --git a/eos/effects/minigamevirusstrengthbonus.py b/eos/effects/minigamevirusstrengthbonus.py
index 2023d0407..0e60325db 100644
--- a/eos/effects/minigamevirusstrengthbonus.py
+++ b/eos/effects/minigamevirusstrengthbonus.py
@@ -1,7 +1,7 @@
 # minigameVirusStrengthBonus
 #
 # Used by:
-# Ships from group: Covert Ops (7 of 7)
+# Ships from group: Covert Ops (7 of 8)
 # Ships named like: Stratios (2 of 2)
 # Subsystems named like: Defensive Covert Reconfiguration (4 of 4)
 # Ship: Astero
diff --git a/eos/effects/reconshipcloakcpubonus1.py b/eos/effects/reconshipcloakcpubonus1.py
index 8f63a28f2..e7c05671c 100644
--- a/eos/effects/reconshipcloakcpubonus1.py
+++ b/eos/effects/reconshipcloakcpubonus1.py
@@ -1,7 +1,7 @@
 # reconShipCloakCpuBonus1
 #
 # Used by:
-# Ships from group: Force Recon Ship (6 of 8)
+# Ships from group: Force Recon Ship (7 of 9)
 type = "passive"
 runTime = "early"
 
diff --git a/eos/effects/shipbonusneutcapneedrolebonus2.py b/eos/effects/shipbonusneutcapneedrolebonus2.py
index 324a01c66..b48e784ad 100644
--- a/eos/effects/shipbonusneutcapneedrolebonus2.py
+++ b/eos/effects/shipbonusneutcapneedrolebonus2.py
@@ -2,7 +2,9 @@
 #
 # Used by:
 # Ship: Damavik
+# Ship: Hydra
 # Ship: Leshak
+# Ship: Tiamat
 # Ship: Vedmak
 type = "passive"
 
diff --git a/eos/effects/shipbonuspctdamagepc1.py b/eos/effects/shipbonuspctdamagepc1.py
index 50db0c467..06e686ab2 100644
--- a/eos/effects/shipbonuspctdamagepc1.py
+++ b/eos/effects/shipbonuspctdamagepc1.py
@@ -1,6 +1,7 @@
 # shipbonusPCTDamagePC1
 #
 # Used by:
+# Ship: Tiamat
 # Ship: Vedmak
 type = "passive"
 
diff --git a/eos/effects/shipbonuspctdamagepf1.py b/eos/effects/shipbonuspctdamagepf1.py
index 7fd636e18..59a1071e2 100644
--- a/eos/effects/shipbonuspctdamagepf1.py
+++ b/eos/effects/shipbonuspctdamagepf1.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Damavik
+# Ship: Hydra
 type = "passive"
 
 
diff --git a/eos/effects/shipbonuspctoptimalpf2.py b/eos/effects/shipbonuspctoptimalpf2.py
index 424b0d282..7403b2146 100644
--- a/eos/effects/shipbonuspctoptimalpf2.py
+++ b/eos/effects/shipbonuspctoptimalpf2.py
@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Damavik
+# Ship: Hydra
 type = "passive"
 
 
diff --git a/eos/effects/shipbonuspcttrackingpc2.py b/eos/effects/shipbonuspcttrackingpc2.py
index 69224ac73..4914d290e 100644
--- a/eos/effects/shipbonuspcttrackingpc2.py
+++ b/eos/effects/shipbonuspcttrackingpc2.py
@@ -1,6 +1,7 @@
 # shipbonusPCTTrackingPC2
 #
 # Used by:
+# Ship: Tiamat
 # Ship: Vedmak
 type = "passive"
 
diff --git a/eos/effects/shipbonusremoterepcapneedrolebonus2.py b/eos/effects/shipbonusremoterepcapneedrolebonus2.py
index d2b7f5ea7..64df7fa9e 100644
--- a/eos/effects/shipbonusremoterepcapneedrolebonus2.py
+++ b/eos/effects/shipbonusremoterepcapneedrolebonus2.py
@@ -2,7 +2,9 @@
 #
 # Used by:
 # Ship: Damavik
+# Ship: Hydra
 # Ship: Leshak
+# Ship: Tiamat
 # Ship: Vedmak
 type = "passive"
 
diff --git a/eos/effects/shipbonusremoterepmaxrangerolebonus1.py b/eos/effects/shipbonusremoterepmaxrangerolebonus1.py
index cdcc2773d..fc2fc3b14 100644
--- a/eos/effects/shipbonusremoterepmaxrangerolebonus1.py
+++ b/eos/effects/shipbonusremoterepmaxrangerolebonus1.py
@@ -2,7 +2,9 @@
 #
 # Used by:
 # Ship: Damavik
+# Ship: Hydra
 # Ship: Leshak
+# Ship: Tiamat
 # Ship: Vedmak
 type = "passive"
 
diff --git a/eos/effects/shipbonussmartbombcapneedrolebonus2.py b/eos/effects/shipbonussmartbombcapneedrolebonus2.py
index 611e9822b..07eb85b54 100644
--- a/eos/effects/shipbonussmartbombcapneedrolebonus2.py
+++ b/eos/effects/shipbonussmartbombcapneedrolebonus2.py
@@ -2,7 +2,9 @@
 #
 # Used by:
 # Ship: Damavik
+# Ship: Hydra
 # Ship: Leshak
+# Ship: Tiamat
 # Ship: Vedmak
 type = "passive"
 
diff --git a/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py b/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py
index db215459d..4fc7124c5 100644
--- a/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py
+++ b/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py
@@ -1,7 +1,7 @@
 # shipBonusSurveyProbeExplosionDelaySkillSurveyCovertOps3
 #
 # Used by:
-# Ships from group: Covert Ops (5 of 7)
+# Ships from group: Covert Ops (5 of 8)
 type = "passive"
 
 
diff --git a/eve.db b/eve.db
index ecab30628..9727bd3fb 100644
Binary files a/eve.db and b/eve.db differ
diff --git a/imgs/icons/10160.png b/imgs/icons/10160.png
new file mode 100644
index 000000000..ce1558e0b
Binary files /dev/null and b/imgs/icons/10160.png differ
diff --git a/imgs/icons/10851.png b/imgs/icons/10851.png
new file mode 100644
index 000000000..30642ceb3
Binary files /dev/null and b/imgs/icons/10851.png differ
diff --git a/imgs/icons/21785.png b/imgs/icons/21785.png
new file mode 100644
index 000000000..d52e7c71d
Binary files /dev/null and b/imgs/icons/21785.png differ
diff --git a/imgs/icons/22029.png b/imgs/icons/22029.png
new file mode 100644
index 000000000..a5e2f7eca
Binary files /dev/null and b/imgs/icons/22029.png differ
diff --git a/imgs/icons/22030.png b/imgs/icons/22030.png
new file mode 100644
index 000000000..627468bb9
Binary files /dev/null and b/imgs/icons/22030.png differ
diff --git a/imgs/icons/22031.png b/imgs/icons/22031.png
new file mode 100644
index 000000000..f9ffc890b
Binary files /dev/null and b/imgs/icons/22031.png differ
diff --git a/imgs/icons/22034.png b/imgs/icons/22034.png
new file mode 100644
index 000000000..aa3e8941f
Binary files /dev/null and b/imgs/icons/22034.png differ
diff --git a/imgs/icons/22036.png b/imgs/icons/22036.png
new file mode 100644
index 000000000..7de00e638
Binary files /dev/null and b/imgs/icons/22036.png differ
diff --git a/imgs/icons/22041.png b/imgs/icons/22041.png
new file mode 100644
index 000000000..560421e25
Binary files /dev/null and b/imgs/icons/22041.png differ
diff --git a/imgs/renders/21344.png b/imgs/renders/21344.png
new file mode 100644
index 000000000..f45f26972
Binary files /dev/null and b/imgs/renders/21344.png differ
diff --git a/imgs/renders/21362.png b/imgs/renders/21362.png
new file mode 100644
index 000000000..f6dff6ea2
Binary files /dev/null and b/imgs/renders/21362.png differ
diff --git a/imgs/renders/21405.png b/imgs/renders/21405.png
new file mode 100644
index 000000000..55a6cc3a5
Binary files /dev/null and b/imgs/renders/21405.png differ
diff --git a/imgs/renders/21406.png b/imgs/renders/21406.png
new file mode 100644
index 000000000..e9d8d8610
Binary files /dev/null and b/imgs/renders/21406.png differ
diff --git a/scripts/icons_update.py b/scripts/icons_update.py
index 7205e3e08..0ad4c5359 100644
--- a/scripts/icons_update.py
+++ b/scripts/icons_update.py
@@ -141,6 +141,7 @@ def get_icon_file(res_path, size):
     icon for it. Return as PIL image object down-
     scaled for use in pyfa.
     """
+    res_path = res_path.replace('//', '/')  #1703
     if res_path not in res_index:
         return None
     res_icon = res_index[res_path]
@@ -192,7 +193,10 @@ if toadd:
     print(('Adding {} icons...'.format(len(toadd))))
     missing = set()
     for fname in sorted(toadd):
-        icon = icon_json[str(fname)]
+        icon = icon_json.get(str(fname), None)
+        if icon is None:
+            print("Can't find iconID {}".format(fname))
+            continue
         key = icon['iconFile'].lower()
         icon = get_icon_file(key, ICON_SIZE)
         if icon is None: