diff --git a/eos/effects/subsystembonusamarrdefensive3armorrepheat.py b/eos/effects/subsystembonusamarrdefensive3armorrepheat.py
new file mode 100644
index 000000000..05118762d
--- /dev/null
+++ b/eos/effects/subsystembonusamarrdefensive3armorrepheat.py
@@ -0,0 +1,8 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
+                                  "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusAmarrDefensive3"),
+                                  skill="Amarr Defensive Systems")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
+                                  "overloadArmorDamageAmount", src.getModifiedItemAttr("subsystemBonusAmarrDefensive3"),
+                                  skill="Amarr Defensive Systems")
diff --git a/eos/effects/subsystembonusamarrpropulsion2warpspeed.py b/eos/effects/subsystembonusamarrpropulsion2warpspeed.py
new file mode 100644
index 000000000..6e192736a
--- /dev/null
+++ b/eos/effects/subsystembonusamarrpropulsion2warpspeed.py
@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("subsystemBonusAmarrPropulsion2"),
+                           skill="Amarr Propulsion Systems")
diff --git a/eos/effects/subsystembonuscaldaridefensive3shieldboostheat.py b/eos/effects/subsystembonuscaldaridefensive3shieldboostheat.py
new file mode 100644
index 000000000..16f78e641
--- /dev/null
+++ b/eos/effects/subsystembonuscaldaridefensive3shieldboostheat.py
@@ -0,0 +1,8 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
+                                  "overloadShieldBonus", src.getModifiedItemAttr("subsystemBonusCaldariDefensive3"),
+                                  skill="Caldari Defensive Systems")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"),
+                                  "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusCaldariDefensive3"),
+                                  skill="Caldari Defensive Systems")
diff --git a/eos/effects/subsystembonuscaldaripropulsion2warpspeed.py b/eos/effects/subsystembonuscaldaripropulsion2warpspeed.py
new file mode 100644
index 000000000..e50cfc50e
--- /dev/null
+++ b/eos/effects/subsystembonuscaldaripropulsion2warpspeed.py
@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("subsystemBonusCaldariPropulsion2"),
+                           skill="Caldari Propulsion Systems")
diff --git a/eos/effects/subsystembonuscaldaripropulsionmaxvelocity.py b/eos/effects/subsystembonuscaldaripropulsionmaxvelocity.py
new file mode 100644
index 000000000..83cc83a6e
--- /dev/null
+++ b/eos/effects/subsystembonuscaldaripropulsionmaxvelocity.py
@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("subsystemBonusCaldariPropulsion"),
+                           skill="Caldari Propulsion Systems")
diff --git a/eos/effects/subsystembonusgallentedefensive3armorrepheat.py b/eos/effects/subsystembonusgallentedefensive3armorrepheat.py
new file mode 100644
index 000000000..c09f77eaa
--- /dev/null
+++ b/eos/effects/subsystembonusgallentedefensive3armorrepheat.py
@@ -0,0 +1,8 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
+                                  "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusGallenteDefensive3"),
+                                  skill="Gallente Defensive Systems")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"),
+                                  "overloadArmorDamageAmount", src.getModifiedItemAttr("subsystemBonusGallenteDefensive3"),
+                                  skill="Gallente Defensive Systems")
diff --git a/eos/effects/subsystembonusgallentepropulsion2warpspeed.py b/eos/effects/subsystembonusgallentepropulsion2warpspeed.py
new file mode 100644
index 000000000..f494ddc60
--- /dev/null
+++ b/eos/effects/subsystembonusgallentepropulsion2warpspeed.py
@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("subsystemBonusGallentePropulsion2"),
+                           skill="Gallente Propulsion Systems")
diff --git a/eos/effects/subsystembonusminmatardefensive3localrepheat.py b/eos/effects/subsystembonusminmatardefensive3localrepheat.py
new file mode 100644
index 000000000..c0dcdcd27
--- /dev/null
+++ b/eos/effects/subsystembonusminmatardefensive3localrepheat.py
@@ -0,0 +1,9 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Shield Operation"),
+                                  "overloadArmorDamageAmount", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive3"),
+                                  skill="Minmatar Defensive Systems")
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Shield Operation"),
+                                  "overloadSelfDurationBonus", src.getModifiedItemAttr("subsystemBonusMinmatarDefensive3"),
+                                  skill="Minmatar Defensive Systems")
+
diff --git a/eos/effects/subsystembonusminmatarpropulsion2warpspeed.py b/eos/effects/subsystembonusminmatarpropulsion2warpspeed.py
new file mode 100644
index 000000000..45f82d3dd
--- /dev/null
+++ b/eos/effects/subsystembonusminmatarpropulsion2warpspeed.py
@@ -0,0 +1,4 @@
+type = "passive"
+def handler(fit, src, context):
+    fit.ship.boostItemAttr("warpSpeedMultiplier", src.getModifiedItemAttr("subsystemBonusMinmatarPropulsion2"),
+                           skill="Minmatar Propulsion Systems")