diff --git a/eos/effects/armorallrepairsystemsamountbonuspassive.py b/eos/effects/armorallrepairsystemsamountbonuspassive.py
index c2eb9e2c4..8307ae2ee 100644
--- a/eos/effects/armorallrepairsystemsamountbonuspassive.py
+++ b/eos/effects/armorallrepairsystemsamountbonuspassive.py
@@ -1,7 +1,7 @@
 # armorAllRepairSystemsAmountBonusPassive
 #
 # Used by:
-# Implants named like: Agency 'Hardshell' TB Dose (3 of 4)
+# Implants named like: Agency 'Hardshell' TB Dose (4 of 4)
 # Implants named like: Exile Booster (4 of 4)
 # Implant: Antipharmakon Kosybo
 type = "passive"
diff --git a/eos/effects/boostermaxvelocitypenalty.py b/eos/effects/boostermaxvelocitypenalty.py
index d42479397..83856e018 100644
--- a/eos/effects/boostermaxvelocitypenalty.py
+++ b/eos/effects/boostermaxvelocitypenalty.py
@@ -1,7 +1,8 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants named like: Booster (12 of 33)
+# Implants named like: Crash Booster (3 of 4)
+# Items from market group: Implants & Boosters > Booster > Booster Slot 02 (9 of 13)
 type = "boosterSideEffect"
 
 # User-friendly name for the side effect
diff --git a/eos/effects/boostershieldcapacitypenalty.py b/eos/effects/boostershieldcapacitypenalty.py
index 6e0b11eb7..ade1336d0 100644
--- a/eos/effects/boostershieldcapacitypenalty.py
+++ b/eos/effects/boostershieldcapacitypenalty.py
@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants named like: Booster (12 of 33)
+# Implants from group: Booster (12 of 66)
 type = "boosterSideEffect"
 
 # User-friendly name for the side effect
diff --git a/eos/effects/capacitorcapacitybonus.py b/eos/effects/capacitorcapacitybonus.py
index f2c0632da..c998bcaa0 100644
--- a/eos/effects/capacitorcapacitybonus.py
+++ b/eos/effects/capacitorcapacitybonus.py
@@ -1,7 +1,7 @@
 # capacitorCapacityBonus
 #
 # Used by:
-# Modules from group: Capacitor Battery (27 of 27)
+# Modules from group: Capacitor Battery (30 of 30)
 type = "passive"
 
 
diff --git a/eos/effects/energynosferatufalloff.py b/eos/effects/energynosferatufalloff.py
index 0dc4fd81b..2d6414e61 100644
--- a/eos/effects/energynosferatufalloff.py
+++ b/eos/effects/energynosferatufalloff.py
@@ -1,7 +1,7 @@
 # energyNosferatuFalloff
 #
 # Used by:
-# Modules from group: Energy Nosferatu (51 of 51)
+# Modules from group: Energy Nosferatu (54 of 54)
 from eos.modifiedAttributeDict import ModifiedAttributeDict
 
 type = "active", "projected"
diff --git a/eos/effects/missileskillwarheadupgradesemdamagebonus.py b/eos/effects/missileskillwarheadupgradesemdamagebonus.py
index 30d0605d5..63e95f67f 100644
--- a/eos/effects/missileskillwarheadupgradesemdamagebonus.py
+++ b/eos/effects/missileskillwarheadupgradesemdamagebonus.py
@@ -1,7 +1,7 @@
 # missileSkillWarheadUpgradesEmDamageBonus
 #
 # Used by:
-# Implants named like: Agency 'Pyrolancea' DB Dose (3 of 4)
+# Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
 # Skill: Warhead Upgrades
 type = "passive"
 
diff --git a/eos/effects/missileskillwarheadupgradesexplosivedamagebonus.py b/eos/effects/missileskillwarheadupgradesexplosivedamagebonus.py
index f0f3fcf3b..6a6228e8e 100644
--- a/eos/effects/missileskillwarheadupgradesexplosivedamagebonus.py
+++ b/eos/effects/missileskillwarheadupgradesexplosivedamagebonus.py
@@ -1,7 +1,7 @@
 # missileSkillWarheadUpgradesExplosiveDamageBonus
 #
 # Used by:
-# Implants named like: Agency 'Pyrolancea' DB Dose (3 of 4)
+# Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
 # Skill: Warhead Upgrades
 type = "passive"
 
diff --git a/eos/effects/missileskillwarheadupgradeskineticdamagebonus.py b/eos/effects/missileskillwarheadupgradeskineticdamagebonus.py
index a9eb7b86e..8b25142a8 100644
--- a/eos/effects/missileskillwarheadupgradeskineticdamagebonus.py
+++ b/eos/effects/missileskillwarheadupgradeskineticdamagebonus.py
@@ -1,7 +1,7 @@
 # missileSkillWarheadUpgradesKineticDamageBonus
 #
 # Used by:
-# Implants named like: Agency 'Pyrolancea' DB Dose (3 of 4)
+# Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
 # Skill: Warhead Upgrades
 type = "passive"
 
diff --git a/eos/effects/missileskillwarheadupgradesthermaldamagebonus.py b/eos/effects/missileskillwarheadupgradesthermaldamagebonus.py
index 8fc3ffc5c..737e5d20d 100644
--- a/eos/effects/missileskillwarheadupgradesthermaldamagebonus.py
+++ b/eos/effects/missileskillwarheadupgradesthermaldamagebonus.py
@@ -1,7 +1,7 @@
 # missileSkillWarheadUpgradesThermalDamageBonus
 #
 # Used by:
-# Implants named like: Agency 'Pyrolancea' DB Dose (3 of 4)
+# Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
 # Skill: Warhead Upgrades
 type = "passive"
 
diff --git a/eos/effects/modifyenergywarfareresistance.py b/eos/effects/modifyenergywarfareresistance.py
index 8cffe1386..874cbf0d7 100644
--- a/eos/effects/modifyenergywarfareresistance.py
+++ b/eos/effects/modifyenergywarfareresistance.py
@@ -1,7 +1,7 @@
 # modifyEnergyWarfareResistance
 #
 # Used by:
-# Modules from group: Capacitor Battery (27 of 27)
+# Modules from group: Capacitor Battery (30 of 30)
 type = "passive"
 
 
diff --git a/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py b/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
index 1ffbda714..6f68c7292 100644
--- a/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
+++ b/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py
@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Rig Anchor (4 of 4)
-# Implants named like: Agency 'Overclocker' SB Dose (3 of 4)
+# Implants named like: Agency 'Overclocker' SB Dose (4 of 4)
 # Implants named like: grade Snake (16 of 18)
 # Modules named like: Auxiliary Thrusters (8 of 8)
 # Implant: Quafe Zero
diff --git a/eos/effects/overloadselfdurationbonus.py b/eos/effects/overloadselfdurationbonus.py
index 498e3a527..90c275da8 100644
--- a/eos/effects/overloadselfdurationbonus.py
+++ b/eos/effects/overloadselfdurationbonus.py
@@ -3,7 +3,7 @@
 # Used by:
 # Modules from group: Capacitor Booster (59 of 59)
 # Modules from group: Energy Neutralizer (54 of 54)
-# Modules from group: Energy Nosferatu (51 of 51)
+# Modules from group: Energy Nosferatu (54 of 54)
 # Modules from group: Hull Repair Unit (25 of 25)
 # Modules from group: Remote Armor Repairer (39 of 39)
 # Modules from group: Remote Capacitor Transmitter (41 of 41)
diff --git a/eos/effects/shieldboostamplifierpassivebooster.py b/eos/effects/shieldboostamplifierpassivebooster.py
index 3dbd40327..30432474d 100644
--- a/eos/effects/shieldboostamplifierpassivebooster.py
+++ b/eos/effects/shieldboostamplifierpassivebooster.py
@@ -1,7 +1,7 @@
 # shieldBoostAmplifierPassiveBooster
 #
 # Used by:
-# Implants named like: Agency 'Hardshell' TB Dose (3 of 4)
+# Implants named like: Agency 'Hardshell' TB Dose (4 of 4)
 # Implants named like: Blue Pill Booster (5 of 5)
 # Implant: Antipharmakon Thureo
 type = "passive"
diff --git a/eos/effects/shippdmgbonusmf.py b/eos/effects/shippdmgbonusmf.py
index 0a359917e..c7ad6a186 100644
--- a/eos/effects/shippdmgbonusmf.py
+++ b/eos/effects/shippdmgbonusmf.py
@@ -1,11 +1,12 @@
 # shipPDmgBonusMF
 #
 # Used by:
-# Variations of ship: Slasher (3 of 3)
 # Ship: Cheetah
 # Ship: Freki
 # Ship: Republic Fleet Firetail
 # Ship: Rifter
+# Ship: Slasher
+# Ship: Stiletto
 # Ship: Wolf
 type = "passive"
 
diff --git a/eos/effects/shipprojectilerofmf.py b/eos/effects/shipprojectilerofmf.py
index 09f4960d1..d0a0e0b1b 100644
--- a/eos/effects/shipprojectilerofmf.py
+++ b/eos/effects/shipprojectilerofmf.py
@@ -1,3 +1,7 @@
+# shipProjectileRofMF
+#
+# Used by:
+# Ship: Claw
 type = "passive"
 def handler(fit, src, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), "speed", src.getModifiedItemAttr("shipBonusMF"), stackingPenalties=True, skill="Minmatar Frigate")
diff --git a/eos/effects/skillbonusdronedurability.py b/eos/effects/skillbonusdronedurability.py
index e91f30acf..97b3c34bf 100644
--- a/eos/effects/skillbonusdronedurability.py
+++ b/eos/effects/skillbonusdronedurability.py
@@ -1,8 +1,7 @@
 # skillBonusDroneDurability
 #
 # Used by:
-# Implant: CreoDron 'Bumblebee' Drone Tuner T10-5D
-# Implant: CreoDron 'Yellowjacket' Drone Tuner D5-10T
+# Implants from group: Cyber Drones (2 of 2)
 # Skill: Drone Durability
 type = "passive"
 
diff --git a/eos/effects/skillbonusdroneinterfacing.py b/eos/effects/skillbonusdroneinterfacing.py
index 93093efc3..0fbac4beb 100644
--- a/eos/effects/skillbonusdroneinterfacing.py
+++ b/eos/effects/skillbonusdroneinterfacing.py
@@ -1,8 +1,7 @@
 # skillBonusDroneInterfacing
 #
 # Used by:
-# Implant: CreoDron 'Bumblebee' Drone Tuner T10-5D
-# Implant: CreoDron 'Yellowjacket' Drone Tuner D5-10T
+# Implants from group: Cyber Drones (2 of 2)
 # Skill: Drone Interfacing
 type = "passive"
 
diff --git a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
index 5a801aab4..481ef2604 100644
--- a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
+++ b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py
@@ -1,7 +1,7 @@
 # surgicalStrikeDamageMultiplierBonusPostPercentDamageMultiplierLocationShipModulesRequiringGunnery
 #
 # Used by:
-# Implants named like: Agency 'Pyrolancea' DB Dose (3 of 4)
+# Implants named like: Agency 'Pyrolancea' DB Dose (4 of 4)
 # Implants named like: Eifyr and Co. 'Gunslinger' Surgical Strike SS (6 of 6)
 # Implant: Standard Cerebral Accelerator
 type = "passive"
diff --git a/imgs/icons/21000.png b/imgs/icons/21000.png
new file mode 100644
index 000000000..f34eda1d4
Binary files /dev/null and b/imgs/icons/21000.png differ
diff --git a/imgs/icons/21833.png b/imgs/icons/21833.png
new file mode 100644
index 000000000..053b59fa4
Binary files /dev/null and b/imgs/icons/21833.png differ
diff --git a/imgs/icons/21988.png b/imgs/icons/21988.png
new file mode 100644
index 000000000..bb32682f3
Binary files /dev/null and b/imgs/icons/21988.png differ
diff --git a/imgs/icons/21999.png b/imgs/icons/21999.png
new file mode 100644
index 000000000..5a7cdad51
Binary files /dev/null and b/imgs/icons/21999.png differ
diff --git a/imgs/icons/22010.png b/imgs/icons/22010.png
new file mode 100644
index 000000000..9452c899b
Binary files /dev/null and b/imgs/icons/22010.png differ